diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp index 0a071a74..7bc6ca9f 100644 --- a/tools/esp8266/app.cpp +++ b/tools/esp8266/app.cpp @@ -62,6 +62,7 @@ void app::setup(uint32_t timeout) { 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)); if(mSettingsValid) { mEep->read(ADDR_INV_INTERVAL, &mSendInterval); @@ -82,6 +83,7 @@ void app::setup(uint32_t timeout) { 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)); for(uint8_t j = 0; j < 4; j++) { @@ -205,7 +207,7 @@ void app::setup(uint32_t timeout) { void app::loop(void) { DPRINTLN(DBG_VERBOSE, F("app::loop")); Main::loop(); - + mSys->Radio.loop(); yield(); @@ -217,8 +219,6 @@ void app::loop(void) { bool rxRdy = mSys->Radio.switchRxCh(); - char respTopic[64]; - if(!mSys->BufCtrl.empty()) { uint8_t len; packet_t *p = mSys->BufCtrl.getBack(); @@ -252,9 +252,22 @@ void app::loop(void) { } } } - if(NULL != iv && p->packet[0] == (0x51 + 0x80)) { // response from dev control command q'n'd - snprintf(respTopic, 64, "%s/devcontrol/%d/resp", mMqtt.getTopic(), iv->id); - mMqtt.sendMsg2(respTopic,(const char*)p->packet,false); + if(NULL != iv && p->packet[0] == (0x51 + 0x80)) { // response from dev control command + DPRINTLN(DBG_INFO, F("Response from devcontrol 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); + 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. + } } } } @@ -364,10 +377,7 @@ void app::loop(void) { if(iv->devControlRequest){ if(mSerialDebug) DPRINTLN(DBG_INFO, F("Devcontrol request ") + String(iv->devControlCmd) + F(" power limit ") + String(iv->powerLimit)); - mSys->Radio.sendControlPacket(iv->radioId.u64, uint16_t(iv->powerLimit),iv->devControlCmd); - // ToDo: Only set Request to false if succesful executed - iv->devControlRequest = false; - // ^^ + mSys->Radio.sendControlPacket(iv->radioId.u64,iv->devControlCmd ,uint16_t(iv->powerLimit)); } else { mSys->Radio.sendTimePacket(iv->radioId.u64, mPayload[iv->id].ts); mRxTicker = 0; @@ -633,66 +643,70 @@ void app::showErase() { void app::cbMqtt(char* topic, byte* payload, unsigned int length) { // callback handling on subscribed devcontrol topic DPRINTLN(DBG_INFO, F("app::cbMqtt")); - DPRINTLN(DBG_INFO, topic); - // subcribed topics are mTopic + "/devcontrol/#" where # is // - // eg. mypvsolar/devcontrol/1/11/400 --> inverter 1 active power limit 400 Watt - char *token = strtok(topic, "/"); + // subcribed topics are mTopic + "/devcontrol/#" where # is / + // eg. mypvsolar/devcontrol/1/11 with payload "400" --> inverter 1 active power limit 400 Watt + const char *token = strtok(topic, "/"); while (token != NULL) { - // .../devcontrol/// - // ^^^ - if (strcmp(token,"devcontrol")){ - Inverter<> *iv = this->mSys->getInverterByPos(std::stoi(strtok(NULL, "/"))); - // .../devcontrol/// - // ^^^ - if(NULL != iv) { - // switch case subcmd - switch ( std::stoi(strtok(NULL, "/")) ){ - // .../devcontrol/// - // ^^^^ - case 11: // Active Power Control - iv->devControlCmd = 11; - iv->powerLimit = std::stoi(strtok(NULL, "/")); - // .../devcontrol/// - // ^^^ - mEep->write(ADDR_INV_PWR_LIM + iv->id * 2,iv->powerLimit); - // updateCrc(); - // mEep->commit(); - DPRINTLN(DBG_INFO, F("Power limit for inverter ") + String(iv->id) + F(" set to ") + String(iv->powerLimit) + F("W") ); - break; - case 0: // Turn On - iv->devControlCmd = 0; - DPRINTLN(DBG_INFO, F("Turn on inverter ") + String(iv->id) ); - break; - case 1: // Turn Off - iv->devControlCmd = 1; - DPRINTLN(DBG_INFO, F("Turn off inverter ") + String(iv->id) ); - break; - case 2: // Restart - iv->devControlCmd = 2; - DPRINTLN(DBG_INFO, F("Restart inverter ") + String(iv->id) ); - 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) ); - break; - case 13: // Set Power Factor - // iv->devControlCmd = 13; - // uint16_t power_factor = std::stoi(strtok(NULL, "/")); - // .../devcontrol/// - // ^^^ - DPRINTLN(DBG_INFO, F("Set Power Factor not implemented for inverter ") + String(iv->id) ); - break; + if (std::strcmp(token,"devcontrol")==0){ + token = strtok(NULL, "/"); + uint8_t iv_id = std::stoi(token); + if (iv_id >= 0 && iv_id <= MAX_NUM_INVERTERS){ + Inverter<> *iv = this->mSys->getInverterByPos(iv_id); + if(NULL != iv) { + if (!iv->devControlRequest) { // still pending + token = strtok(NULL, "/"); + uint8_t subcmd = std::stoi(token); + switch ( subcmd ){ + case 11: // 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->devControlRequest = true; + break; + case 0: // Turn On + iv->devControlCmd = 0; + DPRINTLN(DBG_INFO, F("Turn on inverter ") + String(iv->id) ); + iv->devControlRequest = true; + break; + case 1: // Turn Off + iv->devControlCmd = 1; + DPRINTLN(DBG_INFO, F("Turn off inverter ") + String(iv->id) ); + iv->devControlRequest = true; + break; + case 2: // Restart + iv->devControlCmd = 2; + 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) ); + break; + case 13: // Set Power Factor + // iv->devControlCmd = 13; + // 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: + DPRINTLN(DBG_INFO, "Not implemented"); + break; + } + } } - iv->devControlRequest = true; } break; } token = strtok(NULL, "/"); } + DPRINTLN(DBG_INFO, F("app::cbMqtt finished")); } @@ -747,6 +761,19 @@ void app::showStatistics(void) { mWeb->send(200, F("text/plain"), content); } +//----------------------------------------------------------------------------- +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::showHoymiles(void) { diff --git a/tools/esp8266/app.h b/tools/esp8266/app.h index 2f3d9e8e..a9309e00 100644 --- a/tools/esp8266/app.h +++ b/tools/esp8266/app.h @@ -71,6 +71,7 @@ class app : public Main { void showHoymiles(void); void showLiveData(void); void showJSON(void); + void devControl(void); void saveValues(bool webSend); diff --git a/tools/esp8266/hmInverter.h b/tools/esp8266/hmInverter.h index 213e8c66..b074284e 100644 --- a/tools/esp8266/hmInverter.h +++ b/tools/esp8266/hmInverter.h @@ -84,6 +84,7 @@ class Inverter { ts = 0; powerLimit = -1; // 65535 W Limit -> unlimited devControlRequest = false; + devControlCmd = 0xff; } ~Inverter() { diff --git a/tools/esp8266/hmRadio.h b/tools/esp8266/hmRadio.h index 1062664c..6ff3a834 100644 --- a/tools/esp8266/hmRadio.h +++ b/tools/esp8266/hmRadio.h @@ -166,7 +166,7 @@ class HmRadio { return mTxChLst[mTxChIdx]; }*/ - void sendControlPacket(uint64_t invId, uint16_t data, uint8_t cmd) { + 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); @@ -176,18 +176,25 @@ class HmRadio { if (cmd == 11){ // 4 bytes control data // Power Limit fix point 10 eg. 30 W --> 0d300 = 0x012c - mTxBuf[10 + (++cnt)] = (data*10 >> 8) & 0xff; // 0x01 - mTxBuf[10 + (++cnt)] = (data*10 ) & 0xff; // 0x2c - // are these two bytes necessary? + // -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 + } else { + data*= 10; + } + mTxBuf[10 + (++cnt)] = (data >> 8) & 0xff; // 0x01 + mTxBuf[10 + (++cnt)] = (data ) & 0xff; // 0x2c + // are these two bytes necessary? --> yes it seems so mTxBuf[10 + (++cnt)] = 0x00; mTxBuf[10 + (++cnt)] = 0x00; } // crc control data - uint16_t crc = crc16(&mTxBuf[10], 10 - (cnt+1)); + uint16_t crc = crc16(&mTxBuf[10], cnt+1); mTxBuf[10 + (++cnt)] = (crc >> 8) & 0xff; mTxBuf[10 + (++cnt)] = (crc ) & 0xff; // crc over all - mTxBuf[10 + (++cnt)] = crc8(mTxBuf, 18); + cnt +=1; + mTxBuf[10 + cnt] = crc8(mTxBuf, 10 + cnt); sendPacket(invId, mTxBuf, 10 + (++cnt), true); } diff --git a/tools/esp8266/main.cpp b/tools/esp8266/main.cpp index ffaa0a54..26a47605 100644 --- a/tools/esp8266/main.cpp +++ b/tools/esp8266/main.cpp @@ -71,6 +71,7 @@ void Main::setup(uint32_t timeout) { mUpdater->setup(mWeb); mApActive = startAp; + mStActive = !startAp; } @@ -121,6 +122,10 @@ void Main::loop(void) { stats(); }*/ } + if (WiFi.status() != WL_CONNECTED) { + DPRINTLN(DBG_INFO, "[WiFi]: Connection Lost"); + mStActive = false; + } } diff --git a/tools/esp8266/main.h b/tools/esp8266/main.h index 68f9df5c..98e9f01c 100644 --- a/tools/esp8266/main.h +++ b/tools/esp8266/main.h @@ -118,6 +118,7 @@ class Main { bool mWifiSettingsValid; bool mSettingsValid; bool mApActive; + bool mStActive; ESP8266WebServer *mWeb; char mVersion[9]; char mDeviceName[DEVNAME_LEN]; diff --git a/tools/esp8266/mqtt.h b/tools/esp8266/mqtt.h index 9e973162..a7ff526f 100644 --- a/tools/esp8266/mqtt.h +++ b/tools/esp8266/mqtt.h @@ -102,6 +102,7 @@ class mqtt { char topic[MQTT_TOPIC_LEN + 13 ]; // "/devcontrol/#" --> + 6 byte // ToDo: "/devcontrol/#" is hardcoded snprintf(topic, MQTT_TOPIC_LEN + 13, "%s/devcontrol/#", mTopic); + DPRINTLN(DBG_INFO, F("subscribe to ") + String(topic)); mClient->subscribe(topic); // subscribe to mTopic + "/devcontrol/#" }