3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-15 18:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

buildPayload readable and return one liner

Browse source
This commit is contained in:
DanielR92 2022-10-19 20:23:47 +02:00
parent 44ba08659d
commit 5762002a53
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tools/esp8266/app.cpp
View file

@ -279,21 +279,24 @@ bool app::buildPayload(uint8_t id) {
if(mPayload[id].maxPackId > MAX_PAYLOAD_ENTRIES) if(mPayload[id].maxPackId > MAX_PAYLOAD_ENTRIES)
mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES;
for(uint8_t i = 0; i < mPayload[id].maxPackId; i ++) { for(uint8_t i = 0; i < mPayload[id].maxPackId; i ++)
if(mPayload[id].len[i] > 0) { {
if(i == (mPayload[id].maxPackId-1)) { if(mPayload[id].len[i] > 0)
{
if(i == (mPayload[id].maxPackId-1))
{
crc = Ahoy::crc16(mPayload[id].data[i], mPayload[id].len[i] - 2, crc); crc = Ahoy::crc16(mPayload[id].data[i], mPayload[id].len[i] - 2, crc);
crcRcv = (mPayload[id].data[i][mPayload[id].len[i] - 2] << 8) crcRcv = (mPayload[id].data[i][mPayload[id].len[i] - 2] << 8) | (mPayload[id].data[i][mPayload[id].len[i] - 1]);
| (mPayload[id].data[i][mPayload[id].len[i] - 1]);
} }
else else
{
crc = Ahoy::crc16(mPayload[id].data[i], mPayload[id].len[i], crc); crc = Ahoy::crc16(mPayload[id].data[i], mPayload[id].len[i], crc);
}
} }
yield(); yield();
} }
if(crc == crcRcv)
return true; return (crc == crcRcv) ? true : false;
return false;
} }