Skip to content

Commit 240be8c

Browse files
lumapulumapu
committed
0.8.16
* updated heuristic #1080 #1259 * fix compile opendtufusion fusion ethernet
1 parent 4afd631 commit 240be8c

File tree

5 files changed

+83
-66
lines changed

5 files changed

+83
-66
lines changed

‎src/CHANGES.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## 0.8.16 - 2023-12-09
44
* fix crash if NRF is not enabled
5+
* updated heuristic #1080 #1259
6+
* fix compile opendtufusion fusion ethernet
57

68
## 0.8.15 - 2023-12-09
79
* added support for opendtufusion fusion ethernet shield #886

‎src/hm/Communication.h‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ class Communication : public CommQueue<> {
8888
} else
8989
q->iv->radio->prepareDevInformCmd(q->iv, q->cmd, q->ts, q->iv->alarmLastId, false);
9090

91-
if(!mHeu.getTestModeEnabled(q->iv))
92-
q->iv->radioStatistics.txCnt++;
91+
q->iv->radioStatistics.txCnt++;
9392
mWaitTimeout = millis() + timeout;
9493
mWaitTimeout_min = millis() + timeout_min;
9594
mIsResend = false;
@@ -115,8 +114,7 @@ class Communication : public CommQueue<> {
115114
}
116115
mFirstTry = false;
117116
mlastTO_min = timeout_min;
118-
if(!mHeu.getTestModeEnabled(q->iv))
119-
q->iv->radioStatistics.retransmits++; // got nothing
117+
q->iv->radioStatistics.retransmits++; // got nothing
120118
mState = States::START;
121119
break;
122120
}
@@ -166,6 +164,7 @@ class Communication : public CommQueue<> {
166164
DBGPRINT(String(p->ch));
167165
DBGPRINT(F(" "));
168166
} else {
167+
DBGPRINT(F(" "));
169168
DBGPRINT(String(p->rssi));
170169
DBGPRINT(F("dBm | "));
171170
}
@@ -180,8 +179,7 @@ class Communication : public CommQueue<> {
180179
}
181180

