topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

processPayload make readable

pull/361/head
DanielR92 3 years ago
parent
d6dfe6dc1a
commit
44ba08659d
1 changed files with 23 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      tools/esp8266/app.cpp

34
tools/esp8266/app.cpp
View File

@ -314,18 +314,26 @@ void app::processPayload(bool retransmit) {
mPayload[iv->id].complete = true; mPayload[iv->id].complete = true;
} }
if(!mPayload[iv->id].complete ) { if(!mPayload[iv->id].complete )
if(!buildPayload(iv->id)) { // payload not complete {
if(mPayload[iv->id].requested) { if(!buildPayload(iv->id)) // payload not complete
if(retransmit) { {
if(mPayload[iv->id].requested)
{
if(retransmit)
{
if(iv->devControlCmd == Restart || iv->devControlCmd == CleanState_LockAndAlarm ) { if(iv->devControlCmd == Restart || iv->devControlCmd == CleanState_LockAndAlarm ) {
// This is required to prevent retransmissions without answer. // This is required to prevent retransmissions without answer.
DPRINTLN(DBG_INFO, F("Prevent retransmit on Restart / CleanState_LockAndAlarm...")); DPRINTLN(DBG_INFO, F("Prevent retransmit on Restart / CleanState_LockAndAlarm..."));
mPayload[iv->id].retransmits = mConfig.maxRetransPerPyld; mPayload[iv->id].retransmits = mConfig.maxRetransPerPyld;
} else { }
if(mPayload[iv->id].retransmits < mConfig.maxRetransPerPyld) { else
{
if(mPayload[iv->id].retransmits < mConfig.maxRetransPerPyld)
{
mPayload[iv->id].retransmits++; mPayload[iv->id].retransmits++;
if(mPayload[iv->id].maxPackId != 0) { if(mPayload[iv->id].maxPackId != 0)
{
for(uint8_t i = 0; i < (mPayload[iv->id].maxPackId-1); i++) { for(uint8_t i = 0; i < (mPayload[iv->id].maxPackId-1); i++) {
if(mPayload[iv->id].len[i] == 0) { if(mPayload[iv->id].len[i] == 0) {
if(mConfig.serialDebug) if(mConfig.serialDebug)
@ -336,7 +344,8 @@ void app::processPayload(bool retransmit) {
yield(); yield();
} }
} }
else { else
{
if(mConfig.serialDebug) if(mConfig.serialDebug)
DPRINTLN(DBG_WARN, F("while retrieving data: last frame missing: Request Retransmit")); DPRINTLN(DBG_WARN, F("while retrieving data: last frame missing: Request Retransmit"));
if(0x00 != mLastPacketId) if(0x00 != mLastPacketId)
@ -352,7 +361,8 @@ void app::processPayload(bool retransmit) {
} }
} }
} }
else { // payload complete else
{ // payload complete
DPRINTLN(DBG_INFO, F("procPyld: cmd: ") + String(mPayload[iv->id].txCmd)); DPRINTLN(DBG_INFO, F("procPyld: cmd: ") + String(mPayload[iv->id].txCmd));
DPRINTLN(DBG_INFO, F("procPyld: txid: 0x") + String(mPayload[iv->id].txId, HEX)); DPRINTLN(DBG_INFO, F("procPyld: txid: 0x") + String(mPayload[iv->id].txId, HEX));
DPRINTLN(DBG_DEBUG, F("procPyld: max: ") + String(mPayload[iv->id].maxPackId)); DPRINTLN(DBG_DEBUG, F("procPyld: max: ") + String(mPayload[iv->id].maxPackId));
@ -377,9 +387,11 @@ void app::processPayload(bool retransmit) {
mSys->Radio.dumpBuf(NULL, payload, offs); mSys->Radio.dumpBuf(NULL, payload, offs);
} }
if(NULL == rec) if(NULL == rec) {
DPRINTLN(DBG_ERROR, F("record is NULL!")); DPRINTLN(DBG_ERROR, F("record is NULL!"));
else { }
else
{
rec->ts = mPayload[iv->id].ts; rec->ts = mPayload[iv->id].ts;
for(uint8_t i = 0; i < rec->length; i++) { for(uint8_t i = 0; i < rec->length; i++) {
iv->addValue(i, payload, rec); iv->addValue(i, payload, rec);

Write Preview
Loading…
Cancel
Save