3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-25 23:06:11 +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()) if(!mNrfRadio.isChipConnected())
DPRINTLN(DBG_WARN, F("WARNING! your NRF24 module can't be reached, check the wiring")); 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.setup(this, &mSys, &mCmtRadio, &mStat, 5, &mTimestamp);
mHmsPayload.enableSerialDebug(mConfig->serial.debug); mHmsPayload.enableSerialDebug(mConfig->serial.debug);
mHmsPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1)); mHmsPayload.addPayloadListener(std::bind(&app::payloadEventListener, this, std::placeholders::_1));
} //}
/*DBGPRINTLN("--- after payload"); /*DBGPRINTLN("--- after payload");
DBGPRINTLN(String(ESP.getFreeHeap())); DBGPRINTLN(String(ESP.getFreeHeap()));
@ -167,7 +167,7 @@ void app::loopStandard(void) {
mCmtRadio.mBufCtrl.pop(); mCmtRadio.mBufCtrl.pop();
yield(); yield();
} }
mHmsPayload.process(true); //mHmsPayload.process(true);
} }
#endif #endif
mPayload.loop(); mPayload.loop();

4
src/hm/miPayload.h
View file

@ -99,7 +99,7 @@ class MiPayload {
cmd2 = 0x00; cmd2 = 0x00;
}; };
mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd2, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); mRadio->prepareDevInformCmd(iv->radioId.u64, cmd2, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd);
mPayload[iv->id].txCmd = cmd; mPayload[iv->id].txCmd = cmd;
if (iv->type == INV_TYPE_1CH || iv->type == INV_TYPE_2CH) { if (iv->type == INV_TYPE_1CH || iv->type == INV_TYPE_2CH) {
mPayload[iv->id].dataAB[CH1] = false; mPayload[iv->id].dataAB[CH1] = false;
@ -343,7 +343,7 @@ class MiPayload {
} }
DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") next request is 0x") + String(cmd, HEX)); DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") next request is 0x") + String(cmd, HEX));
//mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd, true); //mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd, true);
mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, true, cmd); mRadio->prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, true, cmd);
mPayload[iv->id].txCmd = cmd; mPayload[iv->id].txCmd = cmd;
yield(); yield();
} }

2
src/hms/hmsPayload.h
View file

@ -381,7 +381,7 @@ class HmsPayload {
void reset(uint8_t id) { void reset(uint8_t id) {
DPRINT(DBG_INFO, "resetPayload: id: "); DPRINT(DBG_INFO, "resetPayload: id: ");
DBGPRINTLN(String(id)); DBGPRINTLN(String(id));
memset(mPayload[id].len, 0, MAX_PAYLOAD_ENTRIES); memset(&mPayload[id], 0, sizeof(hmsPayload_t));
//mPayload[id].txCmd = 0; //mPayload[id].txCmd = 0;
mPayload[id].gotFragment = false; mPayload[id].gotFragment = false;
//mPayload[id].retransmits = 0; //mPayload[id].retransmits = 0;