Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 12, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion targets/CMSIS-OS/ChibiOS/nf-overlay/os/hal/src/stm32_onewire/hal_stm32_onewire.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ces.OneWire/nf_devices_onewire_native_nanoFramework_Devices_OneWire_OneWireController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down