3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-25 20:27:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

bug fix esp8266

Browse source
This commit is contained in:
lumapu 2023-09-30 02:14:35 +02:00
parent ded734fa8b
commit 124cbf6ba2
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/app.cpp
View file

@ -64,8 +64,10 @@ void app::setup() {
mSys.addInverter(i, [this](Inverter<> *iv) { mSys.addInverter(i, [this](Inverter<> *iv) {
if((IV_MI == iv->ivGen) || (IV_HM == iv->ivGen)) if((IV_MI == iv->ivGen) || (IV_HM == iv->ivGen))
iv->radio = &mNrfRadio; iv->radio = &mNrfRadio;
#if defined(ESP32)
else if((IV_HMS == iv->ivGen) || (IV_HMT == iv->ivGen)) else if((IV_HMS == iv->ivGen) || (IV_HMT == iv->ivGen))
iv->radio = &mCmtRadio; iv->radio = &mCmtRadio;
#endif
}); });
} }
if (mConfig->nrf.enabled) { if (mConfig->nrf.enabled) {
@ -116,6 +118,7 @@ void app::setup() {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void app::loop(void) { void app::loop(void) {
ah::Scheduler::loop(); ah::Scheduler::loop();
bool processPayload = false;
if (mNrfRadio.loop() && mConfig->nrf.enabled) { if (mNrfRadio.loop() && mConfig->nrf.enabled) {
while (!mNrfRadio.mBufCtrl.empty()) { while (!mNrfRadio.mBufCtrl.empty()) {
@ -142,7 +145,7 @@ void app::loop(void) {
mNrfRadio.mBufCtrl.pop(); mNrfRadio.mBufCtrl.pop();
yield(); yield();
} }
mPayload.process(true); processPayload = true;
mMiPayload.process(true); mMiPayload.process(true);
} }
#if defined(ESP32) #if defined(ESP32)
@ -167,9 +170,13 @@ void app::loop(void) {
mCmtRadio.mBufCtrl.pop(); mCmtRadio.mBufCtrl.pop();
yield(); yield();
} }
mPayload.process(false); //true processPayload = true;
} }
#endif #endif
if(processPayload)
mPayload.process(true);
mPayload.loop(); mPayload.loop();
mMiPayload.loop(); mMiPayload.loop();

4
src/hm/hmInverter.h
View file

@ -169,7 +169,6 @@ class Inverter {
mDevControlRequest = false; mDevControlRequest = false;
devControlCmd = InitDataState; devControlCmd = InitDataState;
initialized = false; initialized = false;
//lastAlarmMsg = "nothing";
alarmMesIndex = 0; alarmMesIndex = 0;
isConnected = false; isConnected = false;
status = InverterStatus::OFF; status = InverterStatus::OFF;
@ -364,9 +363,6 @@ class Inverter {
} }
else if (rec->assign == AlarmDataAssignment) { else if (rec->assign == AlarmDataAssignment) {
DPRINTLN(DBG_DEBUG, "add alarm"); DPRINTLN(DBG_DEBUG, "add alarm");
//if (getPosByChFld(0, FLD_LAST_ALARM_CODE, rec) == pos){
// lastAlarmMsg = getAlarmStr(rec->record[pos]);
//}
} }
else else
DPRINTLN(DBG_WARN, F("add with unknown assignment")); DPRINTLN(DBG_WARN, F("add with unknown assignment"));