From ad64d737b760bee011e72588860f7b4d2538c18f Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Thu, 9 Mar 2023 07:41:56 +0100 Subject: [PATCH 1/3] MI - request firmware infos --- src/hm/hmInverter.h | 14 +++----- src/hm/miPayload.h | 82 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/src/hm/hmInverter.h b/src/hm/hmInverter.h index e8b83726..18512812 100644 --- a/src/hm/hmInverter.h +++ b/src/hm/hmInverter.h @@ -161,26 +161,20 @@ class Inverter { } } - uint8_t getQueuedCmd() { + 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 (getFwVersion() == 0) + enqueCommand(InverterDevInform_All); // firmware version; might not work, esp. for 1/2 ch hardware 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) { + } else { enqueCommand(0x09); } - //if (getFwVersion() == 0) - // enqueCommand(InverterDevInform_All); // firmware version, might not work, esp. for 1/2 ch hardware } if ((actPowerLimit == 0xffff) && isConnected) diff --git a/src/hm/miPayload.h b/src/hm/miPayload.h index af0b2d8a..d1c76f50 100644 --- a/src/hm/miPayload.h +++ b/src/hm/miPayload.h @@ -24,6 +24,7 @@ typedef struct { uint8_t txId; uint8_t invId; uint8_t retransmits; + uint8_t skipfirstrepeat; bool gotFragment; /* uint8_t data[MAX_PAYLOAD_ENTRIES][MAX_RF_PAYLOAD_SIZE]; @@ -93,12 +94,14 @@ class MiPayload { DBGPRINT(F(") prepareDevInformCmd 0x")); DBGPRINTLN(String(cmd, HEX)); uint8_t cmd2 = cmd; - if (cmd == 0x1 ) { - cmd = TX_REQ_INFO; + if (cmd == 0x1 ) { //0x1 + cmd = 0x0f; cmd2 = 0x00; + mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd2, false); + } else { + mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd2, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); }; - 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; @@ -154,7 +157,41 @@ class MiPayload { //iv->setQueuedCmdFinished(); }*/ - //} + } + else if (p->packet[0] == ( 0x0f + ALL_FRAMES)) { + // MI response from get hardware information request + record_t<> *rec = iv->getRecordStruct(InverterDevInform_All); // choose the record structure + rec->ts = mPayload[iv->id].ts; +/* +case InverterDevInform_All: + rec->length = (uint8_t)(HMINFO_LIST_LEN); + rec->assign = (byteAssign_t *)InfoAssignment; + rec->pyldLen = HMINFO_PAYLOAD_LEN; + break; + +const byteAssign_t InfoAssignment[] = { + { FLD_FW_VERSION, UNIT_NONE, CH0, 0, 2, 1 }, + { FLD_FW_BUILD_YEAR, UNIT_NONE, CH0, 2, 2, 1 }, + { FLD_FW_BUILD_MONTH_DAY, UNIT_NONE, CH0, 4, 2, 1 }, + { FLD_FW_BUILD_HOUR_MINUTE, UNIT_NONE, CH0, 6, 2, 1 }, + { FLD_HW_ID, UNIT_NONE, CH0, 8, 2, 1 } +}; +*/ + + if ( p->packet[9] == 0x00 ) {//first frame + //FLD_FW_VERSION + for (uint8_t i = 0; i < 5; i++) { + iv->setValue(i, rec, (float) ((p->packet[(12+2*i)] << 8) + p->packet[(13+2*i)])/1); + } + iv->setQueuedCmdFinished(); + mStat->rxSuccess++; + mSys->Radio.sendCmdPacket(iv->radioId.u64, 0x0f, 0x01, false); + } else if ( p->packet[9] == 0x01 ) {//second frame + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") got 2nd frame (hw info)")); + mSys->Radio.sendCmdPacket(iv->radioId.u64, 0x0f, 0x12, false); + } else if ( p->packet[9] == 0x12 ) {//3rd frame + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") got 3rd frame (hw info)")); + } } 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... @@ -291,7 +328,8 @@ 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)) && + if ( !mPayload[iv->id].complete && + (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)) && @@ -304,6 +342,13 @@ class MiPayload { continue; // skip to next inverter } + //delayed next message? + //mPayload[iv->id].skipfirstrepeat++; + if (mPayload[iv->id].skipfirstrepeat) { + mPayload[iv->id].skipfirstrepeat = 0; //reset counter*/ + continue; // skip to next inverter + } + if (!mPayload[iv->id].complete) { //DPRINTLN(DBG_INFO, F("Pyld incompl code")); //info for testing only bool crcPass, pyldComplete; @@ -339,6 +384,10 @@ class MiPayload { if (!mPayload[iv->id].stsAB[CH1] || !mPayload[iv->id].dataAB[CH1] ) cmd = 0x09; } + } else if ( cmd == 0x0f ) { + //hard/firmware request; might not work, so just one try... + iv->setQueuedCmdFinished(); + cmd = iv->getQueuedCmd(); } DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") next request is 0x") + String(cmd, HEX)); //mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd, true); @@ -357,7 +406,9 @@ 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 + //This tree is not really tested, most likely it's not truly 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)); @@ -371,7 +422,7 @@ class MiPayload { 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")); + DPRINTLN(DBG_INFO, F("process: compl. set of msgs detected")); iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); iv->doCalculations(); @@ -425,7 +476,7 @@ class MiPayload { } iv->setQueuedCmdFinished(); */ - } + //}*/ } yield(); } @@ -466,15 +517,17 @@ class MiPayload { 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)); + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") alarm ID incremented to ") + String(iv->alarmMesIndex)); iv->enqueCommand(AlarmData); } + //mPayload[iv->id].skipfirstrepeat = 1; 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")); + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") got all msgs")); iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); iv->setQueuedCmdFinished(); iv->doCalculations(); + mPayload[iv->id].skipfirstrepeat = 0; notify(mPayload[iv->id].txCmd); } @@ -561,11 +614,11 @@ class MiPayload { iv->setValue(iv->getPosByChFld(0, FLD_PAC, rec), rec, (float) (ac_pow/10)); if ( mPayload[iv->id].complete || //4ch device - ((iv->type != INV_TYPE_4CH) //other devices + iv->type != INV_TYPE_4CH //other devices && mPayload[iv->id].dataAB[CH0] - && mPayload[iv->id].stsAB[CH0])) { + && mPayload[iv->id].stsAB[CH0] ) { mPayload[iv->id].complete = true; // For 2 CH devices, this might be too short... - DPRINTLN(DBG_INFO, F("rec. complete set of msgs")); + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") got all msgs")); iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); iv->doCalculations(); /*} else { @@ -620,7 +673,7 @@ class MiPayload { //uint8_t cmd = getQueuedCmd(); if(!*complete) { 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)) + if (txCmd == 0x09 || txCmd == 0x11 || txCmd >= 0x36 && txCmd <= 0x39 ) return false; } @@ -654,6 +707,7 @@ class MiPayload { 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].skipfirstrepeat = 0; mPayload[id].requested = false; mPayload[id].ts = *mTimestamp; mPayload[id].sts[0] = 0; //disable this in case gotFragment is not working From 133f018d0421ff089fa3ffea865eb3854ea50468 Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Thu, 9 Mar 2023 19:04:41 +0100 Subject: [PATCH 2/3] MI - code restructuring esp. wrt. AC power calculation --- src/hm/miPayload.h | 227 +++++++++++++++++++-------------------------- 1 file changed, 94 insertions(+), 133 deletions(-) diff --git a/src/hm/miPayload.h b/src/hm/miPayload.h index d1c76f50..e4ae2bf7 100644 --- a/src/hm/miPayload.h +++ b/src/hm/miPayload.h @@ -28,10 +28,8 @@ typedef struct { bool gotFragment; /* uint8_t data[MAX_PAYLOAD_ENTRIES][MAX_RF_PAYLOAD_SIZE]; - uint8_t maxPackId; - bool lastFound; - bool gotFragment;*/ + bool lastFound;*/ } miPayload_t; @@ -121,54 +119,50 @@ class MiPayload { if (p->packet[0] == (0x08 + ALL_FRAMES)) { // 0x88; MI status response to 0x09 miStsDecode(iv, p); - } else if (p->packet[0] == (0x11 + SINGLE_FRAME)) { // 0x92; MI status response to 0x11 - 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] == (0x11 + SINGLE_FRAME)) { // 0x92; MI status response to 0x11 + miStsDecode(iv, p, CH2); + } - } else if ( p->packet[0] == 0x09 + ALL_FRAMES || + 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(); - }*/ - } + else if (p->packet[0] == ( 0x0f + ALL_FRAMES)) { // MI response from get hardware information request record_t<> *rec = iv->getRecordStruct(InverterDevInform_All); // choose the record structure rec->ts = mPayload[iv->id].ts; + mPayload[iv->id].gotFragment = true; + +/* + 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 +*/ + /* case InverterDevInform_All: rec->length = (uint8_t)(HMINFO_LIST_LEN); rec->assign = (byteAssign_t *)InfoAssignment; rec->pyldLen = HMINFO_PAYLOAD_LEN; break; - const byteAssign_t InfoAssignment[] = { { FLD_FW_VERSION, UNIT_NONE, CH0, 0, 2, 1 }, { FLD_FW_BUILD_YEAR, UNIT_NONE, CH0, 2, 2, 1 }, @@ -196,26 +190,6 @@ const byteAssign_t InfoAssignment[] = { } 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]; @@ -231,7 +205,6 @@ const byteAssign_t InfoAssignment[] = { 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)) { @@ -360,9 +333,12 @@ const byteAssign_t InfoAssignment[] = { 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")); + DPRINT(DBG_INFO, F("(#")); + DBGPRINT(String(iv->id)); + DBGPRINTLN(F(") retransmit power limit")); mSys->Radio.sendControlPacket(iv->radioId.u64, iv->devControlCmd, iv->powerLimit, true); } else { + uint8_t cmd = mPayload[iv->id].txCmd; if (mPayload[iv->id].retransmits < mMaxRetrans) { mPayload[iv->id].retransmits++; if( !mPayload[iv->id].gotFragment ) { @@ -370,26 +346,40 @@ const byteAssign_t InfoAssignment[] = { DBGPRINT(String(iv->id)); DBGPRINTLN(F(") nothing received")); mPayload[iv->id].retransmits = mMaxRetrans; + } else if ( cmd == 0x0f ) { + //hard/firmware request + mSys->Radio.sendCmdPacket(iv->radioId.u64, 0x0f, 0x00, true); + //iv->setQueuedCmdFinished(); + //cmd = iv->getQueuedCmd(); } else { - uint8_t cmd = mPayload[iv->id].txCmd; + bool change = false; if ( cmd >= 0x36 && cmd < 0x39 ) { // MI-1500 Data command cmd++; // just request the next channel + change = true; } 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] ) + if (!mPayload[iv->id].stsAB[CH2] || !mPayload[iv->id].dataAB[CH2] ) { cmd = 0x11; + change = true; + } } } 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] ) + if (!mPayload[iv->id].stsAB[CH1] || !mPayload[iv->id].dataAB[CH1] ) { cmd = 0x09; + change = true; + } } - } else if ( cmd == 0x0f ) { - //hard/firmware request; might not work, so just one try... - iv->setQueuedCmdFinished(); - cmd = iv->getQueuedCmd(); } - DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") next request is 0x") + String(cmd, HEX)); + DPRINT(DBG_INFO, F("(#")); + DBGPRINT(String(iv->id)); + DBGPRINT(F(") ")); + if (change) { + DBGPRINT(F("next request is 0x")); + } else { + DBGPRINT(F("not complete: Request Retransmit 0x")); + } + DBGPRINTLN(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; @@ -413,7 +403,6 @@ const byteAssign_t InfoAssignment[] = { 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 ac_pow = 0; //if (mPayload[iv->id].sts[0] == 3) { @@ -421,34 +410,27 @@ const byteAssign_t InfoAssignment[] = { //} 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("process: 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); - 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); @@ -456,7 +438,6 @@ const byteAssign_t InfoAssignment[] = { } iv->doCalculations(); notify(mPayload[iv->id].txCmd); - if(AlarmData == mPayload[iv->id].txCmd) { uint8_t i = 0; uint16_t code; @@ -474,7 +455,6 @@ const byteAssign_t InfoAssignment[] = { DPRINTLN(DBG_ERROR, F("plausibility check failed, expected ") + String(rec->pyldLen) + F(" bytes")); mStat->rxFail++; } - iv->setQueuedCmdFinished(); */ //}*/ } @@ -506,14 +486,6 @@ const byteAssign_t InfoAssignment[] = { 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; - 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?!? @@ -522,15 +494,22 @@ const byteAssign_t InfoAssignment[] = { } //mPayload[iv->id].skipfirstrepeat = 1; if (mPayload[iv->id].stsAB[CH0] && mPayload[iv->id].dataAB[CH0] && !mPayload[iv->id].complete) { - mPayload[iv->id].complete = true; + miComplete(iv); + /*mPayload[iv->id].complete = true; DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") got all msgs")); iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); + //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->setQueuedCmdFinished(); iv->doCalculations(); mPayload[iv->id].skipfirstrepeat = 0; notify(mPayload[iv->id].txCmd); + yield();*/ } - } void miDataDecode(Inverter<> *iv, packet_t *p) { @@ -606,43 +585,30 @@ const byteAssign_t InfoAssignment[] = { } - //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].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... + miComplete(iv); + /*mPayload[iv->id].complete = true; // For 2 CH devices, this might be too short... DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") got all msgs")); iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); + //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->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) - }*/ + iv->setQueuedCmdFinished(); + mStat->rxSuccess++; + yield(); + notify(mPayload[iv->id].txCmd);*/ } - /* 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++; - yield(); - notify(mPayload[iv->id].txCmd); /* if(AlarmData == mPayload[iv->id].txCmd) { @@ -660,6 +626,24 @@ const byteAssign_t InfoAssignment[] = { }*/ } + void miComplete(Inverter<> *iv) { + mPayload[iv->id].complete = true; // For 2 CH devices, this might be too short... + DPRINTLN(DBG_INFO, F("(#") + String(iv->id) + F(") got all msgs")); + record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug); + iv->setValue(iv->getPosByChFld(0, FLD_YD, rec), rec, calcYieldDayCh0(iv,0)); + //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->doCalculations(); + iv->setQueuedCmdFinished(); + mStat->rxSuccess++; + yield(); + notify(mPayload[iv->id].txCmd); + } + bool build(uint8_t id, bool *complete) { DPRINTLN(DBG_VERBOSE, F("build")); /*uint16_t crc = 0xffff, crcRcv = 0x0000; @@ -687,7 +671,6 @@ const byteAssign_t InfoAssignment[] = { } yield(); } - return (crc == crcRcv) ? true : false;*/ return true; } @@ -718,28 +701,6 @@ const byteAssign_t InfoAssignment[] = { } -/* 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; From 8a7b1a07e54edade6e85c55e08e051f05ab3484b Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Thu, 9 Mar 2023 19:12:17 +0100 Subject: [PATCH 3/3] add MI types to firmware version collection --- User_Manual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/User_Manual.md b/User_Manual.md index 298eb262..0a0caaed 100644 --- a/User_Manual.md +++ b/User_Manual.md @@ -308,6 +308,8 @@ To get the information open the URL `/api/record/info` on your AhoyDTU. The info | B5r1oJ0A9G | HM-800 | | 1.0.10 | 2021 | | 104 | | | | B5r1oJ0A9G | HM-800 | | 1.0.10 | 2021 | | 104 | | | | tomquist | TSOL-M1600 | | 1.0.12 | 2020 | 06-24 | 100 | | | +| rejoe2 | MI-600 | | 236 | 2018 | 11-27 | 17 | | | +| rejoe2 | MI-1500 | | 1.0.12 | 2020 | 06-24 | 100 | | | | | | | | | | | | | ## Developer Information about Command Queue