3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-08-06 09:58:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.22

Browse source 
* fix communication state-machine regarding zero export #1267
This commit is contained in:
lumapu 2023-12-13 22:51:59 +01:00
parent 3938216db2
commit 30f580891f
4 changed files with 62 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/CHANGES.md
View file

@ -1,5 +1,8 @@
# Development Changes # Development Changes
## 0.8.22 - 2023-12-13
* fix communication state-machine regarding zero export #1267
## 0.8.21 - 2023-12-12 ## 0.8.21 - 2023-12-12
* fix ethernet save inverter parameters #886 * fix ethernet save inverter parameters #886
* fix ethernet OTA update #886 * fix ethernet OTA update #886

2
src/defines.h
View file

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 8 #define VERSION_MINOR 8
#define VERSION_PATCH 21 #define VERSION_PATCH 22
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

111
src/hm/Communication.h
View file

@ -48,8 +48,8 @@ class Communication : public CommQueue<> {
if(!valid) if(!valid)
return; // empty return; // empty
uint16_t timeout = (q->iv->ivGen == IV_MI) ? MI_TIMEOUT : ((q->iv->mGotFragment && q->iv->mGotLastMsg) || mIsResend) ? SINGLEFR_TIMEOUT : DEFAULT_TIMEOUT; uint16_t timeout = (q->iv->ivGen == IV_MI) ? MI_TIMEOUT : ((q->iv->mGotFragment && q->iv->mGotLastMsg) || mIsRetransmit) ? SINGLEFR_TIMEOUT : DEFAULT_TIMEOUT;
uint16_t timeout_min = (q->iv->ivGen == IV_MI) ? MI_TIMEOUT : ((q->iv->mGotFragment || mIsResend)) ? SINGLEFR_TIMEOUT : FRSTMSG_TIMEOUT; uint16_t timeout_min = (q->iv->ivGen == IV_MI) ? MI_TIMEOUT : ((q->iv->mGotFragment || mIsRetransmit)) ? SINGLEFR_TIMEOUT : FRSTMSG_TIMEOUT;
/*if(mDebugState != mState) { /*if(mDebugState != mState) {
DPRINT(DBG_INFO, F("State: ")); DPRINT(DBG_INFO, F("State: "));
@ -71,7 +71,7 @@ class Communication : public CommQueue<> {
q->iv->mGotFragment = false; q->iv->mGotFragment = false;
q->iv->mGotLastMsg = false; q->iv->mGotLastMsg = false;
q->iv->curFrmCnt = 0; q->iv->curFrmCnt = 0;
mIsResend = false; mIsRetransmit = false;
if(NULL == q->iv->radio) if(NULL == q->iv->radio)
cmdDone(true); // can't communicate while radio is not defined! cmdDone(true); // can't communicate while radio is not defined!
mState = States::START; mState = States::START;
@ -97,15 +97,15 @@ class Communication : public CommQueue<> {
q->iv->radioStatistics.txCnt++; q->iv->radioStatistics.txCnt++;
mWaitTimeout = millis() + timeout; mWaitTimeout = millis() + timeout;
mWaitTimeout_min = millis() + timeout_min; mWaitTimeout_min = millis() + timeout_min;
mIsResend = false; mIsRetransmit = false;
mlastTO_min = timeout_min; mlastTO_min = timeout_min;
setAttempt(); setAttempt();
mState = States::WAIT; mState = States::WAIT;
break; break;
case States::WAIT: case States::WAIT:
/*if(millis() > mWaitTimeout_min) { /*if(millis() > mWaitTimeout_min) {
if(mIsResend) { // we already have been through... if(mIsRetransmit) { // we already have been through...
mWaitTimeout = mWaitTimeout_min; mWaitTimeout = mWaitTimeout_min;
} else if(q->iv->mGotFragment) { // nothing received yet? } else if(q->iv->mGotFragment) { // nothing received yet?
if(q->iv->mGotLastMsg) { if(q->iv->mGotLastMsg) {
@ -132,7 +132,7 @@ class Communication : public CommQueue<> {
break; break;
case States::CHECK_FRAMES: { case States::CHECK_FRAMES: {
if((!q->iv->radio->get() && !mIsResend) || (((q->iv->mGotFragment) || (mIsResend)) && (0 == q->attempts))) { // radio buffer empty or no more answers if((q->iv->radio->mBufCtrl.empty() && !mIsRetransmit) || (0 == q->attempts)) { // radio buffer empty or no more answers
if(*mSerialDebug) { if(*mSerialDebug) {
DPRINT_IVID(DBG_INFO, q->iv->id); DPRINT_IVID(DBG_INFO, q->iv->id);
DBGPRINT(F("request timeout: ")); DBGPRINT(F("request timeout: "));
@ -148,42 +148,15 @@ class Communication : public CommQueue<> {
closeRequest(q, false); closeRequest(q, false);
break; break;
} }
mIsRetransmit = false;
mFirstTry = false; // for correct reset mFirstTry = false; // for correct reset
States nextState = States::RESET; States nextState = States::RESET;
while(!q->iv->radio->mBufCtrl.empty()) { while(!q->iv->radio->mBufCtrl.empty()) {
packet_t *p = &q->iv->radio->mBufCtrl.front(); packet_t *p = &q->iv->radio->mBufCtrl.front();
printRxInfo(q, p);
DPRINT_IVID(DBG_INFO, q->iv->id); if(validateIvSerial(&p->packet[1], q->iv)) {
DBGPRINT(F("RX "));
if(p->millis < 100)
DBGPRINT(F(" "));
DBGPRINT(String(p->millis));
DBGPRINT(F("ms | "));
DBGPRINT(String(p->len));
if((IV_HM == q->iv->ivGen) || (IV_MI == q->iv->ivGen)) {
DBGPRINT(F(" CH"));
if(3 == p->ch)
DBGPRINT(F("0"));
DBGPRINT(String(p->ch));
DBGPRINT(F(" "));
} else {
DBGPRINT(F(" "));
DBGPRINT(String(p->rssi));
DBGPRINT(F("dBm | "));
}
if(*mPrintWholeTrace) {
if(*mPrivacyMode)
ah::dumpBuf(p->packet, p->len, 1, 8);
else
ah::dumpBuf(p->packet, p->len);
} else {
DBGPRINT(F("| "));
DBGHEXLN(p->packet[9]);
}
if(checkIvSerial(&p->packet[1], q->iv)) {
q->iv->radioStatistics.frmCnt++; q->iv->radioStatistics.frmCnt++;
if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command
@ -191,29 +164,29 @@ class Communication : public CommQueue<> {
q->iv->curFrmCnt++; q->iv->curFrmCnt++;
nextState = States::CHECK_PACKAGE; nextState = States::CHECK_PACKAGE;
} else if (p->packet[0] == (TX_REQ_DEVCONTROL + ALL_FRAMES)) { // response from dev control command } else if (p->packet[0] == (TX_REQ_DEVCONTROL + ALL_FRAMES)) { // response from dev control command
parseDevCtrl(p, q); if(parseDevCtrl(p, q))
closeRequest(q, true); closeRequest(q, true);
else
closeRequest(q, false);
return; // don't wait for empty buffer
} else if(IV_MI == q->iv->ivGen) { } else if(IV_MI == q->iv->ivGen) {
if(parseMiFrame(p, q)) if(parseMiFrame(p, q))
q->iv->curFrmCnt++; q->iv->curFrmCnt++;
} }
} else { } //else // serial does not match
q->iv->radioStatistics.rxFail++; // got no complete payload
mWaitTimeout = millis() + timeout;
}
q->iv->radio->mBufCtrl.pop(); q->iv->radio->mBufCtrl.pop();
yield(); yield();
} }
if(0 == q->attempts) if(0 == q->attempts)
closeRequest(q, false); closeRequest(q, false);
else { else {
if(q->iv->ivGen != IV_MI) { if(q->iv->ivGen != IV_MI) {
mState = nextState; mState = nextState;
if(States::RESET == mState) if(States::RESET == nextState) // no valid package received
closeRequest(q, false); closeRequest(q, false);
} } else {
else {
if(q->iv->miMultiParts < 6) { if(q->iv->miMultiParts < 6) {
nextState = States::WAIT; nextState = States::WAIT;
} else { } else {
@ -265,7 +238,7 @@ class Communication : public CommQueue<> {
DBGPRINTLN(F(" attempts left)")); DBGPRINTLN(F(" attempts left)"));
} }
sendRetransmit(q, framnr-1); sendRetransmit(q, framnr-1);
mIsResend = true; mIsRetransmit = true;
mlastTO_min = timeout_min; mlastTO_min = timeout_min;
return; return;
} }
@ -282,7 +255,37 @@ class Communication : public CommQueue<> {
} }
private: private:
inline bool checkIvSerial(uint8_t buf[], Inverter<> *iv) { inline void printRxInfo(const queue_s *q, packet_t *p) {
DPRINT_IVID(DBG_INFO, q->iv->id);
DBGPRINT(F("RX "));
if(p->millis < 100)
DBGPRINT(F(" "));
DBGPRINT(String(p->millis));
DBGPRINT(F("ms | "));
DBGPRINT(String(p->len));
if((IV_HM == q->iv->ivGen) || (IV_MI == q->iv->ivGen)) {
DBGPRINT(F(" CH"));
if(3 == p->ch)
DBGPRINT(F("0"));
DBGPRINT(String(p->ch));
DBGPRINT(F(" "));
} else {
DBGPRINT(F(" "));
DBGPRINT(String(p->rssi));
DBGPRINT(F("dBm | "));
}
if(*mPrintWholeTrace) {
if(*mPrivacyMode)
ah::dumpBuf(p->packet, p->len, 1, 8);
else
ah::dumpBuf(p->packet, p->len);
} else {
DBGPRINT(F("| "));
DBGHEXLN(p->packet[9]);
}
}
inline bool validateIvSerial(uint8_t buf[], Inverter<> *iv) {
uint8_t tmp[4]; uint8_t tmp[4];
CP_U32_BigEndian(tmp, iv->radioId.u64 >> 8); CP_U32_BigEndian(tmp, iv->radioId.u64 >> 8);
for(uint8_t i = 0; i < 4; i++) { for(uint8_t i = 0; i < 4; i++) {
@ -350,9 +353,9 @@ class Communication : public CommQueue<> {
return true; return true;
} }
inline void parseDevCtrl(packet_t *p, const queue_s *q) { inline bool parseDevCtrl(packet_t *p, const queue_s *q) {
if((p->packet[12] != ActivePowerContr) || (p->packet[13] != 0x00)) if((p->packet[12] != ActivePowerContr) || (p->packet[13] != 0x00))
return; return false;
bool accepted = true; bool accepted = true;
if((p->packet[10] == 0x00) && (p->packet[11] == 0x00)) if((p->packet[10] == 0x00) && (p->packet[11] == 0x00))
q->iv->powerLimitAck = true; q->iv->powerLimitAck = true;
@ -367,6 +370,8 @@ class Communication : public CommQueue<> {
DBGPRINT(F(" with PowerLimitControl ")); DBGPRINT(F(" with PowerLimitControl "));
DBGPRINTLN(String(q->iv->powerLimit[1])); DBGPRINTLN(String(q->iv->powerLimit[1]));
q->iv->actPowerLimit = 0xffff; // unknown, readback current value q->iv->actPowerLimit = 0xffff; // unknown, readback current value
return accepted;
} }
inline void compilePayload(const queue_s *q) { inline void compilePayload(const queue_s *q) {
@ -488,7 +493,7 @@ class Communication : public CommQueue<> {
q->iv->mGotFragment = false; q->iv->mGotFragment = false;
q->iv->mGotLastMsg = false; q->iv->mGotLastMsg = false;
q->iv->miMultiParts = 0; q->iv->miMultiParts = 0;
mIsResend = false; mIsRetransmit = false;
mFirstTry = false; // for correct reset mFirstTry = false; // for correct reset
mState = States::RESET; mState = States::RESET;
DBGPRINTLN("-----"); DBGPRINTLN("-----");
@ -702,7 +707,7 @@ class Communication : public CommQueue<> {
mWaitTimeout_min = mWaitTimeout; mWaitTimeout_min = mWaitTimeout;
q->iv->miMultiParts = 0; q->iv->miMultiParts = 0;
q->iv->mGotFragment = 0; q->iv->mGotFragment = 0;
mIsResend = true; mIsRetransmit = true;
chgCmd(cmd); chgCmd(cmd);
//mState = States::WAIT; //mState = States::WAIT;
} }
@ -840,7 +845,7 @@ class Communication : public CommQueue<> {
uint32_t mWaitTimeout_min = 0; uint32_t mWaitTimeout_min = 0;
std::array<frame_t, MAX_PAYLOAD_ENTRIES> mLocalBuf; std::array<frame_t, MAX_PAYLOAD_ENTRIES> mLocalBuf;
bool mFirstTry = false; // see, if we should do a second try bool mFirstTry = false; // see, if we should do a second try
bool mIsResend = false; // we alrady had waited one complete cycle bool mIsRetransmit = false; // we alrady had waited one complete cycle
uint16_t mlastTO_min = DEFAULT_TIMEOUT; // remember timeout_min for correct calculation uint16_t mlastTO_min = DEFAULT_TIMEOUT; // remember timeout_min for correct calculation
uint8_t mMaxFrameId; uint8_t mMaxFrameId;
uint8_t mPayload[MAX_BUFFER]; uint8_t mPayload[MAX_BUFFER];

4
src/hm/radio.h
View file

@ -28,10 +28,6 @@ class Radio {
virtual void loop(void) {}; virtual void loop(void) {};
bool get() {
return !mBufCtrl.empty();
}
void handleIntr(void) { void handleIntr(void) {
mIrqRcvd = true; mIrqRcvd = true;
} }