0.5.13 Bug fixes and minor updates

- Solves Issue 156, 158, 159
- Uncheck "Reboot after save" by default, It is only madatory if an inverter is added or changed (name,address)
- Add "*" to denote mandatory fields in setup
- Remove "MQTT Interval read only" in setup
- Correct typos in Markdown files

tools/esp8266/User_Manual.md

@@ -1,30 +1,30 @@
 # User Manual Ahoy DTU (on ESP8266)
-15.08.2022
+16.08.2022
 ## Introduction
-see the repository [here](https://github.com/grindylow/ahoy/blob/main/tools/esp8266/README.md)
+See the repository [here](https://github.com/grindylow/ahoy/blob/main/tools/esp8266/README.md)
 
 ## Setup
-Assuming you have a running ahoy-dtu and you can access te setup page.
+Assuming you have a running ahoy-dtu and you can access the setup page.
-In the initial case or after click "erease settings" the fields for the inverter setup are empty.
+In the initial case or after click "erase settings" the fields for the inverter setup are empty.
 
 Set at least the serial number and a name for each inverter, check the "reboot after save" and click the "Save" button.
 
 ## Active Power Limit via Setup Page
 I you leave the field "Active Power Limit" empty during the setup and reboot the ahoy-dtu a value of 65535 will be filled in.
-That is the value you have to fill in case you want to operate the inverter without a active power limit. 
+That is the value you have to fill in case you want to operate the inverter without a active power limit.
-If the value is 65535 or -1 after another reboot the value will be seted automatically to "100" and in the drop-down menu "relativ in percent persistent" will be seted. Of course you can do this also by your self.
+If the value is 65535 or -1 after another reboot the value will be set automatically to "100" and in the drop-down menu "relative in percent persistent" will be set. Of course you can do this also by your self.
 
 You can change the setting in the following manner.
 Decide if you want to set
-- an absolut value in Watt
+- an absolute value in Watt
-- an relativ value in percent based on the maximum Power cababilities of the inverter
+- an relative value in percent based on the maximum Power capabilities of the inverter
 and if this settings shall be
 - persistent
 - not persistent
-after a power cylce of the inverter (P_DC=0 and P_AC=0 for at least 10 seconds)
+after a power cycle of the inverter (P_DC=0 and P_AC=0 for at least 10 seconds)
 
-The user has to ensure sensfule settings. Remember that for the inverters of 3rd generation the relative active power limit is in the range of 2% up to 100%.
+The user has to ensure correct settings. Remember that for the inverters of 3rd generation the relative active power limit is in the range of 2% up to 100%.
-Also an absolut active power limit below approx. 30Watt is not senseful because of the control capabilities and reactive power load.
+Also an absolute active power limit below approx. 30Watt is not correct because of the control capabilities and reactive power load.
 
 ## Active Power Limit via MQTT
 The ahoy-dtu subscribes on the topic <CHOOSEN_TOPIC_FROM_SETUP>/devcontrol/# if the mqtt broker is set-up correctly. The default topic is inverter/devcontrol/#.
@@ -58,10 +58,10 @@ The implementation allows to set any of the available <DevCntrlType> Commands:
     Init = 0xff
 } DevControlCmdType;
 ```
-The MQTT payload will be seted on first to bytes and DATA2 will be seted on the second two bytes if the corresponding DevControlCmdType supports 4 byte data. 
+The MQTT payload will be set on first to bytes and DATA2 will be set on the second two bytes if the corresponding DevControlCmdType supports 4 byte data.
 
 So as example sending any payload on inverter/devcontrol/0/1 will switch off the inverter.
-    
+
 ## Active Power Limit via REST API
 It is also implemented to set the power limit via REST API call. Therefore send a POST request to the endpoint /api.
 The response will always be a json with {success:true}
@@ -76,7 +76,7 @@ The payload shall be a json formated string in the following manner
 }
 ```
 With the following value ranges
-    
+
 
 | Value                       | range       | note                            |
 | --------------------------- | ----------- | ------------------------------- |
@@ -84,7 +84,7 @@ With the following value ranges
 | <SUB_CMD_BYTE>              | [0...255]   | integer uint8, subcmds eg. 0x0b |
 | <PAYLOAD_INTEGER_TWO_BYTES> | [0...65535] | uint16                          |
 | <INVERTER_ID>               | [0...3]     | integer uint8                   |
-    
+
 Example to set the active power limit non persistent to 10%
 ```json
 {
@@ -105,23 +105,23 @@ Example to set the active power limit persistent to 600Watt
     "payload2": 256
 }
 ```
-    
+
 ### Developer Information REST API
-In the same approach as for MQTT any other SubCmd can be applied and the respsine payload can be observed in the serial logs. Eg. request the Alarm Data.
+In the same approach as for MQTT any other SubCmd can be applied and the response payload can be observed in the serial logs. Eg. request the Alarm Data.
+
 
-    
 ## Issues and Debuging for active power limit settings
-Turn on the serial debuging in the setup. Try to have find out if the behavior is deterministic. That means can you reproduce the behavior. Be patient and wait on inverter reactions at least some minutes and beware that the DC-Power is sufficient.
+Turn on the serial debugging in the setup. Try to have find out if the behavior is deterministic. That means can you reproduce the behavior. Be patient and wait on inverter reactions at least some minutes and beware that the DC-Power is sufficient.
 In case of issues please report:
 1. Version of firmware
 2. The output of the serial debug esp. the TX messages starting with "0x51" and the RX messages starting with "0xD1" or "0xF1"
 3. Which case you have tried: Setup-Page, MQTT, REST API and at what was shown on the "Visualization Page" at the Location "Limit"
-4. The setting means payload, relativ, absolut, persisten, not persisten (see tables above)
+4. The setting means payload, relative, absolute, persistent, not persistent (see tables above)
+
 
-    
 **Developer Information General for Active Power Limit**
 ⚡To be verified by field tests and feedback
-Internally this values will be seted for the second two bytes for MainCmd: 0x51 SubCmd: 0x0b --> DevControl set ActivePowerLimit
+Internally this values will be set for the second two bytes for MainCmd: 0x51 SubCmd: 0x0b --> DevControl set ActivePowerLimit
 ```C
 typedef enum { // ToDo: to be verified by field tests
     AbsolutNonPersistent = 0x0000, // 0
@@ -129,4 +129,4 @@ typedef enum { // ToDo: to be verified by field tests
     AbsolutPersistent = 0x0100,    // 256
     RelativPersistent = 0x0101  // 257
 } PowerLimitControlType;
-```
+```

tools/esp8266/defines.h

@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       5
-#define VERSION_PATCH       12
+#define VERSION_PATCH       13
 
 
 //-------------------------------------

tools/esp8266/html/setup.html

@@ -109,8 +109,6 @@
                         <input type="text" class="text" name="mqttPwd" value="{MQTT_PWD}"/>
                         <label for="mqttTopic">Topic</label>
                         <input type="text" class="text" name="mqttTopic" value="{MQTT_TOPIC}"/>
-                        <label for="mqttIntvl">Interval [s] (read-only)</label>
-                        <input type="text" class="text" name="mqttIntvl" value="{MQTT_INTVL}" readonly/>
                     </fieldset>
                     </div>
 

tools/esp8266/web.cpp

@@ -189,7 +189,7 @@ void web::showSetup(void) {
 
         inv += F("<label for=\"inv") + String(i) + F("ActivePowerLimitConType\">Active Power Limit Control Type</label>");
         inv += F("<select name=\"inv") + String(i);
-        // UGLY! But I do not know it a better way 
+        // UGLY! But I do not know it a better way
         // ToDo: Need Cookies, IndexDB or PWA for that or in general client browser storage
         if(NULL != iv){
         if(iv->powerLimit[1] == AbsolutNonPersistent)
@@ -269,8 +269,7 @@ void web::showSetup(void) {
     html.replace(F("{MQTT_USER}"),  String(mConfig->mqtt.user));
     html.replace(F("{MQTT_PWD}"),   String(mConfig->mqtt.pwd));
     html.replace(F("{MQTT_TOPIC}"), String(mConfig->mqtt.topic));
-    html.replace(F("{MQTT_INTVL}"), String("0"));
+    
-
     mWeb->send(200, F("text/html"), html);
 }
 
@@ -334,7 +333,7 @@ void web::showSave(void) {
         if(mWeb->arg("invInterval") != "")
             mConfig->sendInterval = mWeb->arg("invInterval").toInt();
         if(mWeb->arg("invRetry") != "")
-            mConfig->sendInterval = mWeb->arg("invRetry").toInt();
+            mConfig->maxRetransPerPyld = mWeb->arg("invRetry").toInt();
 
         // pinout
         uint8_t pin;
@@ -369,8 +368,8 @@ void web::showSave(void) {
         if(mWeb->arg("serIntvl") != "") {
             mConfig->serialInterval = mWeb->arg("serIntvl").toInt() & 0xffff;
 
-            mConfig->serialDebug  = (mWeb->arg("serEn") == "on");
+            mConfig->serialDebug  = (mWeb->arg("serDbg") == "on");
-            mConfig->serialShowIv = (mWeb->arg("serDbg") == "on");
+            mConfig->serialShowIv = (mWeb->arg("serEn") == "on");
             // Needed to log TX buffers to serial console
             mMain->mSys->Radio.mSerialDebug = mConfig->serialDebug;
         }
@@ -424,22 +423,28 @@ void web::showWebApi(void) {
     DPRINTLN(DBG_VERBOSE, F("web::showWebApi"));
     DPRINTLN(DBG_DEBUG, mWeb->arg("plain"));
     const size_t capacity = 200; // Use arduinojson.org/assistant to compute the capacity.
-    DynamicJsonDocument payload(capacity);
+    DynamicJsonDocument response(capacity);
 
-   // Parse JSON object
+    // Parse JSON object
-    deserializeJson(payload, mWeb->arg("plain"));
+    deserializeJson(response, mWeb->arg("plain"));
     // ToDo: error handling for payload
-    if (payload["tx_request"] == TX_REQ_INFO) {
+    uint8_t iv_id = response["inverter"];
-        mMain->mSys->InfoCmd = payload["cmd"];
+    if (response["tx_request"] == (uint8_t)TX_REQ_INFO) {
-        DPRINTLN(DBG_INFO, F("Will make tx-request 0x15 with subcmd ") + String(mMain->mSys->InfoCmd));
+        mMain->mSys->InfoCmd = response["cmd"];
+        if (mMain->mSys->InfoCmd == AlarmData){
+            Inverter<> *iv = mMain->mSys->getInverterByPos(iv_id);
+            if (NULL != iv){
+                iv->alarmMesIndex = response["payload"];
+            }
+        }
+        DPRINTLN(DBG_INFO, F("Will make tx-request 0x15 with subcmd ") + String(mMain->mSys->InfoCmd) + F(" and payload ") + String(response["payload"]));
     }
-    if (payload["tx_request"] == (uint8_t)TX_REQ_DEVCONTROL){
+    if (response["tx_request"] == (uint8_t)TX_REQ_DEVCONTROL){
-        if(payload["cmd"] == (uint8_t)ActivePowerContr){
+        if(response["cmd"] == (uint8_t)ActivePowerContr){
-            uint8_t iv_id = payload["inverter"];
             if (iv_id >= 0  && iv_id <= MAX_NUM_INVERTERS){
                 Inverter<> *iv = mMain->mSys->getInverterByPos(iv_id);
-                uint16_t webapiPayload = payload["payload"];
+                uint16_t webapiPayload = response["payload"];
-                uint16_t webapiPayload2 = payload["payload2"];
+                uint16_t webapiPayload2 = response["payload2"];
                 if (webapiPayload > 0 && webapiPayload < 10000){
                     iv->devControlCmd = ActivePowerContr;
                     iv->powerLimit[0] = webapiPayload;