MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge Onewire changes from Master into Dev 

Master contained two OW changes one of which was already reimplemented in dev using the
correct macros.  The second was from hazarkarabay (f6d0c0c) that onewire_search()
returns a device address vector even when no device is found.  I've reimplemented this
but using the correct index, rom_byte_number, rather than declaring a new temp index i.
This commit is contained in:
TerryE 2015-11-23 01:23:41 +00:00
parent b216e6a809
commit 583049f620
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/driver/onewire.c
View File

@ -407,10 +407,15 @@ uint8_t onewire_search(uint8_t pin, uint8_t *newAddr)
LastFamilyDiscrepancy[pin] = 0; LastFamilyDiscrepancy[pin] = 0;
search_result = FALSE; search_result = FALSE;
} }
int i; else
for (i = 0; i < 8; i++) newAddr[i] = ROM_NO[pin][i]; {
for (rom_byte_number = 0; rom_byte_number < 8; rom_byte_number++)
{
newAddr[rom_byte_number] = ROM_NO[pin][rom_byte_number];
}
}
return search_result; return search_result;
} }
#endif #endif