182181
if(checkIvSerial(&p->packet[1], q->iv)) {
183-
if(!mHeu.getTestModeEnabled(q->iv))
184-
q->iv->radioStatistics.frmCnt++;
182+
q->iv->radioStatistics.frmCnt++;
185183

186184
if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command
187185
parseFrame(p);
@@ -193,8 +191,7 @@ class Communication : public CommQueue<> {
193191
parseMiFrame(p, q);
194192
}
195193
} else {
196-
if(!mHeu.getTestModeEnabled(q->iv))
197-
q->iv->radioStatistics.rxFail++; // got no complete payload
194+
q->iv->radioStatistics.rxFail++; // got no complete payload
198195
DPRINTLN(DBG_WARN, F("Inverter serial does not match"));
199196
mWaitTimeout = millis() + timeout;
200197
}
@@ -370,8 +367,7 @@ class Communication : public CommQueue<> {
370367
DBGPRINT(F("CRC Error "));
371368
if(q->attempts == 0) {
372369
DBGPRINTLN(F("-> Fail"));
373-
/*if(!mHeu.getTestModeEnabled())
374-
q->iv->radioStatistics.rxFail++; // got fragments but not complete response
370+
/*q->iv->radioStatistics.rxFail++; // got fragments but not complete response
375371
cmdDone();*/
376372
closeRequest(q->iv, false, false);
377373

@@ -420,8 +416,7 @@ class Communication : public CommQueue<> {
420416
DBGPRINT(String(rec->pyldLen));
421417
DBGPRINTLN(F(" bytes"));
422418
}
423-
/*if(!mHeu.getTestModeEnabled())
424-
q->iv->radioStatistics.rxFail++;*/
419+
/*q->iv->radioStatistics.rxFail++;*/
425420
closeRequest(q->iv, false, false);
426421

427422
return;
@@ -464,15 +459,12 @@ class Communication : public CommQueue<> {
464459
// ordering of lines is relevant for statistics
465460
if(succeeded) {
466461
mHeu.setGotAll(iv);
467-
if(!mHeu.getTestModeEnabled(iv))
468-
iv->radioStatistics.rxSuccess++;
462+
iv->radioStatistics.rxSuccess++;
469463
} else if(iv->mGotFragment) {
470464
mHeu.setGotFragment(iv);
471-
if(!mHeu.getTestModeEnabled(iv))
472-
iv->radioStatistics.rxFail++; // got no complete payload
465+
iv->radioStatistics.rxFail++; // got no complete payload
473466
} else {
474-
if(!mHeu.getTestModeEnabled(iv))
475-
iv->radioStatistics.rxFailNoAnser++; // got nothing
467+
iv->radioStatistics.rxFailNoAnser++; // got nothing
476468
mHeu.setGotNothing(iv);
477469
mWaitTimeout = millis() + WAIT_GAP_TIMEOUT;
478470
}
@@ -682,12 +674,10 @@ class Communication : public CommQueue<> {
682674

683675
if(q->iv->miMultiParts == 7) {
684676
mHeu.setGotAll(q->iv);
685-
if(!mHeu.getTestModeEnabled(q->iv))
686-
q->iv->radioStatistics.rxSuccess++;
677+
q->iv->radioStatistics.rxSuccess++;
687678
} else
688679
mHeu.setGotFragment(q->iv);
689-
/*if(!mHeu.getTestModeEnabled())
690-
iv->radioStatistics.rxFail++; // got no complete payload*/
680+
/*iv->radioStatistics.rxFail++; // got no complete payload*/
691681
//q->iv->radioStatistics.retransmits++;
692682
q->iv->radio->sendCmdPacket(q->iv, cmd, 0x00, true);
693683

‎src/hm/Heuristic.h‎

Lines changed: 55 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,61 +10,79 @@
1010
#include "hmInverter.h"
1111
#include "HeuristicInv.h"
1212

13+
#define RF_TEST_PERIOD_MAX_SEND_CNT 50
14+
#define RF_TEST_PERIOD_MAX_FAIL_CNT 5
15+
16+
#define RF_TX_TEST_CHAN_1ST_USE 0xff
17+
1318
class Heuristic {
1419
public:
1520
uint8_t getTxCh(Inverter<> *iv) {
1621
if((IV_HMS == iv->ivGen) || (IV_HMT == iv->ivGen))
1722
return 0; // not used for these inverter types
1823

19-
uint8_t bestId = 0;
20-
int8_t bestQuality = -6;
21-
for(uint8_t i = 0; i < RF_MAX_CHANNEL_ID; i++) {
22-
if(iv->heuristics.txRfQuality[i] > bestQuality) {
23-
bestQuality = iv->heuristics.txRfQuality[i];
24-
bestId = i;
25-
}
24+
HeuristicInv *ih = &iv->heuristics;
25+
26+
// start with the next index: round robbin in case of same 'best' quality
27+
uint8_t curId = (ih->txRfChId + 1) % RF_MAX_CHANNEL_ID;
28+
uint8_t lastBestId = ih->txRfChId;
29+
ih->txRfChId = curId;
30+
curId = (curId + 1) % RF_MAX_CHANNEL_ID;
31+
for(uint8_t i = 1; i < RF_MAX_CHANNEL_ID; i++) {
32+
if(ih->txRfQuality[curId] > ih->txRfQuality[ih->txRfChId])
33+
ih->txRfChId = curId;
34+
curId = (curId + 1) % RF_MAX_CHANNEL_ID;
2635
}
2736

28-
if(iv->heuristics.testEn) {
29-
DPRINTLN(DBG_INFO, F("heuristic test mode"));
30-
iv->heuristics.testIdx = (iv->heuristics.testIdx + 1) % RF_MAX_CHANNEL_ID;
37+
if(ih->testPeriodSendCnt < 0xff)
38+
ih->testPeriodSendCnt++;
3139

32-
if (iv->heuristics.testIdx == bestId)
33-
iv->heuristics.testIdx = (iv->heuristics.testIdx + 1) % RF_MAX_CHANNEL_ID;
40+
if((ih->txRfChId == lastBestId) && (ih->testPeriodSendCnt >= RF_TEST_PERIOD_MAX_SEND_CNT)) {
41+
if(ih->testPeriodFailCnt > RF_TEST_PERIOD_MAX_FAIL_CNT) {
42+
// try round robbin another chan and see if it works even better
43+
ih->testChId = (ih->testChId + 1) % RF_MAX_CHANNEL_ID;
44+
if(ih->testChId = ih->txRfChId)
45+
ih->testChId = (ih->testChId + 1) % RF_MAX_CHANNEL_ID;
3446

35-
// test channel get's quality of best channel (maybe temporarily, see in 'setGotNothing')
36-
iv->heuristics.storedIdx = iv->heuristics.txRfQuality[iv->heuristics.testIdx];
37-
iv->heuristics.txRfQuality[iv->heuristics.testIdx] = bestQuality;
47+
// give it a fair chance but remember old status in case of immediate fail
48+
ih->txRfChId = ih->testChId;
49+
ih->testChId = RF_TX_TEST_CHAN_1ST_USE; // mark the chan as a test and as 1st use during new test period
50+
DPRINTLN(DBG_INFO, "Test CH " + String(id2Ch(ih->txRfChId)));
51+
}
3852

39-
iv->heuristics.txRfChId = iv->heuristics.testIdx;
40-
} else
41-
iv->heuristics.txRfChId = bestId;
53+
// start new test period
54+
ih->testPeriodSendCnt = 0;
55+
ih->testPeriodFailCnt = 0;
56+
} else if(ih->txRfChId != lastBestId) {
57+
// start new test period
58+
ih->testPeriodSendCnt = 0;
59+
ih->testPeriodFailCnt = 0;
60+
}
4261

43-
return id2Ch(iv->heuristics.txRfChId);
62+
return id2Ch(ih->txRfChId);
4463
}
4564

4665
void setGotAll(Inverter<> *iv) {
4766
updateQuality(iv, 2); // GOOD
48-
iv->heuristics.testEn = false;
4967
}
5068

5169
void setGotFragment(Inverter<> *iv) {
5270
updateQuality(iv, 1); // OK
53-
iv->heuristics.testEn = false;
5471
}
5572

5673
void setGotNothing(Inverter<> *iv) {
57-
if(RF_NA != iv->heuristics.storedIdx) {
58-
// if communication fails on first try with temporarily good level, revert it back to its original level
59-
iv->heuristics.txRfQuality[iv->heuristics.txRfChId] = iv->heuristics.storedIdx;
60-
iv->heuristics.storedIdx = RF_NA;
74+
HeuristicInv *ih = &iv->heuristics;
75+
76+
if(RF_TX_TEST_CHAN_1ST_USE == ih->testChId) {
77+
// immediate fail
78+
ih->testChId = ih->txRfChId; // reset to best
79+
return;
6180
}
6281

63-
if(!iv->heuristics.testEn) {
64-
updateQuality(iv, -2); // BAD
65-
iv->heuristics.testEn = true;
66-
} else
67-
iv->heuristics.testEn = false;
82+
if(ih->testPeriodFailCnt < 0xff)
83+
ih->testPeriodFailCnt++;
84+
85+
updateQuality(iv, -2); // BAD
6886
}
6987

7088
void printStatus(Inverter<> *iv) {
@@ -86,17 +104,15 @@ class Heuristic {
86104
DBGPRINTLN(String(iv->config->powerLevel));
87105
}
88106

89-
bool getTestModeEnabled(Inverter<> *iv) {
90-
return iv->heuristics.testEn;
91-
}
92-
93107
private:
94108
void updateQuality(Inverter<> *iv, uint8_t quality) {
95-
iv->heuristics.txRfQuality[iv->heuristics.txRfChId] += quality;
96-
if(iv->heuristics.txRfQuality[iv->heuristics.txRfChId] > RF_MAX_QUALITY)
97-
iv->heuristics.txRfQuality[iv->heuristics.txRfChId] = RF_MAX_QUALITY;
98-
else if(iv->heuristics.txRfQuality[iv->heuristics.txRfChId] < RF_MIN_QUALTIY)
99-
iv->heuristics.txRfQuality[iv->heuristics.txRfChId] = RF_MIN_QUALTIY;
109+
HeuristicInv *ih = &iv->heuristics;
110+
111+
ih->txRfQuality[ih->txRfChId] += quality;
112+
if(ih->txRfQuality[ih->txRfChId] > RF_MAX_QUALITY)
113+
ih->txRfQuality[ih->txRfChId] = RF_MAX_QUALITY;
114+
else if(ih->txRfQuality[ih->txRfChId] < RF_MIN_QUALTIY)
115+
ih->txRfQuality[ih->txRfChId] = RF_MIN_QUALTIY;
100116
}
101117

102118
inline uint8_t id2Ch(uint8_t id) {

‎src/hm/HeuristicInv.h‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,17 @@
1313

1414
class HeuristicInv {
1515
public:
16-
int8_t txRfQuality[5]; // heuristics tx quality (check 'Heuristics.h')
17-
uint8_t txRfChId; // RF TX channel id
16+
HeuristicInv() {
17+
memset(txRfQuality, -6, RF_MAX_CHANNEL_ID);
18+
}
1819

19-
bool testEn = false;
20-
uint8_t testIdx = 0;
21-
int8_t storedIdx = RF_NA;
20+
public:
21+
int8_t txRfQuality[RF_MAX_CHANNEL_ID]; // heuristics tx quality (check 'Heuristics.h')
22+
uint8_t txRfChId = 0; // RF TX channel id
23+
24+
uint8_t testPeriodSendCnt = 0;
25+
uint8_t testPeriodFailCnt = 0;
26+
uint8_t testChId = 0;
2227
};
2328

2429
#endif /*__HEURISTIC_INV_H__*/

‎src/hm/hmRadio.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ class HmRadio : public Radio {
3535
HmRadio() {
3636
mDtuSn = DTU_SN;
3737
mIrqRcvd = false;
38+
#if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(ETHERNET)
39+
mNrf24.reset(new RF24());
40+
#else
3841
mNrf24.reset(new RF24(CE_PIN, CS_PIN, SPI_SPEED));
42+
#endif
3943
}
4044
~HmRadio() {}
4145

0 commit comments

Comments
 (0)