From 079ba896d13d53889e6b8390bcb68e38526e8d16 Mon Sep 17 00:00:00 2001 From: tastendruecker123 <111116980+tastendruecker123@users.noreply.github.com> Date: Mon, 22 Aug 2022 19:59:45 +0200 Subject: [PATCH 1/8] MQTT reconnect delay, fixed ESP32 build --- tools/esp8266/defines.h | 1 + tools/esp8266/mqtt.h | 20 +++++++++++--------- tools/esp8266/web.cpp | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h index 31b65b77..4d55a7fc 100644 --- a/tools/esp8266/defines.h +++ b/tools/esp8266/defines.h @@ -104,6 +104,7 @@ typedef enum { // ToDo: to be verified by field tests #define MQTT_PORT_LEN 2 // uint16_t #define MQTT_DISCOVERY_PREFIX "homeassistant" #define MQTT_MAX_PACKET_SIZE 384 +#define MQTT_RECONNECT_DELAY 5000 #define SER_ENABLE_LEN 1 // uint8_t #define SER_DEBUG_LEN 1 // uint8_t diff --git a/tools/esp8266/mqtt.h b/tools/esp8266/mqtt.h index 74193afa..28ca2c1c 100644 --- a/tools/esp8266/mqtt.h +++ b/tools/esp8266/mqtt.h @@ -85,7 +85,8 @@ class mqtt { #endif boolean resub = false; - if(!mClient->connected()) { + if(!mClient->connected() && (millis() - lastReconnect) > MQTT_RECONNECT_DELAY ) { + lastReconnect = millis(); if(strlen(mDevName) > 0) { // der Server und der Port müssen neu gesetzt werden, // da ein MQTT_CONNECTION_LOST -3 die Werte zerstört hat. @@ -95,14 +96,14 @@ class mqtt { resub = mClient->connect(mDevName, mCfg->user, mCfg->pwd); else resub = mClient->connect(mDevName); - } - // ein Subscribe ist nur nach einem connect notwendig - if(resub) { - char topic[MQTT_TOPIC_LEN + 13 ]; // "/devcontrol/#" --> + 6 byte - // ToDo: "/devcontrol/#" is hardcoded - snprintf(topic, MQTT_TOPIC_LEN + 13, "%s/devcontrol/#", mCfg->topic); - DPRINTLN(DBG_INFO, F("subscribe to ") + String(topic)); - mClient->subscribe(topic); // subscribe to mTopic + "/devcontrol/#" + // ein Subscribe ist nur nach einem connect notwendig + if(resub) { + char topic[MQTT_TOPIC_LEN + 13 ]; // "/devcontrol/#" --> + 6 byte + // ToDo: "/devcontrol/#" is hardcoded + snprintf(topic, MQTT_TOPIC_LEN + 13, "%s/devcontrol/#", mCfg->topic); + DPRINTLN(DBG_INFO, F("subscribe to ") + String(topic)); + mClient->subscribe(topic); // subscribe to mTopic + "/devcontrol/#" + } } } } @@ -113,6 +114,7 @@ class mqtt { bool mAddressSet; mqttConfig_t *mCfg; char mDevName[DEVNAME_LEN]; + unsigned long lastReconnect = 0; }; #endif /*__MQTT_H_*/ diff --git a/tools/esp8266/web.cpp b/tools/esp8266/web.cpp index 5ccdb002..72d680df 100644 --- a/tools/esp8266/web.cpp +++ b/tools/esp8266/web.cpp @@ -453,7 +453,7 @@ void web::showWebApi(void) if (cmd == AlarmData){ iv->alarmMesIndex = response["payload"]; } - DPRINTLN(DBG_INFO, F("Will make tx-request 0x15 with subcmd ") + String(cmd) + F(" and payload ") + String(response["payload"])); + DPRINTLN(DBG_INFO, F("Will make tx-request 0x15 with subcmd ") + String(cmd) + F(" and payload ") + String((uint16_t) response["payload"])); // process payload from web request corresponding to the cmd iv->enqueCommand(cmd); } From f76fbea5c2c4ef77199988fe33381b15659282ec Mon Sep 17 00:00:00 2001 From: Andreas Schiffler Date: Tue, 23 Aug 2022 17:52:07 +0200 Subject: [PATCH 2/8] added last alarm msg request --- tools/esp8266/app.cpp | 18 ++- tools/esp8266/defines.h | 2 +- tools/esp8266/hmDefines.h | 12 +- tools/esp8266/hmInverter.h | 244 ++++++++++++++++++++++++++++++++++++- tools/esp8266/web.cpp | 8 ++ 5 files changed, 268 insertions(+), 16 deletions(-) diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp index 75fe77df..1d088840 100644 --- a/tools/esp8266/app.cpp +++ b/tools/esp8266/app.cpp @@ -239,6 +239,10 @@ void app::loop(void) { if(!mPayload[iv->id].complete) { mRxFailed++; + iv->setQueuedCmdFinished(); // command failed + if(mConfig.serialDebug) { + DPRINTLN(DBG_INFO, F("enqueued cmd failed/timeout")); + } if(mConfig.serialDebug) { DPRINT(DBG_INFO, F("Inverter #") + String(iv->id) + " "); DPRINTLN(DBG_INFO, F("no Payload received! (retransmits: ") + String(mPayload[iv->id].retransmits) + ")"); @@ -551,18 +555,12 @@ String app::getLiveData(void) modHtml += F("
" "
") + - String(iv->name) + F(" Limit ") + String(iv->actPowerLimit); - if (true) - { // live Power Limit from inverter is always in % - modHtml += F(" %"); - } - else - { - modHtml += F(" W"); - } + String(iv->name) + F(" Limit ") + String(iv->actPowerLimit) + + F("% | last Alarm: ") + iv->lastAlarmMsg + F(""); + uint8_t list[] = {FLD_UAC, FLD_IAC, FLD_PAC, FLD_F, FLD_PCT, FLD_T, FLD_YT, FLD_YD, FLD_PDC, FLD_EFF, FLD_PRA, FLD_ALARM_MES_ID}; - for (uint8_t fld = 0; fld < 12; fld++) + for (uint8_t fld = 0; fld < 11; fld++) { pos = (iv->getPosByChFld(CH0, list[fld])); if (0xff != pos) diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h index 4d55a7fc..ef0ea40a 100644 --- a/tools/esp8266/defines.h +++ b/tools/esp8266/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 5 -#define VERSION_PATCH 15 +#define VERSION_PATCH 16 //------------------------------------- diff --git a/tools/esp8266/hmDefines.h b/tools/esp8266/hmDefines.h index 36139bb2..6330db98 100644 --- a/tools/esp8266/hmDefines.h +++ b/tools/esp8266/hmDefines.h @@ -23,9 +23,13 @@ const char* const units[] = {"V", "A", "W", "Wh", "kWh", "Hz", "°C", "%","VAr", // field types enum {FLD_UDC = 0, FLD_IDC, FLD_PDC, FLD_YD, FLD_YW, FLD_YT, - FLD_UAC, FLD_IAC, FLD_PAC, FLD_F, FLD_T, FLD_PCT, FLD_EFF, FLD_IRR, FLD_PRA,FLD_ALARM_MES_ID,FLD_FW_VERSION,FLD_FW_BUILD_YEAR,FLD_FW_BUILD_MONTH_DAY,FLD_HW_ID,FLD_ACT_PWR_LIMIT}; + FLD_UAC, FLD_IAC, FLD_PAC, FLD_F, FLD_T, FLD_PCT, FLD_EFF, + FLD_IRR, FLD_PRA,FLD_ALARM_MES_ID,FLD_FW_VERSION,FLD_FW_BUILD_YEAR, + FLD_FW_BUILD_MONTH_DAY,FLD_HW_ID,FLD_ACT_PWR_LIMIT,FLD_LAST_ALARM_CODE}; + const char* const fields[] = {"U_DC", "I_DC", "P_DC", "YieldDay", "YieldWeek", "YieldTotal", - "U_AC", "I_AC", "P_AC", "Freq", "Temp", "Pct", "Efficiency", "Irradiation","P_ACr","ALARM_MES_ID","FWVersion","FWBuildYear","FWBuildMonthDay","HWPartId","PowerLimit"}; + "U_AC", "I_AC", "P_AC", "Freq", "Temp", "Pct", "Efficiency", "Irradiation","P_ACr", + "ALARM_MES_ID","FWVersion","FWBuildYear","FWBuildMonthDay","HWPartId","PowerLimit","LastAlarmCode"}; // mqtt discovery device classes enum {DEVICE_CLS_NONE = 0, DEVICE_CLS_CURRENT, DEVICE_CLS_ENERGY, DEVICE_CLS_PWR, DEVICE_CLS_VOLTAGE, DEVICE_CLS_FREQ, DEVICE_CLS_TEMP}; @@ -97,6 +101,10 @@ const byteAssign_t SystemConfigParaAssignment[] = { }; #define HMSYSTEM_LIST_LEN (sizeof(SystemConfigParaAssignment) / sizeof(byteAssign_t)) +const byteAssign_t AlarmDataAssignment[] = { + { FLD_LAST_ALARM_CODE, UNIT_NONE, CH0, 0, 2, 1 } +}; +#define HMALARMDATA_LIST_LEN (sizeof(AlarmDataAssignment) / sizeof(byteAssign_t)) diff --git a/tools/esp8266/hmInverter.h b/tools/esp8266/hmInverter.h index 774fd809..f1250ffd 100644 --- a/tools/esp8266/hmInverter.h +++ b/tools/esp8266/hmInverter.h @@ -115,6 +115,7 @@ class Inverter { RECORDTYPE *record; // pointer for values uint16_t chMaxPwr[4]; // maximum power of the modules (Wp) char chName[4][MAX_NAME_LENGTH]; // human readable name for channel + String lastAlarmMsg; bool initialized; // needed to check if the inverter was correctly added (ESP32 specific - union types are never null) Inverter() { @@ -126,6 +127,8 @@ class Inverter { devControlCmd = 0xff; initialized = false; fwVersion = 0; + lastAlarmMsg = "nothing"; + alarmMesIndex = 0; } ~Inverter() { @@ -164,8 +167,8 @@ class Inverter { memset(name, 0, MAX_NAME_LENGTH); memset(chName, 0, MAX_NAME_LENGTH * 4); memset(record, 0, sizeof(RECORDTYPE) * listLen); - enqueCommand(InverterDevInform_All); enqueCommand(SystemConfigPara); + enqueCommand(InverterDevInform_All); initialized = true; } @@ -206,12 +209,25 @@ class Inverter { val <<= 8; val |= buf[ptr]; } while(++ptr != end); - record[pos] = (RECORDTYPE)(val) / (RECORDTYPE)(div); + if ((RECORDTYPE)(div) > 1){ + record[pos] = (RECORDTYPE)(val) / (RECORDTYPE)(div); + } + else { + record[pos] = (RECORDTYPE)(val); + } + } if (cmd == RealTimeRunData_Debug) { // get last alarm message index and save it in the inverter object if (getPosByChFld(0, FLD_ALARM_MES_ID) == pos){ - alarmMesIndex = record[pos]; + if (alarmMesIndex < record[pos]){ + alarmMesIndex = record[pos]; + enqueCommand(AlarmUpdate); + enqueCommand(AlarmData); + } + else { + alarmMesIndex = record[pos]; // no change + } } } if (cmd == InverterDevInform_All) { @@ -228,6 +244,11 @@ class Inverter { DPRINT(DBG_DEBUG, F("Inverter actual power limit: ") + String(actPowerLimit)); } } + if (cmd == AlarmData){ + if (getPosByChFld(0, FLD_LAST_ALARM_CODE) == pos){ + lastAlarmMsg = getAlarmStr(record[pos]); + } + } } RECORDTYPE getValue(uint8_t pos) { @@ -307,10 +328,227 @@ class Inverter { listLen = (uint8_t)(HMSYSTEM_LIST_LEN); assign = (byteAssign_t *)SystemConfigParaAssignment; break; + case AlarmData: + listLen = (uint8_t)(HMALARMDATA_LIST_LEN); + assign = (byteAssign_t *)AlarmDataAssignment; + break; default: DPRINTLN(DBG_INFO, "Parser not implemented"); } } + String getAlarmStr(u_int16_t alarmCode) + { + switch (alarmCode) + { + case 1: + return String(F("Inverter start")); + break; + case 2: + return String(F("DTU command failed")); + break; + case 121: + return String(F("Over temperature protection")); + break; + case 125: + return String(F("Grid configuration parameter error")); + break; + case 126: + return String(F("Software error code 126")); + break; + case 127: + return String(F("Firmware error")); + break; + case 128: + return String(F("Software error code 128")); + break; + case 129: + return String(F("Software error code 129")); + break; + case 130: + return String(F("Offline")); + break; + case 141: + return String(F("Grid overvoltage")); + break; + case 142: + return String(F("Average grid overvoltage")); + break; + case 143: + return String(F("Grid undervoltage")); + break; + case 144: + return String(F("Grid overfrequency")); + break; + case 145: + return String(F("Grid underfrequency")); + break; + case 146: + return String(F("Rapid grid frequency change")); + break; + case 147: + return String(F("Power grid outage")); + break; + case 148: + return String(F("Grid disconnection")); + break; + case 149: + return String(F("Island detected")); + break; + case 205: + return String(F("Input port 1 & 2 overvoltage")); + break; + case 206: + return String(F("Input port 3 & 4 overvoltage")); + break; + case 207: + return String(F("Input port 1 & 2 undervoltage")); + break; + case 208: + return String(F("Input port 3 & 4 undervoltage")); + break; + case 209: + return String(F("Port 1 no input")); + break; + case 210: + return String(F("Port 2 no input")); + break; + case 211: + return String(F("Port 3 no input")); + break; + case 212: + return String(F("Port 4 no input")); + break; + case 213: + return String(F("PV-1 & PV-2 abnormal wiring")); + break; + case 214: + return String(F("PV-3 & PV-4 abnormal wiring")); + break; + case 215: + return String(F("PV-1 Input overvoltage")); + break; + case 216: + return String(F("PV-1 Input undervoltage")); + break; + case 217: + return String(F("PV-2 Input overvoltage")); + break; + case 218: + return String(F("PV-2 Input undervoltage")); + break; + case 219: + return String(F("PV-3 Input overvoltage")); + break; + case 220: + return String(F("PV-3 Input undervoltage")); + break; + case 221: + return String(F("PV-4 Input overvoltage")); + break; + case 222: + return String(F("PV-4 Input undervoltage")); + break; + case 301: + return String(F("Hardware error code 301")); + break; + case 302: + return String(F("Hardware error code 302")); + break; + case 303: + return String(F("Hardware error code 303")); + break; + case 304: + return String(F("Hardware error code 304")); + break; + case 305: + return String(F("Hardware error code 305")); + break; + case 306: + return String(F("Hardware error code 306")); + break; + case 307: + return String(F("Hardware error code 307")); + break; + case 308: + return String(F("Hardware error code 308")); + break; + case 309: + return String(F("Hardware error code 309")); + break; + case 310: + return String(F("Hardware error code 310")); + break; + case 311: + return String(F("Hardware error code 311")); + break; + case 312: + return String(F("Hardware error code 312")); + break; + case 313: + return String(F("Hardware error code 313")); + break; + case 314: + return String(F("Hardware error code 314")); + break; + case 5041: + return String(F("Error code-04 Port 1")); + break; + case 5042: + return String(F("Error code-04 Port 2")); + break; + case 5043: + return String(F("Error code-04 Port 3")); + break; + case 5044: + return String(F("Error code-04 Port 4")); + break; + case 5051: + return String(F("PV Input 1 Overvoltage/Undervoltage")); + break; + case 5052: + return String(F("PV Input 2 Overvoltage/Undervoltage")); + break; + case 5053: + return String(F("PV Input 3 Overvoltage/Undervoltage")); + break; + case 5054: + return String(F("PV Input 4 Overvoltage/Undervoltage")); + break; + case 5060: + return String(F("Abnormal bias")); + break; + case 5070: + return String(F("Over temperature protection")); + break; + case 5080: + return String(F("Grid Overvoltage/Undervoltage")); + break; + case 5090: + return String(F("Grid Overfrequency/Underfrequency")); + break; + case 5100: + return String(F("Island detected")); + break; + case 5120: + return String(F("EEPROM reading and writing error")); + break; + case 5150: + return String(F("10 min value grid overvoltage")); + break; + case 5200: + return String(F("Firmware error")); + break; + case 8310: + return String(F("Shut down")); + break; + case 9000: + return String(F("Microinverter is suspected of being stolen")); + break; + default: + return String(F("Unknown")); + break; + } + } private: std::queue> _commandQueue; diff --git a/tools/esp8266/web.cpp b/tools/esp8266/web.cpp index 72d680df..426a9803 100644 --- a/tools/esp8266/web.cpp +++ b/tools/esp8266/web.cpp @@ -488,6 +488,14 @@ void web::showWebApi(void) iv->devControlRequest = true; // queue it in the request loop } } + if (response["cmd"] == (uint8_t)TurnOff){ + iv->devControlCmd = TurnOff; + iv->devControlRequest = true; // queue it in the request loop + } + if (response["cmd"] == (uint8_t)TurnOn){ + iv->devControlCmd = TurnOn; + iv->devControlRequest = true; // queue it in the request loop + } } } mWeb->send(200, "text/json", "{success:true}"); From 0af251bff996a9a93e90074e4bf376f32d7a54ba Mon Sep 17 00:00:00 2001 From: Andreas Schiffler Date: Tue, 23 Aug 2022 19:44:22 +0200 Subject: [PATCH 3/8] added esp32 to release work flow --- .github/workflows/compile_esp8266.yml | 4 ++-- tools/esp8266/scripts/getVersion.py | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compile_esp8266.yml b/.github/workflows/compile_esp8266.yml index 245a5aac..787465d3 100644 --- a/.github/workflows/compile_esp8266.yml +++ b/.github/workflows/compile_esp8266.yml @@ -39,7 +39,7 @@ jobs: working-directory: tools/esp8266/html run: python convert.py - name: Run PlatformIO - run: pio run -d tools/esp8266 --environment esp8266-release + run: pio run -d tools/esp8266 --environment esp8266-release --environment esp32-wroom32-release - name: rename-binary-files id: rename-binary-files working-directory: tools/esp8266/scripts @@ -72,4 +72,4 @@ jobs: upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: ./${{ steps.rename-binary-files.outputs.name }}.zip asset_name: ${{ steps.rename-binary-files.outputs.name }}.zip - asset_content_type: application/zip \ No newline at end of file + asset_content_type: application/zip diff --git a/tools/esp8266/scripts/getVersion.py b/tools/esp8266/scripts/getVersion.py index 9907eb55..6ebe71b0 100644 --- a/tools/esp8266/scripts/getVersion.py +++ b/tools/esp8266/scripts/getVersion.py @@ -24,6 +24,12 @@ def readVersion(path, infile): src = path + ".pio/build/esp8266-release/firmware.bin" dst = path + ".pio/build/out/" + versionout os.rename(src, dst) + + versionout = version[:-1] + "_esp32_" + sha + ".bin" + src = path + ".pio/build/esp32-wroom32-release/firmware.bin" + dst = path + ".pio/build/out/" + versionout + os.rename(src, dst) + print("::set-output name=name::" + versionnumber[:-1] ) From 146a1d5eea77ac208775b37e747305436b0c1fcc Mon Sep 17 00:00:00 2001 From: Andreas Schiffler Date: Wed, 24 Aug 2022 08:31:33 +0200 Subject: [PATCH 4/8] improvment mqtt after add values --- tools/esp8266/app.cpp | 26 ++++++++++++- tools/esp8266/hmInverter.h | 75 ++++++++++++++++++++++---------------- tools/esp8266/hmRadio.h | 3 +- tools/esp8266/web.cpp | 5 ++- 4 files changed, 72 insertions(+), 37 deletions(-) diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp index 1d088840..64923559 100644 --- a/tools/esp8266/app.cpp +++ b/tools/esp8266/app.cpp @@ -160,6 +160,7 @@ void app::loop(void) { if((++mMqttTicker >= mMqttInterval) && (mMqttInterval != 0xffff) && mMqttActive) { mMqttTicker = 0; mMqtt.isConnected(true); // really needed? See comment from HorstG-57 #176 + /* char topic[30], val[10]; for(uint8_t id = 0; id < mSys->getNumInverters(); id++) { Inverter<> *iv = mSys->getInverterByPos(id); @@ -174,6 +175,8 @@ void app::loop(void) { } } } + */ + char val[10]; snprintf(val, 10, "%ld", millis()/1000); #ifndef __MQTT_NO_DISCOVERCONFIG__ @@ -370,11 +373,32 @@ void app::processPayload(bool retransmit) { yield(); } iv->doCalculations(); // cmd value decides which parser is used to decode payload + + iv->setQueuedCmdFinished(); + + // send out + char topic[30], val[10]; + for (uint8_t id = 0; id < mSys->getNumInverters(); id++) + { + Inverter<> *iv = mSys->getInverterByPos(id); + if (NULL != iv) + { + if (iv->isAvailable(mTimestamp)) + { + for (uint8_t i = 0; i < iv->listLen; i++) + { + snprintf(topic, 30, "%s/ch%d/%s", iv->name, iv->assign[i].ch, fields[iv->assign[i].fieldId]); + snprintf(val, 10, "%.3f", iv->getValue(i)); + mMqtt.sendMsg(topic, val); + yield(); + } + } + } + } #ifdef __MQTT_AFTER_RX__ doMQTT = true; #endif - iv->setQueuedCmdFinished(); } } yield(); diff --git a/tools/esp8266/hmInverter.h b/tools/esp8266/hmInverter.h index f1250ffd..6a8d2994 100644 --- a/tools/esp8266/hmInverter.h +++ b/tools/esp8266/hmInverter.h @@ -144,7 +144,8 @@ class Inverter { void setQueuedCmdFinished(){ if (!_commandQueue.empty()){ - _commandQueue.pop(); // Will destroy CommandAbstract Class Object (?) + // Will destroy CommandAbstract Class Object (?) + _commandQueue.pop(); } } @@ -153,7 +154,14 @@ class Inverter { if (_commandQueue.empty()){ // Fill with default commands enqueCommand(RealTimeRunData_Debug); - //enqueCommand(SystemConfigPara); + if (fwVersion == 0) + { // info needed maybe after "one nigth" (=> DC>0 to DC=0 and to DC>0) or reboot + enqueCommand(InverterDevInform_All); + } + if (actPowerLimit == 0xffff) + { // info needed maybe after "one nigth" (=> DC>0 to DC=0 and to DC>0) or reboot + enqueCommand(SystemConfigPara); + } } return _commandQueue.front().get()->getCmd(); } @@ -167,8 +175,6 @@ class Inverter { memset(name, 0, MAX_NAME_LENGTH); memset(chName, 0, MAX_NAME_LENGTH * 4); memset(record, 0, sizeof(RECORDTYPE) * listLen); - enqueCommand(SystemConfigPara); - enqueCommand(InverterDevInform_All); initialized = true; } @@ -222,7 +228,7 @@ class Inverter { if (getPosByChFld(0, FLD_ALARM_MES_ID) == pos){ if (alarmMesIndex < record[pos]){ alarmMesIndex = record[pos]; - enqueCommand(AlarmUpdate); + //enqueCommand(AlarmUpdate); // What is the function of AlarmUpdate? enqueCommand(AlarmData); } else { @@ -284,41 +290,46 @@ class Inverter { return false; } - uint32_t getLastTs(void) { + uint32_t getLastTs(void) + { DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getLastTs")); return ts; } - void getAssignment() { + void getAssignment() + { DPRINTLN(DBG_DEBUG, F("hmInverter.h:getAssignment")); + // Default assignment; + if (INV_TYPE_1CH == type) + { + listLen = (uint8_t)(HM1CH_LIST_LEN); + assign = (byteAssign_t *)hm1chAssignment; + channels = 1; + } + else if (INV_TYPE_2CH == type) + { + listLen = (uint8_t)(HM2CH_LIST_LEN); + assign = (byteAssign_t *)hm2chAssignment; + channels = 2; + } + else if (INV_TYPE_4CH == type) + { + listLen = (uint8_t)(HM4CH_LIST_LEN); + assign = (byteAssign_t *)hm4chAssignment; + channels = 4; + } + else + { + listLen = 0; + channels = 0; + assign = NULL; + } + uint8_t cmd = getQueuedCmd(); switch (cmd) { case RealTimeRunData_Debug: - if (INV_TYPE_1CH == type) - { - listLen = (uint8_t)(HM1CH_LIST_LEN); - assign = (byteAssign_t *)hm1chAssignment; - channels = 1; - } - else if (INV_TYPE_2CH == type) - { - listLen = (uint8_t)(HM2CH_LIST_LEN); - assign = (byteAssign_t *)hm2chAssignment; - channels = 2; - } - else if (INV_TYPE_4CH == type) - { - listLen = (uint8_t)(HM4CH_LIST_LEN); - assign = (byteAssign_t *)hm4chAssignment; - channels = 4; - } - else - { - listLen = 0; - channels = 0; - assign = NULL; - } + // Do nothing will use default break; case InverterDevInform_All: listLen = (uint8_t)(HMINFO_LIST_LEN); @@ -333,7 +344,7 @@ class Inverter { assign = (byteAssign_t *)AlarmDataAssignment; break; default: - DPRINTLN(DBG_INFO, "Parser not implemented"); + DPRINTLN(DBG_INFO, "Parser not implemented"); } } String getAlarmStr(u_int16_t alarmCode) diff --git a/tools/esp8266/hmRadio.h b/tools/esp8266/hmRadio.h index 7decd2c2..de900218 100644 --- a/tools/esp8266/hmRadio.h +++ b/tools/esp8266/hmRadio.h @@ -192,10 +192,9 @@ class HmRadio { mTxBuf[10] = cmd; // cid mTxBuf[11] = 0x00; CP_U32_LittleEndian(&mTxBuf[12], ts); - if (cmd == RealTimeRunData_Debug || cmd == AlarmData || cmd == AlarmUpdate ){ + if (cmd == RealTimeRunData_Debug || cmd == AlarmData ){ mTxBuf[18] = (alarmMesId >> 8) & 0xff; mTxBuf[19] = (alarmMesId ) & 0xff; - //mTxBuf[19] = 0x05; // ToDo: Shall be the last received Alarm Index Number } else { mTxBuf[18] = 0x00; mTxBuf[19] = 0x00; diff --git a/tools/esp8266/web.cpp b/tools/esp8266/web.cpp index 426a9803..070bfcbb 100644 --- a/tools/esp8266/web.cpp +++ b/tools/esp8266/web.cpp @@ -450,8 +450,9 @@ void web::showWebApi(void) if (response["tx_request"] == (uint8_t)TX_REQ_INFO) { // if the AlarmData is requested set the Alarm Index to the requested one - if (cmd == AlarmData){ - iv->alarmMesIndex = response["payload"]; + if (cmd == AlarmData || cmd == AlarmUpdate){ + // set the AlarmMesIndex for the request from user input + iv->alarmMesIndex = response["payload"]; } DPRINTLN(DBG_INFO, F("Will make tx-request 0x15 with subcmd ") + String(cmd) + F(" and payload ") + String((uint16_t) response["payload"])); // process payload from web request corresponding to the cmd From 41e67e1782cbdf7c22fcda64fe7dd2ec141c6762 Mon Sep 17 00:00:00 2001 From: DanielR92 Date: Wed, 24 Aug 2022 19:36:34 +0200 Subject: [PATCH 5/8] Added a Hint for update from a low version to new --- tools/esp8266/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/esp8266/README.md b/tools/esp8266/README.md index 3f37baa0..c8fcbccb 100644 --- a/tools/esp8266/README.md +++ b/tools/esp8266/README.md @@ -54,6 +54,8 @@ This code can be compiled using Visual Studio Code and **PlatformIO** Addon. The X. configure your WiFi settings, save, repower Y. check your router or serial console for the IP address of the module. You can try ping the configured device name as well. + +! ATTENTION: If you update from a very low version to the newest, please make sure to wipe all flash data! ## pages | page | output | From 5c33690f1ac71ca6814d93530f403669cd33375f Mon Sep 17 00:00:00 2001 From: DanielR92 Date: Wed, 24 Aug 2022 20:06:48 +0200 Subject: [PATCH 6/8] Update Scheduler / Task manager + MQTT --- tools/esp8266/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/esp8266/README.md b/tools/esp8266/README.md index 3f37baa0..143982dc 100644 --- a/tools/esp8266/README.md +++ b/tools/esp8266/README.md @@ -79,11 +79,14 @@ The webinterface has the following abilities: - some statistics about communication (debug) The serial console will print the converted values which were read out of the inverter(s) + +### MQTT command to set the DTU without webinterface + [Read here](https://github.com/grindylow/ahoy/blob/development02/tools/esp8266/User_Manual.md) ## Todo's [See this post](https://github.com/grindylow/ahoy/issues/142) - [ ] Wechsel zu AsyncWebServer und ElegantOTA für Stabilität -- [ ] klarer Scheduler / Task manager, der ggf. den Receive Task priorisieren kann +- [x] klarer Scheduler / Task manager, der ggf. den Receive Task priorisieren kann - [x] Device Info Kommandos (Firmware Version, etc.) über das Dashboard anzeigen [Device Information ( `0x15` `REQ_ARW_DAT_ALL` ) SubCmd Kommandos #145](https://github.com/grindylow/ahoy/issues/145) - [ ] AlarmData & AlarmUpdate Parsen und auf eigener Seite darstellen From 3212aeb1423a88fa3c49cbd397e5584812eaaabd Mon Sep 17 00:00:00 2001 From: lumapu Date: Thu, 25 Aug 2022 09:59:21 +0200 Subject: [PATCH 7/8] code review: added check if mqtt is enabled before sending out values --- tools/esp8266/app.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp index 64923559..938a3e5a 100644 --- a/tools/esp8266/app.cpp +++ b/tools/esp8266/app.cpp @@ -376,21 +376,23 @@ void app::processPayload(bool retransmit) { iv->setQueuedCmdFinished(); - // send out - char topic[30], val[10]; - for (uint8_t id = 0; id < mSys->getNumInverters(); id++) - { - Inverter<> *iv = mSys->getInverterByPos(id); - if (NULL != iv) + // MQTT send out + if(mMqttActive) { + char topic[30], val[10]; + for (uint8_t id = 0; id < mSys->getNumInverters(); id++) { - if (iv->isAvailable(mTimestamp)) + Inverter<> *iv = mSys->getInverterByPos(id); + if (NULL != iv) { - for (uint8_t i = 0; i < iv->listLen; i++) + if (iv->isAvailable(mTimestamp)) { - snprintf(topic, 30, "%s/ch%d/%s", iv->name, iv->assign[i].ch, fields[iv->assign[i].fieldId]); - snprintf(val, 10, "%.3f", iv->getValue(i)); - mMqtt.sendMsg(topic, val); - yield(); + for (uint8_t i = 0; i < iv->listLen; i++) + { + snprintf(topic, 30, "%s/ch%d/%s", iv->name, iv->assign[i].ch, fields[iv->assign[i].fieldId]); + snprintf(val, 10, "%.3f", iv->getValue(i)); + mMqtt.sendMsg(topic, val); + yield(); + } } } } @@ -968,4 +970,4 @@ void app::resetPayload(Inverter<>* iv) mPayload[iv->id].complete = false; mPayload[iv->id].requested = true; mPayload[iv->id].ts = mTimestamp; -} \ No newline at end of file +} From 3a51f3545c687106e338c99ba109c1f77611f95d Mon Sep 17 00:00:00 2001 From: lumapu Date: Thu, 25 Aug 2022 10:49:31 +0200 Subject: [PATCH 8/8] improved generation of power limit control html select element --- tools/esp8266/web.cpp | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/tools/esp8266/web.cpp b/tools/esp8266/web.cpp index 070bfcbb..535fac1f 100644 --- a/tools/esp8266/web.cpp +++ b/tools/esp8266/web.cpp @@ -16,6 +16,21 @@ #include "html/h/setup_html.h" #include "html/h/visualization_html.h" + +const uint16_t pwrLimitOptionValues[] { + AbsolutNonPersistent, + AbsolutPersistent, + RelativNonPersistent, + RelativPersistent +}; + +const char* const pwrLimitOptions[] { + "absolute in Watt non persistent", + "absolute in Watt persistent", + "relativ in percent non persistent", + "relativ in percent persistent" +}; + //----------------------------------------------------------------------------- web::web(app *main, sysConfig_t *sysCfg, config_t *config, char version[]) { mMain = main; @@ -200,21 +215,16 @@ void web::showSetup(void) { inv += F("\"/ maxlength=\"") + String(6) + "\">"; inv += F(""); - inv += F(""); - if(iv->powerLimit[1] == RelativNonPersistent) - inv += F("PowerLimitControl\">"); - if(iv->powerLimit[1] == AbsolutPersistent) - inv += F("PowerLimitControl\">"); - if(iv->powerLimit[1] == RelativPersistent) - inv += F("PowerLimitControl\">"); - } else - inv += F("PowerLimitControl\">"); - // UGLY! But I do not know it a better way --// + inv += F(""); inv += F("
");