diff options
| author | barthess <barthess@yandex.ru> | 2014-12-18 00:21:28 +0300 |
|---|---|---|
| committer | barthess <barthess@yandex.ru> | 2014-12-18 00:21:28 +0300 |
| commit | 073d4d467f501f99334c43ef5583ae40888aa274 (patch) | |
| tree | 05f01f08c62b00e33c0be78bea1b6937e2d08e59 /testhal/STM32/STM32F4xx/onewire/onewire_test.c | |
| parent | 99505cdea68069a3873e670ccc95cdc0f94d2319 (diff) | |
| download | ChibiOS-Contrib-073d4d467f501f99334c43ef5583ae40888aa274.tar.gz ChibiOS-Contrib-073d4d467f501f99334c43ef5583ae40888aa274.tar.bz2 ChibiOS-Contrib-073d4d467f501f99334c43ef5583ae40888aa274.zip | |
1-wire. STM32F1xx code tested
Diffstat (limited to 'testhal/STM32/STM32F4xx/onewire/onewire_test.c')
| -rw-r--r-- | testhal/STM32/STM32F4xx/onewire/onewire_test.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/testhal/STM32/STM32F4xx/onewire/onewire_test.c b/testhal/STM32/STM32F4xx/onewire/onewire_test.c index 139732d..7d0de69 100644 --- a/testhal/STM32/STM32F4xx/onewire/onewire_test.c +++ b/testhal/STM32/STM32F4xx/onewire/onewire_test.c @@ -32,19 +32,23 @@ #if defined(BOARD_ST_STM32F4_DISCOVERY) #define GPIOB_ONEWIRE GPIOB_PIN8 +#define ONEWIRE_PAD_MODE_ACTIVE (PAL_MODE_ALTERNATE(2) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUDR_PULLUP) #define search_led_off() (palClearPad(GPIOD, GPIOD_LED4)) #define search_led_on() (palSetPad(GPIOD, GPIOD_LED4)) #define ONEWIRE_MASTER_CHANNEL 2 #define ONEWIRE_SAMPLE_CHANNEL 3 #elif defined(BOARD_OLIMEX_STM32_103STK) #define GPIOB_ONEWIRE 8 -#define search_led_off() (palClearPad(GPIOC, GPIOC_LED)) -#define search_led_on() (palSetPad(GPIOC, GPIOC_LED)) -#define ONEWIRE_MASTER_CHANNEL 3 -#define ONEWIRE_SAMPLE_CHANNEL 2 +#define ONEWIRE_PAD_MODE_IDLE PAL_MODE_INPUT +#define ONEWIRE_PAD_MODE_ACTIVE PAL_MODE_STM32_ALTERNATE_OPENDRAIN +#define search_led_on() (palClearPad(GPIOC, GPIOC_LED)) +#define search_led_off() (palSetPad(GPIOC, GPIOC_LED)) +#define ONEWIRE_MASTER_CHANNEL 2 +#define ONEWIRE_SAMPLE_CHANNEL 3 #else #define GPIOB_ONEWIRE GPIOB_TACHOMETER #include "pads.h" +#define ONEWIRE_PAD_MODE_ACTIVE (PAL_MODE_ALTERNATE(2) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUDR_PULLUP) #define search_led_on red_led_on #define search_led_off red_led_off #define ONEWIRE_MASTER_CHANNEL 2 @@ -65,7 +69,6 @@ /* * Forward declarations */ -static uint_fast8_t onewire_read_bit_X(void); #if ONEWIRE_USE_STRONG_PULLUP static void strong_pullup_assert(void); static void strong_pullup_release(void); @@ -88,7 +91,12 @@ static const onewireConfig ow_cfg = { &PWMD4, ONEWIRE_MASTER_CHANNEL, ONEWIRE_SAMPLE_CHANNEL, - onewire_read_bit_X, + GPIOB, + GPIOB_ONEWIRE, +#if defined(STM32F1XX) + ONEWIRE_PAD_MODE_IDLE, +#endif + ONEWIRE_PAD_MODE_ACTIVE, #if ONEWIRE_USE_STRONG_PULLUP strong_pullup_assert, strong_pullup_release @@ -121,17 +129,6 @@ static void strong_pullup_release(void) { } #endif /* ONEWIRE_USE_STRONG_PULLUP */ -/** - * - */ -static uint_fast8_t onewire_read_bit_X(void) { -#if ONEWIRE_SYNTH_SEARCH_TEST - return _synth_ow_read_bit(); -#else - return palReadPad(GPIOB, GPIOB_ONEWIRE); -#endif -} - /* ****************************************************************************** * EXPORTED FUNCTIONS |