diff options
| author | barthess <barthess@yandex.ru> | 2016-10-18 12:02:55 +0300 |
|---|---|---|
| committer | barthess <barthess@yandex.ru> | 2016-10-18 12:02:55 +0300 |
| commit | 555f301da2f276cc353a8e2d0a283a488bd8eeff (patch) | |
| tree | 2ae51b49dec5bf94ef79ea97a66a263a2aef7b88 /os | |
| parent | bd47894d622acbc18bf99b0b46bf7b0ed7330634 (diff) | |
| download | ChibiOS-Contrib-555f301da2f276cc353a8e2d0a283a488bd8eeff.tar.gz ChibiOS-Contrib-555f301da2f276cc353a8e2d0a283a488bd8eeff.tar.bz2 ChibiOS-Contrib-555f301da2f276cc353a8e2d0a283a488bd8eeff.zip | |
1-Wire. Duplicated code from testhal apllications moved to separate directory.
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/include/hal_onewire.h | 4 | ||||
| -rw-r--r-- | os/hal/src/hal_onewire.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/os/hal/include/hal_onewire.h b/os/hal/include/hal_onewire.h index 12e7b75..bbaf77b 100644 --- a/os/hal/include/hal_onewire.h +++ b/os/hal/include/hal_onewire.h @@ -59,11 +59,13 @@ /*===========================================================================*/ /* Driver pre-compile time settings. */ /*===========================================================================*/ +#if ONEWIRE_SYNTH_SEARCH_TEST && !ONEWIRE_USE_SEARCH_ROM +#error "Synthetic search rom test needs ONEWIRE_USE_SEARCH_ROM" +#endif /*===========================================================================*/ /* Derived constants and error checks. */ /*===========================================================================*/ - #if !HAL_USE_PWM #error "1-wire Driver requires HAL_USE_PWM" #endif diff --git a/os/hal/src/hal_onewire.c b/os/hal/src/hal_onewire.c index 85630d9..4e80807 100644 --- a/os/hal/src/hal_onewire.c +++ b/os/hal/src/hal_onewire.c @@ -881,7 +881,7 @@ size_t onewireSearchRom(onewireDriver *owp, uint8_t *result, * Include test code (if enabled). */ #if ONEWIRE_SYNTH_SEARCH_TEST -#include "search_rom_synth.c" +#include "synth_searchrom.c" #endif #endif /* HAL_USE_ONEWIRE */ |