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

Merge branch 'main' into main

Browse source
This commit is contained in:
lumapu 2022-06-02 22:39:55 +02:00 • committed by GitHub
commit e0800bd87e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 54 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tools/esp8266/app.cpp
View file

@ -157,6 +157,8 @@ void app::loop(void) {
//app_loops++;
Main::loop();
mSys->Radio.loop();
if(checkTicker(&mRxTicker, 5)) {
//DPRINTLN(F("app_loops =") + String(app_loops));
//app_loops=0;
@ -195,6 +197,7 @@ void app::loop(void) {
}
mSys->BufCtrl.popBack();
yield();
}
@ -319,6 +322,7 @@ bool app::buildPayload(uint8_t id) {
else
crc = crc16(mPayload[id].data[i], mPayload[id].len[i], crc);
}
yield();
}
if(crc == crcRcv)
return true;
@ -353,7 +357,7 @@ void app::processPayload(bool retransmit) {
else
mSys->Radio.sendTimePacket(iv->radioId.u64, mPayload[iv->id].ts);
}
mSys->Radio.switchRxCh(100);
mSys->Radio.switchRxCh(300);
}
}
else {
@ -364,6 +368,7 @@ void app::processPayload(bool retransmit) {
for(uint8_t i = 0; i < (mPayload[iv->id].maxPackId); i ++) {
memcpy(&payload[offs], mPayload[iv->id].data[i], (mPayload[iv->id].len[i]));
offs += (mPayload[iv->id].len[i]);
yield();
}
offs-=2;
if(mSerialDebug) {
@ -379,6 +384,7 @@ void app::processPayload(bool retransmit) {
}
}
}
yield();
}
}
@ -650,6 +656,7 @@ void app::showLiveData(void) {
}
}
modHtml += "</div>";
yield();
}
modHtml += F("<div class=\"ts\">Last received data requested at: ") + getDateTimeStr(iv->ts) + F("</div>");
modHtml += F("</div>");