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

fix merge changes

Browse source
This commit is contained in:
lumapu 2023-03-08 08:28:12 +01:00
parent 10271ea7d8
commit a01666aee8
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/app.cpp
View file

@ -64,11 +64,11 @@ void app::setup() {
if(!mNrfRadio.isChipConnected())
DPRINTLN(DBG_WARN, F("WARNING! your NRF24 module can't be reached, check the wiring"));
}
if(mConfig->cmt.enabled) {
//if(mConfig->cmt.enabled) {
mHmsPayload.setup(this, &mSys, &mCmtRadio, &mStat, 5, &mTimestamp);
mHmsPayload.enableSerialDebug(mConfig->serial.debug);
mHmsPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1));
}
//}
/*DBGPRINTLN("--- after payload");
DBGPRINTLN(String(ESP.getFreeHeap()));
@ -167,7 +167,7 @@ void app::loopStandard(void) {
mCmtRadio.mBufCtrl.pop();
yield();
}
mHmsPayload.process(true);
//mHmsPayload.process(true);
}
#endif
mPayload.loop();