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

first comparison, compiles fine

Browse source
This commit is contained in:
lumapu 2023-09-29 23:54:29 +02:00
parent 963e618c5c
commit 09896fbe6b
3 changed files with 160 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/hm/hmPayload.h
View file

@ -1,6 +1,6 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// 2023 Ahoy, https://ahoydtu.de // 2023 Ahoy, https://ahoydtu.de
// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/ // Creative Commons - https://creativecommons.org/licenses/by-nc-sa/4.0/deed
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef __HM_PAYLOAD_H__ #ifndef __HM_PAYLOAD_H__
@ -15,7 +15,6 @@
typedef struct { typedef struct {
uint8_t txCmd; uint8_t txCmd;
uint8_t txId; uint8_t txId;
uint8_t invId;
uint32_t ts; uint32_t ts;
uint8_t data[MAX_PAYLOAD_ENTRIES][MAX_RF_PAYLOAD_SIZE]; uint8_t data[MAX_PAYLOAD_ENTRIES][MAX_RF_PAYLOAD_SIZE];
int8_t rssi[MAX_PAYLOAD_ENTRIES]; int8_t rssi[MAX_PAYLOAD_ENTRIES];

237
src/hms/hmsPayload.h
View file

@ -16,7 +16,6 @@
typedef struct { typedef struct {
uint8_t txCmd; uint8_t txCmd;
uint8_t txId; uint8_t txId;
//uint8_t invId;
uint32_t ts; uint32_t ts;
uint8_t data[MAX_PAYLOAD_ENTRIES][MAX_RF_PAYLOAD_SIZE]; uint8_t data[MAX_PAYLOAD_ENTRIES][MAX_RF_PAYLOAD_SIZE];
int8_t rssi[MAX_PAYLOAD_ENTRIES]; int8_t rssi[MAX_PAYLOAD_ENTRIES];
@ -27,6 +26,7 @@ typedef struct {
uint8_t retransmits; uint8_t retransmits;
bool requested; bool requested;
bool gotFragment; bool gotFragment;
bool rxTmo;
} hmsPayload_t; } hmsPayload_t;
@ -50,11 +50,10 @@ class HmsPayload {
reset(i); reset(i);
mIvCmd56Cnt[i] = 0; mIvCmd56Cnt[i] = 0;
} }
mSerialDebug = false; mSerialDebug = false;
mHighPrioIv = NULL; mHighPrioIv = NULL;
mCbAlarm = NULL; mCbAlarm = NULL;
mCbPayload = NULL; mCbPayload = NULL;
//mLastRx = 0;
} }
void enableSerialDebug(bool enable) { void enableSerialDebug(bool enable) {
@ -70,12 +69,35 @@ class HmsPayload {
} }
void loop() { void loop() {
if(NULL != mHighPrioIv) { if (NULL != mHighPrioIv) {
ivSend(mHighPrioIv, true); ivSend(mHighPrioIv, true);
mHighPrioIv = NULL; mHighPrioIv = NULL;
} }
} }
/*void simulation() {
uint8_t pay[] = {
0x00, 0x01, 0x01, 0x24, 0x02, 0x28, 0x02, 0x33,
0x06, 0x49, 0x06, 0x6a, 0x00, 0x05, 0x5f, 0x1b,
0x00, 0x06, 0x66, 0x9a, 0x03, 0xfd, 0x04, 0x0b,
0x01, 0x23, 0x02, 0x28, 0x02, 0x28, 0x06, 0x41,
0x06, 0x43, 0x00, 0x05, 0xdc, 0x2c, 0x00, 0x06,
0x2e, 0x3f, 0x04, 0x01, 0x03, 0xfb, 0x09, 0x78,
0x13, 0x86, 0x18, 0x15, 0x00, 0xcf, 0x00, 0xfe,
0x03, 0xe7, 0x01, 0x42, 0x00, 0x03
};
Inverter<> *iv = mSys->getInverterByPos(0);
record_t<> *rec = iv->getRecordStruct(0x0b);
rec->ts = *mTimestamp;
for (uint8_t i = 0; i < rec->length; i++) {
iv->addValue(i, pay, rec);
yield();
}
iv->doCalculations();
notify(0x0b, iv);
}*/
void ivSendHighPrio(Inverter<> *iv) { void ivSendHighPrio(Inverter<> *iv) {
mHighPrioIv = iv; mHighPrioIv = iv;
} }
@ -90,26 +112,26 @@ class HmsPayload {
process(false); // no retransmit process(false); // no retransmit
if (!mPayload[iv->id].complete) { if (!mPayload[iv->id].complete) {
if (MAX_PAYLOAD_ENTRIES == mPayload[iv->id].maxPackId)
mStat->rxFailNoAnser++; // got nothing
else
mStat->rxFail++; // got fragments but not complete response
iv->setQueuedCmdFinished(); // command failed
if (mSerialDebug) if (mSerialDebug)
DPRINTLN(DBG_INFO, F("enqueued cmd failed/timeout")); DPRINT_IVID(DBG_INFO, iv->id);
/*if (mSerialDebug) { if (MAX_PAYLOAD_ENTRIES == mPayload[iv->id].maxPackId) {
DPRINT(DBG_INFO, F("(#")); mStat->rxFailNoAnser++; // got nothing
DBGPRINT(String(iv->id)); if (mSerialDebug)
DBGPRINT(F(") no Payload received! (retransmits: ")); DBGPRINTLN(F("enqueued cmd failed/timeout"));
DBGPRINT(String(mPayload[iv->id].retransmits)); } else {
DBGPRINTLN(F(")")); mStat->rxFail++; // got fragments but not complete response
}*/ if (mSerialDebug) {
DBGPRINT(F("no complete Payload received! (retransmits: "));
DBGPRINT(String(mPayload[iv->id].retransmits));
DBGPRINTLN(F(")"));
}
}
iv->setQueuedCmdFinished(); // command failed
} }
} }
} }
reset(iv->id); reset(iv->id, !iv->isAvailable());
mPayload[iv->id].requested = true; mPayload[iv->id].requested = true;
yield(); yield();
@ -140,9 +162,11 @@ class HmsPayload {
if(++mIvCmd56Cnt[iv->id] == 10) if(++mIvCmd56Cnt[iv->id] == 10)
mIvCmd56Cnt[iv->id] = 0; mIvCmd56Cnt[iv->id] = 0;
uint8_t cmd = iv->getQueuedCmd(); uint8_t cmd = iv->getQueuedCmd();
DPRINT_IVID(DBG_INFO, iv->id); if (mSerialDebug) {
DBGPRINT(F("prepareDevInformCmd 0x")); DPRINT_IVID(DBG_INFO, iv->id);
DBGHEXLN(cmd); DBGPRINT(F("prepareDevInformCmd 0x"));
DBGHEXLN(cmd);
}
mRadio->prepareDevInformCmd(&iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmLastId, false); mRadio->prepareDevInformCmd(&iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmLastId, false);
mPayload[iv->id].txCmd = cmd; mPayload[iv->id].txCmd = cmd;
} }
@ -154,7 +178,7 @@ class HmsPayload {
DPRINTLN(DBG_DEBUG, F("Response from info request received")); DPRINTLN(DBG_DEBUG, F("Response from info request received"));
uint8_t *pid = &p->data[10]; uint8_t *pid = &p->data[10];
if (*pid == 0x00) { if (*pid == 0x00) {
DPRINT(DBG_DEBUG, F("fragment number zero received and ignored")); DPRINTLN(DBG_DEBUG, F("fragment number zero received and ignored"));
} else { } else {
DPRINTLN(DBG_DEBUG, "PID: 0x" + String(*pid, HEX)); DPRINTLN(DBG_DEBUG, "PID: 0x" + String(*pid, HEX));
if ((*pid & 0x7F) < MAX_PAYLOAD_ENTRIES) { if ((*pid & 0x7F) < MAX_PAYLOAD_ENTRIES) {
@ -186,13 +210,16 @@ class HmsPayload {
iv->powerLimitAck = true; iv->powerLimitAck = true;
} else } else
ok = false; ok = false;
DPRINT_IVID(DBG_INFO, iv->id);
DBGPRINT(F(" has ")); if (mSerialDebug) {
if(!ok) DBGPRINT(F("not ")); DPRINT_IVID(DBG_INFO, iv->id);
DBGPRINT(F("accepted power limit set point ")); DBGPRINT(F(" has "));
DBGPRINT(String(iv->powerLimit[0])); if(!ok) DBGPRINT(F("not "));
DBGPRINT(F(" with PowerLimitControl ")); DBGPRINT(F("accepted power limit set point "));
DBGPRINTLN(String(iv->powerLimit[1])); DBGPRINT(String(iv->powerLimit[0]));
DBGPRINT(F(" with PowerLimitControl "));
DBGPRINTLN(String(iv->powerLimit[1]));
}
iv->clearCmdQueue(); iv->clearCmdQueue();
iv->enqueCommand<InfoCommand>(SystemConfigPara); // read back power limit iv->enqueCommand<InfoCommand>(SystemConfigPara); // read back power limit
@ -219,8 +246,9 @@ class HmsPayload {
} }
if (!mPayload[iv->id].complete) { if (!mPayload[iv->id].complete) {
bool crcPass, pyldComplete; bool crcPass, pyldComplete, fastNext;
crcPass = build(iv->id, &pyldComplete);
crcPass = build(iv, &pyldComplete, &fastNext);
if (!crcPass && !pyldComplete) { // payload not complete if (!crcPass && !pyldComplete) { // payload not complete
if ((mPayload[iv->id].requested) && (retransmit)) { if ((mPayload[iv->id].requested) && (retransmit)) {
if (mPayload[iv->id].retransmits < mMaxRetrans) { if (mPayload[iv->id].retransmits < mMaxRetrans) {
@ -230,26 +258,31 @@ class HmsPayload {
DPRINTLN(DBG_INFO, F("Prevent retransmit on Restart / CleanState_LockAndAlarm...")); DPRINTLN(DBG_INFO, F("Prevent retransmit on Restart / CleanState_LockAndAlarm..."));
mPayload[iv->id].retransmits = mMaxRetrans; mPayload[iv->id].retransmits = mMaxRetrans;
} else if(iv->devControlCmd == ActivePowerContr) { } else if(iv->devControlCmd == ActivePowerContr) {
DPRINT_IVID(DBG_INFO, iv->id);
DPRINTLN(DBG_INFO, F("retransmit power limit")); DPRINTLN(DBG_INFO, F("retransmit power limit"));
mRadio->sendControlPacket(&iv->radioId.u64, iv->devControlCmd, iv->powerLimit, true); mRadio->sendControlPacket(&iv->radioId.u64, iv->devControlCmd, iv->powerLimit, true);
} else { } else {
if(false == mPayload[iv->id].gotFragment) { if(false == mPayload[iv->id].gotFragment) {
DPRINT_IVID(DBG_WARN, iv->id);
//DPRINTLN(DBG_WARN, F("nothing received: Request Complete Retransmit")); if (mPayload[iv->id].rxTmo) {
//mPayload[iv->id].txCmd = iv->getQueuedCmd(); DBGPRINTLN(F("nothing received"));
//DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") prepareDevInformCmd 0x") + String(mPayload[iv->id].txCmd, HEX)); mPayload[iv->id].retransmits = mMaxRetrans;
//mRadio->prepareDevInformCmd(iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].ts, iv->alarmLastId, true); } else {
DBGPRINTLN(F("nothing received: complete retransmit"));
DPRINT_IVID(DBG_INFO, iv->id); mPayload[iv->id].txCmd = iv->getQueuedCmd();
DBGPRINTLN(F("nothing received")); DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") prepareDevInformCmd 0x") + String(mPayload[iv->id].txCmd, HEX));
mPayload[iv->id].retransmits = mMaxRetrans; mRadio->prepareDevInformCmd(&iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].ts, iv->alarmMesIndex, true);
}
} else { } else {
for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId - 1); i++) { for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId - 1); i++) {
if (mPayload[iv->id].len[i] == 0) { if (mPayload[iv->id].len[i] == 0) {
DPRINT(DBG_WARN, F("Frame ")); if (mSerialDebug) {
DBGPRINT(String(i + 1)); DPRINT_IVID(DBG_WARN, iv->id);
DBGPRINTLN(F(" missing: Request Retransmit")); DBGPRINT(F("Frame "));
//mRadio->sendCmdPacket(iv->radioId.u64, TX_REQ_INFO, (SINGLE_FRAME + i), true); DBGPRINT(String(i + 1));
DBGPRINTLN(F(" missing: Request Retransmit"));
}
mRadio->sendCmdPacket(iv->radioId.u64, TX_REQ_INFO, (SINGLE_FRAME + i), true);
break; // only request retransmit one frame per loop break; // only request retransmit one frame per loop
} }
yield(); yield();
@ -257,26 +290,36 @@ class HmsPayload {
} }
} }
} }
} else if (false == mPayload[iv->id].gotFragment) {
// only if there is no sign of life
mPayload[iv->id].rxTmo = true; // inv might be down, no complete retransmit anymore
} }
} /*else if(!crcPass && pyldComplete) { // crc error on complete Payload } else if(!crcPass && pyldComplete) { // crc error on complete Payload
if (mPayload[iv->id].retransmits < mMaxRetrans) { if (mPayload[iv->id].retransmits < mMaxRetrans) {
mPayload[iv->id].retransmits++; mPayload[iv->id].retransmits++;
DPRINTLN(DBG_WARN, F("CRC Error: Request Complete Retransmit"));
mPayload[iv->id].txCmd = iv->getQueuedCmd(); mPayload[iv->id].txCmd = iv->getQueuedCmd();
DPRINT(DBG_INFO, F("(#")); if (mSerialDebug) {
DBGPRINT(String(iv->id)); DPRINTLN(DBG_WARN, F("CRC Error: Request Complete Retransmit"));
DBGPRINT(F(") prepareDevInformCmd 0x")); DPRINT_IVID(DBG_INFO, iv->id);
DBGPRINTLN(String(mPayload[iv->id].txCmd, HEX)); DBGPRINT(F("prepareDevInformCmd 0x"));
mRadio->prepareDevInformCmd(iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].ts, iv->alarmLastId, true); DBGHEXLN(mPayload[iv->id].txCmd);
}
mRadio->prepareDevInformCmd(&iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].ts, iv->alarmLastId, true);
}
} else { // payload complete
if (mSerialDebug) {
DPRINT_IVID(DBG_INFO, iv->id);
DBGPRINT(F("procPyld: cmd: 0x"));
DBGHEXLN(mPayload[iv->id].txCmd);
//DPRINT(DBG_DEBUG, F("procPyld: txid: 0x"));
//DBGHEXLN(mPayload[iv->id].txId);
DPRINT(DBG_DEBUG, F("procPyld: max: "));
DPRINTLN(DBG_DEBUG, String(mPayload[iv->id].maxPackId));
} }
}*/ else { // payload complete
DPRINT(DBG_INFO, F("procPyld: cmd: 0x"));
DBGPRINTLN(String(mPayload[iv->id].txCmd, HEX));
//DPRINT(DBG_DEBUG, F("procPyld: txid: 0x"));
//DBGPRINTLN(String(mPayload[iv->id].txId, HEX));
DPRINTLN(DBG_DEBUG, F("procPyld: max: ") + String(mPayload[iv->id].maxPackId));
record_t<> *rec = iv->getRecordStruct(mPayload[iv->id].txCmd); // choose the parser record_t<> *rec = iv->getRecordStruct(mPayload[iv->id].txCmd); // choose the parser
mPayload[iv->id].complete = true; mPayload[iv->id].complete = true;
mPayload[iv->id].requested = false;
mPayload[iv->id].rxTmo = false;
uint8_t payload[150]; uint8_t payload[150];
uint8_t payloadLen = 0; uint8_t payloadLen = 0;
@ -324,7 +367,6 @@ class HmsPayload {
if(AlarmData == mPayload[iv->id].txCmd) { if(AlarmData == mPayload[iv->id].txCmd) {
uint8_t i = 0; uint8_t i = 0;
uint32_t start, end;
while(1) { while(1) {
if(0 == iv->parseAlarmLog(i++, payload, payloadLen)) if(0 == iv->parseAlarmLog(i++, payload, payloadLen))
break; break;
@ -333,10 +375,28 @@ class HmsPayload {
yield(); yield();
} }
} }
if (fastNext && (mHighPrioIv == NULL)) {
/*iv->setQueuedCmdFinished();
uint8_t cmd = iv->getQueuedCmd();
if (mSerialDebug) {
DPRINT_IVID(DBG_INFO, iv->id);
DBGPRINT(F("fast mode "));
DBGPRINT(F("prepareDevInformCmd 0x"));
DBGHEXLN(cmd);
}
mStat->rxSuccess++;
mRadio->prepareDevInformCmd(&iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmLastId, false);
mPayload[iv->id].txCmd = cmd;
*/
mHighPrioIv = iv;
}
} else { } else {
DPRINT(DBG_ERROR, F("plausibility check failed, expected ")); if (mSerialDebug) {
DBGPRINT(String(rec->pyldLen)); DPRINT(DBG_ERROR, F("plausibility check failed, expected "));
DBGPRINTLN(F(" bytes")); DBGPRINT(String(rec->pyldLen));
DBGPRINTLN(F(" bytes"));
}
mStat->rxFail++; mStat->rxFail++;
} }
@ -353,47 +413,59 @@ class HmsPayload {
(mCbPayload)(val, iv); (mCbPayload)(val, iv);
} }
bool build(uint8_t id, bool *complete) { bool build(Inverter<> *iv, bool *complete, bool *fastNext ) {
DPRINTLN(DBG_VERBOSE, F("build")); DPRINTLN(DBG_VERBOSE, F("build"));
uint16_t crc = 0xffff, crcRcv = 0x0000; uint16_t crc = 0xffff, crcRcv = 0x0000;
if (mPayload[id].maxPackId > MAX_PAYLOAD_ENTRIES) if (mPayload[iv->id].maxPackId > MAX_PAYLOAD_ENTRIES)
mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; mPayload[iv->id].maxPackId = MAX_PAYLOAD_ENTRIES;
// check if all fragments are there // check if all fragments are there
*complete = true; *complete = true;
for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { *fastNext = false;
if(mPayload[id].len[i] == 0) for (uint8_t i = 0; i < mPayload[iv->id].maxPackId; i++) {
if(mPayload[iv->id].len[i] == 0) {
*complete = false; *complete = false;
}
} }
if(!*complete) if(!*complete)
return false; return false;
for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { for (uint8_t i = 0; i < mPayload[iv->id].maxPackId; i++) {
if (mPayload[id].len[i] > 0) { if (mPayload[iv->id].len[i] > 0) {
if (i == (mPayload[id].maxPackId - 1)) { if (i == (mPayload[iv->id].maxPackId - 1)) {
crc = ah::crc16(mPayload[id].data[i], mPayload[id].len[i] - 1, crc); crc = ah::crc16(mPayload[iv->id].data[i], mPayload[iv->id].len[i] - 1, crc);
crcRcv = (mPayload[id].data[i][mPayload[id].len[i] - 2] << 8) | (mPayload[id].data[i][mPayload[id].len[i] - 1]); crcRcv = (mPayload[iv->id].data[i][mPayload[iv->id].len[i] - 2] << 8) | (mPayload[iv->id].data[i][mPayload[iv->id].len[i] - 1]);
} else } else
crc = ah::crc16(mPayload[id].data[i], mPayload[id].len[i], crc); crc = ah::crc16(mPayload[iv->id].data[i], mPayload[iv->id].len[i], crc);
} }
yield(); yield();
} }
return (crc == crcRcv) ? true : false; //return (crc == crcRcv) ? true : false;
if (crc != crcRcv)
return false;
//requests to cause the next request to be executed immediately
if (mPayload[iv->id].gotFragment && ((mPayload[iv->id].txCmd < 11) || (mPayload[iv->id].txCmd > 18))) {
*fastNext = true;
}
return true;
} }
void reset(uint8_t id) { void reset(uint8_t id, bool setTxTmo = true) {
//DPRINT(DBG_INFO, "resetPayload: id: "); //DPRINT_IVID(DBG_INFO, id);
//DBGPRINTLN(String(id)); //DBGPRINTLN(F("resetPayload"));
memset(&mPayload[id], 0, sizeof(hmsPayload_t)); memset(mPayload[id].len, 0, MAX_PAYLOAD_ENTRIES);
mPayload[id].txCmd = 0; mPayload[id].txCmd = 0;
mPayload[id].gotFragment = false; mPayload[id].gotFragment = false;
//mPayload[id].retransmits = 0; mPayload[id].retransmits = 0;
mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES;
mPayload[id].lastFound = false; mPayload[id].lastFound = false;
mPayload[id].complete = false; mPayload[id].complete = false;
mPayload[id].requested = false; mPayload[id].requested = false;
mPayload[id].ts = *mTimestamp; mPayload[id].ts = *mTimestamp;
mPayload[id].rxTmo = setTxTmo; // design: don't start with complete retransmit
} }
IApp *mApp; IApp *mApp;
@ -402,7 +474,6 @@ class HmsPayload {
statistics_t *mStat; statistics_t *mStat;
uint8_t mMaxRetrans; uint8_t mMaxRetrans;
uint32_t *mTimestamp; uint32_t *mTimestamp;
//uint32_t mLastRx;
hmsPayload_t mPayload[MAX_NUM_INVERTERS]; hmsPayload_t mPayload[MAX_NUM_INVERTERS];
uint8_t mIvCmd56Cnt[MAX_NUM_INVERTERS]; uint8_t mIvCmd56Cnt[MAX_NUM_INVERTERS];
bool mSerialDebug; bool mSerialDebug;

5
src/hms/hmsRadio.h
View file

@ -111,6 +111,11 @@ class CmtRadio {
sendPacket(24, isRetransmit); sendPacket(24, isRetransmit);
} }
void sendCmdPacket(uint64_t ivId, uint8_t mid, uint8_t pid, bool isRetransmit) {
initPacket(&ivId, mid, pid);
sendPacket(10, isRetransmit);
}
void sendPacket(uint8_t len, bool isRetransmit) { void sendPacket(uint8_t len, bool isRetransmit) {
if (len > 14) { if (len > 14) {
uint16_t crc = ah::crc16(&mTxBuf[10], len - 10); uint16_t crc = ah::crc16(&mTxBuf[10], len - 10);