diff --git a/.github/workflows/compile_esp8266.yml b/.github/workflows/compile_esp8266.yml index 18021623..19d9995c 100644 --- a/.github/workflows/compile_esp8266.yml +++ b/.github/workflows/compile_esp8266.yml @@ -41,5 +41,5 @@ jobs: run: python getVersion.py - uses: actions/upload-artifact@v3 with: - name: esp8266 - path: tools/esp8266/.pio/build/d1_mini/out + name: esp8266_ahoy + path: tools/esp8266/.pio/build/out/*.bin diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp index 913b8a1c..4b3a8b56 100644 --- a/tools/esp8266/app.cpp +++ b/tools/esp8266/app.cpp @@ -9,6 +9,8 @@ #include "html/h/index_html.h" #include "html/h/setup_html.h" #include "html/h/hoymiles_html.h" +#include + //----------------------------------------------------------------------------- @@ -53,17 +55,17 @@ void app::setup(uint32_t timeout) { DPRINTLN(DBG_VERBOSE, F("app::setup")); Main::setup(timeout); - mWeb->on("/", std::bind(&app::showIndex, this)); - mWeb->on("/favicon.ico", std::bind(&app::showFavicon, this)); - mWeb->on("/setup", std::bind(&app::showSetup, this)); - mWeb->on("/save", std::bind(&app::showSave, this)); - mWeb->on("/erase", std::bind(&app::showErase, this)); - mWeb->on("/cmdstat", std::bind(&app::showStatistics, this)); - mWeb->on("/hoymiles", std::bind(&app::showHoymiles, this)); - mWeb->on("/livedata", std::bind(&app::showLiveData, this)); - mWeb->on("/json", std::bind(&app::showJSON, this)); - mWeb->on("/devcontrol", std::bind(&app::devControl, this)); - + mWeb->on("/", std::bind(&app::showIndex, this)); + mWeb->on("/favicon.ico", std::bind(&app::showFavicon, this)); + mWeb->on("/setup", std::bind(&app::showSetup, this)); + mWeb->on("/save", std::bind(&app::showSave, this)); + mWeb->on("/erase", std::bind(&app::showErase, this)); + mWeb->on("/cmdstat", std::bind(&app::showStatistics, this)); + mWeb->on("/hoymiles", std::bind(&app::showHoymiles, this)); + mWeb->on("/livedata", std::bind(&app::showLiveData, this)); + mWeb->on("/json", std::bind(&app::showJSON, this)); + mWeb->on("/api",HTTP_POST, std::bind(&app::webapi, this)); + if(mSettingsValid) { mEep->read(ADDR_INV_INTERVAL, &mSendInterval); if(mSendInterval < MIN_SEND_INTERVAL) @@ -82,10 +84,13 @@ void app::setup(uint32_t timeout) { if(0ULL != invSerial) { iv = mSys->addInverter(name, invSerial, modPwr); if(NULL != iv) { - mEep->read(ADDR_INV_PWR_LIM + (i * 2),&iv->powerLimit); - iv->devControlCmd = 11; // set active power limit - iv->devControlRequest = true; // set to true to update the active power limit from setup html page - DPRINTLN(DBG_INFO, F("add inverter: ") + String(name) + ", SN: " + String(invSerial, HEX) + ", Power Limit: " + String(iv->powerLimit)); + mEep->read(ADDR_INV_PWR_LIM + (i * 2),(uint16_t *)&(iv->powerLimit[0])); + if (iv->powerLimit[0] != 0xffff) { // only set it, if it is changed by user. Default value in the html setup page is -1 = 0xffff + iv->powerLimit[1] = 0x0100; // set the limit as persistent + iv->devControlCmd = ActivePowerContr; // set active power limit + iv->devControlRequest = true; // set to true to update the active power limit from setup html page + DPRINTLN(DBG_INFO, F("add inverter: ") + String(name) + ", SN: " + String(invSerial, HEX) + ", Power Limit: " + String(iv->powerLimit[0])); + } for(uint8_t j = 0; j < 4; j++) { mEep->read(ADDR_INV_CH_NAME + (i * 4 * MAX_NAME_LENGTH) + j * MAX_NAME_LENGTH, iv->chName[j], MAX_NAME_LENGTH); } @@ -235,52 +240,97 @@ void app::loop(void) { // process buffer only on first occurrence if(mSerialDebug) { DPRINT(DBG_INFO, "RX " + String(len) + "B Ch" + String(p->rxCh) + " | "); - mSys->Radio.dumpBuf(NULL, p->packet, len); } mFrameCnt++; if(0 != len) { Inverter<> *iv = mSys->findInverter(&p->packet[1]); - if(NULL != iv && p->packet[0] == (0x15 + 0x80)) { // response from get all information command - uint8_t *pid = &p->packet[9]; - if (*pid == 0x00) { - DPRINT(DBG_DEBUG, "fragment number zero received and ignored"); - } else { - if((*pid & 0x7F) < 5) { - memcpy(mPayload[iv->id].data[(*pid & 0x7F) - 1], &p->packet[10], len-11); - mPayload[iv->id].len[(*pid & 0x7F) - 1] = len-11; + if(NULL != iv && p->packet[0] == (TX_REQ_INFO + 0x80)) { // response from get information command + DPRINTLN(DBG_DEBUG, F("Response from info request received")); + switch (mSys->InfoCmd){ + case InverterDevInform_Simple: + { + DPRINT(DBG_INFO, "Response from inform simple\n"); + mSys->InfoCmd = RealTimeRunData_Debug; // Set back to default + break; + } + case InverterDevInform_All: + { + DPRINT(DBG_INFO, "Response from inform all\n"); + mSys->InfoCmd = RealTimeRunData_Debug; // Set back to default + break; + } + case GetLossRate: + { + DPRINT(DBG_INFO, "Response from get loss rate\n"); + mSys->InfoCmd = RealTimeRunData_Debug; // Set back to default + break; + } + case AlarmData: + { + DPRINT(DBG_INFO, "Response from AlarmData\n"); + mSys->InfoCmd = RealTimeRunData_Debug; // Set back to default + break; + } + case AlarmUpdate: + { + DPRINT(DBG_INFO, "Response from AlarmUpdate\n"); + mSys->InfoCmd = RealTimeRunData_Debug; // Set back to default + break; } + case RealTimeRunData_Debug: + { + uint8_t *pid = &p->packet[9]; + if (*pid == 0x00) { + DPRINT(DBG_DEBUG, "fragment number zero received and ignored"); + } else { + if((*pid & 0x7F) < 5) { + memcpy(mPayload[iv->id].data[(*pid & 0x7F) - 1], &p->packet[10], len-11); + mPayload[iv->id].len[(*pid & 0x7F) - 1] = len-11; + } - if((*pid & 0x80) == 0x80) { - if((*pid & 0x7f) > mPayload[iv->id].maxPackId) { - mPayload[iv->id].maxPackId = (*pid & 0x7f); - if(*pid > 0x81) - mLastPacketId = *pid; + if((*pid & 0x80) == 0x80) { // Last packet + if((*pid & 0x7f) > mPayload[iv->id].maxPackId) { + mPayload[iv->id].maxPackId = (*pid & 0x7f); + if(*pid > 0x81) + mLastPacketId = *pid; + } + } } + break; } } } - if(NULL != iv && p->packet[0] == (0x51 + 0x80)) { // response from dev control command - DPRINTLN(DBG_INFO, F("Response from devcontrol received")); + if(NULL != iv && p->packet[0] == (TX_REQ_DEVCONTROL + 0x80)) { // response from dev control command + DPRINTLN(DBG_DEBUG, F("Response from devcontrol request received")); iv->devControlRequest = false; - if (p->packet[12] != 11 && iv->devControlCmd == 11){ - // set back to last accpted limit - mEep->read(ADDR_INV_PWR_LIM + iv->id * 2, &iv->powerLimit); + switch (p->packet[12]){ + case ActivePowerContr: + if (iv->devControlCmd >= ActivePowerContr && iv->devControlCmd <= PFSet){ // ok inverter accepted the set point copy it to dtu eeprom + if (iv->powerLimit[1]>0){ // User want to have it persistent + mEep->write(ADDR_INV_PWR_LIM + iv->id * 2,iv->powerLimit[0]); + updateCrc(); + mEep->commit(); + DPRINTLN(DBG_INFO, F("Inverter has accepted power limit set point, written to dtu eeprom")); + } else { + DPRINTLN(DBG_INFO, F("Inverter has accepted power limit set point")); + } + iv->devControlCmd = Init; + } + break; + default: + if (iv->devControlCmd == ActivePowerContr){ + //case inverter did not accept the sent limit; set back to last stored limit + mEep->read(ADDR_INV_PWR_LIM + iv->id * 2, (uint16_t *)&(iv->powerLimit[0])); DPRINTLN(DBG_INFO, F("Inverter has not accepted power limit set point")); - } - if (p->packet[12] == 11 && iv->devControlCmd == 11){ // ok inverter accepted the set point copy it to dtu eeprom - // on every reboot the dtu sets the power limit acc to the value in eeprom - mEep->write(ADDR_INV_PWR_LIM + iv->id * 2,iv->powerLimit); - updateCrc(); - mEep->commit(); - DPRINTLN(DBG_INFO, F("Inverter has accepted power limit set point, written to dtu eeprom")); - iv->devControlCmd = 0xff; // set to none known command. + } + iv->devControlCmd = Init; + break; } } } } - mSys->BufCtrl.popBack(); } yield(); @@ -386,12 +436,12 @@ void app::loop(void) { if(mSerialDebug) DPRINTLN(DBG_DEBUG, F("app:loop WiFi WiFi.status ") + String(WiFi.status()) ); DPRINTLN(DBG_INFO, F("Requesting Inverter SN ") + String(iv->serial.u64, HEX)); - if(iv->devControlRequest){ + if(iv->devControlRequest && iv->powerLimit[0] > 0){ // prevent to "switch off" if(mSerialDebug) - DPRINTLN(DBG_INFO, F("Devcontrol request ") + String(iv->devControlCmd) + F(" power limit ") + String(iv->powerLimit)); - mSys->Radio.sendControlPacket(iv->radioId.u64,iv->devControlCmd ,uint16_t(iv->powerLimit)); + DPRINTLN(DBG_INFO, F("Devcontrol request ") + String(iv->devControlCmd) + F(" power limit ") + String(iv->powerLimit[0])); + mSys->Radio.sendControlPacket(iv->radioId.u64,iv->devControlCmd ,iv->powerLimit); } else { - mSys->Radio.sendTimePacket(iv->radioId.u64, mPayload[iv->id].ts); + mSys->Radio.sendTimePacket(iv->radioId.u64, mSys->InfoCmd, mPayload[iv->id].ts,iv->alarmMesIndex); mRxTicker = 0; } } @@ -453,7 +503,7 @@ void app::processPayload(bool retransmit) { if(mPayload[iv->id].len[i] == 0) { if(mSerialDebug) DPRINTLN(DBG_ERROR, F("while retrieving data: Frame ") + String(i+1) + F(" missing: Request Retransmit")); - mSys->Radio.sendCmdPacket(iv->radioId.u64, 0x15, (0x81+i), true); + mSys->Radio.sendCmdPacket(iv->radioId.u64, TX_REQ_INFO, (SINGLE_FRAME+i), true); break; // only retransmit one frame per loop } yield(); @@ -463,9 +513,9 @@ void app::processPayload(bool retransmit) { if(mSerialDebug) DPRINTLN(DBG_ERROR, F("while retrieving data: last frame missing: Request Retransmit")); if(0x00 != mLastPacketId) - mSys->Radio.sendCmdPacket(iv->radioId.u64, 0x15, mLastPacketId, true); + mSys->Radio.sendCmdPacket(iv->radioId.u64, TX_REQ_INFO, mLastPacketId, true); else - mSys->Radio.sendTimePacket(iv->radioId.u64, mPayload[iv->id].ts); + mSys->Radio.sendTimePacket(iv->radioId.u64, mSys->InfoCmd, mPayload[iv->id].ts,iv->alarmMesIndex); } mSys->Radio.switchRxCh(100); } @@ -541,7 +591,7 @@ void app::showSetup(void) { mEep->read(ADDR_INV_ADDR + (i * 8), &invSerial); mEep->read(ADDR_INV_NAME + (i * MAX_NAME_LENGTH), name, MAX_NAME_LENGTH); mEep->read(ADDR_INV_CH_PWR + (i * 2 * 4), modPwr, 4); - mEep->read(ADDR_INV_PWR_LIM + (i * 2),&invActivePowerLimit); + mEep->read(ADDR_INV_PWR_LIM + (i * 2),(uint16_t *) &invActivePowerLimit); inv += F("

Inverter ") + String(i) + "

"; inv += F(""); @@ -557,7 +607,12 @@ void app::showSetup(void) { inv += F(""); inv += F(""; @@ -676,43 +731,44 @@ void app::cbMqtt(char* topic, byte* payload, unsigned int length) { if(NULL != iv) { if (!iv->devControlRequest) { // still pending token = strtok(NULL, "/"); - uint8_t subcmd = std::stoi(token); - switch ( subcmd ){ - case 11: // Active Power Control + switch ( std::stoi(token) ){ + case ActivePowerContr: // Active Power Control if (true){ // if (std::stoi((char*)payload) > 0) error handling powerlimit needed? - iv->devControlCmd = 11; - iv->powerLimit = std::stoi((char*)payload); - DPRINTLN(DBG_INFO, F("Power limit for inverter ") + String(iv->id) + F(" set to ") + String(iv->powerLimit) + F("W") ); + iv->devControlCmd = ActivePowerContr; + iv->powerLimit[0] = std::stoi((char*)payload); + iv->powerLimit[1] = 0x0000; // if power limit is set via external interface --> set it temporay + DPRINTLN(DBG_DEBUG, F("Power limit for inverter ") + String(iv->id) + F(" set to ") + String(iv->powerLimit[0]) + F("W") ); } iv->devControlRequest = true; break; - case 0: // Turn On - iv->devControlCmd = 0; + case TurnOn: // Turn On + iv->devControlCmd = TurnOn; DPRINTLN(DBG_INFO, F("Turn on inverter ") + String(iv->id) ); iv->devControlRequest = true; break; - case 1: // Turn Off - iv->devControlCmd = 1; + case TurnOff: // Turn Off + iv->devControlCmd = TurnOff; DPRINTLN(DBG_INFO, F("Turn off inverter ") + String(iv->id) ); iv->devControlRequest = true; break; - case 2: // Restart - iv->devControlCmd = 2; + case Restart: // Restart + iv->devControlCmd = Restart; DPRINTLN(DBG_INFO, F("Restart inverter ") + String(iv->id) ); iv->devControlRequest = true; break; - case 12: // Reactive Power Control - // iv->devControlCmd = 12; - // uint16_t reactive_power = std::stoi(strtok(NULL, "/")); - // .../devcontrol/// - // ^^^ - DPRINTLN(DBG_INFO, F("Reactive Power Control not implemented for inverter ") + String(iv->id) ); + case ReactivePowerContr: // Reactive Power Control + iv->devControlCmd = ReactivePowerContr; + if (true){ // if (std::stoi((char*)payload) > 0) error handling powerlimit needed? + iv->devControlCmd = ReactivePowerContr; + iv->powerLimit[0] = std::stoi((char*)payload); + iv->powerLimit[1] = 0x0000; // if reactivepower limit is set via external interface --> set it temporay + DPRINTLN(DBG_DEBUG, F("Reactivepower limit for inverter ") + String(iv->id) + F(" set to ") + String(iv->powerLimit[0]) + F("W") ); + iv->devControlRequest = true; + } break; - case 13: // Set Power Factor - // iv->devControlCmd = 13; + case PFSet: // Set Power Factor + // iv->devControlCmd = PFSet; // uint16_t power_factor = std::stoi(strtok(NULL, "/")); - // .../devcontrol/// - // ^^^ DPRINTLN(DBG_INFO, F("Set Power Factor not implemented for inverter ") + String(iv->id) ); break; default: @@ -782,16 +838,20 @@ void app::showStatistics(void) { } //----------------------------------------------------------------------------- -void app::devControl(void) { // ToDo - DPRINTLN(DBG_VERBOSE, F("app::devControl")); - if(mWeb->args() > 0) { - //mWeb->arg("ivid").toChar... - // get iv - // set devControl on/off/power limt --> integrate buttons in app::showLiveData - // ... - mWeb->send(200, F("text/html"), F("Command sent" - "

sent

")); +void app::webapi(void) { // ToDo + DPRINTLN(DBG_VERBOSE, F("app::api")); + DPRINTLN(DBG_DEBUG, mWeb->arg("plain")); + const size_t capacity = 200; // Use arduinojson.org/assistant to compute the capacity. + DynamicJsonDocument payload(capacity); + + // Parse JSON object + deserializeJson(payload, mWeb->arg("plain")); + // ToDo: error handling for payload + if (payload["tx_request"] == TX_REQ_INFO){ + mSys->InfoCmd = payload["cmd"]; + DPRINTLN(DBG_INFO, F("Will make tx-request 0x15 with subcmd ") + String(mSys->InfoCmd)); } + mWeb->send ( 200, "text/json", "{success:true}" ); } @@ -833,10 +893,10 @@ void app::showLiveData(void) { } modHtml += F("
" - "
") + String(iv->name) + F(" Limit ") + String(iv->powerLimit) + F(" W"); - uint8_t list[] = {FLD_UAC, FLD_IAC, FLD_PAC, FLD_F, FLD_PCT, FLD_T, FLD_YT, FLD_YD, FLD_PDC, FLD_EFF}; + "
") + String(iv->name) + F(" Limit ") + String(iv->powerLimit[0]) + F(" W"); + 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 < 10; fld++) { + for(uint8_t fld = 0; fld < 12; fld++) { pos = (iv->getPosByChFld(CH0, list[fld])); if(0xff != pos) { modHtml += F("
"); @@ -942,7 +1002,9 @@ void app::saveValues(bool webSend = true) { // active power limit activepowerlimit = mWeb->arg("inv" + String(i) + "ActivePowerLimit").toInt(); - mEep->write(ADDR_INV_PWR_LIM + i * 2,activepowerlimit); + if (activepowerlimit != 0xffff && activepowerlimit > 0) { + mEep->write(ADDR_INV_PWR_LIM + i * 2,activepowerlimit); + } // name mWeb->arg("inv" + String(i) + "Name").toCharArray(buf, 20); diff --git a/tools/esp8266/app.h b/tools/esp8266/app.h index a9309e00..ca9bac1f 100644 --- a/tools/esp8266/app.h +++ b/tools/esp8266/app.h @@ -71,7 +71,7 @@ class app : public Main { void showHoymiles(void); void showLiveData(void); void showJSON(void); - void devControl(void); + void webapi(void); void saveValues(bool webSend); diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h index 33d76132..0300f70b 100644 --- a/tools/esp8266/defines.h +++ b/tools/esp8266/defines.h @@ -30,6 +30,43 @@ typedef struct { uint8_t packet[MAX_RF_PAYLOAD_SIZE]; } packet_t; +typedef enum +{ + InverterDevInform_Simple = 0, // 0x00 + InverterDevInform_All = 1, // 0x01 + //GridOnProFilePara = 2, // 0x02 + //HardWareConfig = 3, // 0x03 + //SimpleCalibrationPara = 4, // 0x04 + //SystemConfigPara = 5, // 0x05 + RealTimeRunData_Debug = 11, // 0x0b + //RealTimeRunData_Reality = 12, // 0x0c + //RealTimeRunData_A_Phase = 13, // 0x0d + //RealTimeRunData_B_Phase = 14, // 0x0e + //RealTimeRunData_C_Phase = 15, // 0x0f + AlarmData = 17, // 0x11 //Alarm data - all unsent alarms + AlarmUpdate = 18, // 0x12 //Alarm data - all pending alarms + //RecordData = 19, // 0x13 + //InternalData = 20, // 0x14 + GetLossRate = 21, // 0x15 + //GetSelfCheckState = 30, // 0x1e + //InitDataState = 0xff +} InfoCmdType; + +typedef enum +{ + TurnOn = 0, // 0x00 + TurnOff = 1, // 0x01 + Restart = 2, // 0x02 + Lock = 3, // 0x03 + Unlock = 4, // 0x04 + ActivePowerContr = 11, // 0x0b + ReactivePowerContr = 12, // 0x0c + PFSet = 13, // 0x0d + CleanState_LockAndAlarm = 20, // 0x14 + SelfInspection = 40, // 0x28 // self-inspection of grid-connected protection files + Init = 0xff +} DevControlCmdType; + // minimum serial interval #define MIN_SERIAL_INTERVAL 5 diff --git a/tools/esp8266/hmDefines.h b/tools/esp8266/hmDefines.h index 6499b44b..1450379b 100644 --- a/tools/esp8266/hmDefines.h +++ b/tools/esp8266/hmDefines.h @@ -17,15 +17,15 @@ union serial_u { // units -enum {UNIT_V = 0, UNIT_A, UNIT_W, UNIT_WH, UNIT_KWH, UNIT_HZ, UNIT_C, UNIT_PCT}; -const char* const units[] = {"V", "A", "W", "Wh", "kWh", "Hz", "°C", "%"}; +enum {UNIT_V = 0, UNIT_A, UNIT_W, UNIT_WH, UNIT_KWH, UNIT_HZ, UNIT_C, UNIT_PCT, UNIT_VA, UNIT_ALARM_MES_ID}; +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_UAC, FLD_IAC, FLD_PAC, FLD_F, FLD_T, FLD_PCT, FLD_EFF, FLD_IRR, FLD_PRA,FLD_ALARM_MES_ID}; const char* const fields[] = {"U_DC", "I_DC", "P_DC", "YieldDay", "YieldWeek", "YieldTotal", - "U_AC", "I_AC", "P_AC", "Freq", "Temp", "Pct", "Efficiency", "Irradiation"}; + "U_AC", "I_AC", "P_AC", "Freq", "Temp", "Pct", "Efficiency", "Irradiation","P_ACr","ALARM_MES_ID"}; // 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}; @@ -95,8 +95,10 @@ const byteAssign_t hm1chAssignment[] = { { FLD_UAC, UNIT_V, CH0, 14, 2, 10 }, { FLD_IAC, UNIT_A, CH0, 22, 2, 100 }, { FLD_PAC, UNIT_W, CH0, 18, 2, 10 }, + { FLD_PRA, UNIT_VA, CH0, 20, 2, 10 }, { FLD_F, UNIT_HZ, CH0, 16, 2, 100 }, { FLD_T, UNIT_C, CH0, 26, 2, 10 }, + { FLD_ALARM_MES_ID, UNIT_ALARM_MES_ID, CH0, 28, 2, 1 }, { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC }, { FLD_EFF, UNIT_PCT, CH0, CALC_EFF_CH0, 0, CMD_CALC } }; @@ -124,8 +126,10 @@ const byteAssign_t hm2chAssignment[] = { { FLD_UAC, UNIT_V, CH0, 26, 2, 10 }, { FLD_IAC, UNIT_A, CH0, 34, 2, 100 }, { FLD_PAC, UNIT_W, CH0, 30, 2, 10 }, + { FLD_PRA, UNIT_VA, CH0, 32, 2, 10 }, { FLD_F, UNIT_HZ, CH0, 28, 2, 100 }, { FLD_T, UNIT_C, CH0, 38, 2, 10 }, + { FLD_ALARM_MES_ID, UNIT_ALARM_MES_ID, CH0, 40, 2, 1 }, { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC }, { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC }, { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC }, @@ -170,9 +174,11 @@ const byteAssign_t hm4chAssignment[] = { { FLD_UAC, UNIT_V, CH0, 46, 2, 10 }, { FLD_IAC, UNIT_A, CH0, 54, 2, 100 }, { FLD_PAC, UNIT_W, CH0, 50, 2, 10 }, + { FLD_PRA, UNIT_VA, CH0, 52, 2, 10 }, { FLD_F, UNIT_HZ, CH0, 48, 2, 100 }, { FLD_PCT, UNIT_PCT, CH0, 56, 2, 10 }, { FLD_T, UNIT_C, CH0, 58, 2, 10 }, + { FLD_ALARM_MES_ID, UNIT_ALARM_MES_ID, CH0, 60, 2, 1 }, { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC }, { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC }, { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC }, diff --git a/tools/esp8266/hmInverter.h b/tools/esp8266/hmInverter.h index b074284e..531e1e60 100644 --- a/tools/esp8266/hmInverter.h +++ b/tools/esp8266/hmInverter.h @@ -69,7 +69,8 @@ class Inverter { uint8_t type; // integer which refers to inverter type byteAssign_t* assign; // type of inverter uint8_t listLen; // length of assignments - uint16_t powerLimit; // limit power output + uint16_t alarmMesIndex; // Last recorded Alarm Message Index + uint16_t powerLimit[2]; // limit power output uint8_t devControlCmd; // carries the requested cmd bool devControlRequest; // true if change needed serial_u serial; // serial number as on barcode @@ -82,7 +83,8 @@ class Inverter { Inverter() { ts = 0; - powerLimit = -1; // 65535 W Limit -> unlimited + powerLimit[0] = -1; // 65535 W Limit -> unlimited + powerLimit[1] = 0x0100; // 0x0000 --> set temporary , 0x0100 --> set persistent devControlRequest = false; devControlCmd = 0xff; } @@ -131,7 +133,6 @@ class Inverter { uint8_t ptr = assign[pos].start; uint8_t end = ptr + assign[pos].num; uint16_t div = assign[pos].div; - if(CMD_CALC != div) { uint32_t val = 0; do { @@ -141,6 +142,10 @@ class Inverter { record[pos] = (RECORDTYPE)(val) / (RECORDTYPE)(div); } + // get last alarm message index and save it in the inverter instance + if (getPosByChFld(0, FLD_ALARM_MES_ID) == pos){ + alarmMesIndex = record[pos]; + } } RECORDTYPE getValue(uint8_t pos) { diff --git a/tools/esp8266/hmRadio.h b/tools/esp8266/hmRadio.h index da4c78ee..4c4866b5 100644 --- a/tools/esp8266/hmRadio.h +++ b/tools/esp8266/hmRadio.h @@ -22,6 +22,10 @@ #define RF_CHANNELS 5 #define RF_LOOP_CNT 300 +#define TX_REQ_INFO 0X15 +#define TX_REQ_DEVCONTROL 0x51 +#define ALL_FRAMES 0x80 +#define SINGLE_FRAME 0x81 const char* const rf24AmpPower[] = {"MIN", "LOW", "HIGH", "MAX"}; @@ -159,27 +163,26 @@ class HmRadio { return mRfChLst[mTxChIdx]; } - void sendControlPacket(uint64_t invId, uint8_t cmd, uint16_t data) { + void sendControlPacket(uint64_t invId, uint8_t cmd, uint16_t *data) { DPRINTLN(DBG_VERBOSE, F("hmRadio.h:sendControlPacket")); - // sendCmdPacket(invId, 0x51, 0x80, false); // 0x80 implementation as original DTU code - sendCmdPacket(invId, 0x51, 0x81, false); + sendCmdPacket(invId, TX_REQ_DEVCONTROL, ALL_FRAMES, false); // 0x80 implementation as original DTU code int cnt = 0; mTxBuf[10] = cmd; // cmd --> 0x0b => Type_ActivePowerContr, 0 on, 1 off, 2 restart, 12 reactive power, 13 power factor mTxBuf[10 + (++cnt)] = 0x00; - if (cmd == 11){ + if (cmd >= ActivePowerContr && cmd <= PFSet){ // 4 bytes control data // Power Limit fix point 10 eg. 30 W --> 0d300 = 0x012c // -1 = 0xffff --> no limit - if (data == 0xffff){ - data &= 0xffff; // ToDo: unlimit value is needed and is inverter specific! --> get it via RF from inverter or via user interface + if (data[0] == 0xffff){ + data[0] &= 0xffff; // ToDo: unlimit value is needed and is inverter specific! --> get it via RF from inverter or via user interface } else { - data*= 10; + data[0] *= 10; // will overwrite the data bc it is a pointer } - mTxBuf[10 + (++cnt)] = (data >> 8) & 0xff; // 0x01 - mTxBuf[10 + (++cnt)] = (data ) & 0xff; // 0x2c - // mTxBuf[10 + (++cnt)] = 0x00; // not persistent - mTxBuf[10 + (++cnt)] = 0x01; // persistent - mTxBuf[10 + (++cnt)] = 0x00; + mTxBuf[10 + (++cnt)] = (data[0] >> 8) & 0xff; // power limit + mTxBuf[10 + (++cnt)] = (data[0] ) & 0xff; // power limit + mTxBuf[10 + (++cnt)] = (data[1] >> 8) & 0xff; // setting for persistens handling + mTxBuf[10 + (++cnt)] = (data[1] ) & 0xff; // setting for persistens handling + data[0] /= 10; // UGLY! } // crc control data uint16_t crc = crc16(&mTxBuf[10], cnt+1); @@ -192,14 +195,20 @@ class HmRadio { sendPacket(invId, mTxBuf, 10 + (++cnt), true); } - void sendTimePacket(uint64_t invId, uint32_t ts) { + void sendTimePacket(uint64_t invId, uint8_t cmd, uint32_t ts, uint16_t alarmMesId) { //DPRINTLN(DBG_VERBOSE, F("hmRadio.h:sendTimePacket")); - sendCmdPacket(invId, 0x15, 0x80, false); - mTxBuf[10] = 0x0b; // cid + sendCmdPacket(invId, TX_REQ_INFO, ALL_FRAMES, false); + mTxBuf[10] = cmd; // cid mTxBuf[11] = 0x00; CP_U32_LittleEndian(&mTxBuf[12], ts); - mTxBuf[19] = 0x05; - + if (cmd == RealTimeRunData_Debug || cmd == AlarmData || cmd == AlarmUpdate ){ + 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; + } uint16_t crc = crc16(&mTxBuf[10], 14); mTxBuf[24] = (crc >> 8) & 0xff; mTxBuf[25] = (crc ) & 0xff; @@ -342,6 +351,8 @@ class HmRadio { BUFFER *mBufCtrl; uint8_t mTxBuf[MAX_RF_PAYLOAD_SIZE]; + DevControlCmdType DevControlCmd; + volatile bool mIrqRcvd; }; diff --git a/tools/esp8266/hmSystem.h b/tools/esp8266/hmSystem.h index a2ddbcf4..3d7f7f2b 100644 --- a/tools/esp8266/hmSystem.h +++ b/tools/esp8266/hmSystem.h @@ -19,9 +19,12 @@ class HmSystem { RadioType Radio; typedef BUFFER BufferType; BufferType BufCtrl; + InfoCmdType InfoCmd; + //DevControlCmdType DevControlCmd; HmSystem() { mNumInv = 0; + InfoCmd = RealTimeRunData_Debug; // default case } ~HmSystem() { // TODO: cleanup diff --git a/tools/esp8266/scripts/getVersion.py b/tools/esp8266/scripts/getVersion.py index 3b4a9145..98f75b9e 100644 --- a/tools/esp8266/scripts/getVersion.py +++ b/tools/esp8266/scripts/getVersion.py @@ -15,11 +15,17 @@ def readVersion(path, infile): p = line.find(s) if(p != -1): version += line[p+13:].rstrip() + "." - - version = version[:-1] + "_esp8266.bin" + + os.mkdir(path + ".pio/build/out/") + + versionout = version[:-1] + "_esp8266_node_mcu_v2.bin" + src = path + ".pio/build/node_mcu_v2/firmware.bin" + dst = path + ".pio/build/out/" + versionout + os.rename(src, dst) + + versionout = version[:-1] + "_esp8266_d1_mini.bin" src = path + ".pio/build/d1_mini/firmware.bin" - dst = path + ".pio/build/d1_mini/out/" + version - os.mkdir(path + ".pio/build/d1_mini/out/") + dst = path + ".pio/build/out/" + versionout os.rename(src, dst) readVersion("../", "defines.h")