Fix endless loop in 1-Wire during ID search (#1501)

nanoframework · Nov 12, 2019 · b774ca6 · b774ca6
1 parent b5e3989
commit b774ca6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/targets/CMSIS-OS/ChibiOS/nf-overlay/os/hal/src/stm32_onewire/hal_stm32_onewire.c b/targets/CMSIS-OS/ChibiOS/nf-overlay/os/hal/src/stm32_onewire/hal_stm32_onewire.c
@@ -1012,7 +1012,7 @@ bool oneWireFindNext (bool doReset, bool alarmOnly)
     }
     while (romByteIndex < 8);  // loop until we have all ROM bytes
 
-    if (romBitIndex < (65 || lastcrc8))
+    if ((romBitIndex < 65) || (lastcrc8 != 0))
     {
         // search was unsuccessful reset the last discrepancy
         LastDiscrepancy = 0;

diff --git a/...ces.OneWire/nf_devices_onewire_native_nanoFramework_Devices_OneWire_OneWireController.cpp b/...ces.OneWire/nf_devices_onewire_native_nanoFramework_Devices_OneWire_OneWireController.cpp
@@ -366,7 +366,7 @@ bool oneWireFindNext (bool doReset, bool alarmOnly)
     }
     while (romByteIndex < 8);  // loop until we have all ROM bytes
 
-    if (romBitIndex < (65 || lastcrc8))
+    if ((romBitIndex < 65) || (lastcrc8 != 0))
     {
         // search was unsuccessful reset the last discrepancy
         LastDiscrepancy = 0;