From a5fb9cce17dd8d09e691a4c3dd92a1b131505520 Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Fri, 3 Mar 2023 18:16:45 +0100 Subject: [PATCH 1/8] interim version most likely outdated --- miPayload.h | 581 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 581 insertions(+) create mode 100644 miPayload.h diff --git a/miPayload.h b/miPayload.h new file mode 100644 index 00000000..9c68ee18 --- /dev/null +++ b/miPayload.h @@ -0,0 +1,581 @@ +//----------------------------------------------------------------------------- +// 2023 Ahoy, https://ahoydtu.de +// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/ +//----------------------------------------------------------------------------- + +#ifndef __MI_PAYLOAD_H__ +#define __MI_PAYLOAD_H__ + +//#include "hmInverter.h" +#include "../utils/dbg.h" +#include "../utils/crc.h" +#include "../config/config.h" +#include + +typedef struct { + uint32_t ts; + bool requested; + uint8_t txCmd; + uint8_t len[MAX_PAYLOAD_ENTRIES]; + bool complete; + uint8_t sts[iv->channels]; + uint8_t txId; + uint8_t invId; + uint8_t retransmits; + /* + uint8_t data[MAX_PAYLOAD_ENTRIES][MAX_RF_PAYLOAD_SIZE]; + + uint8_t maxPackId; + bool lastFound; + bool gotFragment;*/ +} miPayload_t; + + +typedef std::function miPayloadListenerType; + + +template +class MiPayload { + public: + MiPayload() {} + + void setup(IApp *app, HMSYSTEM *sys, statistics_t *stat, uint8_t maxRetransmits, uint32_t *timestamp) { + mApp = app; + mSys = sys; + mStat = stat; + mMaxRetrans = maxRetransmits; + mTimestamp = timestamp; + for(uint8_t i = 0; i < MAX_NUM_INVERTERS; i++) { + reset(i); + } + mSerialDebug = false; + mHighPrioIv = NULL; + mCbMiPayload = NULL; + } + + void enableSerialDebug(bool enable) { + mSerialDebug = enable; + } + + void addPayloadListener(miPayloadListenerType cb) { + mCbMiPayload = cb; + } + + void addAlarmListener(alarmListenerType cb) { + mCbMiAlarm = cb; + } + void loop() { + /*if(NULL != mHighPrioIv) { + iv->ivSend(mHighPrioIv, true); // should request firmware version etc.? + mHighPrioIv = NULL; + }*/ + } + + void ivSendHighPrio(Inverter<> *iv) { + mHighPrioIv = iv; + } + + void ivSend(Inverter<> *iv) { + reset(iv->id); + mPayload[iv->id].requested = true; + + yield(); + if (mSerialDebug) + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") Requesting Inv SN ") + String(iv->config->serial.u64, HEX)); + + uint8_t cmd = iv->type == INV_TYPE_4CH ? 0x36 : 0x09; //iv->getQueuedCmd(); + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") prepareDevInformCmd")); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + } + + void add(Inverter<> *iv, packet_t *p) { + //DPRINTLN(DBG_INFO, F("MI got data [0]=") + String(p->packet[0], HEX)); + + if (p->packet[0] == (0x08 + ALL_FRAMES)) { // 0x88; MI status response to 0x09 + //mPayload[iv->id].sts[0] = true; + miStsDecode(iv, p); + } else if (p->packet[0] == (0x11 + SINGLE_FRAME)) { // 0x92; MI status response to 0x11 + //mPayload[iv->id].sts[1] = true; + miStsDecode(iv, p, CH2); + } else if (p->packet[0] == (0x09 + ALL_FRAMES)) { // MI data response to 0x09 + mPayload[iv->id].txId = p->packet[0]; + miDataDecode(iv,p); + iv->setQueuedCmdFinished(); + if (INV_TYPE_2CH == iv->type) { + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); + } else { // additional check for mPayload[iv->id].stsa == true might be a good idea (request retransmit?) + mPayload[iv->id].complete = true; + //iv->setQueuedCmdFinished(); + } + + } else if (p->packet[0] == (0x11 + ALL_FRAMES)) { // MI data response to 0x11 + mPayload[iv->id].txId = p->packet[0]; + mPayload[iv->id].complete = true; + miDataDecode(iv,p); + iv->setQueuedCmdFinished(); + + } else if (p->packet[0] >= (0x36 + ALL_FRAMES) && p->packet[0] < (0x39 + SINGLE_FRAME)) { // MI 1500 data response to 0x36, 0x37, 0x38 and 0x39 + mPayload[iv->id].txId = p->packet[0]; + miDataDecode(iv,p); + iv->setQueuedCmdFinished(); + if (p->packet[0] < (0x39 + ALL_FRAMES)) { + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, p->packet[0] + 1 - ALL_FRAMES); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, p->packet[0] + 1 - ALL_FRAMES, mPayload[iv->id].ts, iv->alarmMesIndex, false, p->packet[0] + 1 - ALL_FRAMES); + } else { + mPayload[iv->id].complete = true; + //iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, CALC_YD_CH0); + //iv->setQueuedCmdFinished(); + } + + /*} + + if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command + mPayload[iv->id].txId = p->packet[0]; + DPRINTLN(DBG_DEBUG, F("Response from info request received")); + uint8_t *pid = &p->packet[9]; + if (*pid == 0x00) { + DPRINT(DBG_DEBUG, F("fragment number zero received and ignored")); + } else { + DPRINTLN(DBG_DEBUG, "PID: 0x" + String(*pid, HEX)); + if ((*pid & 0x7F) < MAX_PAYLOAD_ENTRIES) { + memcpy(mPayload[iv->id].data[(*pid & 0x7F) - 1], &p->packet[10], p->len - 11); + mPayload[iv->id].len[(*pid & 0x7F) - 1] = p->len - 11; + mPayload[iv->id].gotFragment = true; + } + + if ((*pid & ALL_FRAMES) == ALL_FRAMES) { + // Last packet + if (((*pid & 0x7f) > mPayload[iv->id].maxPackId) || (MAX_PAYLOAD_ENTRIES == mPayload[iv->id].maxPackId)) { + mPayload[iv->id].maxPackId = (*pid & 0x7f); + if (*pid > 0x81) + mPayload[iv->id].lastFound = true; + } + } + } + } */ + } else if (p->packet[0] == (TX_REQ_DEVCONTROL + ALL_FRAMES)) { // response from dev control command + DPRINTLN(DBG_DEBUG, F("Response from devcontrol request received")); + + mPayload[iv->id].txId = p->packet[0]; + iv->clearDevControlRequest(); + + if ((p->packet[12] == ActivePowerContr) && (p->packet[13] == 0x00)) { + String msg = ""; + if((p->packet[10] == 0x00) && (p->packet[11] == 0x00)) + mApp->setMqttPowerLimitAck(iv); + else + msg = "NOT "; + DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(" has ") + msg + F("accepted power limit set point ") + String(iv->powerLimit[0]) + F(" with PowerLimitControl ") + String(iv->powerLimit[1])); + iv->clearCmdQueue(); + iv->enqueCommand(SystemConfigPara); // read back power limit + } + iv->devControlCmd = Init; + } else { // some other response; copied from hmPayload:process; might not be correct to do that here!!! + DPRINTLN(DBG_INFO, F("procPyld: cmd: 0x") + String(mPayload[iv->id].txCmd, HEX)); + DPRINTLN(DBG_INFO, F("procPyld: txid: 0x") + 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 + mPayload[iv->id].complete = true; + + uint8_t payload[128]; + uint8_t payloadLen = 0; + + memset(payload, 0, 128); + + /*for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId); i++) { + memcpy(&payload[payloadLen], mPayload[iv->id].data[i], (mPayload[iv->id].len[i])); + payloadLen += (mPayload[iv->id].len[i]); + yield(); + }*/ + payloadLen -= 2; + + if (mSerialDebug) { + DPRINT(DBG_INFO, F("Payload (") + String(payloadLen) + "): "); + mSys->Radio.dumpBuf(payload, payloadLen); + } + + if (NULL == rec) { + DPRINTLN(DBG_ERROR, F("record is NULL!")); + } else if ((rec->pyldLen == payloadLen) || (0 == rec->pyldLen)) { + if (mPayload[iv->id].txId == (TX_REQ_INFO + ALL_FRAMES)) + mStat->rxSuccess++; + + rec->ts = mPayload[iv->id].ts; + for (uint8_t i = 0; i < rec->length; i++) { + iv->addValue(i, payload, rec); + yield(); + } + iv->doCalculations(); + notify(mPayload[iv->id].txCmd); + + if(AlarmData == mPayload[iv->id].txCmd) { + uint8_t i = 0; + uint16_t code; + uint32_t start, end; + while(1) { + code = iv->parseAlarmLog(i++, payload, payloadLen, &start, &end); + if(0 == code) + break; + if (NULL != mCbMiAlarm) + (mCbMiAlarm)(code, start, end); + yield(); + } + } + } else { + DPRINTLN(DBG_ERROR, F("plausibility check failed, expected ") + String(rec->pyldLen) + F(" bytes")); + mStat->rxFail++; + } + + iv->setQueuedCmdFinished(); + } + } + + void process(bool retransmit) { + for (uint8_t id = 0; id < mSys->getNumInverters(); id++) { + Inverter<> *iv = mSys->getInverterByPos(id); + if (NULL == iv) + continue; // skip to next inverter + + if (IV_HM == iv->ivGen) // only process MI inverters + continue; // skip to next inverter + + /*if ((mPayload[iv->id].txId != (TX_REQ_INFO + ALL_FRAMES)) && (0 != mPayload[iv->id].txId)) { + // no processing needed if txId is not 0x95 + mPayload[iv->id].complete = true; + continue; // skip to next inverter + }*/ + + if (!mPayload[iv->id].complete) { + bool crcPass, pyldComplete; + crcPass = build(iv->id, &pyldComplete); + if (!crcPass && !pyldComplete) { // payload not complete + if ((mPayload[iv->id].requested) && (retransmit)) { + if (iv->devControlCmd == Restart || iv->devControlCmd == CleanState_LockAndAlarm) { + // This is required to prevent retransmissions without answer. + DPRINTLN(DBG_INFO, F("Prevent retransmit on Restart / CleanState_LockAndAlarm...")); + mPayload[iv->id].retransmits = mMaxRetrans; + } else if(iv->devControlCmd == ActivePowerContr) { + DPRINTLN(DBG_INFO, F("retransmit power limit")); + mSys->Radio.sendControlPacket(iv->radioId.u64, iv->devControlCmd, iv->powerLimit, true); + } else { + if (mPayload[iv->id].retransmits < mMaxRetrans) { + mPayload[iv->id].retransmits++; + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); + mSys->Radio.sendCmdPacket(iv->radioId.u64, iv->getQueuedCmd(), 24, true); + /*if(false == mPayload[iv->id].gotFragment) { + DPRINTLN(DBG_WARN, F("(#") + String(iv->id) + F(") nothing received")); + mPayload[iv->id].retransmits = mMaxRetrans; + } else { + for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId - 1); i++) { + if (mPayload[iv->id].len[i] == 0) { + DPRINTLN(DBG_WARN, F("Frame ") + String(i + 1) + F(" missing: Request Retransmit")); + mSys->Radio.sendCmdPacket(iv->radioId.u64, TX_REQ_INFO, (SINGLE_FRAME + i), true); + break; // only request retransmit one frame per loop + } + yield(); + } + }*/ + } + } + } + } else if(!crcPass && pyldComplete) { // crc error on complete Payload + if (mPayload[iv->id].retransmits < mMaxRetrans) { + mPayload[iv->id].retransmits++; + DPRINTLN(DBG_WARN, F("CRC Error: Request Complete Retransmit")); + mPayload[iv->id].txCmd = iv->getQueuedCmd(); + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") prepareDevInformCmd 0x") + String(mPayload[iv->id].txCmd, HEX)); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].ts, iv->alarmMesIndex, true); + } + } /*else { // payload complete + DPRINTLN(DBG_INFO, F("procPyld: cmd: 0x") + String(mPayload[iv->id].txCmd, HEX)); + DPRINTLN(DBG_INFO, F("procPyld: txid: 0x") + 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 + mPayload[iv->id].complete = true; + + uint8_t payload[128]; + uint8_t payloadLen = 0; + + memset(payload, 0, 128); + + for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId); i++) { + memcpy(&payload[payloadLen], mPayload[iv->id].data[i], (mPayload[iv->id].len[i])); + payloadLen += (mPayload[iv->id].len[i]); + yield(); + } + payloadLen -= 2; + + if (mSerialDebug) { + DPRINT(DBG_INFO, F("Payload (") + String(payloadLen) + "): "); + mSys->Radio.dumpBuf(payload, payloadLen); + } + + if (NULL == rec) { + DPRINTLN(DBG_ERROR, F("record is NULL!")); + } else if ((rec->pyldLen == payloadLen) || (0 == rec->pyldLen)) { + if (mPayload[iv->id].txId == (TX_REQ_INFO + ALL_FRAMES)) + mStat->rxSuccess++; + + rec->ts = mPayload[iv->id].ts; + for (uint8_t i = 0; i < rec->length; i++) { + iv->addValue(i, payload, rec); + yield(); + } + iv->doCalculations(); + notify(mPayload[iv->id].txCmd); + + if(AlarmData == mPayload[iv->id].txCmd) { + uint8_t i = 0; + uint16_t code; + uint32_t start, end; + while(1) { + code = iv->parseAlarmLog(i++, payload, payloadLen, &start, &end); + if(0 == code) + break; + if (NULL != mCbAlarm) + (mCbAlarm)(code, start, end); + yield(); + } + } + } else { + DPRINTLN(DBG_ERROR, F("plausibility check failed, expected ") + String(rec->pyldLen) + F(" bytes")); + mStat->rxFail++; + } + + iv->setQueuedCmdFinished(); + }*/ + } + yield(); + } + } + + private: + void notify(uint8_t val) { + if(NULL != mCbMiPayload) + (mCbMiPayload)(val); + } + + void miStsDecode(Inverter<> *iv, packet_t *p, uint8_t chan = CH1) { + DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(": status msg 0x") + String(p->packet[0], HEX)); + record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); // choose the record structure + rec->ts = mPayload[iv->id].ts; + + //iv->setValue(iv->getPosByChFld(chan, FLD_YD, rec), rec, (int)((p->packet[11+6] << 8) + p->packet[12+6])); // was 11/12, might be wrong! + + //if (INV_TYPE_1CH == iv->type) + //iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, (int)((p->packet[11+6] << 8) + p->packet[12+6])); + + //iv->setValue(iv->getPosByChFld(chan, FLD_EVT, rec), rec, (int)((p->packet[13] << 8) + p->packet[14])); + uint8_t status = (p->packet[11] << 8) + p->packet[12]; + uint8_t stschan = p->packet[0] == 0x88 ? CH1 : CH2; + + mPayload[iv->id].sts[stschan] = status; + iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, calcMiSts(iv)); + //iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, (int)((p->packet[14] << 8) + p->packet[16])); + if (iv->alarmMesIndex < rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]){ + iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; // seems there's no status per channel in 3rd gen. models?!? + + DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); + iv->enqueCommand(AlarmData); + } + /* Unclear how in HM inverters Info and alarm data is handled... + */ + + + /* int8_t offset = -2; + + for decoding see + void MI600StsMsg (NRF24_packet_t *p){ + STAT = (int)((p->packet[11] << 8) + p->packet[12]); + FCNT = (int)((p->packet[13] << 8) + p->packet[14]); + FCODE = (int)((p->packet[15] << 8) + p->packet[16]); + #ifdef ESP8266 + VALUES[PV][5]=STAT; + VALUES[PV][6]=FCNT; + VALUES[PV][7]=FCODE; + #endif + } + */ + } + + void miDataDecode(Inverter<> *iv, packet_t *p) { + record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); // choose the parser + rec->ts = mPayload[iv->id].ts; + + uint8_t datachan = ( p->packet[0] == 0x89 || p->packet[0] == (0x36 + ALL_FRAMES) ) ? CH1 : + ( p->packet[0] == 0x91 || p->packet[0] == (0x37 + ALL_FRAMES) ) ? CH2 : + p->packet[0] == (0x38 + ALL_FRAMES) ? CH3 : + CH4; + int8_t offset = -2; + // U_DC = (float) ((p->packet[11] << 8) + p->packet[12])/10; + iv->setValue(iv->getPosByChFld(datachan, FLD_UDC, rec), rec, (float)((p->packet[11+offset] << 8) + p->packet[12+offset])/10); + yield(); + // I_DC = (float) ((p->packet[13] << 8) + p->packet[14])/10; + iv->setValue(iv->getPosByChFld(datachan, FLD_IDC, rec), rec, (float)((p->packet[13+offset] << 8) + p->packet[14+offset])/10); + yield(); + // U_AC = (float) ((p->packet[15] << 8) + p->packet[16])/10; + iv->setValue(iv->getPosByChFld(0, FLD_UAC, rec), rec, (float)((p->packet[15+offset] << 8) + p->packet[16+offset])/10); + yield(); + // F_AC = (float) ((p->packet[17] << 8) + p->packet[18])/100; + //iv->setValue(iv->getPosByChFld(0, FLD_IAC, rec), rec, (float)((p->packet[17+offset] << 8) + p->packet[18+offset])/100); + //yield(); + // P_DC = (float)((p->packet[19] << 8) + p->packet[20])/10; + iv->setValue(iv->getPosByChFld(datachan, FLD_PDC, rec), rec, (float)((p->packet[19+offset] << 8) + p->packet[20+offset])/10); + yield(); + // Q_DC = (float)((p->packet[21] << 8) + p->packet[22])/1; + iv->setValue(iv->getPosByChFld(datachan, FLD_YD, rec), rec, (float)((p->packet[21+offset] << 8) + p->packet[22+offset])/1); + yield(); + iv->setValue(iv->getPosByChFld(0, FLD_T, rec), rec, (float) ((int16_t)(p->packet[23+offset] << 8) + p->packet[24+offset])/10); //23 is freq or IAC? + iv->setValue(iv->getPosByChFld(0, FLD_F, rec), rec, (float) ((p->packet[17+offset] << 8) + p->packet[18+offset])/100); + iv->setValue(iv->getPosByChFld(0, FLD_IRR, rec), rec, (float) (calcIrradiation(iv, datachan))); + yield(); + //FLD_YD + + if (p->packet[0] >= (0x36 + ALL_FRAMES) ) { + mPayload[iv->id].sts[stschan] = (uint8_t)(p->packet[25+offset]); + iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, calcMiSts(iv));yield(); + if (iv->alarmMesIndex < rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]){ + iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; + + DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); + iv->enqueCommand(AlarmData); + } + } + //iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, CALC_YD_CH0); // (getValue(iv->getPosByChFld(1, FLD_YD, rec), rec) + getValue(iv->getPosByChFld(2, FLD_YD, rec), rec))); + iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); //datachan)); + iv->doCalculations(); + notify(mPayload[iv->id].txCmd); +/* + if(AlarmData == mPayload[iv->id].txCmd) { + uint8_t i = 0; + uint16_t code; + uint32_t start, end; + while(1) { + code = iv->parseAlarmLog(i++, payload, payloadLen, &start, &end); + if(0 == code) + break; + if (NULL != mCbMiAlarm) + (mCbAlarm)(code, start, end); + yield(); + } + }*/ +/*decode here or memcopy payload for later decoding? + void MI600DataMsg(NRF24_packet_t *p){ + U_DC = (float) ((p->packet[11] << 8) + p->packet[12])/10; + I_DC = (float) ((p->packet[13] << 8) + p->packet[14])/10; + U_AC = (float) ((p->packet[15] << 8) + p->packet[16])/10; + F_AC = (float) ((p->packet[17] << 8) + p->packet[18])/100; + P_DC = (float)((p->packet[19] << 8) + p->packet[20])/10; + Q_DC = (float)((p->packet[21] << 8) + p->packet[22])/1; + TEMP = (float) ((p->packet[23] << 8) + p->packet[24])/10; //(int16_t) + + if ((30packet[2] == 0x89) {PV= 0; TotalP[1]=P_DC; pvCnt[0]=1;}//port 1 + if (p->packet[2] == 0x91) {PV= 1; TotalP[2]=P_DC; pvCnt[1]=1;}//port 2 + + TotalP[0]=TotalP[1]+TotalP[2]+TotalP[3]+TotalP[4];//in TotalP[0] is the totalPV power + if((P_DC>400) || (P_DC<0) || (TotalP[0]>MAXPOWER)){// cant be!! + TotalP[0]=0; + return; + } + #ifdef ESP8266 + VALUES[PV][0]=PV; + VALUES[PV][1]=P_DC; + VALUES[PV][2]=U_DC; + VALUES[PV][3]=I_DC; + VALUES[PV][4]=Q_DC; + #endif + PMI=TotalP[0]; + LIM=(uint16_t)Limit; + PrintOutValues(); + }*/ + + /*For MI1500: + if (MI1500) { + STAT = (uint8_t)(p->packet[25] ); + FCNT = (uint8_t)(p->packet[26]); + FCODE = (uint8_t)(p->packet[27]); + } + */ + DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(": data msg 0x") + String(p->packet[0], HEX) + F(" channel ") + datachan); + } + + bool build(uint8_t id, bool *complete) { + /*DPRINTLN(DBG_VERBOSE, F("build")); + uint16_t crc = 0xffff, crcRcv = 0x0000; + if (mPayload[id].maxPackId > MAX_PAYLOAD_ENTRIES) + mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; + + // check if all fragments are there + *complete = true; + for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { + if(mPayload[id].len[i] == 0) + *complete = false; + } + if(!*complete) + return false; + + for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { + if (mPayload[id].len[i] > 0) { + if (i == (mPayload[id].maxPackId - 1)) { + crc = ah::crc16(mPayload[id].data[i], mPayload[id].len[i] - 2, crc); + crcRcv = (mPayload[id].data[i][mPayload[id].len[i] - 2] << 8) | (mPayload[id].data[i][mPayload[id].len[i] - 1]); + } else + crc = ah::crc16(mPayload[id].data[i], mPayload[id].len[i], crc); + } + yield(); + } + + return (crc == crcRcv) ? true : false;*/ + return true; + } + + void reset(uint8_t id) { + DPRINTLN(DBG_INFO, "resetPayload: id: " + String(id)); + memset(mPayload[id].len, 0, MAX_PAYLOAD_ENTRIES); + /* + mPayload[id].gotFragment = false; + mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; + mPayload[id].lastFound = false;*/ + mPayload[id].retransmits = 0; + mPayload[id].complete = false; + mPayload[id].txCmd = 0; + mPayload[id].requested = false; + mPayload[id].ts = *mTimestamp; + mPayload[id].sts[] = (0); + } + + + template + static T calcMiSts(Inverter<> *iv) { + if(NULL != iv) { + T result = 0; + for(uint8_t i = 1; i <= iv->channels; i++) { + uint8_t sChState = mPayload[iv->id].sts[i]; + if (!sChState && !result || sChState && sChState < result) { + result = sChState; + } + return result; + } + return 0; + } + + IApp *mApp; + HMSYSTEM *mSys; + statistics_t *mStat; + uint8_t mMaxRetrans; + uint32_t *mTimestamp; + miPayload_t mPayload[MAX_NUM_INVERTERS]; + bool mSerialDebug; + + Inverter<> *mHighPrioIv; + alarmListenerType mCbMiAlarm; + payloadListenerType mCbMiPayload; +}; + +#endif /*__MI_PAYLOAD_H__*/ From 7add54bf2bac79151632bb9aca22f914a9eed067 Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Sun, 5 Mar 2023 10:50:19 +0100 Subject: [PATCH 2/8] MI - request missing parts seems to basically work --- src/hm/hmInverter.h | 30 ++++- src/hm/miPayload.h | 314 ++++++++++++++++++++++++++------------------ 2 files changed, 210 insertions(+), 134 deletions(-) diff --git a/src/hm/hmInverter.h b/src/hm/hmInverter.h index c764cee0..f150628a 100644 --- a/src/hm/hmInverter.h +++ b/src/hm/hmInverter.h @@ -90,6 +90,13 @@ class InfoCommand : public CommandAbstract { } }; +class MiInfoCommand : public CommandAbstract { + public: + MiInfoCommand(uint8_t cmd){ + _TxType = cmd; + _Cmd = cmd; + } +}; // list of all available functions, mapped in hmDefines.h template const calcFunc_t calcFunctions[] = { @@ -163,9 +170,26 @@ class Inverter { uint8_t getQueuedCmd() { if (_commandQueue.empty()) { - if (getFwVersion() == 0) - enqueCommand(InverterDevInform_All); // firmware version - enqueCommand(RealTimeRunData_Debug); // live data + if (ivGen != IV_MI) { + if (getFwVersion() == 0) + enqueCommand(InverterDevInform_All); // firmware version + enqueCommand(RealTimeRunData_Debug); // live data + } else if (ivGen == IV_MI){ + if (type == INV_TYPE_4CH) { + enqueCommand(0x36); + /*for(uint8_t i = 0x36; i <= 0x39; i++) { + enqueCommand(i); // live data + }*/ + } else if (type == INV_TYPE_2CH) { + enqueCommand(0x09); + //enqueCommand(0x11); + } else if (type == INV_TYPE_1CH) { + enqueCommand(0x09); + } + //if (getFwVersion() == 0) + // enqueCommand(InverterDevInform_All); // firmware version, might not work, esp. for 1/2 ch hardware + } + if ((actPowerLimit == 0xffff) && isConnected) enqueCommand(SystemConfigPara); // power limit info } diff --git a/src/hm/miPayload.h b/src/hm/miPayload.h index aa295db7..ac455f3d 100644 --- a/src/hm/miPayload.h +++ b/src/hm/miPayload.h @@ -18,8 +18,8 @@ typedef struct { uint8_t txCmd; uint8_t len[MAX_PAYLOAD_ENTRIES]; bool complete; - bool stsa; - bool stsb; + bool dataAB[2]; + uint8_t sts[5]; uint8_t txId; uint8_t invId; uint8_t retransmits; @@ -65,6 +65,7 @@ class MiPayload { void addAlarmListener(alarmListenerType cb) { mCbMiAlarm = cb; } + void loop() { /*if(NULL != mHighPrioIv) { iv->ivSend(mHighPrioIv, true); // should request firmware version etc.? @@ -84,55 +85,83 @@ class MiPayload { if (mSerialDebug) DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") Requesting Inv SN ") + String(iv->config->serial.u64, HEX)); - uint8_t cmd = iv->type == INV_TYPE_4CH ? 0x36 : 0x09; //iv->getQueuedCmd(); - DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") prepareDevInformCmd")); + //first channel request + /*uint8_t cmd = iv->type == INV_TYPE_4CH ? 0x36 : 0x09; + DPRINT(DBG_INFO, F("(#")); + DBGPRINT(String(iv->id)); + DBGPRINT(F(") prepareDevInformCmd 0x")); + DBGPRINTLN(String(cmd, HEX)); mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd; + mPayload[iv->id].txCmd = cmd;*/ + + uint8_t cmd = iv->getQueuedCmd(); + DPRINT(DBG_INFO, F("(#")); + DBGPRINT(String(iv->id)); + DBGPRINT(F(") prepareDevInformCmd 0x")); + DBGPRINTLN(String(cmd, HEX)); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + //other channel requests + /*if (iv->type == INV_TYPE_4CH) { + for(uint8_t i = 1; i < iv->channels; i++) { + iv->enqueCommand(cmd + i, cmd + i); + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd + i); + } + } else */ + if (iv->type == INV_TYPE_2CH) { + mPayload[iv->id].dataAB[0] = false; + mPayload[iv->id].dataAB[1] = false; + //iv->enqueCommand(0x11); + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); + } } void add(Inverter<> *iv, packet_t *p) { //DPRINTLN(DBG_INFO, F("MI got data [0]=") + String(p->packet[0], HEX)); if (p->packet[0] == (0x08 + ALL_FRAMES)) { // 0x88; MI status response to 0x09 - mPayload[iv->id].stsa = true; + //mPayload[iv->id].sts[0] = true; miStsDecode(iv, p); } else if (p->packet[0] == (0x11 + SINGLE_FRAME)) { // 0x92; MI status response to 0x11 - mPayload[iv->id].stsb = true; + //mPayload[iv->id].sts[1] = true; miStsDecode(iv, p, CH2); - } else if (p->packet[0] == (0x09 + ALL_FRAMES)) { // MI data response to 0x09 + /*} else if (p->packet[0] == (0x09 + ALL_FRAMES)) { // MI data response to 0x09 mPayload[iv->id].txId = p->packet[0]; miDataDecode(iv,p); - iv->setQueuedCmdFinished(); + //iv->setQueuedCmdFinished(); if (INV_TYPE_2CH == iv->type) { //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); } else { // additional check for mPayload[iv->id].stsa == true might be a good idea (request retransmit?) mPayload[iv->id].complete = true; //iv->setQueuedCmdFinished(); } - } else if (p->packet[0] == (0x11 + ALL_FRAMES)) { // MI data response to 0x11 + } else if (p->packet[0] == ()) { // MI data response to 0x11 mPayload[iv->id].txId = p->packet[0]; - mPayload[iv->id].complete = true; miDataDecode(iv,p); - iv->setQueuedCmdFinished(); + mStat->rxSuccess++; + //iv->setQueuedCmdFinished();*/ - } else if (p->packet[0] >= (0x36 + ALL_FRAMES) && p->packet[0] < (0x39 + SINGLE_FRAME)) { // MI 1500 data response to 0x36, 0x37, 0x38 and 0x39 + } else if ( p->packet[0] == 0x09 + ALL_FRAMES || + p->packet[0] == 0x11 + ALL_FRAMES || + ( p->packet[0] >= (0x36 + ALL_FRAMES) && p->packet[0] < (0x39 + SINGLE_FRAME) ) ) { // small MI or MI 1500 data responses to 0x09, 0x11, 0x36, 0x37, 0x38 and 0x39 mPayload[iv->id].txId = p->packet[0]; miDataDecode(iv,p); - iv->setQueuedCmdFinished(); - if (p->packet[0] < (0x39 + ALL_FRAMES)) { + //mStat->rxSuccess++; + //iv->setQueuedCmdFinished(); + /*if (p->packet[0] < (0x39 + ALL_FRAMES)) { //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, p->packet[0] + 1 - ALL_FRAMES); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, p->packet[0] + 1 - ALL_FRAMES, mPayload[iv->id].ts, iv->alarmMesIndex, false, p->packet[0] + 1 - ALL_FRAMES); + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, p->packet[0] + 1 - ALL_FRAMES, mPayload[iv->id].ts, iv->alarmMesIndex, false, p->packet[0] + 1 - ALL_FRAMES); } else { mPayload[iv->id].complete = true; //iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, CALC_YD_CH0); //iv->setQueuedCmdFinished(); - } + }*/ - /*} + //} - 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 mPayload[iv->id].txId = p->packet[0]; DPRINTLN(DBG_DEBUG, F("Response from info request received")); uint8_t *pid = &p->packet[9]; @@ -170,7 +199,7 @@ class MiPayload { msg = "NOT "; DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(" has ") + msg + F("accepted power limit set point ") + String(iv->powerLimit[0]) + F(" with PowerLimitControl ") + String(iv->powerLimit[1])); iv->clearCmdQueue(); - iv->enqueCommand(SystemConfigPara); // read back power limit + iv->enqueCommand(SystemConfigPara); // read back power limit } iv->devControlCmd = Init; } else { // some other response; copied from hmPayload:process; might not be correct to do that here!!! @@ -264,6 +293,7 @@ class MiPayload { if (mPayload[iv->id].retransmits < mMaxRetrans) { mPayload[iv->id].retransmits++; //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); + DPRINTLN(DBG_WARN, F("missing answer to 0x") + String(iv->getQueuedCmd(), HEX) + F("Request Retransmit")); mSys->Radio.sendCmdPacket(iv->radioId.u64, iv->getQueuedCmd(), 24, true); /*if(false == mPayload[iv->id].gotFragment) { DPRINTLN(DBG_WARN, F("(#") + String(iv->id) + F(") nothing received")); @@ -363,39 +393,28 @@ class MiPayload { record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); // choose the record structure rec->ts = mPayload[iv->id].ts; - //iv->setValue(iv->getPosByChFld(chan, FLD_YD, rec), rec, (int)((p->packet[11+6] << 8) + p->packet[12+6])); // was 11/12, might be wrong! - - //if (INV_TYPE_1CH == iv->type) - //iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, (int)((p->packet[11+6] << 8) + p->packet[12+6])); + uint8_t status = (p->packet[11] << 8) + p->packet[12]; + uint8_t stschan = p->packet[0] == 0x88 ? CH1 : CH2; + mPayload[iv->id].dataAB[stschan-1] = true; + mPayload[iv->id].sts[stschan] = status; + if ( !mPayload[iv->id].sts[0] || status < mPayload[iv->id].sts[0]) { + mPayload[iv->id].sts[0] = status; + iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, status); + } - //iv->setValue(iv->getPosByChFld(chan, FLD_EVT, rec), rec, (int)((p->packet[13] << 8) + p->packet[14])); + if ( !mPayload[iv->id].dataAB[0] || !mPayload[iv->id].dataAB[1] ) { + uint8_t cmd = mPayload[iv->id].dataAB[0] ? 0x11 : 0x09; + DPRINTLN(DBG_INFO, F("request missing status 0x") + String(cmd, HEX)); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + } - iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, (int)((p->packet[11] << 8) + p->packet[12])); - //iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, (int)((p->packet[14] << 8) + p->packet[16])); if (iv->alarmMesIndex < rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]){ iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; // seems there's no status per channel in 3rd gen. models?!? DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); - iv->enqueCommand(AlarmData); + iv->enqueCommand(AlarmData); } - /* Unclear how in HM inverters Info and alarm data is handled... - */ - - - /* int8_t offset = -2; - - for decoding see - void MI600StsMsg (NRF24_packet_t *p){ - STAT = (int)((p->packet[11] << 8) + p->packet[12]); - FCNT = (int)((p->packet[13] << 8) + p->packet[14]); - FCODE = (int)((p->packet[15] << 8) + p->packet[16]); - #ifdef ESP8266 - VALUES[PV][5]=STAT; - VALUES[PV][6]=FCNT; - VALUES[PV][7]=FCODE; - #endif - } - */ } void miDataDecode(Inverter<> *iv, packet_t *p) { @@ -406,49 +425,93 @@ class MiPayload { ( p->packet[0] == 0x91 || p->packet[0] == (0x37 + ALL_FRAMES) ) ? CH2 : p->packet[0] == (0x38 + ALL_FRAMES) ? CH3 : CH4; - int8_t offset = -2; - // U_DC = (float) ((p->packet[11] << 8) + p->packet[12])/10; - iv->setValue(iv->getPosByChFld(datachan, FLD_UDC, rec), rec, (float)((p->packet[11+offset] << 8) + p->packet[12+offset])/10); + DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(": data msg 0x") + String(p->packet[0], HEX) + F(" channel ") + datachan); + // count in RF_communication_protocol.xlsx is with offset = -1 + iv->setValue(iv->getPosByChFld(datachan, FLD_UDC, rec), rec, (float)((p->packet[9] << 8) + p->packet[10])/10); yield(); - // I_DC = (float) ((p->packet[13] << 8) + p->packet[14])/10; - iv->setValue(iv->getPosByChFld(datachan, FLD_IDC, rec), rec, (float)((p->packet[13+offset] << 8) + p->packet[14+offset])/10); + iv->setValue(iv->getPosByChFld(datachan, FLD_IDC, rec), rec, (float)((p->packet[11] << 8) + p->packet[12])/10); yield(); - // U_AC = (float) ((p->packet[15] << 8) + p->packet[16])/10; - iv->setValue(iv->getPosByChFld(0, FLD_UAC, rec), rec, (float)((p->packet[15+offset] << 8) + p->packet[16+offset])/10); + iv->setValue(iv->getPosByChFld(0, FLD_UAC, rec), rec, (float)((p->packet[13] << 8) + p->packet[14])/10); yield(); - // F_AC = (float) ((p->packet[17] << 8) + p->packet[18])/100; - //iv->setValue(iv->getPosByChFld(0, FLD_IAC, rec), rec, (float)((p->packet[17+offset] << 8) + p->packet[18+offset])/100); - //yield(); - // P_DC = (float)((p->packet[19] << 8) + p->packet[20])/10; - iv->setValue(iv->getPosByChFld(datachan, FLD_PDC, rec), rec, (float)((p->packet[19+offset] << 8) + p->packet[20+offset])/10); + iv->setValue(iv->getPosByChFld(0, FLD_F, rec), rec, (float) ((p->packet[15] << 8) + p->packet[16])/100); + iv->setValue(iv->getPosByChFld(datachan, FLD_PDC, rec), rec, (float)((p->packet[17] << 8) + p->packet[18])/10); yield(); - // Q_DC = (float)((p->packet[21] << 8) + p->packet[22])/1; - iv->setValue(iv->getPosByChFld(datachan, FLD_YD, rec), rec, (float)((p->packet[21+offset] << 8) + p->packet[22+offset])/1); + iv->setValue(iv->getPosByChFld(datachan, FLD_YD, rec), rec, (float)((p->packet[19] << 8) + p->packet[20])/1); yield(); - iv->setValue(iv->getPosByChFld(0, FLD_T, rec), rec, (float) ((int16_t)(p->packet[23+offset] << 8) + p->packet[24+offset])/10); //23 is freq or IAC? - iv->setValue(iv->getPosByChFld(0, FLD_F, rec), rec, (float) ((p->packet[17+offset] << 8) + p->packet[18+offset])/100); + iv->setValue(iv->getPosByChFld(0, FLD_T, rec), rec, (float) ((int16_t)(p->packet[21] << 8) + p->packet[22])/10); iv->setValue(iv->getPosByChFld(0, FLD_IRR, rec), rec, (float) (calcIrradiation(iv, datachan))); - yield(); - //FLD_YD + //AC Power is missing; we may have to calculate, as no respective data is in payload if (p->packet[0] >= (0x36 + ALL_FRAMES) ) { - /*status message analysis most liklely needs to be changed, see MiStsMst*/ - /*STAT = (uint8_t)(p->packet[25] ); - FCNT = (uint8_t)(p->packet[26]); - FCODE = (uint8_t)(p->packet[27]); // MI300/Mi600 stsMsg:: (int)((p->packet[15] << 8) + p->packet[16]); */ - iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, (uint8_t)(p->packet[25+offset])); - yield(); + + /*For MI1500: + if (MI1500) { + STAT = (uint8_t)(p->packet[25] ); + FCNT = (uint8_t)(p->packet[26]); + FCODE = (uint8_t)(p->packet[27]); + }*/ + + uint8_t status = (uint8_t)(p->packet[23]); + mPayload[iv->id].sts[datachan] = status; + if ( !mPayload[iv->id].sts[0] || status < mPayload[iv->id].sts[0]) { + mPayload[iv->id].sts[0] = status; + iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, status); + } + + if (p->packet[0] < (0x39 + ALL_FRAMES) ) { + uint8_t cmd = p->packet[0] - ALL_FRAMES + 1; + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + mPayload[iv->id].complete = false; + } + + //iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, calcMiSts(iv));yield(); if (iv->alarmMesIndex < rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]){ iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); - iv->enqueCommand(AlarmData); + //iv->enqueCommand(AlarmData); } + } - //iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, CALC_YD_CH0); // (getValue(iv->getPosByChFld(1, FLD_YD, rec), rec) + getValue(iv->getPosByChFld(2, FLD_YD, rec), rec))); - iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); //datachan)); - iv->doCalculations(); - notify(mPayload[iv->id].txCmd); + + //preliminary AC calculation... + uint8_t ac_pow = 0; + //if (mPayload[iv->id].sts[0] == 3) { + ac_pow = calcPowerDcCh0(iv, 0)*9.5; + //} + iv->setValue(iv->getPosByChFld(0, FLD_PAC, rec), rec, (float) (ac_pow/10)); + //iv->setValue(iv->getPosByChFld(0, FLD_PAC, rec), rec, (float) (mPayload[iv->id].sts[0] == 3 ? calcPowerDcCh0(iv, 0)*0.95 : 0)); + + if ( mPayload[iv->id].sts[0] ) { + uint8_t cmd = mPayload[iv->id].dataAB[0] ? 0x11 : 0x09; + if ( mPayload[iv->id].dataAB[0] && mPayload[iv->id].dataAB[1] ) { + mPayload[iv->id].complete = true; // For 2 CH devices, this might be too short... + DPRINTLN(DBG_INFO, F("complete tree detected")); + iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); + iv->doCalculations(); + } else { + //retry to get missing status info for one or two channel devices + DPRINTLN(DBG_INFO, F("request missing data or status 0x") + String(cmd, HEX)); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + //iv->enqueCommand(cmd); // mPayload[iv->id].dataAB[1] ? 0x09 : 0x11) + } + } // not yet moved to hmInverter::getQueuedCmd + else if (mPayload[iv->id].txCmd == 0x09 && iv->type == INV_TYPE_2CH) { + uint8_t cmd = 0x11; + DPRINTLN(DBG_INFO, F("request second data channel 0x") + String(cmd, HEX)); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + mPayload[iv->id].complete = false; + } + + iv->setQueuedCmdFinished(); + mStat->rxSuccess++; + yield(); + + notify(mPayload[iv->id].txCmd); + /* if(AlarmData == mPayload[iv->id].txCmd) { uint8_t i = 0; @@ -463,66 +526,26 @@ class MiPayload { yield(); } }*/ -/*decode here or memcopy payload for later decoding? - void MI600DataMsg(NRF24_packet_t *p){ - U_DC = (float) ((p->packet[11] << 8) + p->packet[12])/10; - I_DC = (float) ((p->packet[13] << 8) + p->packet[14])/10; - U_AC = (float) ((p->packet[15] << 8) + p->packet[16])/10; - F_AC = (float) ((p->packet[17] << 8) + p->packet[18])/100; - P_DC = (float)((p->packet[19] << 8) + p->packet[20])/10; - Q_DC = (float)((p->packet[21] << 8) + p->packet[22])/1; - TEMP = (float) ((p->packet[23] << 8) + p->packet[24])/10; //(int16_t) - - if ((30packet[2] == 0x89) {PV= 0; TotalP[1]=P_DC; pvCnt[0]=1;}//port 1 - if (p->packet[2] == 0x91) {PV= 1; TotalP[2]=P_DC; pvCnt[1]=1;}//port 2 - - TotalP[0]=TotalP[1]+TotalP[2]+TotalP[3]+TotalP[4];//in TotalP[0] is the totalPV power - if((P_DC>400) || (P_DC<0) || (TotalP[0]>MAXPOWER)){// cant be!! - TotalP[0]=0; - return; - } - #ifdef ESP8266 - VALUES[PV][0]=PV; - VALUES[PV][1]=P_DC; - VALUES[PV][2]=U_DC; - VALUES[PV][3]=I_DC; - VALUES[PV][4]=Q_DC; - #endif - PMI=TotalP[0]; - LIM=(uint16_t)Limit; - PrintOutValues(); - }*/ - - /*For MI1500: - if (MI1500) { - STAT = (uint8_t)(p->packet[25] ); - FCNT = (uint8_t)(p->packet[26]); - FCODE = (uint8_t)(p->packet[27]); - } - */ - DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(": data msg 0x") + String(p->packet[0], HEX) + F(" channel ") + datachan); } bool build(uint8_t id, bool *complete) { - /*DPRINTLN(DBG_VERBOSE, F("build")); - uint16_t crc = 0xffff, crcRcv = 0x0000; + DPRINTLN(DBG_VERBOSE, F("build")); + /*uint16_t crc = 0xffff, crcRcv = 0x0000; if (mPayload[id].maxPackId > MAX_PAYLOAD_ENTRIES) mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; - - // check if all fragments are there - *complete = true; - for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { - if(mPayload[id].len[i] == 0) - *complete = false; + */ + // check if all messages are there + + *complete = mPayload[id].complete; + uint8_t txCmd = mPayload[id].txCmd; + //uint8_t cmd = getQueuedCmd(); + if(!*complete) { + //if (txCmd == 0x09 || txCmd == 0x11 || txCmd >= 0x36 && txCmd <= 0x39 ) + // return false; + DPRINTLN(DBG_VERBOSE, F("incomlete, txCmd is 0x") + String(txCmd, HEX)); // + F("cmd is 0x") + String(cmd, HEX)); } - if(!*complete) - return false; - for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { + /*for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { if (mPayload[id].len[i] > 0) { if (i == (mPayload[id].maxPackId - 1)) { crc = ah::crc16(mPayload[id].data[i], mPayload[id].len[i] - 2, crc); @@ -546,13 +569,42 @@ class MiPayload { mPayload[id].lastFound = false;*/ mPayload[id].retransmits = 0; mPayload[id].complete = false; + mPayload[id].dataAB[0] = true; //only required for 2CH devices + mPayload[id].dataAB[1] = true; mPayload[id].txCmd = 0; mPayload[id].requested = false; mPayload[id].ts = *mTimestamp; - mPayload[id].stsa = false; - mPayload[id].stsb = false; + //mPayload[id].sts[0] = 0; + mPayload[id].sts[1] = 0; + mPayload[id].sts[2] = 0; + mPayload[id].sts[3] = 0; + mPayload[id].sts[4] = 0; } + +/* template + static T calcMiSts(Inverter<> *iv) { + if(NULL != iv) { + T result = 0; + bool stsComplete = true; + uint8_t stsCh; + for(uint8_t i = 1; i <= iv->channels; i++) { + stsCh = mPayload[iv->id].sts[i]; + if (!stsCh) { + stsComplete = false; + } else if ( !result || stsCh < result ) { + result = stsCh; + if (stsComplete && stsCh > stsComplete) { + stsComplete = stsCh; + } + } + } + mPayload[iv->id].sts[0] = stsComplete; + return result; + } + return 0; + } */ + IApp *mApp; HMSYSTEM *mSys; statistics_t *mStat; From 319a69dd712118f2babda8169769a9588deac1b0 Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Sun, 5 Mar 2023 12:28:48 +0100 Subject: [PATCH 3/8] small changes --- hmInverter.h | 689 +++++++++++++++++++++++++++++++++++++++++++++++++++ miPayload.h | 299 ++++++++++++---------- 2 files changed, 858 insertions(+), 130 deletions(-) create mode 100644 hmInverter.h diff --git a/hmInverter.h b/hmInverter.h new file mode 100644 index 00000000..175c6177 --- /dev/null +++ b/hmInverter.h @@ -0,0 +1,689 @@ +//----------------------------------------------------------------------------- +// 2023 Ahoy, https://www.mikrocontroller.net/topic/525778 +// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/ +//----------------------------------------------------------------------------- + +#ifndef __HM_INVERTER_H__ +#define __HM_INVERTER_H__ + +#if defined(ESP32) && defined(F) + #undef F + #define F(sl) (sl) +#endif + +#include "hmDefines.h" +#include +#include +#include "../config/settings.h" + +/** + * For values which are of interest and not transmitted by the inverter can be + * calculated automatically. + * A list of functions can be linked to the assignment and will be executed + * automatically. Their result does not differ from original read values. + */ + +// forward declaration of class +template +class Inverter; + + +// prototypes +template +static T calcYieldTotalCh0(Inverter<> *iv, uint8_t arg0); + +template +static T calcYieldDayCh0(Inverter<> *iv, uint8_t arg0); + +template +static T calcUdcCh(Inverter<> *iv, uint8_t arg0); + +template +static T calcPowerDcCh0(Inverter<> *iv, uint8_t arg0); + +template +static T calcEffiencyCh0(Inverter<> *iv, uint8_t arg0); + +template +static T calcIrradiation(Inverter<> *iv, uint8_t arg0); + +template +using func_t = T (Inverter<> *, uint8_t); + +template +struct calcFunc_t { + uint8_t funcId; // unique id + func_t* func; // function pointer +}; + +template +struct record_t { + byteAssign_t* assign; // assigment of bytes in payload + uint8_t length; // length of the assignment list + T *record; // data pointer + uint32_t ts; // timestamp of last received payload + uint8_t pyldLen; // expected payload length for plausibility check +}; + +class CommandAbstract { + public: + CommandAbstract(uint8_t txType = 0, uint8_t cmd = 0) { + _TxType = txType; + _Cmd = cmd; + }; + virtual ~CommandAbstract() {}; + + const uint8_t getCmd() { + return _Cmd; + } + + protected: + uint8_t _TxType; + uint8_t _Cmd; +}; + +class InfoCommand : public CommandAbstract { + public: + InfoCommand(uint8_t cmd){ + _TxType = 0x15; + _Cmd = cmd; + } +}; + +class MiInfoCommand : public CommandAbstract { + public: + MiInfoCommand(uint8_t cmd){ + _TxType = cmd; + _Cmd = cmd; + } +}; +// list of all available functions, mapped in hmDefines.h +template +const calcFunc_t calcFunctions[] = { + { CALC_YT_CH0, &calcYieldTotalCh0 }, + { CALC_YD_CH0, &calcYieldDayCh0 }, + { CALC_UDC_CH, &calcUdcCh }, + { CALC_PDC_CH0, &calcPowerDcCh0 }, + { CALC_EFF_CH0, &calcEffiencyCh0 }, + { CALC_IRR_CH, &calcIrradiation } +}; + + +template +class Inverter { + public: + uint8_t ivGen; // generation of inverter (HM / MI) + cfgIv_t *config; // stored settings + uint8_t id; // unique id + uint8_t type; // integer which refers to inverter type + uint16_t alarmMesIndex; // Last recorded Alarm Message Index + uint16_t powerLimit[2]; // limit power output + float actPowerLimit; // actual power limit + uint8_t devControlCmd; // carries the requested cmd + serial_u radioId; // id converted to modbus + uint8_t channels; // number of PV channels (1-4) + record_t recordMeas; // structure for measured values + record_t recordInfo; // structure for info values + record_t recordConfig; // structure for system config values + record_t recordAlarm; // structure for alarm values + //String lastAlarmMsg; + bool initialized; // needed to check if the inverter was correctly added (ESP32 specific - union types are never null) + bool isConnected; // shows if inverter was successfully identified (fw version and hardware info) + + Inverter() { + ivGen = IV_HM; + powerLimit[0] = 0xffff; // 65535 W Limit -> unlimited + powerLimit[1] = AbsolutNonPersistent; // default power limit setting + actPowerLimit = 0xffff; // init feedback from inverter to -1 + mDevControlRequest = false; + devControlCmd = InitDataState; + initialized = false; + //lastAlarmMsg = "nothing"; + alarmMesIndex = 0; + isConnected = false; + } + + ~Inverter() { + // TODO: cleanup + } + + template + void enqueCommand(uint8_t cmd) { + _commandQueue.push(std::make_shared(cmd)); + DPRINTLN(DBG_INFO, F("(#") + String(id) + F(") enqueuedCmd: 0x") + String(cmd, HEX)); + } + + void setQueuedCmdFinished() { + if (!_commandQueue.empty()) { + // Will destroy CommandAbstract Class Object (?) + _commandQueue.pop(); + } + } + + void clearCmdQueue() { + DPRINTLN(DBG_INFO, F("clearCmdQueue")); + while (!_commandQueue.empty()) { + // Will destroy CommandAbstract Class Object (?) + _commandQueue.pop(); + } + } + + uint8_t getQueuedCmd() { + if (_commandQueue.empty()) { + if (ivGen != IV_MI) { + if (getFwVersion() == 0) + enqueCommand(InverterDevInform_All); // firmware version + enqueCommand(RealTimeRunData_Debug); // live data + } else if (ivGen == IV_MI){ + if (type == INV_TYPE_4CH) { + enqueCommand(0x36); + /*for(uint8_t i = 0x36; i <= 0x39; i++) { + enqueCommand(i); // live data + }*/ + } else if (type == INV_TYPE_2CH) { + enqueCommand(0x09); + //enqueCommand(0x11); + } else if (type == INV_TYPE_1CH) { + enqueCommand(0x09); + } + //if (getFwVersion() == 0) + // enqueCommand(InverterDevInform_All); // firmware version, might not work, esp. for 1/2 ch hardware + } + + if ((actPowerLimit == 0xffff) && isConnected) + enqueCommand(SystemConfigPara); // power limit info + } + return _commandQueue.front().get()->getCmd(); + } + + + void init(void) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:init")); + initAssignment(&recordMeas, RealTimeRunData_Debug); + initAssignment(&recordInfo, InverterDevInform_All); + initAssignment(&recordConfig, SystemConfigPara); + initAssignment(&recordAlarm, AlarmData); + toRadioId(); + initialized = true; + } + + uint8_t getPosByChFld(uint8_t channel, uint8_t fieldId, record_t<> *rec) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getPosByChFld")); + uint8_t pos = 0; + if(NULL != rec) { + for(; pos < rec->length; pos++) { + if((rec->assign[pos].ch == channel) && (rec->assign[pos].fieldId == fieldId)) + break; + } + return (pos >= rec->length) ? 0xff : pos; + } + else + return 0xff; + } + + byteAssign_t *getByteAssign(uint8_t pos, record_t<> *rec) { + return &rec->assign[pos]; + } + + const char *getFieldName(uint8_t pos, record_t<> *rec) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getFieldName")); + if(NULL != rec) + return fields[rec->assign[pos].fieldId]; + return notAvail; + } + + const char *getUnit(uint8_t pos, record_t<> *rec) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getUnit")); + if(NULL != rec) + return units[rec->assign[pos].unitId]; + return notAvail; + } + + uint8_t getChannel(uint8_t pos, record_t<> *rec) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getChannel")); + if(NULL != rec) + return rec->assign[pos].ch; + return 0; + } + + bool setDevControlRequest(uint8_t cmd) { + if(isConnected) { + mDevControlRequest = true; + devControlCmd = cmd; + } + return isConnected; + } + + void clearDevControlRequest() { + mDevControlRequest = false; + } + + inline bool getDevControlRequest() { + return mDevControlRequest; + } + + void addValue(uint8_t pos, uint8_t buf[], record_t<> *rec) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:addValue")); + if(NULL != rec) { + uint8_t ptr = rec->assign[pos].start; + uint8_t end = ptr + rec->assign[pos].num; + uint16_t div = rec->assign[pos].div; + + if(NULL != rec) { + if(CMD_CALC != div) { + uint32_t val = 0; + do { + val <<= 8; + val |= buf[ptr]; + } while(++ptr != end); + if (FLD_T == rec->assign[pos].fieldId) { + // temperature is a signed value! + rec->record[pos] = (REC_TYP)((int16_t)val) / (REC_TYP)(div); + } else if (FLD_YT == rec->assign[pos].fieldId) { + rec->record[pos] = ((REC_TYP)(val) / (REC_TYP)(div)) + ((REC_TYP)config->yieldCor[rec->assign[pos].ch-1]); + } else { + if ((REC_TYP)(div) > 1) + rec->record[pos] = (REC_TYP)(val) / (REC_TYP)(div); + else + rec->record[pos] = (REC_TYP)(val); + } + } + } + + if(rec == &recordMeas) { + DPRINTLN(DBG_VERBOSE, "add real time"); + + // get last alarm message index and save it in the inverter object + if (getPosByChFld(0, FLD_EVT, rec) == pos){ + if (alarmMesIndex < rec->record[pos]){ + alarmMesIndex = rec->record[pos]; + //enqueCommand(AlarmUpdate); // What is the function of AlarmUpdate? + + DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(alarmMesIndex)); + enqueCommand(AlarmData); + } + } + } + else if (rec->assign == InfoAssignment) { + DPRINTLN(DBG_DEBUG, "add info"); + // eg. fw version ... + isConnected = true; + } + else if (rec->assign == SystemConfigParaAssignment) { + DPRINTLN(DBG_DEBUG, "add config"); + if (getPosByChFld(0, FLD_ACT_ACTIVE_PWR_LIMIT, rec) == pos){ + actPowerLimit = rec->record[pos]; + DPRINT(DBG_DEBUG, F("Inverter actual power limit: ") + String(actPowerLimit, 1)); + } + } + else if (rec->assign == AlarmDataAssignment) { + DPRINTLN(DBG_DEBUG, "add alarm"); + //if (getPosByChFld(0, FLD_LAST_ALARM_CODE, rec) == pos){ + // lastAlarmMsg = getAlarmStr(rec->record[pos]); + //} + } + else + DPRINTLN(DBG_WARN, F("add with unknown assginment")); + } + else + DPRINTLN(DBG_ERROR, F("addValue: assignment not found with cmd 0x")); + } + + /*inline REC_TYP getPowerLimit(void) { + record_t<> *rec = getRecordStruct(SystemConfigPara); + return getChannelFieldValue(CH0, FLD_ACT_ACTIVE_PWR_LIMIT, rec); + }*/ + + bool setValue(uint8_t pos, record_t<> *rec, REC_TYP val) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:setValue")); + if(NULL == rec) + return false; + if(pos > rec->length) + return false; + rec->record[pos] = val; + return true; + } + + REC_TYP getChannelFieldValue(uint8_t channel, uint8_t fieldId, record_t<> *rec) { + uint8_t pos = 0; + if(NULL != rec) { + for(; pos < rec->length; pos++) { + if((rec->assign[pos].ch == channel) && (rec->assign[pos].fieldId == fieldId)) + break; + } + if(pos >= rec->length) + return 0; + + return rec->record[pos]; + } + else + return 0; + } + + REC_TYP getValue(uint8_t pos, record_t<> *rec) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getValue")); + if(NULL == rec) + return 0; + if(pos > rec->length) + return 0; + return rec->record[pos]; + } + + void doCalculations() { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:doCalculations")); + record_t<> *rec = getRecordStruct(RealTimeRunData_Debug); + for(uint8_t i = 0; i < rec->length; i++) { + if(CMD_CALC == rec->assign[i].div) { + rec->record[i] = calcFunctions[rec->assign[i].start].func(this, rec->assign[i].num); + } + yield(); + } + } + + bool isAvailable(uint32_t timestamp) { + if((timestamp - recordMeas.ts) < INACT_THRES_SEC) + return true; + if((timestamp - recordInfo.ts) < INACT_THRES_SEC) + return true; + if((timestamp - recordConfig.ts) < INACT_THRES_SEC) + return true; + if((timestamp - recordAlarm.ts) < INACT_THRES_SEC) + return true; + return false; + } + + bool isProducing(uint32_t timestamp) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:isProducing")); + if(isAvailable(timestamp)) { + uint8_t pos = getPosByChFld(CH0, FLD_PAC, &recordMeas); + return (getValue(pos, &recordMeas) > INACT_PWR_THRESH); + } + return false; + } + + uint16_t getFwVersion() { + record_t<> *rec = getRecordStruct(InverterDevInform_All); + uint8_t pos = getPosByChFld(CH0, FLD_FW_VERSION, rec); + return getValue(pos, rec); + } + + uint32_t getLastTs(record_t<> *rec) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getLastTs")); + return rec->ts; + } + + record_t<> *getRecordStruct(uint8_t cmd) { + switch (cmd) { + case RealTimeRunData_Debug: return &recordMeas; // 11 = 0x0b + case InverterDevInform_All: return &recordInfo; // 1 = 0x01 + case SystemConfigPara: return &recordConfig; // 5 = 0x05 + case AlarmData: return &recordAlarm; // 17 = 0x11 + default: break; + } + return NULL; + } + + void initAssignment(record_t<> *rec, uint8_t cmd) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:initAssignment")); + rec->ts = 0; + rec->length = 0; + switch (cmd) { + case RealTimeRunData_Debug: + if (INV_TYPE_1CH == type) { + rec->length = (uint8_t)(HM1CH_LIST_LEN); + rec->assign = (byteAssign_t *)hm1chAssignment; + rec->pyldLen = HM1CH_PAYLOAD_LEN; + channels = 1; + } + else if (INV_TYPE_2CH == type) { + rec->length = (uint8_t)(HM2CH_LIST_LEN); + rec->assign = (byteAssign_t *)hm2chAssignment; + rec->pyldLen = HM2CH_PAYLOAD_LEN; + channels = 2; + } + else if (INV_TYPE_4CH == type) { + rec->length = (uint8_t)(HM4CH_LIST_LEN); + rec->assign = (byteAssign_t *)hm4chAssignment; + rec->pyldLen = HM4CH_PAYLOAD_LEN; + channels = 4; + } + else { + rec->length = 0; + rec->assign = NULL; + rec->pyldLen = 0; + channels = 0; + } + break; + case InverterDevInform_All: + rec->length = (uint8_t)(HMINFO_LIST_LEN); + rec->assign = (byteAssign_t *)InfoAssignment; + rec->pyldLen = HMINFO_PAYLOAD_LEN; + break; + case SystemConfigPara: + rec->length = (uint8_t)(HMSYSTEM_LIST_LEN); + rec->assign = (byteAssign_t *)SystemConfigParaAssignment; + rec->pyldLen = HMSYSTEM_PAYLOAD_LEN; + break; + case AlarmData: + rec->length = (uint8_t)(HMALARMDATA_LIST_LEN); + rec->assign = (byteAssign_t *)AlarmDataAssignment; + rec->pyldLen = HMALARMDATA_PAYLOAD_LEN; + break; + default: + DPRINTLN(DBG_INFO, F("initAssignment: Parser not implemented")); + break; + } + + if(0 != rec->length) { + rec->record = new REC_TYP[rec->length]; + memset(rec->record, 0, sizeof(REC_TYP) * rec->length); + } + } + + uint16_t parseAlarmLog(uint8_t id, uint8_t pyld[], uint8_t len, uint32_t *start, uint32_t *endTime) { + uint8_t startOff = 2 + id * ALARM_LOG_ENTRY_SIZE; + if((startOff + ALARM_LOG_ENTRY_SIZE) > len) + return 0; + + uint16_t wCode = ((uint16_t)pyld[startOff]) << 8 | pyld[startOff+1]; + uint32_t startTimeOffset = 0, endTimeOffset = 0; + + if (((wCode >> 13) & 0x01) == 1) // check if is AM or PM + startTimeOffset = 12 * 60 * 60; + if (((wCode >> 12) & 0x01) == 1) // check if is AM or PM + endTimeOffset = 12 * 60 * 60; + + *start = (((uint16_t)pyld[startOff + 4] << 8) | ((uint16_t)pyld[startOff + 5])) + startTimeOffset; + *endTime = (((uint16_t)pyld[startOff + 6] << 8) | ((uint16_t)pyld[startOff + 7])) + endTimeOffset; + + DPRINTLN(DBG_INFO, "Alarm #" + String(pyld[startOff+1]) + " '" + String(getAlarmStr(pyld[startOff+1])) + "' start: " + ah::getTimeStr(*start) + ", end: " + ah::getTimeStr(*endTime)); + return pyld[startOff+1]; + } + + String getAlarmStr(uint16_t alarmCode) { + switch (alarmCode) { // breaks are intentionally missing! + case 1: return String(F("Inverter start")); + case 2: return String(F("DTU command failed")); + case 121: return String(F("Over temperature protection")); + case 125: return String(F("Grid configuration parameter error")); + case 126: return String(F("Software error code 126")); + case 127: return String(F("Firmware error")); + case 128: return String(F("Software error code 128")); + case 129: return String(F("Software error code 129")); + case 130: return String(F("Offline")); + case 141: return String(F("Grid overvoltage")); + case 142: return String(F("Average grid overvoltage")); + case 143: return String(F("Grid undervoltage")); + case 144: return String(F("Grid overfrequency")); + case 145: return String(F("Grid underfrequency")); + case 146: return String(F("Rapid grid frequency change")); + case 147: return String(F("Power grid outage")); + case 148: return String(F("Grid disconnection")); + case 149: return String(F("Island detected")); + case 205: return String(F("Input port 1 & 2 overvoltage")); + case 206: return String(F("Input port 3 & 4 overvoltage")); + case 207: return String(F("Input port 1 & 2 undervoltage")); + case 208: return String(F("Input port 3 & 4 undervoltage")); + case 209: return String(F("Port 1 no input")); + case 210: return String(F("Port 2 no input")); + case 211: return String(F("Port 3 no input")); + case 212: return String(F("Port 4 no input")); + case 213: return String(F("PV-1 & PV-2 abnormal wiring")); + case 214: return String(F("PV-3 & PV-4 abnormal wiring")); + case 215: return String(F("PV-1 Input overvoltage")); + case 216: return String(F("PV-1 Input undervoltage")); + case 217: return String(F("PV-2 Input overvoltage")); + case 218: return String(F("PV-2 Input undervoltage")); + case 219: return String(F("PV-3 Input overvoltage")); + case 220: return String(F("PV-3 Input undervoltage")); + case 221: return String(F("PV-4 Input overvoltage")); + case 222: return String(F("PV-4 Input undervoltage")); + case 301: return String(F("Hardware error code 301")); + case 302: return String(F("Hardware error code 302")); + case 303: return String(F("Hardware error code 303")); + case 304: return String(F("Hardware error code 304")); + case 305: return String(F("Hardware error code 305")); + case 306: return String(F("Hardware error code 306")); + case 307: return String(F("Hardware error code 307")); + case 308: return String(F("Hardware error code 308")); + case 309: return String(F("Hardware error code 309")); + case 310: return String(F("Hardware error code 310")); + case 311: return String(F("Hardware error code 311")); + case 312: return String(F("Hardware error code 312")); + case 313: return String(F("Hardware error code 313")); + case 314: return String(F("Hardware error code 314")); + case 5041: return String(F("Error code-04 Port 1")); + case 5042: return String(F("Error code-04 Port 2")); + case 5043: return String(F("Error code-04 Port 3")); + case 5044: return String(F("Error code-04 Port 4")); + case 5051: return String(F("PV Input 1 Overvoltage/Undervoltage")); + case 5052: return String(F("PV Input 2 Overvoltage/Undervoltage")); + case 5053: return String(F("PV Input 3 Overvoltage/Undervoltage")); + case 5054: return String(F("PV Input 4 Overvoltage/Undervoltage")); + case 5060: return String(F("Abnormal bias")); + case 5070: return String(F("Over temperature protection")); + case 5080: return String(F("Grid Overvoltage/Undervoltage")); + case 5090: return String(F("Grid Overfrequency/Underfrequency")); + case 5100: return String(F("Island detected")); + case 5120: return String(F("EEPROM reading and writing error")); + case 5150: return String(F("10 min value grid overvoltage")); + case 5200: return String(F("Firmware error")); + case 8310: return String(F("Shut down")); + case 9000: return String(F("Microinverter is suspected of being stolen")); + default: return String(F("Unknown")); + } + } + + private: + void toRadioId(void) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:toRadioId")); + radioId.u64 = 0ULL; + radioId.b[4] = config->serial.b[0]; + radioId.b[3] = config->serial.b[1]; + radioId.b[2] = config->serial.b[2]; + radioId.b[1] = config->serial.b[3]; + radioId.b[0] = 0x01; + } + + std::queue> _commandQueue; + bool mDevControlRequest; // true if change needed +}; + + +/** + * To calculate values which are not transmitted by the unit there is a generic + * list of functions which can be linked to the assignment. + * The special command 0xff (CMDFF) must be used. + */ + +template +static T calcYieldTotalCh0(Inverter<> *iv, uint8_t arg0) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcYieldTotalCh0")); + if(NULL != iv) { + record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); + T yield = 0; + for(uint8_t i = 1; i <= iv->channels; i++) { + uint8_t pos = iv->getPosByChFld(i, FLD_YT, rec); + yield += iv->getValue(pos, rec); + } + return yield; + } + return 0.0; +} + +template +static T calcYieldDayCh0(Inverter<> *iv, uint8_t arg0) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcYieldDayCh0")); + if(NULL != iv) { + record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); + T yield = 0; + for(uint8_t i = 1; i <= iv->channels; i++) { + uint8_t pos = iv->getPosByChFld(i, FLD_YD, rec); + yield += iv->getValue(pos, rec); + } + return yield; + } + return 0.0; +} + +template +static T calcUdcCh(Inverter<> *iv, uint8_t arg0) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcUdcCh")); + // arg0 = channel of source + record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); + for(uint8_t i = 0; i < rec->length; i++) { + if((FLD_UDC == rec->assign[i].fieldId) && (arg0 == rec->assign[i].ch)) { + return iv->getValue(i, rec); + } + } + + return 0.0; +} + +template +static T calcPowerDcCh0(Inverter<> *iv, uint8_t arg0) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcPowerDcCh0")); + if(NULL != iv) { + record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); + T dcPower = 0; + for(uint8_t i = 1; i <= iv->channels; i++) { + uint8_t pos = iv->getPosByChFld(i, FLD_PDC, rec); + dcPower += iv->getValue(pos, rec); + } + return dcPower; + } + return 0.0; +} + +template +static T calcEffiencyCh0(Inverter<> *iv, uint8_t arg0) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcEfficiencyCh0")); + if(NULL != iv) { + record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); + uint8_t pos = iv->getPosByChFld(CH0, FLD_PAC, rec); + T acPower = iv->getValue(pos, rec); + T dcPower = 0; + for(uint8_t i = 1; i <= iv->channels; i++) { + pos = iv->getPosByChFld(i, FLD_PDC, rec); + dcPower += iv->getValue(pos, rec); + } + if(dcPower > 0) + return acPower / dcPower * 100.0f; + } + return 0.0; +} + +template +static T calcIrradiation(Inverter<> *iv, uint8_t arg0) { + DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcIrradiation")); + // arg0 = channel + if(NULL != iv) { + record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); + uint8_t pos = iv->getPosByChFld(arg0, FLD_PDC, rec); + if(iv->config->chMaxPwr[arg0-1] > 0) + return iv->getValue(pos, rec) / iv->config->chMaxPwr[arg0-1] * 100.0f; + } + return 0.0; +} + +#endif /*__HM_INVERTER_H__*/ diff --git a/miPayload.h b/miPayload.h index 9c68ee18..ae750710 100644 --- a/miPayload.h +++ b/miPayload.h @@ -18,7 +18,8 @@ typedef struct { uint8_t txCmd; uint8_t len[MAX_PAYLOAD_ENTRIES]; bool complete; - uint8_t sts[iv->channels]; + bool dataAB[2]; + uint8_t sts[5]; uint8_t txId; uint8_t invId; uint8_t retransmits; @@ -64,6 +65,7 @@ class MiPayload { void addAlarmListener(alarmListenerType cb) { mCbMiAlarm = cb; } + void loop() { /*if(NULL != mHighPrioIv) { iv->ivSend(mHighPrioIv, true); // should request firmware version etc.? @@ -83,10 +85,35 @@ class MiPayload { if (mSerialDebug) DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") Requesting Inv SN ") + String(iv->config->serial.u64, HEX)); - uint8_t cmd = iv->type == INV_TYPE_4CH ? 0x36 : 0x09; //iv->getQueuedCmd(); - DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") prepareDevInformCmd")); + //first channel request + /*uint8_t cmd = iv->type == INV_TYPE_4CH ? 0x36 : 0x09; + DPRINT(DBG_INFO, F("(#")); + DBGPRINT(String(iv->id)); + DBGPRINT(F(") prepareDevInformCmd 0x")); + DBGPRINTLN(String(cmd, HEX)); mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd; + mPayload[iv->id].txCmd = cmd;*/ + + uint8_t cmd = iv->getQueuedCmd(); + DPRINT(DBG_INFO, F("(#")); + DBGPRINT(String(iv->id)); + DBGPRINT(F(") prepareDevInformCmd 0x")); + DBGPRINTLN(String(cmd, HEX)); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + //other channel requests + /*if (iv->type == INV_TYPE_4CH) { + for(uint8_t i = 1; i < iv->channels; i++) { + iv->enqueCommand(cmd + i, cmd + i); + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd + i); + } + } else */ + if (iv->type == INV_TYPE_2CH) { + mPayload[iv->id].dataAB[0] = false; + mPayload[iv->id].dataAB[1] = false; + //iv->enqueCommand(0x11); + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); + } } void add(Inverter<> *iv, packet_t *p) { @@ -98,40 +125,43 @@ class MiPayload { } else if (p->packet[0] == (0x11 + SINGLE_FRAME)) { // 0x92; MI status response to 0x11 //mPayload[iv->id].sts[1] = true; miStsDecode(iv, p, CH2); - } else if (p->packet[0] == (0x09 + ALL_FRAMES)) { // MI data response to 0x09 + /*} else if (p->packet[0] == (0x09 + ALL_FRAMES)) { // MI data response to 0x09 mPayload[iv->id].txId = p->packet[0]; miDataDecode(iv,p); - iv->setQueuedCmdFinished(); + //iv->setQueuedCmdFinished(); if (INV_TYPE_2CH == iv->type) { //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); } else { // additional check for mPayload[iv->id].stsa == true might be a good idea (request retransmit?) mPayload[iv->id].complete = true; //iv->setQueuedCmdFinished(); } - } else if (p->packet[0] == (0x11 + ALL_FRAMES)) { // MI data response to 0x11 + } else if (p->packet[0] == ()) { // MI data response to 0x11 mPayload[iv->id].txId = p->packet[0]; - mPayload[iv->id].complete = true; miDataDecode(iv,p); - iv->setQueuedCmdFinished(); + mStat->rxSuccess++; + //iv->setQueuedCmdFinished();*/ - } else if (p->packet[0] >= (0x36 + ALL_FRAMES) && p->packet[0] < (0x39 + SINGLE_FRAME)) { // MI 1500 data response to 0x36, 0x37, 0x38 and 0x39 + } else if ( p->packet[0] == 0x09 + ALL_FRAMES || + p->packet[0] == 0x11 + ALL_FRAMES || + ( p->packet[0] >= (0x36 + ALL_FRAMES) && p->packet[0] < (0x39 + SINGLE_FRAME) ) ) { // small MI or MI 1500 data responses to 0x09, 0x11, 0x36, 0x37, 0x38 and 0x39 mPayload[iv->id].txId = p->packet[0]; miDataDecode(iv,p); - iv->setQueuedCmdFinished(); - if (p->packet[0] < (0x39 + ALL_FRAMES)) { + //mStat->rxSuccess++; + //iv->setQueuedCmdFinished(); + /*if (p->packet[0] < (0x39 + ALL_FRAMES)) { //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, p->packet[0] + 1 - ALL_FRAMES); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, p->packet[0] + 1 - ALL_FRAMES, mPayload[iv->id].ts, iv->alarmMesIndex, false, p->packet[0] + 1 - ALL_FRAMES); + //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, p->packet[0] + 1 - ALL_FRAMES, mPayload[iv->id].ts, iv->alarmMesIndex, false, p->packet[0] + 1 - ALL_FRAMES); } else { mPayload[iv->id].complete = true; //iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, CALC_YD_CH0); //iv->setQueuedCmdFinished(); - } + }*/ - /*} + //} - 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 mPayload[iv->id].txId = p->packet[0]; DPRINTLN(DBG_DEBUG, F("Response from info request received")); uint8_t *pid = &p->packet[9]; @@ -169,7 +199,7 @@ class MiPayload { msg = "NOT "; DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(" has ") + msg + F("accepted power limit set point ") + String(iv->powerLimit[0]) + F(" with PowerLimitControl ") + String(iv->powerLimit[1])); iv->clearCmdQueue(); - iv->enqueCommand(SystemConfigPara); // read back power limit + iv->enqueCommand(SystemConfigPara); // read back power limit } iv->devControlCmd = Init; } else { // some other response; copied from hmPayload:process; might not be correct to do that here!!! @@ -263,6 +293,7 @@ class MiPayload { if (mPayload[iv->id].retransmits < mMaxRetrans) { mPayload[iv->id].retransmits++; //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); + DPRINTLN(DBG_WARN, F("missing answer to 0x") + String(iv->getQueuedCmd(), HEX) + F("Request Retransmit")); mSys->Radio.sendCmdPacket(iv->radioId.u64, iv->getQueuedCmd(), 24, true); /*if(false == mPayload[iv->id].gotFragment) { DPRINTLN(DBG_WARN, F("(#") + String(iv->id) + F(") nothing received")); @@ -362,42 +393,28 @@ class MiPayload { record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); // choose the record structure rec->ts = mPayload[iv->id].ts; - //iv->setValue(iv->getPosByChFld(chan, FLD_YD, rec), rec, (int)((p->packet[11+6] << 8) + p->packet[12+6])); // was 11/12, might be wrong! - - //if (INV_TYPE_1CH == iv->type) - //iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, (int)((p->packet[11+6] << 8) + p->packet[12+6])); - - //iv->setValue(iv->getPosByChFld(chan, FLD_EVT, rec), rec, (int)((p->packet[13] << 8) + p->packet[14])); uint8_t status = (p->packet[11] << 8) + p->packet[12]; uint8_t stschan = p->packet[0] == 0x88 ? CH1 : CH2; - + mPayload[iv->id].dataAB[stschan-1] = true; mPayload[iv->id].sts[stschan] = status; - iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, calcMiSts(iv)); - //iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, (int)((p->packet[14] << 8) + p->packet[16])); + if ( !mPayload[iv->id].sts[0] || status < mPayload[iv->id].sts[0]) { + mPayload[iv->id].sts[0] = status; + iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, status); + } + + if ( !mPayload[iv->id].dataAB[0] || !mPayload[iv->id].dataAB[1] ) { + uint8_t cmd = mPayload[iv->id].dataAB[0] ? 0x11 : 0x09; + DPRINTLN(DBG_INFO, F("request missing status 0x") + String(cmd, HEX)); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + } + if (iv->alarmMesIndex < rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]){ iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; // seems there's no status per channel in 3rd gen. models?!? DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); - iv->enqueCommand(AlarmData); + iv->enqueCommand(AlarmData); } - /* Unclear how in HM inverters Info and alarm data is handled... - */ - - - /* int8_t offset = -2; - - for decoding see - void MI600StsMsg (NRF24_packet_t *p){ - STAT = (int)((p->packet[11] << 8) + p->packet[12]); - FCNT = (int)((p->packet[13] << 8) + p->packet[14]); - FCODE = (int)((p->packet[15] << 8) + p->packet[16]); - #ifdef ESP8266 - VALUES[PV][5]=STAT; - VALUES[PV][6]=FCNT; - VALUES[PV][7]=FCODE; - #endif - } - */ } void miDataDecode(Inverter<> *iv, packet_t *p) { @@ -408,45 +425,92 @@ class MiPayload { ( p->packet[0] == 0x91 || p->packet[0] == (0x37 + ALL_FRAMES) ) ? CH2 : p->packet[0] == (0x38 + ALL_FRAMES) ? CH3 : CH4; - int8_t offset = -2; - // U_DC = (float) ((p->packet[11] << 8) + p->packet[12])/10; - iv->setValue(iv->getPosByChFld(datachan, FLD_UDC, rec), rec, (float)((p->packet[11+offset] << 8) + p->packet[12+offset])/10); + DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(": data msg 0x") + String(p->packet[0], HEX) + F(" channel ") + datachan); + // count in RF_communication_protocol.xlsx is with offset = -1 + iv->setValue(iv->getPosByChFld(datachan, FLD_UDC, rec), rec, (float)((p->packet[9] << 8) + p->packet[10])/10); yield(); - // I_DC = (float) ((p->packet[13] << 8) + p->packet[14])/10; - iv->setValue(iv->getPosByChFld(datachan, FLD_IDC, rec), rec, (float)((p->packet[13+offset] << 8) + p->packet[14+offset])/10); + iv->setValue(iv->getPosByChFld(datachan, FLD_IDC, rec), rec, (float)((p->packet[11] << 8) + p->packet[12])/10); yield(); - // U_AC = (float) ((p->packet[15] << 8) + p->packet[16])/10; - iv->setValue(iv->getPosByChFld(0, FLD_UAC, rec), rec, (float)((p->packet[15+offset] << 8) + p->packet[16+offset])/10); + iv->setValue(iv->getPosByChFld(0, FLD_UAC, rec), rec, (float)((p->packet[13] << 8) + p->packet[14])/10); yield(); - // F_AC = (float) ((p->packet[17] << 8) + p->packet[18])/100; - //iv->setValue(iv->getPosByChFld(0, FLD_IAC, rec), rec, (float)((p->packet[17+offset] << 8) + p->packet[18+offset])/100); - //yield(); - // P_DC = (float)((p->packet[19] << 8) + p->packet[20])/10; - iv->setValue(iv->getPosByChFld(datachan, FLD_PDC, rec), rec, (float)((p->packet[19+offset] << 8) + p->packet[20+offset])/10); + iv->setValue(iv->getPosByChFld(0, FLD_F, rec), rec, (float) ((p->packet[15] << 8) + p->packet[16])/100); + iv->setValue(iv->getPosByChFld(datachan, FLD_PDC, rec), rec, (float)((p->packet[17] << 8) + p->packet[18])/10); yield(); - // Q_DC = (float)((p->packet[21] << 8) + p->packet[22])/1; - iv->setValue(iv->getPosByChFld(datachan, FLD_YD, rec), rec, (float)((p->packet[21+offset] << 8) + p->packet[22+offset])/1); + iv->setValue(iv->getPosByChFld(datachan, FLD_YD, rec), rec, (float)((p->packet[19] << 8) + p->packet[20])/1); yield(); - iv->setValue(iv->getPosByChFld(0, FLD_T, rec), rec, (float) ((int16_t)(p->packet[23+offset] << 8) + p->packet[24+offset])/10); //23 is freq or IAC? - iv->setValue(iv->getPosByChFld(0, FLD_F, rec), rec, (float) ((p->packet[17+offset] << 8) + p->packet[18+offset])/100); + iv->setValue(iv->getPosByChFld(0, FLD_T, rec), rec, (float) ((int16_t)(p->packet[21] << 8) + p->packet[22])/10); iv->setValue(iv->getPosByChFld(0, FLD_IRR, rec), rec, (float) (calcIrradiation(iv, datachan))); - yield(); - //FLD_YD + //AC Power is missing; we may have to calculate, as no respective data is in payload if (p->packet[0] >= (0x36 + ALL_FRAMES) ) { - mPayload[iv->id].sts[stschan] = (uint8_t)(p->packet[25+offset]); - iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, calcMiSts(iv));yield(); + + /*For MI1500: + if (MI1500) { + STAT = (uint8_t)(p->packet[25] ); + FCNT = (uint8_t)(p->packet[26]); + FCODE = (uint8_t)(p->packet[27]); + }*/ + + uint8_t status = (uint8_t)(p->packet[23]); + mPayload[iv->id].sts[datachan] = status; + if ( !mPayload[iv->id].sts[0] || status < mPayload[iv->id].sts[0]) { + mPayload[iv->id].sts[0] = status; + iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, status); + } + + if (p->packet[0] < (0x39 + ALL_FRAMES) ) { + uint8_t cmd = p->packet[0] - ALL_FRAMES + 1; + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + mPayload[iv->id].complete = false; + } + + //iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, calcMiSts(iv));yield(); if (iv->alarmMesIndex < rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]){ iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); - iv->enqueCommand(AlarmData); + //iv->enqueCommand(AlarmData); } + } - //iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, CALC_YD_CH0); // (getValue(iv->getPosByChFld(1, FLD_YD, rec), rec) + getValue(iv->getPosByChFld(2, FLD_YD, rec), rec))); - iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); //datachan)); - iv->doCalculations(); - notify(mPayload[iv->id].txCmd); + + //preliminary AC calculation... + uint8_t ac_pow = 0; + //if (mPayload[iv->id].sts[0] == 3) { + ac_pow = calcPowerDcCh0(iv, 0)*9.5; + //} + iv->setValue(iv->getPosByChFld(0, FLD_PAC, rec), rec, (float) (ac_pow/10)); + + if ( mPayload[iv->id].sts[0] ) { + uint8_t cmd = mPayload[iv->id].dataAB[0] ? 0x11 : 0x09; + if ( mPayload[iv->id].dataAB[0] && mPayload[iv->id].dataAB[1] ) { + mPayload[iv->id].complete = true; // For 2 CH devices, this might be too short... + DPRINTLN(DBG_INFO, F("complete tree detected")); + iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); + iv->doCalculations(); + } else { + //retry to get missing status info for one or two channel devices + DPRINTLN(DBG_INFO, F("request missing data or status 0x") + String(cmd, HEX)); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + //iv->enqueCommand(cmd); // mPayload[iv->id].dataAB[1] ? 0x09 : 0x11) + } + } // not yet moved to hmInverter::getQueuedCmd + else if (mPayload[iv->id].txCmd == 0x09 && iv->type == INV_TYPE_2CH) { + uint8_t cmd = 0x11; + DPRINTLN(DBG_INFO, F("request second data channel 0x") + String(cmd, HEX)); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + mPayload[iv->id].complete = false; + } + + iv->setQueuedCmdFinished(); + mStat->rxSuccess++; + yield(); + + notify(mPayload[iv->id].txCmd); + /* if(AlarmData == mPayload[iv->id].txCmd) { uint8_t i = 0; @@ -461,66 +525,26 @@ class MiPayload { yield(); } }*/ -/*decode here or memcopy payload for later decoding? - void MI600DataMsg(NRF24_packet_t *p){ - U_DC = (float) ((p->packet[11] << 8) + p->packet[12])/10; - I_DC = (float) ((p->packet[13] << 8) + p->packet[14])/10; - U_AC = (float) ((p->packet[15] << 8) + p->packet[16])/10; - F_AC = (float) ((p->packet[17] << 8) + p->packet[18])/100; - P_DC = (float)((p->packet[19] << 8) + p->packet[20])/10; - Q_DC = (float)((p->packet[21] << 8) + p->packet[22])/1; - TEMP = (float) ((p->packet[23] << 8) + p->packet[24])/10; //(int16_t) - - if ((30packet[2] == 0x89) {PV= 0; TotalP[1]=P_DC; pvCnt[0]=1;}//port 1 - if (p->packet[2] == 0x91) {PV= 1; TotalP[2]=P_DC; pvCnt[1]=1;}//port 2 - - TotalP[0]=TotalP[1]+TotalP[2]+TotalP[3]+TotalP[4];//in TotalP[0] is the totalPV power - if((P_DC>400) || (P_DC<0) || (TotalP[0]>MAXPOWER)){// cant be!! - TotalP[0]=0; - return; - } - #ifdef ESP8266 - VALUES[PV][0]=PV; - VALUES[PV][1]=P_DC; - VALUES[PV][2]=U_DC; - VALUES[PV][3]=I_DC; - VALUES[PV][4]=Q_DC; - #endif - PMI=TotalP[0]; - LIM=(uint16_t)Limit; - PrintOutValues(); - }*/ - - /*For MI1500: - if (MI1500) { - STAT = (uint8_t)(p->packet[25] ); - FCNT = (uint8_t)(p->packet[26]); - FCODE = (uint8_t)(p->packet[27]); - } - */ - DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(": data msg 0x") + String(p->packet[0], HEX) + F(" channel ") + datachan); } bool build(uint8_t id, bool *complete) { - /*DPRINTLN(DBG_VERBOSE, F("build")); - uint16_t crc = 0xffff, crcRcv = 0x0000; + DPRINTLN(DBG_VERBOSE, F("build")); + /*uint16_t crc = 0xffff, crcRcv = 0x0000; if (mPayload[id].maxPackId > MAX_PAYLOAD_ENTRIES) mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; - - // check if all fragments are there - *complete = true; - for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { - if(mPayload[id].len[i] == 0) - *complete = false; + */ + // check if all messages are there + + *complete = mPayload[id].complete; + uint8_t txCmd = mPayload[id].txCmd; + //uint8_t cmd = getQueuedCmd(); + if(!*complete) { + //if (txCmd == 0x09 || txCmd == 0x11 || txCmd >= 0x36 && txCmd <= 0x39 ) + // return false; + DPRINTLN(DBG_VERBOSE, F("incomlete, txCmd is 0x") + String(txCmd, HEX)); // + F("cmd is 0x") + String(cmd, HEX)); } - if(!*complete) - return false; - for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { + /*for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { if (mPayload[id].len[i] > 0) { if (i == (mPayload[id].maxPackId - 1)) { crc = ah::crc16(mPayload[id].data[i], mPayload[id].len[i] - 2, crc); @@ -544,26 +568,41 @@ class MiPayload { mPayload[id].lastFound = false;*/ mPayload[id].retransmits = 0; mPayload[id].complete = false; + mPayload[id].dataAB[0] = true; //only required for 2CH devices + mPayload[id].dataAB[1] = true; mPayload[id].txCmd = 0; mPayload[id].requested = false; mPayload[id].ts = *mTimestamp; - mPayload[id].sts[] = (0); + //mPayload[id].sts[0] = 0; + mPayload[id].sts[1] = 0; + mPayload[id].sts[2] = 0; + mPayload[id].sts[3] = 0; + mPayload[id].sts[4] = 0; } - template +/* template static T calcMiSts(Inverter<> *iv) { if(NULL != iv) { T result = 0; + bool stsComplete = true; + uint8_t stsCh; for(uint8_t i = 1; i <= iv->channels; i++) { - uint8_t sChState = mPayload[iv->id].sts[i]; - if (!sChState && !result || sChState && sChState < result) { - result = sChState; + stsCh = mPayload[iv->id].sts[i]; + if (!stsCh) { + stsComplete = false; + } else if ( !result || stsCh < result ) { + result = stsCh; + if (stsComplete && stsCh > stsComplete) { + stsComplete = stsCh; + } + } } + mPayload[iv->id].sts[0] = stsComplete; return result; } return 0; - } + } */ IApp *mApp; HMSYSTEM *mSys; From 0026b2e5b38b9f59372f8fc0d11c56f422446b52 Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Sun, 5 Mar 2023 12:29:50 +0100 Subject: [PATCH 4/8] Delete hmInverter.h ...wrong place --- hmInverter.h | 689 --------------------------------------------------- 1 file changed, 689 deletions(-) delete mode 100644 hmInverter.h diff --git a/hmInverter.h b/hmInverter.h deleted file mode 100644 index 175c6177..00000000 --- a/hmInverter.h +++ /dev/null @@ -1,689 +0,0 @@ -//----------------------------------------------------------------------------- -// 2023 Ahoy, https://www.mikrocontroller.net/topic/525778 -// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/ -//----------------------------------------------------------------------------- - -#ifndef __HM_INVERTER_H__ -#define __HM_INVERTER_H__ - -#if defined(ESP32) && defined(F) - #undef F - #define F(sl) (sl) -#endif - -#include "hmDefines.h" -#include -#include -#include "../config/settings.h" - -/** - * For values which are of interest and not transmitted by the inverter can be - * calculated automatically. - * A list of functions can be linked to the assignment and will be executed - * automatically. Their result does not differ from original read values. - */ - -// forward declaration of class -template -class Inverter; - - -// prototypes -template -static T calcYieldTotalCh0(Inverter<> *iv, uint8_t arg0); - -template -static T calcYieldDayCh0(Inverter<> *iv, uint8_t arg0); - -template -static T calcUdcCh(Inverter<> *iv, uint8_t arg0); - -template -static T calcPowerDcCh0(Inverter<> *iv, uint8_t arg0); - -template -static T calcEffiencyCh0(Inverter<> *iv, uint8_t arg0); - -template -static T calcIrradiation(Inverter<> *iv, uint8_t arg0); - -template -using func_t = T (Inverter<> *, uint8_t); - -template -struct calcFunc_t { - uint8_t funcId; // unique id - func_t* func; // function pointer -}; - -template -struct record_t { - byteAssign_t* assign; // assigment of bytes in payload - uint8_t length; // length of the assignment list - T *record; // data pointer - uint32_t ts; // timestamp of last received payload - uint8_t pyldLen; // expected payload length for plausibility check -}; - -class CommandAbstract { - public: - CommandAbstract(uint8_t txType = 0, uint8_t cmd = 0) { - _TxType = txType; - _Cmd = cmd; - }; - virtual ~CommandAbstract() {}; - - const uint8_t getCmd() { - return _Cmd; - } - - protected: - uint8_t _TxType; - uint8_t _Cmd; -}; - -class InfoCommand : public CommandAbstract { - public: - InfoCommand(uint8_t cmd){ - _TxType = 0x15; - _Cmd = cmd; - } -}; - -class MiInfoCommand : public CommandAbstract { - public: - MiInfoCommand(uint8_t cmd){ - _TxType = cmd; - _Cmd = cmd; - } -}; -// list of all available functions, mapped in hmDefines.h -template -const calcFunc_t calcFunctions[] = { - { CALC_YT_CH0, &calcYieldTotalCh0 }, - { CALC_YD_CH0, &calcYieldDayCh0 }, - { CALC_UDC_CH, &calcUdcCh }, - { CALC_PDC_CH0, &calcPowerDcCh0 }, - { CALC_EFF_CH0, &calcEffiencyCh0 }, - { CALC_IRR_CH, &calcIrradiation } -}; - - -template -class Inverter { - public: - uint8_t ivGen; // generation of inverter (HM / MI) - cfgIv_t *config; // stored settings - uint8_t id; // unique id - uint8_t type; // integer which refers to inverter type - uint16_t alarmMesIndex; // Last recorded Alarm Message Index - uint16_t powerLimit[2]; // limit power output - float actPowerLimit; // actual power limit - uint8_t devControlCmd; // carries the requested cmd - serial_u radioId; // id converted to modbus - uint8_t channels; // number of PV channels (1-4) - record_t recordMeas; // structure for measured values - record_t recordInfo; // structure for info values - record_t recordConfig; // structure for system config values - record_t recordAlarm; // structure for alarm values - //String lastAlarmMsg; - bool initialized; // needed to check if the inverter was correctly added (ESP32 specific - union types are never null) - bool isConnected; // shows if inverter was successfully identified (fw version and hardware info) - - Inverter() { - ivGen = IV_HM; - powerLimit[0] = 0xffff; // 65535 W Limit -> unlimited - powerLimit[1] = AbsolutNonPersistent; // default power limit setting - actPowerLimit = 0xffff; // init feedback from inverter to -1 - mDevControlRequest = false; - devControlCmd = InitDataState; - initialized = false; - //lastAlarmMsg = "nothing"; - alarmMesIndex = 0; - isConnected = false; - } - - ~Inverter() { - // TODO: cleanup - } - - template - void enqueCommand(uint8_t cmd) { - _commandQueue.push(std::make_shared(cmd)); - DPRINTLN(DBG_INFO, F("(#") + String(id) + F(") enqueuedCmd: 0x") + String(cmd, HEX)); - } - - void setQueuedCmdFinished() { - if (!_commandQueue.empty()) { - // Will destroy CommandAbstract Class Object (?) - _commandQueue.pop(); - } - } - - void clearCmdQueue() { - DPRINTLN(DBG_INFO, F("clearCmdQueue")); - while (!_commandQueue.empty()) { - // Will destroy CommandAbstract Class Object (?) - _commandQueue.pop(); - } - } - - uint8_t getQueuedCmd() { - if (_commandQueue.empty()) { - if (ivGen != IV_MI) { - if (getFwVersion() == 0) - enqueCommand(InverterDevInform_All); // firmware version - enqueCommand(RealTimeRunData_Debug); // live data - } else if (ivGen == IV_MI){ - if (type == INV_TYPE_4CH) { - enqueCommand(0x36); - /*for(uint8_t i = 0x36; i <= 0x39; i++) { - enqueCommand(i); // live data - }*/ - } else if (type == INV_TYPE_2CH) { - enqueCommand(0x09); - //enqueCommand(0x11); - } else if (type == INV_TYPE_1CH) { - enqueCommand(0x09); - } - //if (getFwVersion() == 0) - // enqueCommand(InverterDevInform_All); // firmware version, might not work, esp. for 1/2 ch hardware - } - - if ((actPowerLimit == 0xffff) && isConnected) - enqueCommand(SystemConfigPara); // power limit info - } - return _commandQueue.front().get()->getCmd(); - } - - - void init(void) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:init")); - initAssignment(&recordMeas, RealTimeRunData_Debug); - initAssignment(&recordInfo, InverterDevInform_All); - initAssignment(&recordConfig, SystemConfigPara); - initAssignment(&recordAlarm, AlarmData); - toRadioId(); - initialized = true; - } - - uint8_t getPosByChFld(uint8_t channel, uint8_t fieldId, record_t<> *rec) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getPosByChFld")); - uint8_t pos = 0; - if(NULL != rec) { - for(; pos < rec->length; pos++) { - if((rec->assign[pos].ch == channel) && (rec->assign[pos].fieldId == fieldId)) - break; - } - return (pos >= rec->length) ? 0xff : pos; - } - else - return 0xff; - } - - byteAssign_t *getByteAssign(uint8_t pos, record_t<> *rec) { - return &rec->assign[pos]; - } - - const char *getFieldName(uint8_t pos, record_t<> *rec) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getFieldName")); - if(NULL != rec) - return fields[rec->assign[pos].fieldId]; - return notAvail; - } - - const char *getUnit(uint8_t pos, record_t<> *rec) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getUnit")); - if(NULL != rec) - return units[rec->assign[pos].unitId]; - return notAvail; - } - - uint8_t getChannel(uint8_t pos, record_t<> *rec) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getChannel")); - if(NULL != rec) - return rec->assign[pos].ch; - return 0; - } - - bool setDevControlRequest(uint8_t cmd) { - if(isConnected) { - mDevControlRequest = true; - devControlCmd = cmd; - } - return isConnected; - } - - void clearDevControlRequest() { - mDevControlRequest = false; - } - - inline bool getDevControlRequest() { - return mDevControlRequest; - } - - void addValue(uint8_t pos, uint8_t buf[], record_t<> *rec) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:addValue")); - if(NULL != rec) { - uint8_t ptr = rec->assign[pos].start; - uint8_t end = ptr + rec->assign[pos].num; - uint16_t div = rec->assign[pos].div; - - if(NULL != rec) { - if(CMD_CALC != div) { - uint32_t val = 0; - do { - val <<= 8; - val |= buf[ptr]; - } while(++ptr != end); - if (FLD_T == rec->assign[pos].fieldId) { - // temperature is a signed value! - rec->record[pos] = (REC_TYP)((int16_t)val) / (REC_TYP)(div); - } else if (FLD_YT == rec->assign[pos].fieldId) { - rec->record[pos] = ((REC_TYP)(val) / (REC_TYP)(div)) + ((REC_TYP)config->yieldCor[rec->assign[pos].ch-1]); - } else { - if ((REC_TYP)(div) > 1) - rec->record[pos] = (REC_TYP)(val) / (REC_TYP)(div); - else - rec->record[pos] = (REC_TYP)(val); - } - } - } - - if(rec == &recordMeas) { - DPRINTLN(DBG_VERBOSE, "add real time"); - - // get last alarm message index and save it in the inverter object - if (getPosByChFld(0, FLD_EVT, rec) == pos){ - if (alarmMesIndex < rec->record[pos]){ - alarmMesIndex = rec->record[pos]; - //enqueCommand(AlarmUpdate); // What is the function of AlarmUpdate? - - DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(alarmMesIndex)); - enqueCommand(AlarmData); - } - } - } - else if (rec->assign == InfoAssignment) { - DPRINTLN(DBG_DEBUG, "add info"); - // eg. fw version ... - isConnected = true; - } - else if (rec->assign == SystemConfigParaAssignment) { - DPRINTLN(DBG_DEBUG, "add config"); - if (getPosByChFld(0, FLD_ACT_ACTIVE_PWR_LIMIT, rec) == pos){ - actPowerLimit = rec->record[pos]; - DPRINT(DBG_DEBUG, F("Inverter actual power limit: ") + String(actPowerLimit, 1)); - } - } - else if (rec->assign == AlarmDataAssignment) { - DPRINTLN(DBG_DEBUG, "add alarm"); - //if (getPosByChFld(0, FLD_LAST_ALARM_CODE, rec) == pos){ - // lastAlarmMsg = getAlarmStr(rec->record[pos]); - //} - } - else - DPRINTLN(DBG_WARN, F("add with unknown assginment")); - } - else - DPRINTLN(DBG_ERROR, F("addValue: assignment not found with cmd 0x")); - } - - /*inline REC_TYP getPowerLimit(void) { - record_t<> *rec = getRecordStruct(SystemConfigPara); - return getChannelFieldValue(CH0, FLD_ACT_ACTIVE_PWR_LIMIT, rec); - }*/ - - bool setValue(uint8_t pos, record_t<> *rec, REC_TYP val) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:setValue")); - if(NULL == rec) - return false; - if(pos > rec->length) - return false; - rec->record[pos] = val; - return true; - } - - REC_TYP getChannelFieldValue(uint8_t channel, uint8_t fieldId, record_t<> *rec) { - uint8_t pos = 0; - if(NULL != rec) { - for(; pos < rec->length; pos++) { - if((rec->assign[pos].ch == channel) && (rec->assign[pos].fieldId == fieldId)) - break; - } - if(pos >= rec->length) - return 0; - - return rec->record[pos]; - } - else - return 0; - } - - REC_TYP getValue(uint8_t pos, record_t<> *rec) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getValue")); - if(NULL == rec) - return 0; - if(pos > rec->length) - return 0; - return rec->record[pos]; - } - - void doCalculations() { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:doCalculations")); - record_t<> *rec = getRecordStruct(RealTimeRunData_Debug); - for(uint8_t i = 0; i < rec->length; i++) { - if(CMD_CALC == rec->assign[i].div) { - rec->record[i] = calcFunctions[rec->assign[i].start].func(this, rec->assign[i].num); - } - yield(); - } - } - - bool isAvailable(uint32_t timestamp) { - if((timestamp - recordMeas.ts) < INACT_THRES_SEC) - return true; - if((timestamp - recordInfo.ts) < INACT_THRES_SEC) - return true; - if((timestamp - recordConfig.ts) < INACT_THRES_SEC) - return true; - if((timestamp - recordAlarm.ts) < INACT_THRES_SEC) - return true; - return false; - } - - bool isProducing(uint32_t timestamp) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:isProducing")); - if(isAvailable(timestamp)) { - uint8_t pos = getPosByChFld(CH0, FLD_PAC, &recordMeas); - return (getValue(pos, &recordMeas) > INACT_PWR_THRESH); - } - return false; - } - - uint16_t getFwVersion() { - record_t<> *rec = getRecordStruct(InverterDevInform_All); - uint8_t pos = getPosByChFld(CH0, FLD_FW_VERSION, rec); - return getValue(pos, rec); - } - - uint32_t getLastTs(record_t<> *rec) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getLastTs")); - return rec->ts; - } - - record_t<> *getRecordStruct(uint8_t cmd) { - switch (cmd) { - case RealTimeRunData_Debug: return &recordMeas; // 11 = 0x0b - case InverterDevInform_All: return &recordInfo; // 1 = 0x01 - case SystemConfigPara: return &recordConfig; // 5 = 0x05 - case AlarmData: return &recordAlarm; // 17 = 0x11 - default: break; - } - return NULL; - } - - void initAssignment(record_t<> *rec, uint8_t cmd) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:initAssignment")); - rec->ts = 0; - rec->length = 0; - switch (cmd) { - case RealTimeRunData_Debug: - if (INV_TYPE_1CH == type) { - rec->length = (uint8_t)(HM1CH_LIST_LEN); - rec->assign = (byteAssign_t *)hm1chAssignment; - rec->pyldLen = HM1CH_PAYLOAD_LEN; - channels = 1; - } - else if (INV_TYPE_2CH == type) { - rec->length = (uint8_t)(HM2CH_LIST_LEN); - rec->assign = (byteAssign_t *)hm2chAssignment; - rec->pyldLen = HM2CH_PAYLOAD_LEN; - channels = 2; - } - else if (INV_TYPE_4CH == type) { - rec->length = (uint8_t)(HM4CH_LIST_LEN); - rec->assign = (byteAssign_t *)hm4chAssignment; - rec->pyldLen = HM4CH_PAYLOAD_LEN; - channels = 4; - } - else { - rec->length = 0; - rec->assign = NULL; - rec->pyldLen = 0; - channels = 0; - } - break; - case InverterDevInform_All: - rec->length = (uint8_t)(HMINFO_LIST_LEN); - rec->assign = (byteAssign_t *)InfoAssignment; - rec->pyldLen = HMINFO_PAYLOAD_LEN; - break; - case SystemConfigPara: - rec->length = (uint8_t)(HMSYSTEM_LIST_LEN); - rec->assign = (byteAssign_t *)SystemConfigParaAssignment; - rec->pyldLen = HMSYSTEM_PAYLOAD_LEN; - break; - case AlarmData: - rec->length = (uint8_t)(HMALARMDATA_LIST_LEN); - rec->assign = (byteAssign_t *)AlarmDataAssignment; - rec->pyldLen = HMALARMDATA_PAYLOAD_LEN; - break; - default: - DPRINTLN(DBG_INFO, F("initAssignment: Parser not implemented")); - break; - } - - if(0 != rec->length) { - rec->record = new REC_TYP[rec->length]; - memset(rec->record, 0, sizeof(REC_TYP) * rec->length); - } - } - - uint16_t parseAlarmLog(uint8_t id, uint8_t pyld[], uint8_t len, uint32_t *start, uint32_t *endTime) { - uint8_t startOff = 2 + id * ALARM_LOG_ENTRY_SIZE; - if((startOff + ALARM_LOG_ENTRY_SIZE) > len) - return 0; - - uint16_t wCode = ((uint16_t)pyld[startOff]) << 8 | pyld[startOff+1]; - uint32_t startTimeOffset = 0, endTimeOffset = 0; - - if (((wCode >> 13) & 0x01) == 1) // check if is AM or PM - startTimeOffset = 12 * 60 * 60; - if (((wCode >> 12) & 0x01) == 1) // check if is AM or PM - endTimeOffset = 12 * 60 * 60; - - *start = (((uint16_t)pyld[startOff + 4] << 8) | ((uint16_t)pyld[startOff + 5])) + startTimeOffset; - *endTime = (((uint16_t)pyld[startOff + 6] << 8) | ((uint16_t)pyld[startOff + 7])) + endTimeOffset; - - DPRINTLN(DBG_INFO, "Alarm #" + String(pyld[startOff+1]) + " '" + String(getAlarmStr(pyld[startOff+1])) + "' start: " + ah::getTimeStr(*start) + ", end: " + ah::getTimeStr(*endTime)); - return pyld[startOff+1]; - } - - String getAlarmStr(uint16_t alarmCode) { - switch (alarmCode) { // breaks are intentionally missing! - case 1: return String(F("Inverter start")); - case 2: return String(F("DTU command failed")); - case 121: return String(F("Over temperature protection")); - case 125: return String(F("Grid configuration parameter error")); - case 126: return String(F("Software error code 126")); - case 127: return String(F("Firmware error")); - case 128: return String(F("Software error code 128")); - case 129: return String(F("Software error code 129")); - case 130: return String(F("Offline")); - case 141: return String(F("Grid overvoltage")); - case 142: return String(F("Average grid overvoltage")); - case 143: return String(F("Grid undervoltage")); - case 144: return String(F("Grid overfrequency")); - case 145: return String(F("Grid underfrequency")); - case 146: return String(F("Rapid grid frequency change")); - case 147: return String(F("Power grid outage")); - case 148: return String(F("Grid disconnection")); - case 149: return String(F("Island detected")); - case 205: return String(F("Input port 1 & 2 overvoltage")); - case 206: return String(F("Input port 3 & 4 overvoltage")); - case 207: return String(F("Input port 1 & 2 undervoltage")); - case 208: return String(F("Input port 3 & 4 undervoltage")); - case 209: return String(F("Port 1 no input")); - case 210: return String(F("Port 2 no input")); - case 211: return String(F("Port 3 no input")); - case 212: return String(F("Port 4 no input")); - case 213: return String(F("PV-1 & PV-2 abnormal wiring")); - case 214: return String(F("PV-3 & PV-4 abnormal wiring")); - case 215: return String(F("PV-1 Input overvoltage")); - case 216: return String(F("PV-1 Input undervoltage")); - case 217: return String(F("PV-2 Input overvoltage")); - case 218: return String(F("PV-2 Input undervoltage")); - case 219: return String(F("PV-3 Input overvoltage")); - case 220: return String(F("PV-3 Input undervoltage")); - case 221: return String(F("PV-4 Input overvoltage")); - case 222: return String(F("PV-4 Input undervoltage")); - case 301: return String(F("Hardware error code 301")); - case 302: return String(F("Hardware error code 302")); - case 303: return String(F("Hardware error code 303")); - case 304: return String(F("Hardware error code 304")); - case 305: return String(F("Hardware error code 305")); - case 306: return String(F("Hardware error code 306")); - case 307: return String(F("Hardware error code 307")); - case 308: return String(F("Hardware error code 308")); - case 309: return String(F("Hardware error code 309")); - case 310: return String(F("Hardware error code 310")); - case 311: return String(F("Hardware error code 311")); - case 312: return String(F("Hardware error code 312")); - case 313: return String(F("Hardware error code 313")); - case 314: return String(F("Hardware error code 314")); - case 5041: return String(F("Error code-04 Port 1")); - case 5042: return String(F("Error code-04 Port 2")); - case 5043: return String(F("Error code-04 Port 3")); - case 5044: return String(F("Error code-04 Port 4")); - case 5051: return String(F("PV Input 1 Overvoltage/Undervoltage")); - case 5052: return String(F("PV Input 2 Overvoltage/Undervoltage")); - case 5053: return String(F("PV Input 3 Overvoltage/Undervoltage")); - case 5054: return String(F("PV Input 4 Overvoltage/Undervoltage")); - case 5060: return String(F("Abnormal bias")); - case 5070: return String(F("Over temperature protection")); - case 5080: return String(F("Grid Overvoltage/Undervoltage")); - case 5090: return String(F("Grid Overfrequency/Underfrequency")); - case 5100: return String(F("Island detected")); - case 5120: return String(F("EEPROM reading and writing error")); - case 5150: return String(F("10 min value grid overvoltage")); - case 5200: return String(F("Firmware error")); - case 8310: return String(F("Shut down")); - case 9000: return String(F("Microinverter is suspected of being stolen")); - default: return String(F("Unknown")); - } - } - - private: - void toRadioId(void) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:toRadioId")); - radioId.u64 = 0ULL; - radioId.b[4] = config->serial.b[0]; - radioId.b[3] = config->serial.b[1]; - radioId.b[2] = config->serial.b[2]; - radioId.b[1] = config->serial.b[3]; - radioId.b[0] = 0x01; - } - - std::queue> _commandQueue; - bool mDevControlRequest; // true if change needed -}; - - -/** - * To calculate values which are not transmitted by the unit there is a generic - * list of functions which can be linked to the assignment. - * The special command 0xff (CMDFF) must be used. - */ - -template -static T calcYieldTotalCh0(Inverter<> *iv, uint8_t arg0) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcYieldTotalCh0")); - if(NULL != iv) { - record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); - T yield = 0; - for(uint8_t i = 1; i <= iv->channels; i++) { - uint8_t pos = iv->getPosByChFld(i, FLD_YT, rec); - yield += iv->getValue(pos, rec); - } - return yield; - } - return 0.0; -} - -template -static T calcYieldDayCh0(Inverter<> *iv, uint8_t arg0) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcYieldDayCh0")); - if(NULL != iv) { - record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); - T yield = 0; - for(uint8_t i = 1; i <= iv->channels; i++) { - uint8_t pos = iv->getPosByChFld(i, FLD_YD, rec); - yield += iv->getValue(pos, rec); - } - return yield; - } - return 0.0; -} - -template -static T calcUdcCh(Inverter<> *iv, uint8_t arg0) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcUdcCh")); - // arg0 = channel of source - record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); - for(uint8_t i = 0; i < rec->length; i++) { - if((FLD_UDC == rec->assign[i].fieldId) && (arg0 == rec->assign[i].ch)) { - return iv->getValue(i, rec); - } - } - - return 0.0; -} - -template -static T calcPowerDcCh0(Inverter<> *iv, uint8_t arg0) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcPowerDcCh0")); - if(NULL != iv) { - record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); - T dcPower = 0; - for(uint8_t i = 1; i <= iv->channels; i++) { - uint8_t pos = iv->getPosByChFld(i, FLD_PDC, rec); - dcPower += iv->getValue(pos, rec); - } - return dcPower; - } - return 0.0; -} - -template -static T calcEffiencyCh0(Inverter<> *iv, uint8_t arg0) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcEfficiencyCh0")); - if(NULL != iv) { - record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); - uint8_t pos = iv->getPosByChFld(CH0, FLD_PAC, rec); - T acPower = iv->getValue(pos, rec); - T dcPower = 0; - for(uint8_t i = 1; i <= iv->channels; i++) { - pos = iv->getPosByChFld(i, FLD_PDC, rec); - dcPower += iv->getValue(pos, rec); - } - if(dcPower > 0) - return acPower / dcPower * 100.0f; - } - return 0.0; -} - -template -static T calcIrradiation(Inverter<> *iv, uint8_t arg0) { - DPRINTLN(DBG_VERBOSE, F("hmInverter.h:calcIrradiation")); - // arg0 = channel - if(NULL != iv) { - record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); - uint8_t pos = iv->getPosByChFld(arg0, FLD_PDC, rec); - if(iv->config->chMaxPwr[arg0-1] > 0) - return iv->getValue(pos, rec) / iv->config->chMaxPwr[arg0-1] * 100.0f; - } - return 0.0; -} - -#endif /*__HM_INVERTER_H__*/ From b973d61d0451d6b9d6b880eef33ebee926dcb7d0 Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Sun, 5 Mar 2023 12:30:05 +0100 Subject: [PATCH 5/8] Delete miPayload.h ...wrong place --- miPayload.h | 620 ---------------------------------------------------- 1 file changed, 620 deletions(-) delete mode 100644 miPayload.h diff --git a/miPayload.h b/miPayload.h deleted file mode 100644 index ae750710..00000000 --- a/miPayload.h +++ /dev/null @@ -1,620 +0,0 @@ -//----------------------------------------------------------------------------- -// 2023 Ahoy, https://ahoydtu.de -// Creative Commons - http://creativecommons.org/licenses/by-nc-sa/3.0/de/ -//----------------------------------------------------------------------------- - -#ifndef __MI_PAYLOAD_H__ -#define __MI_PAYLOAD_H__ - -//#include "hmInverter.h" -#include "../utils/dbg.h" -#include "../utils/crc.h" -#include "../config/config.h" -#include - -typedef struct { - uint32_t ts; - bool requested; - uint8_t txCmd; - uint8_t len[MAX_PAYLOAD_ENTRIES]; - bool complete; - bool dataAB[2]; - uint8_t sts[5]; - uint8_t txId; - uint8_t invId; - uint8_t retransmits; - /* - uint8_t data[MAX_PAYLOAD_ENTRIES][MAX_RF_PAYLOAD_SIZE]; - - uint8_t maxPackId; - bool lastFound; - bool gotFragment;*/ -} miPayload_t; - - -typedef std::function miPayloadListenerType; - - -template -class MiPayload { - public: - MiPayload() {} - - void setup(IApp *app, HMSYSTEM *sys, statistics_t *stat, uint8_t maxRetransmits, uint32_t *timestamp) { - mApp = app; - mSys = sys; - mStat = stat; - mMaxRetrans = maxRetransmits; - mTimestamp = timestamp; - for(uint8_t i = 0; i < MAX_NUM_INVERTERS; i++) { - reset(i); - } - mSerialDebug = false; - mHighPrioIv = NULL; - mCbMiPayload = NULL; - } - - void enableSerialDebug(bool enable) { - mSerialDebug = enable; - } - - void addPayloadListener(miPayloadListenerType cb) { - mCbMiPayload = cb; - } - - void addAlarmListener(alarmListenerType cb) { - mCbMiAlarm = cb; - } - - void loop() { - /*if(NULL != mHighPrioIv) { - iv->ivSend(mHighPrioIv, true); // should request firmware version etc.? - mHighPrioIv = NULL; - }*/ - } - - void ivSendHighPrio(Inverter<> *iv) { - mHighPrioIv = iv; - } - - void ivSend(Inverter<> *iv) { - reset(iv->id); - mPayload[iv->id].requested = true; - - yield(); - if (mSerialDebug) - DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") Requesting Inv SN ") + String(iv->config->serial.u64, HEX)); - - //first channel request - /*uint8_t cmd = iv->type == INV_TYPE_4CH ? 0x36 : 0x09; - DPRINT(DBG_INFO, F("(#")); - DBGPRINT(String(iv->id)); - DBGPRINT(F(") prepareDevInformCmd 0x")); - DBGPRINTLN(String(cmd, HEX)); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd;*/ - - uint8_t cmd = iv->getQueuedCmd(); - DPRINT(DBG_INFO, F("(#")); - DBGPRINT(String(iv->id)); - DBGPRINT(F(") prepareDevInformCmd 0x")); - DBGPRINTLN(String(cmd, HEX)); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd; - //other channel requests - /*if (iv->type == INV_TYPE_4CH) { - for(uint8_t i = 1; i < iv->channels; i++) { - iv->enqueCommand(cmd + i, cmd + i); - //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd + i); - } - } else */ - if (iv->type == INV_TYPE_2CH) { - mPayload[iv->id].dataAB[0] = false; - mPayload[iv->id].dataAB[1] = false; - //iv->enqueCommand(0x11); - //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); - } - } - - void add(Inverter<> *iv, packet_t *p) { - //DPRINTLN(DBG_INFO, F("MI got data [0]=") + String(p->packet[0], HEX)); - - if (p->packet[0] == (0x08 + ALL_FRAMES)) { // 0x88; MI status response to 0x09 - //mPayload[iv->id].sts[0] = true; - miStsDecode(iv, p); - } else if (p->packet[0] == (0x11 + SINGLE_FRAME)) { // 0x92; MI status response to 0x11 - //mPayload[iv->id].sts[1] = true; - miStsDecode(iv, p, CH2); - /*} else if (p->packet[0] == (0x09 + ALL_FRAMES)) { // MI data response to 0x09 - mPayload[iv->id].txId = p->packet[0]; - miDataDecode(iv,p); - //iv->setQueuedCmdFinished(); - if (INV_TYPE_2CH == iv->type) { - //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); - //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); - } else { // additional check for mPayload[iv->id].stsa == true might be a good idea (request retransmit?) - mPayload[iv->id].complete = true; - //iv->setQueuedCmdFinished(); - } - - } else if (p->packet[0] == ()) { // MI data response to 0x11 - mPayload[iv->id].txId = p->packet[0]; - miDataDecode(iv,p); - mStat->rxSuccess++; - //iv->setQueuedCmdFinished();*/ - - } else if ( p->packet[0] == 0x09 + ALL_FRAMES || - p->packet[0] == 0x11 + ALL_FRAMES || - ( p->packet[0] >= (0x36 + ALL_FRAMES) && p->packet[0] < (0x39 + SINGLE_FRAME) ) ) { // small MI or MI 1500 data responses to 0x09, 0x11, 0x36, 0x37, 0x38 and 0x39 - mPayload[iv->id].txId = p->packet[0]; - miDataDecode(iv,p); - //mStat->rxSuccess++; - //iv->setQueuedCmdFinished(); - /*if (p->packet[0] < (0x39 + ALL_FRAMES)) { - //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, p->packet[0] + 1 - ALL_FRAMES); - //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, p->packet[0] + 1 - ALL_FRAMES, mPayload[iv->id].ts, iv->alarmMesIndex, false, p->packet[0] + 1 - ALL_FRAMES); - } else { - mPayload[iv->id].complete = true; - //iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, CALC_YD_CH0); - //iv->setQueuedCmdFinished(); - }*/ - - //} - - /*if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command - mPayload[iv->id].txId = p->packet[0]; - DPRINTLN(DBG_DEBUG, F("Response from info request received")); - uint8_t *pid = &p->packet[9]; - if (*pid == 0x00) { - DPRINT(DBG_DEBUG, F("fragment number zero received and ignored")); - } else { - DPRINTLN(DBG_DEBUG, "PID: 0x" + String(*pid, HEX)); - if ((*pid & 0x7F) < MAX_PAYLOAD_ENTRIES) { - memcpy(mPayload[iv->id].data[(*pid & 0x7F) - 1], &p->packet[10], p->len - 11); - mPayload[iv->id].len[(*pid & 0x7F) - 1] = p->len - 11; - mPayload[iv->id].gotFragment = true; - } - - if ((*pid & ALL_FRAMES) == ALL_FRAMES) { - // Last packet - if (((*pid & 0x7f) > mPayload[iv->id].maxPackId) || (MAX_PAYLOAD_ENTRIES == mPayload[iv->id].maxPackId)) { - mPayload[iv->id].maxPackId = (*pid & 0x7f); - if (*pid > 0x81) - mPayload[iv->id].lastFound = true; - } - } - } - } */ - } else if (p->packet[0] == (TX_REQ_DEVCONTROL + ALL_FRAMES)) { // response from dev control command - DPRINTLN(DBG_DEBUG, F("Response from devcontrol request received")); - - mPayload[iv->id].txId = p->packet[0]; - iv->clearDevControlRequest(); - - if ((p->packet[12] == ActivePowerContr) && (p->packet[13] == 0x00)) { - String msg = ""; - if((p->packet[10] == 0x00) && (p->packet[11] == 0x00)) - mApp->setMqttPowerLimitAck(iv); - else - msg = "NOT "; - DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(" has ") + msg + F("accepted power limit set point ") + String(iv->powerLimit[0]) + F(" with PowerLimitControl ") + String(iv->powerLimit[1])); - iv->clearCmdQueue(); - iv->enqueCommand(SystemConfigPara); // read back power limit - } - iv->devControlCmd = Init; - } else { // some other response; copied from hmPayload:process; might not be correct to do that here!!! - DPRINTLN(DBG_INFO, F("procPyld: cmd: 0x") + String(mPayload[iv->id].txCmd, HEX)); - DPRINTLN(DBG_INFO, F("procPyld: txid: 0x") + 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 - mPayload[iv->id].complete = true; - - uint8_t payload[128]; - uint8_t payloadLen = 0; - - memset(payload, 0, 128); - - /*for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId); i++) { - memcpy(&payload[payloadLen], mPayload[iv->id].data[i], (mPayload[iv->id].len[i])); - payloadLen += (mPayload[iv->id].len[i]); - yield(); - }*/ - payloadLen -= 2; - - if (mSerialDebug) { - DPRINT(DBG_INFO, F("Payload (") + String(payloadLen) + "): "); - mSys->Radio.dumpBuf(payload, payloadLen); - } - - if (NULL == rec) { - DPRINTLN(DBG_ERROR, F("record is NULL!")); - } else if ((rec->pyldLen == payloadLen) || (0 == rec->pyldLen)) { - if (mPayload[iv->id].txId == (TX_REQ_INFO + ALL_FRAMES)) - mStat->rxSuccess++; - - rec->ts = mPayload[iv->id].ts; - for (uint8_t i = 0; i < rec->length; i++) { - iv->addValue(i, payload, rec); - yield(); - } - iv->doCalculations(); - notify(mPayload[iv->id].txCmd); - - if(AlarmData == mPayload[iv->id].txCmd) { - uint8_t i = 0; - uint16_t code; - uint32_t start, end; - while(1) { - code = iv->parseAlarmLog(i++, payload, payloadLen, &start, &end); - if(0 == code) - break; - if (NULL != mCbMiAlarm) - (mCbMiAlarm)(code, start, end); - yield(); - } - } - } else { - DPRINTLN(DBG_ERROR, F("plausibility check failed, expected ") + String(rec->pyldLen) + F(" bytes")); - mStat->rxFail++; - } - - iv->setQueuedCmdFinished(); - } - } - - void process(bool retransmit) { - for (uint8_t id = 0; id < mSys->getNumInverters(); id++) { - Inverter<> *iv = mSys->getInverterByPos(id); - if (NULL == iv) - continue; // skip to next inverter - - if (IV_HM == iv->ivGen) // only process MI inverters - continue; // skip to next inverter - - /*if ((mPayload[iv->id].txId != (TX_REQ_INFO + ALL_FRAMES)) && (0 != mPayload[iv->id].txId)) { - // no processing needed if txId is not 0x95 - mPayload[iv->id].complete = true; - continue; // skip to next inverter - }*/ - - if (!mPayload[iv->id].complete) { - bool crcPass, pyldComplete; - crcPass = build(iv->id, &pyldComplete); - if (!crcPass && !pyldComplete) { // payload not complete - if ((mPayload[iv->id].requested) && (retransmit)) { - if (iv->devControlCmd == Restart || iv->devControlCmd == CleanState_LockAndAlarm) { - // This is required to prevent retransmissions without answer. - DPRINTLN(DBG_INFO, F("Prevent retransmit on Restart / CleanState_LockAndAlarm...")); - mPayload[iv->id].retransmits = mMaxRetrans; - } else if(iv->devControlCmd == ActivePowerContr) { - DPRINTLN(DBG_INFO, F("retransmit power limit")); - mSys->Radio.sendControlPacket(iv->radioId.u64, iv->devControlCmd, iv->powerLimit, true); - } else { - if (mPayload[iv->id].retransmits < mMaxRetrans) { - mPayload[iv->id].retransmits++; - //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); - DPRINTLN(DBG_WARN, F("missing answer to 0x") + String(iv->getQueuedCmd(), HEX) + F("Request Retransmit")); - mSys->Radio.sendCmdPacket(iv->radioId.u64, iv->getQueuedCmd(), 24, true); - /*if(false == mPayload[iv->id].gotFragment) { - DPRINTLN(DBG_WARN, F("(#") + String(iv->id) + F(") nothing received")); - mPayload[iv->id].retransmits = mMaxRetrans; - } else { - for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId - 1); i++) { - if (mPayload[iv->id].len[i] == 0) { - DPRINTLN(DBG_WARN, F("Frame ") + String(i + 1) + F(" missing: Request Retransmit")); - mSys->Radio.sendCmdPacket(iv->radioId.u64, TX_REQ_INFO, (SINGLE_FRAME + i), true); - break; // only request retransmit one frame per loop - } - yield(); - } - }*/ - } - } - } - } else if(!crcPass && pyldComplete) { // crc error on complete Payload - if (mPayload[iv->id].retransmits < mMaxRetrans) { - mPayload[iv->id].retransmits++; - DPRINTLN(DBG_WARN, F("CRC Error: Request Complete Retransmit")); - mPayload[iv->id].txCmd = iv->getQueuedCmd(); - DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") prepareDevInformCmd 0x") + String(mPayload[iv->id].txCmd, HEX)); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].ts, iv->alarmMesIndex, true); - } - } /*else { // payload complete - DPRINTLN(DBG_INFO, F("procPyld: cmd: 0x") + String(mPayload[iv->id].txCmd, HEX)); - DPRINTLN(DBG_INFO, F("procPyld: txid: 0x") + 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 - mPayload[iv->id].complete = true; - - uint8_t payload[128]; - uint8_t payloadLen = 0; - - memset(payload, 0, 128); - - for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId); i++) { - memcpy(&payload[payloadLen], mPayload[iv->id].data[i], (mPayload[iv->id].len[i])); - payloadLen += (mPayload[iv->id].len[i]); - yield(); - } - payloadLen -= 2; - - if (mSerialDebug) { - DPRINT(DBG_INFO, F("Payload (") + String(payloadLen) + "): "); - mSys->Radio.dumpBuf(payload, payloadLen); - } - - if (NULL == rec) { - DPRINTLN(DBG_ERROR, F("record is NULL!")); - } else if ((rec->pyldLen == payloadLen) || (0 == rec->pyldLen)) { - if (mPayload[iv->id].txId == (TX_REQ_INFO + ALL_FRAMES)) - mStat->rxSuccess++; - - rec->ts = mPayload[iv->id].ts; - for (uint8_t i = 0; i < rec->length; i++) { - iv->addValue(i, payload, rec); - yield(); - } - iv->doCalculations(); - notify(mPayload[iv->id].txCmd); - - if(AlarmData == mPayload[iv->id].txCmd) { - uint8_t i = 0; - uint16_t code; - uint32_t start, end; - while(1) { - code = iv->parseAlarmLog(i++, payload, payloadLen, &start, &end); - if(0 == code) - break; - if (NULL != mCbAlarm) - (mCbAlarm)(code, start, end); - yield(); - } - } - } else { - DPRINTLN(DBG_ERROR, F("plausibility check failed, expected ") + String(rec->pyldLen) + F(" bytes")); - mStat->rxFail++; - } - - iv->setQueuedCmdFinished(); - }*/ - } - yield(); - } - } - - private: - void notify(uint8_t val) { - if(NULL != mCbMiPayload) - (mCbMiPayload)(val); - } - - void miStsDecode(Inverter<> *iv, packet_t *p, uint8_t chan = CH1) { - DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(": status msg 0x") + String(p->packet[0], HEX)); - record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); // choose the record structure - rec->ts = mPayload[iv->id].ts; - - uint8_t status = (p->packet[11] << 8) + p->packet[12]; - uint8_t stschan = p->packet[0] == 0x88 ? CH1 : CH2; - mPayload[iv->id].dataAB[stschan-1] = true; - mPayload[iv->id].sts[stschan] = status; - if ( !mPayload[iv->id].sts[0] || status < mPayload[iv->id].sts[0]) { - mPayload[iv->id].sts[0] = status; - iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, status); - } - - if ( !mPayload[iv->id].dataAB[0] || !mPayload[iv->id].dataAB[1] ) { - uint8_t cmd = mPayload[iv->id].dataAB[0] ? 0x11 : 0x09; - DPRINTLN(DBG_INFO, F("request missing status 0x") + String(cmd, HEX)); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd; - } - - if (iv->alarmMesIndex < rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]){ - iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; // seems there's no status per channel in 3rd gen. models?!? - - DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); - iv->enqueCommand(AlarmData); - } - } - - void miDataDecode(Inverter<> *iv, packet_t *p) { - record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); // choose the parser - rec->ts = mPayload[iv->id].ts; - - uint8_t datachan = ( p->packet[0] == 0x89 || p->packet[0] == (0x36 + ALL_FRAMES) ) ? CH1 : - ( p->packet[0] == 0x91 || p->packet[0] == (0x37 + ALL_FRAMES) ) ? CH2 : - p->packet[0] == (0x38 + ALL_FRAMES) ? CH3 : - CH4; - DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(": data msg 0x") + String(p->packet[0], HEX) + F(" channel ") + datachan); - // count in RF_communication_protocol.xlsx is with offset = -1 - iv->setValue(iv->getPosByChFld(datachan, FLD_UDC, rec), rec, (float)((p->packet[9] << 8) + p->packet[10])/10); - yield(); - iv->setValue(iv->getPosByChFld(datachan, FLD_IDC, rec), rec, (float)((p->packet[11] << 8) + p->packet[12])/10); - yield(); - iv->setValue(iv->getPosByChFld(0, FLD_UAC, rec), rec, (float)((p->packet[13] << 8) + p->packet[14])/10); - yield(); - iv->setValue(iv->getPosByChFld(0, FLD_F, rec), rec, (float) ((p->packet[15] << 8) + p->packet[16])/100); - iv->setValue(iv->getPosByChFld(datachan, FLD_PDC, rec), rec, (float)((p->packet[17] << 8) + p->packet[18])/10); - yield(); - iv->setValue(iv->getPosByChFld(datachan, FLD_YD, rec), rec, (float)((p->packet[19] << 8) + p->packet[20])/1); - yield(); - iv->setValue(iv->getPosByChFld(0, FLD_T, rec), rec, (float) ((int16_t)(p->packet[21] << 8) + p->packet[22])/10); - iv->setValue(iv->getPosByChFld(0, FLD_IRR, rec), rec, (float) (calcIrradiation(iv, datachan))); - //AC Power is missing; we may have to calculate, as no respective data is in payload - - if (p->packet[0] >= (0x36 + ALL_FRAMES) ) { - - /*For MI1500: - if (MI1500) { - STAT = (uint8_t)(p->packet[25] ); - FCNT = (uint8_t)(p->packet[26]); - FCODE = (uint8_t)(p->packet[27]); - }*/ - - uint8_t status = (uint8_t)(p->packet[23]); - mPayload[iv->id].sts[datachan] = status; - if ( !mPayload[iv->id].sts[0] || status < mPayload[iv->id].sts[0]) { - mPayload[iv->id].sts[0] = status; - iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, status); - } - - if (p->packet[0] < (0x39 + ALL_FRAMES) ) { - uint8_t cmd = p->packet[0] - ALL_FRAMES + 1; - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd; - mPayload[iv->id].complete = false; - } - - //iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, calcMiSts(iv));yield(); - if (iv->alarmMesIndex < rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]){ - iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; - - DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); - //iv->enqueCommand(AlarmData); - } - - } - - //preliminary AC calculation... - uint8_t ac_pow = 0; - //if (mPayload[iv->id].sts[0] == 3) { - ac_pow = calcPowerDcCh0(iv, 0)*9.5; - //} - iv->setValue(iv->getPosByChFld(0, FLD_PAC, rec), rec, (float) (ac_pow/10)); - - if ( mPayload[iv->id].sts[0] ) { - uint8_t cmd = mPayload[iv->id].dataAB[0] ? 0x11 : 0x09; - if ( mPayload[iv->id].dataAB[0] && mPayload[iv->id].dataAB[1] ) { - mPayload[iv->id].complete = true; // For 2 CH devices, this might be too short... - DPRINTLN(DBG_INFO, F("complete tree detected")); - iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); - iv->doCalculations(); - } else { - //retry to get missing status info for one or two channel devices - DPRINTLN(DBG_INFO, F("request missing data or status 0x") + String(cmd, HEX)); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd; - //iv->enqueCommand(cmd); // mPayload[iv->id].dataAB[1] ? 0x09 : 0x11) - } - } // not yet moved to hmInverter::getQueuedCmd - else if (mPayload[iv->id].txCmd == 0x09 && iv->type == INV_TYPE_2CH) { - uint8_t cmd = 0x11; - DPRINTLN(DBG_INFO, F("request second data channel 0x") + String(cmd, HEX)); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd; - mPayload[iv->id].complete = false; - } - - iv->setQueuedCmdFinished(); - mStat->rxSuccess++; - yield(); - - notify(mPayload[iv->id].txCmd); - -/* - if(AlarmData == mPayload[iv->id].txCmd) { - uint8_t i = 0; - uint16_t code; - uint32_t start, end; - while(1) { - code = iv->parseAlarmLog(i++, payload, payloadLen, &start, &end); - if(0 == code) - break; - if (NULL != mCbMiAlarm) - (mCbAlarm)(code, start, end); - yield(); - } - }*/ - } - - bool build(uint8_t id, bool *complete) { - DPRINTLN(DBG_VERBOSE, F("build")); - /*uint16_t crc = 0xffff, crcRcv = 0x0000; - if (mPayload[id].maxPackId > MAX_PAYLOAD_ENTRIES) - mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; - */ - // check if all messages are there - - *complete = mPayload[id].complete; - uint8_t txCmd = mPayload[id].txCmd; - //uint8_t cmd = getQueuedCmd(); - if(!*complete) { - //if (txCmd == 0x09 || txCmd == 0x11 || txCmd >= 0x36 && txCmd <= 0x39 ) - // return false; - DPRINTLN(DBG_VERBOSE, F("incomlete, txCmd is 0x") + String(txCmd, HEX)); // + F("cmd is 0x") + String(cmd, HEX)); - } - - /*for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { - if (mPayload[id].len[i] > 0) { - if (i == (mPayload[id].maxPackId - 1)) { - crc = ah::crc16(mPayload[id].data[i], mPayload[id].len[i] - 2, crc); - crcRcv = (mPayload[id].data[i][mPayload[id].len[i] - 2] << 8) | (mPayload[id].data[i][mPayload[id].len[i] - 1]); - } else - crc = ah::crc16(mPayload[id].data[i], mPayload[id].len[i], crc); - } - yield(); - } - - return (crc == crcRcv) ? true : false;*/ - return true; - } - - void reset(uint8_t id) { - DPRINTLN(DBG_INFO, "resetPayload: id: " + String(id)); - memset(mPayload[id].len, 0, MAX_PAYLOAD_ENTRIES); - /* - mPayload[id].gotFragment = false; - mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; - mPayload[id].lastFound = false;*/ - mPayload[id].retransmits = 0; - mPayload[id].complete = false; - mPayload[id].dataAB[0] = true; //only required for 2CH devices - mPayload[id].dataAB[1] = true; - mPayload[id].txCmd = 0; - mPayload[id].requested = false; - mPayload[id].ts = *mTimestamp; - //mPayload[id].sts[0] = 0; - mPayload[id].sts[1] = 0; - mPayload[id].sts[2] = 0; - mPayload[id].sts[3] = 0; - mPayload[id].sts[4] = 0; - } - - -/* template - static T calcMiSts(Inverter<> *iv) { - if(NULL != iv) { - T result = 0; - bool stsComplete = true; - uint8_t stsCh; - for(uint8_t i = 1; i <= iv->channels; i++) { - stsCh = mPayload[iv->id].sts[i]; - if (!stsCh) { - stsComplete = false; - } else if ( !result || stsCh < result ) { - result = stsCh; - if (stsComplete && stsCh > stsComplete) { - stsComplete = stsCh; - } - } - } - mPayload[iv->id].sts[0] = stsComplete; - return result; - } - return 0; - } */ - - IApp *mApp; - HMSYSTEM *mSys; - statistics_t *mStat; - uint8_t mMaxRetrans; - uint32_t *mTimestamp; - miPayload_t mPayload[MAX_NUM_INVERTERS]; - bool mSerialDebug; - - Inverter<> *mHighPrioIv; - alarmListenerType mCbMiAlarm; - payloadListenerType mCbMiPayload; -}; - -#endif /*__MI_PAYLOAD_H__*/ From 4eed422cacf42b633d320f924bd91d59b7504ba4 Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Sun, 5 Mar 2023 12:30:44 +0100 Subject: [PATCH 6/8] MI - small changes --- src/hm/hmInverter.h | 4 ++-- src/hm/miPayload.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/hm/hmInverter.h b/src/hm/hmInverter.h index f150628a..175c6177 100644 --- a/src/hm/hmInverter.h +++ b/src/hm/hmInverter.h @@ -176,7 +176,7 @@ class Inverter { enqueCommand(RealTimeRunData_Debug); // live data } else if (ivGen == IV_MI){ if (type == INV_TYPE_4CH) { - enqueCommand(0x36); + enqueCommand(0x36); /*for(uint8_t i = 0x36; i <= 0x39; i++) { enqueCommand(i); // live data }*/ @@ -184,7 +184,7 @@ class Inverter { enqueCommand(0x09); //enqueCommand(0x11); } else if (type == INV_TYPE_1CH) { - enqueCommand(0x09); + enqueCommand(0x09); } //if (getFwVersion() == 0) // enqueCommand(InverterDevInform_All); // firmware version, might not work, esp. for 1/2 ch hardware diff --git a/src/hm/miPayload.h b/src/hm/miPayload.h index ac455f3d..ae750710 100644 --- a/src/hm/miPayload.h +++ b/src/hm/miPayload.h @@ -481,8 +481,7 @@ class MiPayload { ac_pow = calcPowerDcCh0(iv, 0)*9.5; //} iv->setValue(iv->getPosByChFld(0, FLD_PAC, rec), rec, (float) (ac_pow/10)); - //iv->setValue(iv->getPosByChFld(0, FLD_PAC, rec), rec, (float) (mPayload[iv->id].sts[0] == 3 ? calcPowerDcCh0(iv, 0)*0.95 : 0)); - + if ( mPayload[iv->id].sts[0] ) { uint8_t cmd = mPayload[iv->id].dataAB[0] ? 0x11 : 0x09; if ( mPayload[iv->id].dataAB[0] && mPayload[iv->id].dataAB[1] ) { From 892ce444415c1fe326038605f092cc57a20296d5 Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Sun, 5 Mar 2023 21:47:02 +0100 Subject: [PATCH 7/8] MI - delete unnecessary MiInfoCommand compiles, but untested yet; should work --- src/hm/hmInverter.h | 7 ------- src/hm/miPayload.h | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/hm/hmInverter.h b/src/hm/hmInverter.h index 175c6177..e8b83726 100644 --- a/src/hm/hmInverter.h +++ b/src/hm/hmInverter.h @@ -90,13 +90,6 @@ class InfoCommand : public CommandAbstract { } }; -class MiInfoCommand : public CommandAbstract { - public: - MiInfoCommand(uint8_t cmd){ - _TxType = cmd; - _Cmd = cmd; - } -}; // list of all available functions, mapped in hmDefines.h template const calcFunc_t calcFunctions[] = { diff --git a/src/hm/miPayload.h b/src/hm/miPayload.h index ae750710..d2b53145 100644 --- a/src/hm/miPayload.h +++ b/src/hm/miPayload.h @@ -199,7 +199,7 @@ class MiPayload { msg = "NOT "; DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(" has ") + msg + F("accepted power limit set point ") + String(iv->powerLimit[0]) + F(" with PowerLimitControl ") + String(iv->powerLimit[1])); iv->clearCmdQueue(); - iv->enqueCommand(SystemConfigPara); // read back power limit + iv->enqueCommand(SystemConfigPara); // read back power limit } iv->devControlCmd = Init; } else { // some other response; copied from hmPayload:process; might not be correct to do that here!!! @@ -413,7 +413,7 @@ class MiPayload { iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; // seems there's no status per channel in 3rd gen. models?!? DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); - iv->enqueCommand(AlarmData); + iv->enqueCommand(AlarmData); } } @@ -481,7 +481,7 @@ class MiPayload { ac_pow = calcPowerDcCh0(iv, 0)*9.5; //} iv->setValue(iv->getPosByChFld(0, FLD_PAC, rec), rec, (float) (ac_pow/10)); - + if ( mPayload[iv->id].sts[0] ) { uint8_t cmd = mPayload[iv->id].dataAB[0] ? 0x11 : 0x09; if ( mPayload[iv->id].dataAB[0] && mPayload[iv->id].dataAB[1] ) { From 52020d54313deeb80dcf7d41b999b7b17ccf3e58 Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Tue, 7 Mar 2023 08:38:36 +0100 Subject: [PATCH 8/8] MI - refacture "complete?" code for 1/2 ch --- src/hm/miPayload.h | 239 ++++++++++++++++++++++++++++++--------------- 1 file changed, 161 insertions(+), 78 deletions(-) diff --git a/src/hm/miPayload.h b/src/hm/miPayload.h index d2b53145..24e6693a 100644 --- a/src/hm/miPayload.h +++ b/src/hm/miPayload.h @@ -18,11 +18,13 @@ typedef struct { uint8_t txCmd; uint8_t len[MAX_PAYLOAD_ENTRIES]; bool complete; - bool dataAB[2]; + bool dataAB[3]; + bool stsAB[3]; uint8_t sts[5]; uint8_t txId; uint8_t invId; uint8_t retransmits; + bool gotFragment; /* uint8_t data[MAX_PAYLOAD_ENTRIES][MAX_RF_PAYLOAD_SIZE]; @@ -85,34 +87,29 @@ class MiPayload { if (mSerialDebug) DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") Requesting Inv SN ") + String(iv->config->serial.u64, HEX)); - //first channel request - /*uint8_t cmd = iv->type == INV_TYPE_4CH ? 0x36 : 0x09; + uint8_t cmd = iv->getQueuedCmd(); DPRINT(DBG_INFO, F("(#")); DBGPRINT(String(iv->id)); DBGPRINT(F(") prepareDevInformCmd 0x")); DBGPRINTLN(String(cmd, HEX)); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd;*/ + uint8_t cmd2 = cmd; + if (cmd == 0x1 ) { + cmd = TX_REQ_INFO; + cmd2 = 0x00; + }; + + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd2, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd; + if (iv->type == INV_TYPE_1CH || iv->type == INV_TYPE_2CH) { + mPayload[iv->id].dataAB[CH1] = false; + mPayload[iv->id].stsAB[CH1] = false; + mPayload[iv->id].dataAB[CH0] = false; + mPayload[iv->id].stsAB[CH0] = false; + } - uint8_t cmd = iv->getQueuedCmd(); - DPRINT(DBG_INFO, F("(#")); - DBGPRINT(String(iv->id)); - DBGPRINT(F(") prepareDevInformCmd 0x")); - DBGPRINTLN(String(cmd, HEX)); - mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd; - //other channel requests - /*if (iv->type == INV_TYPE_4CH) { - for(uint8_t i = 1; i < iv->channels; i++) { - iv->enqueCommand(cmd + i, cmd + i); - //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd + i); - } - } else */ if (iv->type == INV_TYPE_2CH) { - mPayload[iv->id].dataAB[0] = false; - mPayload[iv->id].dataAB[1] = false; - //iv->enqueCommand(0x11); - //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, 0x11, mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); + mPayload[iv->id].dataAB[CH2] = false; + mPayload[iv->id].stsAB[CH2] = false; } } @@ -120,10 +117,8 @@ class MiPayload { //DPRINTLN(DBG_INFO, F("MI got data [0]=") + String(p->packet[0], HEX)); if (p->packet[0] == (0x08 + ALL_FRAMES)) { // 0x88; MI status response to 0x09 - //mPayload[iv->id].sts[0] = true; miStsDecode(iv, p); } else if (p->packet[0] == (0x11 + SINGLE_FRAME)) { // 0x92; MI status response to 0x11 - //mPayload[iv->id].sts[1] = true; miStsDecode(iv, p, CH2); /*} else if (p->packet[0] == (0x09 + ALL_FRAMES)) { // MI data response to 0x09 mPayload[iv->id].txId = p->packet[0]; @@ -161,14 +156,39 @@ class MiPayload { //} - /*if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command + } else if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command + // atm, we just do nothing else than print out what we got... + // for decoding see xls- Data collection instructions - #147ff +/* + Polling the device software and hardware version number command + start byte Command word routing address target address User data check end byte + byte[0] byte[1] byte[2] byte[3] byte[4] byte[5] byte[6] byte[7] byte[8] byte[9] byte[10] byte[11] byte[12] + 0x7e 0x0f xx xx xx xx YY YY YY YY 0x00 CRC 0x7f + + Command Receipt - First Frame + start byte Command word target address routing address Multi-frame marking User data User data User data User data User data User data User data User data User data User data User data User data User data User data User data User data check end byte + byte[0] byte[1] byte[2] byte[3] byte[4] byte[5] byte[6] byte[7] byte[8] byte[9] byte[10] byte[11] byte[12] byte[13] byte[14] byte[15] byte[16] byte[17] byte[18] byte[19] byte[20] byte[21] byte[22] byte[23] byte[24] byte[25] byte[26] byte[27] byte[28] + 0x7e 0x8f YY YY YY YY xx xx xx xx 0x00 USFWBuild_VER APPFWBuild_VER APPFWBuild_YYYY APPFWBuild_MMDD APPFWBuild_HHMM APPFW_PN HW_VER CRC 0x7f + Command Receipt - Second Frame + start byte Command word target address routing address Multi-frame marking User data User data User data User data User data User data User data User data User data User data User data User data User data User data User data User data check end byte + byte[0] byte[1] byte[2] byte[3] byte[4] byte[5] byte[6] byte[7] byte[8] byte[9] byte[10] byte[11] byte[12] byte[13] byte[14] byte[15] byte[16] byte[17] byte[18] byte[19] byte[20] byte[21] byte[22] byte[23] byte[24] byte[25] byte[26] byte[27] byte[28] + 0x7e 0x8f YY YY YY YY xx xx xx xx 0x01 HW_PN HW_FB_TLmValue HW_FB_ReSPRT HW_GridSamp_ResValule HW_ECapValue Matching_APPFW_PN CRC 0x7f + Command receipt - third frame + start byte Command word target address routing address Multi-frame marking User data User data User data User data User data User data User data User data check end byte + byte[0] byte[1] byte[2] byte[3] byte[4] byte[5] byte[6] byte[7] byte[8] byte[9] byte[10] byte[11] byte[12] byte[13] byte[14] byte[15] byte[16] byte[15] byte[16] byte[17] byte[18] + 0x7e 0x8f YY YY YY YY xx xx xx xx 0x12 APPFW_MINVER HWInfoAddr PNInfoCRC_gusv PNInfoCRC_gusv CRC 0x7f + +*/ mPayload[iv->id].txId = p->packet[0]; DPRINTLN(DBG_DEBUG, F("Response from info request received")); uint8_t *pid = &p->packet[9]; if (*pid == 0x00) { - DPRINT(DBG_DEBUG, F("fragment number zero received and ignored")); - } else { + DPRINT(DBG_DEBUG, F("fragment number zero received")); + + iv->setQueuedCmdFinished(); + } //else { DPRINTLN(DBG_DEBUG, "PID: 0x" + String(*pid, HEX)); + /* if ((*pid & 0x7F) < MAX_PAYLOAD_ENTRIES) { memcpy(mPayload[iv->id].data[(*pid & 0x7F) - 1], &p->packet[10], p->len - 11); mPayload[iv->id].len[(*pid & 0x7F) - 1] = p->len - 11; @@ -271,13 +291,21 @@ class MiPayload { if (IV_HM == iv->ivGen) // only process MI inverters continue; // skip to next inverter - /*if ((mPayload[iv->id].txId != (TX_REQ_INFO + ALL_FRAMES)) && (0 != mPayload[iv->id].txId)) { - // no processing needed if txId is not 0x95 + if ((mPayload[iv->id].txId != (TX_REQ_INFO + ALL_FRAMES)) && + (mPayload[iv->id].txId < (0x36 + ALL_FRAMES)) && + (mPayload[iv->id].txId > (0x39 + ALL_FRAMES)) && + (mPayload[iv->id].txId != (0x09 + ALL_FRAMES)) && + (mPayload[iv->id].txId != (0x11 + ALL_FRAMES)) && + (mPayload[iv->id].txId != (0x88)) && + (mPayload[iv->id].txId != (0x92)) && + (mPayload[iv->id].txId != 0 )) { + // no processing needed if txId is not one of 0x95, 0x88, 0x89, 0x91, 0x92 or resonse to 0x36ff mPayload[iv->id].complete = true; continue; // skip to next inverter - }*/ + } if (!mPayload[iv->id].complete) { + //DPRINTLN(DBG_INFO, F("Pyld incompl code")); //info for testing only bool crcPass, pyldComplete; crcPass = build(iv->id, &pyldComplete); if (!crcPass && !pyldComplete) { // payload not complete @@ -292,22 +320,32 @@ class MiPayload { } else { if (mPayload[iv->id].retransmits < mMaxRetrans) { mPayload[iv->id].retransmits++; - //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, iv->getQueuedCmd(), mPayload[iv->id].ts, iv->alarmMesIndex, false, 0x11); - DPRINTLN(DBG_WARN, F("missing answer to 0x") + String(iv->getQueuedCmd(), HEX) + F("Request Retransmit")); - mSys->Radio.sendCmdPacket(iv->radioId.u64, iv->getQueuedCmd(), 24, true); - /*if(false == mPayload[iv->id].gotFragment) { - DPRINTLN(DBG_WARN, F("(#") + String(iv->id) + F(") nothing received")); + if( !mPayload[iv->id].gotFragment ) { + DPRINT(DBG_INFO, F("(#")); + DBGPRINT(String(iv->id)); + DBGPRINTLN(F(") nothing received")); mPayload[iv->id].retransmits = mMaxRetrans; } else { - for (uint8_t i = 0; i < (mPayload[iv->id].maxPackId - 1); i++) { - if (mPayload[iv->id].len[i] == 0) { - DPRINTLN(DBG_WARN, F("Frame ") + String(i + 1) + F(" missing: Request Retransmit")); - mSys->Radio.sendCmdPacket(iv->radioId.u64, TX_REQ_INFO, (SINGLE_FRAME + i), true); - break; // only request retransmit one frame per loop + uint8_t cmd = mPayload[iv->id].txCmd; + if ( cmd >= 0x36 && cmd < 0x39 ) { // MI-1500 Data command + cmd++; // just request the next channel + } else if ( cmd == 0x09 ) {//MI single or dual channel device + if ( mPayload[iv->id].dataAB[CH1] && iv->type == INV_TYPE_2CH ) { + if (!mPayload[iv->id].stsAB[CH2] || !mPayload[iv->id].dataAB[CH2] ) + cmd = 0x11; + } + } else if ( cmd == 0x11) { + if ( mPayload[iv->id].dataAB[CH2] ) { // data is there, but no status + if (!mPayload[iv->id].stsAB[CH1] || !mPayload[iv->id].dataAB[CH1] ) + cmd = 0x09; } - yield(); } - }*/ + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") next request is 0x") + String(cmd, HEX)); + //mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd, true); + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, true, cmd); + mPayload[iv->id].txCmd = cmd; + yield(); + } } } } @@ -319,14 +357,25 @@ class MiPayload { DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") prepareDevInformCmd 0x") + String(mPayload[iv->id].txCmd, HEX)); mSys->Radio.prepareDevInformCmd(iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].ts, iv->alarmMesIndex, true); } - } /*else { // payload complete + } else { // payload complete DPRINTLN(DBG_INFO, F("procPyld: cmd: 0x") + String(mPayload[iv->id].txCmd, HEX)); DPRINTLN(DBG_INFO, F("procPyld: txid: 0x") + 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 - mPayload[iv->id].complete = true; + //DPRINTLN(DBG_DEBUG, F("procPyld: max: ") + String(mPayload[iv->id].maxPackId)); + //record_t<> *rec = iv->getRecordStruct(mPayload[iv->id].txCmd); // choose the parser - uint8_t payload[128]; + mPayload[iv->id].complete = true; + uint8_t ac_pow = 0; + //if (mPayload[iv->id].sts[0] == 3) { + ac_pow = calcPowerDcCh0(iv, 0)*9.5; + //} + record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); // choose the parser + iv->setValue(iv->getPosByChFld(0, FLD_PAC, rec), rec, (float) (ac_pow/10)); + + DPRINTLN(DBG_INFO, F("proces: compl. set of msgs detected")); + iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); + iv->doCalculations(); + + /*uint8_t payload[128]; uint8_t payloadLen = 0; memset(payload, 0, 128); @@ -375,8 +424,8 @@ class MiPayload { mStat->rxFail++; } - iv->setQueuedCmdFinished(); - }*/ + iv->setQueuedCmdFinished(); */ + } } yield(); } @@ -389,25 +438,30 @@ class MiPayload { } void miStsDecode(Inverter<> *iv, packet_t *p, uint8_t chan = CH1) { - DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(": status msg 0x") + String(p->packet[0], HEX)); + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") status msg 0x") + String(p->packet[0], HEX)); record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); // choose the record structure rec->ts = mPayload[iv->id].ts; + mPayload[iv->id].gotFragment = true; + mPayload[iv->id].txId = p->packet[0]; uint8_t status = (p->packet[11] << 8) + p->packet[12]; uint8_t stschan = p->packet[0] == 0x88 ? CH1 : CH2; - mPayload[iv->id].dataAB[stschan-1] = true; mPayload[iv->id].sts[stschan] = status; + mPayload[iv->id].stsAB[stschan] = true; + if (mPayload[iv->id].stsAB[CH1] && mPayload[iv->id].stsAB[CH2]) + mPayload[iv->id].stsAB[CH0] = true; if ( !mPayload[iv->id].sts[0] || status < mPayload[iv->id].sts[0]) { mPayload[iv->id].sts[0] = status; iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, status); } - if ( !mPayload[iv->id].dataAB[0] || !mPayload[iv->id].dataAB[1] ) { + /*if ( !mPayload[iv->id].dataAB[0] || !mPayload[iv->id].dataAB[1] ) { uint8_t cmd = mPayload[iv->id].dataAB[0] ? 0x11 : 0x09; DPRINTLN(DBG_INFO, F("request missing status 0x") + String(cmd, HEX)); mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); mPayload[iv->id].txCmd = cmd; - } + rem: gotFragment should be a better solution + } */ if (iv->alarmMesIndex < rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]){ iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; // seems there's no status per channel in 3rd gen. models?!? @@ -415,17 +469,27 @@ class MiPayload { DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); iv->enqueCommand(AlarmData); } + if (mPayload[iv->id].stsAB[CH0] && mPayload[iv->id].dataAB[CH0] && !mPayload[iv->id].complete) { + mPayload[iv->id].complete = true; + DPRINTLN(DBG_INFO, F("rec. complete set of msgs")); + iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); + iv->setQueuedCmdFinished(); + iv->doCalculations(); + notify(mPayload[iv->id].txCmd); + } + } void miDataDecode(Inverter<> *iv, packet_t *p) { record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); // choose the parser rec->ts = mPayload[iv->id].ts; + mPayload[iv->id].gotFragment = true; uint8_t datachan = ( p->packet[0] == 0x89 || p->packet[0] == (0x36 + ALL_FRAMES) ) ? CH1 : ( p->packet[0] == 0x91 || p->packet[0] == (0x37 + ALL_FRAMES) ) ? CH2 : p->packet[0] == (0x38 + ALL_FRAMES) ? CH3 : CH4; - DPRINTLN(DBG_INFO, F("Inverter ") + String(iv->id) + F(": data msg 0x") + String(p->packet[0], HEX) + F(" channel ") + datachan); + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") data msg 0x") + String(p->packet[0], HEX) + F(" channel ") + datachan); // count in RF_communication_protocol.xlsx is with offset = -1 iv->setValue(iv->getPosByChFld(datachan, FLD_UDC, rec), rec, (float)((p->packet[9] << 8) + p->packet[10])/10); yield(); @@ -442,6 +506,13 @@ class MiPayload { iv->setValue(iv->getPosByChFld(0, FLD_IRR, rec), rec, (float) (calcIrradiation(iv, datachan))); //AC Power is missing; we may have to calculate, as no respective data is in payload + if ( datachan < 3 ) { + mPayload[iv->id].dataAB[datachan] = true; + } + if ( !mPayload[iv->id].dataAB[CH0] && mPayload[iv->id].dataAB[CH2] && mPayload[iv->id].dataAB[CH2] ) { + mPayload[iv->id].dataAB[CH0] = true; + } + if (p->packet[0] >= (0x36 + ALL_FRAMES) ) { /*For MI1500: @@ -459,17 +530,24 @@ class MiPayload { } if (p->packet[0] < (0x39 + ALL_FRAMES) ) { - uint8_t cmd = p->packet[0] - ALL_FRAMES + 1; + /*uint8_t cmd = p->packet[0] - ALL_FRAMES + 1; mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); - mPayload[iv->id].txCmd = cmd; + mPayload[iv->id].txCmd = cmd;*/ mPayload[iv->id].complete = false; } + else if (p->packet[0] == (0x39 + ALL_FRAMES) ) { + /*uint8_t cmd = p->packet[0] - ALL_FRAMES + 1; + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); + mPayload[iv->id].txCmd = cmd;*/ + mPayload[iv->id].complete = true; + } + //iv->setValue(iv->getPosByChFld(0, FLD_EVT, rec), rec, calcMiSts(iv));yield(); if (iv->alarmMesIndex < rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]){ iv->alarmMesIndex = rec->record[iv->getPosByChFld(0, FLD_EVT, rec)]; - DPRINTLN(DBG_INFO, "alarm ID incremented to " + String(iv->alarmMesIndex)); + DPRINTLN(DBG_INFO, F("alarm ID incremented to ") + String(iv->alarmMesIndex)); //iv->enqueCommand(AlarmData); } @@ -482,28 +560,30 @@ class MiPayload { //} iv->setValue(iv->getPosByChFld(0, FLD_PAC, rec), rec, (float) (ac_pow/10)); - if ( mPayload[iv->id].sts[0] ) { - uint8_t cmd = mPayload[iv->id].dataAB[0] ? 0x11 : 0x09; - if ( mPayload[iv->id].dataAB[0] && mPayload[iv->id].dataAB[1] ) { + if ( mPayload[iv->id].complete || //4ch device + iv->type != INV_TYPE_4CH //other devices + && mPayload[iv->id].dataAB[CH0] + && mPayload[iv->id].stsAB[CH0] ) { mPayload[iv->id].complete = true; // For 2 CH devices, this might be too short... - DPRINTLN(DBG_INFO, F("complete tree detected")); + DPRINTLN(DBG_INFO, F("rec. complete set of msgs")); iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); iv->doCalculations(); - } else { + /*} else { //retry to get missing status info for one or two channel devices DPRINTLN(DBG_INFO, F("request missing data or status 0x") + String(cmd, HEX)); mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); mPayload[iv->id].txCmd = cmd; //iv->enqueCommand(cmd); // mPayload[iv->id].dataAB[1] ? 0x09 : 0x11) - } - } // not yet moved to hmInverter::getQueuedCmd + }*/ + } + /* should be included in process() else if (mPayload[iv->id].txCmd == 0x09 && iv->type == INV_TYPE_2CH) { uint8_t cmd = 0x11; DPRINTLN(DBG_INFO, F("request second data channel 0x") + String(cmd, HEX)); mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); mPayload[iv->id].txCmd = cmd; mPayload[iv->id].complete = false; - } + }*/ iv->setQueuedCmdFinished(); mStat->rxSuccess++; @@ -539,9 +619,9 @@ class MiPayload { uint8_t txCmd = mPayload[id].txCmd; //uint8_t cmd = getQueuedCmd(); if(!*complete) { - //if (txCmd == 0x09 || txCmd == 0x11 || txCmd >= 0x36 && txCmd <= 0x39 ) - // return false; DPRINTLN(DBG_VERBOSE, F("incomlete, txCmd is 0x") + String(txCmd, HEX)); // + F("cmd is 0x") + String(cmd, HEX)); + if (txCmd == 0x09 || txCmd == 0x11 || txCmd >= 0x36 && txCmd <= 0x39 ) + return false; } /*for (uint8_t i = 0; i < mPayload[id].maxPackId; i++) { @@ -560,24 +640,27 @@ class MiPayload { } void reset(uint8_t id) { - DPRINTLN(DBG_INFO, "resetPayload: id: " + String(id)); + DPRINTLN(DBG_INFO, F("resetPayload: id: ") + String(id)); memset(mPayload[id].len, 0, MAX_PAYLOAD_ENTRIES); - /* mPayload[id].gotFragment = false; - mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; + /*mPayload[id].maxPackId = MAX_PAYLOAD_ENTRIES; mPayload[id].lastFound = false;*/ mPayload[id].retransmits = 0; mPayload[id].complete = false; - mPayload[id].dataAB[0] = true; //only required for 2CH devices - mPayload[id].dataAB[1] = true; + mPayload[id].dataAB[CH0] = true; //required for 1CH and 2CH devices + mPayload[id].dataAB[CH1] = true; //required for 1CH and 2CH devices + mPayload[id].dataAB[CH2] = true; //only required for 2CH devices + mPayload[id].stsAB[CH0] = true; //required for 1CH and 2CH devices + mPayload[id].stsAB[CH1] = true; //required for 1CH and 2CH devices + mPayload[id].stsAB[CH2] = true; //only required for 2CH devices mPayload[id].txCmd = 0; mPayload[id].requested = false; mPayload[id].ts = *mTimestamp; - //mPayload[id].sts[0] = 0; - mPayload[id].sts[1] = 0; - mPayload[id].sts[2] = 0; - mPayload[id].sts[3] = 0; - mPayload[id].sts[4] = 0; + mPayload[id].sts[0] = 0; //disable this in case gotFragment is not working + mPayload[id].sts[CH1] = 0; + mPayload[id].sts[CH2] = 0; + mPayload[id].sts[CH3] = 0; + mPayload[id].sts[CH4] = 0; }