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

fix some errors

Browse source
This commit is contained in:
lumapu 2023-09-30 02:02:19 +02:00
parent a695356313
commit ded734fa8b
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/app.cpp
View file

@ -120,7 +120,6 @@ void app::loop(void) {
if (mNrfRadio.loop() && mConfig->nrf.enabled) { if (mNrfRadio.loop() && mConfig->nrf.enabled) {
while (!mNrfRadio.mBufCtrl.empty()) { while (!mNrfRadio.mBufCtrl.empty()) {
packet_t *p = &mNrfRadio.mBufCtrl.front(); packet_t *p = &mNrfRadio.mBufCtrl.front();
if (mConfig->serial.debug) { if (mConfig->serial.debug) {
DPRINT(DBG_INFO, F("RX ")); DPRINT(DBG_INFO, F("RX "));
DBGPRINT(String(p->len)); DBGPRINT(String(p->len));
@ -135,10 +134,10 @@ void app::loop(void) {
Inverter<> *iv = mSys.findInverter(&p->packet[1]); Inverter<> *iv = mSys.findInverter(&p->packet[1]);
if (NULL != iv) { if (NULL != iv) {
if (IV_HM == iv->ivGen) if (IV_MI == iv->ivGen)
mPayload.add(iv, p);
else
mMiPayload.add(iv, p); mMiPayload.add(iv, p);
else
mPayload.add(iv, p);
} }
mNrfRadio.mBufCtrl.pop(); mNrfRadio.mBufCtrl.pop();
yield(); yield();

2
src/defines.h
View file

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 7 #define VERSION_MINOR 7
#define VERSION_PATCH 60 #define VERSION_PATCH 61
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

5
src/hm/hmSystem.h
View file

@ -69,10 +69,13 @@ class HmSystem {
} else if(iv->config->serial.u64 != 0ULL) { } else if(iv->config->serial.u64 != 0ULL) {
DPRINTLN(DBG_ERROR, F("inverter type can't be detected!")); DPRINTLN(DBG_ERROR, F("inverter type can't be detected!"));
return; return;
} } else
iv->ivGen = IV_UNKNOWN;
iv->init(); iv->init();
mNumInv ++; mNumInv ++;
if(IV_UNKNOWN == iv->ivGen)
return; // serial is 0
DPRINT(DBG_INFO, "added inverter "); DPRINT(DBG_INFO, "added inverter ");
if(iv->config->serial.b[5] == 0x11) { if(iv->config->serial.b[5] == 0x11) {