v3.39

Author: pvtom

.github/workflows/dockerimage.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       -
         name: Docker meta
         id: meta

DOCKER.md

@@ -10,7 +10,7 @@ A Docker image is available at https://hub.docker.com/r/pvtom/rscp2mqtt
 ### Start the docker container
 
 ```
-docker run --rm -e TZ=Europe/Berlin -e E3DC_IP=<IP> -e E3DC_USER=<your user> -e E3DC_PASSWORD=<your password -e E3DC_AES_PASSWORD=<your AES password> -e MQTT_HOST=<MQTT broker> pvtom/rscp2mqtt:latest
+docker run --rm -e TZ=Europe/Berlin -e E3DC_IP=<IP> -e E3DC_USER=<your user> -e E3DC_PASSWORD=<your password> -e E3DC_AES_PASSWORD=<your AES password> -e MQTT_HOST=<MQTT broker> pvtom/rscp2mqtt:latest
 
 # or with .config
 docker run -e TZ=Europe/Berlin --rm -v /path/to/your/.config:/opt/rscp2mqtt/.config pvtom/rscp2mqtt:latest
@@ -19,7 +19,7 @@ docker run -e TZ=Europe/Berlin --rm -v /path/to/your/.config:/opt/rscp2mqtt/.con
 ### Start the docker container including InfluxDB support 
 
 ```
-docker run --rm -e TZ=Europe/Berlin -e E3DC_IP=<IP> -e E3DC_USER=<your user> -e E3DC_PASSWORD=<your password -e E3DC_AES_PASSWORD=<your AES password> -e MQTT_HOST=<MQTT broker> -e ENABLE_INFLUXDB=true -e INFLUXDB_HOST=<host name> -e INFLUXDB_VERSION=1 -e INFLUXDB_1_DB=<db name> pvtom/rscp2mqtt:latest-with-influxdb
+docker run --rm -e TZ=Europe/Berlin -e E3DC_IP=<IP> -e E3DC_USER=<your user> -e E3DC_PASSWORD=<your password> -e E3DC_AES_PASSWORD=<your AES password> -e MQTT_HOST=<MQTT broker> -e ENABLE_INFLUXDB=true -e INFLUXDB_HOST=<host name> -e INFLUXDB_VERSION=1 -e INFLUXDB_1_DB=<db name> pvtom/rscp2mqtt:latest-with-influxdb
 
 # or with .config
 docker run -e TZ=Europe/Berlin --rm -v /path/to/your/.config:/opt/rscp2mqtt/.config pvtom/rscp2mqtt:latest-with-influxdb

README.md

@@ -130,7 +130,7 @@ or to show the help page
 If everything works properly, you will see something like this:
 
 ```
-rscp2mqtt [3.38]
+rscp2mqtt [3.39]
 E3DC system >192.168.178.111:5033< user: >your E3DC user<
 MQTT broker >localhost:1883< qos = >0< retain = >✗< tls >✗< client id >✗< prefix >e3dc<
 Requesting PVI ✓ | PM (0) | DCB ✓ (1 battery string) | Wallbox ✗ | Interval 2 | Autorefresh ✓ | Raw data ✗ | Logging OFF

RELEASE.md

@@ -1,5 +1,12 @@
 ## Release Notes
 
+### Release v3.39 (11.10.2025)
+
+Features:
+- Pull request #113
+- Issue #111: New topics e3dc/wallbox/auto_phase_switch and e3dc/set/wallbox/auto_phase_switch
+- Issue #116: .config can be edited by a Windows Editor (CR/LF) now
+
 ### Release v3.38 (06.07.2025)
 
 Features:

RscpMqttMain.cpp

@@ -22,7 +22,7 @@
 #include <regex>
 #include <mutex>
 
-#define RSCP2MQTT_VERSION       "3.38"
+#define RSCP2MQTT_VERSION       "3.39"
 
 #define AES_KEY_SIZE            32
 #define AES_BLOCK_SIZE          32
@@ -1822,6 +1822,7 @@ void createRequest(SRscpFrameBuffer * frameBuffer) {
                 protocol.appendValue(&WBContainer, TAG_WB_REQ_PM_ACTIVE_PHASES);
                 protocol.appendValue(&WBContainer, TAG_WB_REQ_EXTERN_DATA_ALG);
                 protocol.appendValue(&WBContainer, TAG_WB_REQ_NUMBER_PHASES);
+                protocol.appendValue(&WBContainer, TAG_WB_REQ_AUTO_PHASE_SWITCH_ENABLED); // Issue #111
                 protocol.appendValue(&WBContainer, TAG_WB_REQ_KEY_STATE);
                 protocol.appendValue(&WBContainer, TAG_WB_REQ_PM_POWER_L1);
                 protocol.appendValue(&WBContainer, TAG_WB_REQ_PM_POWER_L2);
@@ -3059,7 +3060,7 @@ int main(int argc, char *argv[], char *envp[]) {
             if (skip) continue;
             memset(key, 0, sizeof(key));
             memset(value, 0, sizeof(value));
-            if (sscanf(line, "%127[^ \t=]=%127[^\n]", key, value) == 2) {
+            if (sscanf(line, "%127[^ \t=]=%127[^\r^\n]", key, value) == 2) { // Issue #116 accept Windows format as well
                 if (strcasecmp(key, "E3DC_IP") == 0)
                     strcpy(cfg.e3dc_ip, value);
                 else if (strcasecmp(key, "E3DC_PORT") == 0)
@@ -3434,7 +3435,11 @@ int main(int argc, char *argv[], char *envp[]) {
             addSetTopic(TAG_WB_REQ_DATA, TAG_WB_REQ_SET_MIN_CHARGE_CURRENT, c, topic, (char *)"^[0-9]{1,2}$", (char *)"", (char *)"", (char *)"", RSCP::eTypeUChar8, false);
 
             sprintf(topic, "set/wallbox/%d/number_phases", c + 1);
-            addSetTopic(TAG_WB_REQ_DATA, TAG_WB_REQ_SET_NUMBER_PHASES, c, topic, (char *)"^1|3$", (char *)"", (char *)"", (char *)"", RSCP::eTypeUChar8, true);
+            addSetTopic(TAG_WB_REQ_DATA, TAG_WB_REQ_SET_NUMBER_PHASES, c, topic, (char *)"^1|3$", (char *)"", (char *)"", (char *)"", RSCP::eTypeUChar8, false);
+
+// Issue #111
+            sprintf(topic, "set/wallbox/%d/auto_phase_switch", c + 1);
+            addSetTopic(TAG_WB_REQ_DATA, TAG_WB_REQ_SET_AUTO_PHASE_SWITCH_ENABLED, c, topic, (char *)"^true|on|1$", (char *)"true", (char *)"^false|off|0$", (char *)"false", RSCP::eTypeBool, true);
         }
     }
 

RscpMqttMapping.h

@@ -495,6 +495,7 @@ cache_t templates[] = {
     { TAG_WB_DATA, TAG_WB_PM_ACTIVE_PHASES, 0, "%s/phases/L2", "", F_AUTO, UNIT_NONE, 1, 2, false, false, false, false, false },
     { TAG_WB_DATA, TAG_WB_PM_ACTIVE_PHASES, 0, "%s/phases/L3", "", F_AUTO, UNIT_NONE, 1, 4, false, false, false, false, false },
     { TAG_WB_DATA, TAG_WB_NUMBER_PHASES, 0, "%s/number_phases", "", F_AUTO, UNIT_NONE, 1, 0, false, false, false, false, false },
+    { TAG_WB_DATA, TAG_WB_AUTO_PHASE_SWITCH_ENABLED, 0, "%s/auto_phase_switch", "", F_AUTO, UNIT_NONE, 1, 0, false, false, false, false, false }, // Issue #111
     { TAG_WB_DATA, TAG_WB_MIN_CHARGE_CURRENT, 0, "%s/min_current", "", F_AUTO, UNIT_A, 1, 0, false, false, false, false, false }, // Issue #84
     { TAG_WB_DATA, TAG_WB_SOC, 0, "%s/soc", "", F_AUTO, UNIT_PERCENT, 1, 0, false, false, false, false, false },
     { TAG_WB_DATA, TAG_WB_KEY_STATE, 0, "%s/key_state", "", F_AUTO, UNIT_NONE, 1, 1, false, false, false, false, false },
@@ -556,6 +557,7 @@ rec_cache_t rec_cache[] = {
     { TAG_WB_REQ_DATA, TAG_WB_EXTERN_DATA, 0, "set/wallbox/suspended", "^true|on|1$", "1", "^false|off|0$", "0", "", UNIT_NONE, RSCP::eTypeBool, 0, false, true },
     { TAG_WB_REQ_DATA, TAG_WB_EXTERN_DATA, 0, "set/wallbox/max_current", "^[0-9]{1,2}$", "", "", "", "", UNIT_A, RSCP::eTypeUChar8, 0, false, true },
     { TAG_WB_REQ_DATA, TAG_WB_REQ_SET_NUMBER_PHASES, 0, "set/wallbox/number_phases", "^1|3$", "", "", "", "", UNIT_NONE, RSCP::eTypeUChar8, 0, false, true },
+    { TAG_WB_REQ_DATA, TAG_WB_REQ_SET_AUTO_PHASE_SWITCH_ENABLED, 0, "set/wallbox/auto_phase_switch", "^true|on|1$", "true", "^false|off|0$", "false", "", UNIT_NONE, RSCP::eTypeBool, 0, false, true }, // Issue #111
     { TAG_WB_REQ_DATA, TAG_WB_REQ_SET_MIN_CHARGE_CURRENT, 0, "set/wallbox/min_current", "^[0-9]{1,2}$", "", "", "", "", UNIT_A, RSCP::eTypeUChar8, 0, false, true }, // Issue #84
     { 0, 0, 0, "set/requests/pm", "^true|on|1$", "true", "^false|off|0$", "false", "", UNIT_NONE, RSCP::eTypeBool, 0, false, true },
     { 0, 0, 0, "set/requests/pvi", "^true|on|1$", "true", "^false|off|0$", "false", "", UNIT_NONE, RSCP::eTypeBool, 0, false, true },

TOPICS.md

@@ -256,6 +256,7 @@ All topics are listed with the default prefix "e3dc".
 | Wallbox Phases **** | e3dc/wallbox/phases/L2 | (true/false) |
 | Wallbox Phases **** | e3dc/wallbox/phases/L3 | (true/false) |
 | Wallbox Phases **** | e3dc/wallbox/number_phases | (1/3) |
+| Wallbox Phases **** | e3dc/wallbox/auto_phase_switch | (true/false) |
 | Wallbox Plugged **** | e3dc/wallbox/plugged | (true/false) |
 | Wallbox Power All | e3dc/wallbox/solar/power | [W] |
 | Wallbox Power Solar | e3dc/wallbox/total/power | [W] |
@@ -360,6 +361,7 @@ Please find detailled information and examples in the [README](README.md).
 | Set battery discharge until [%] | e3dc/set/wallbox/discharge_battery_until | [%] |
 | Set disable charging battery at mix mode | e3dc/set/wallbox/disable_battery_at_mix_mode | (true/false) |
 | Set number of phases | e3dc/set/wallbox/number_phases | (1/3) |
+| Set auto phase switch | e3dc/set/wallbox/auto_phase_switch | (true/false) |
 | Historical daily data | | |
 | Query data for a specific day | e3dc/set/request/day | "2023-12-31" |
 | Settings and others | | |

WALLBOX.md

@@ -50,7 +50,8 @@ The following topics are sent to the MQTT broker:
 | Wallbox Phases * | e3dc/wallbox/phases/L1 | (true/false) |
 | Wallbox Phases * | e3dc/wallbox/phases/L2 | (true/false) |
 | Wallbox Phases * | e3dc/wallbox/phases/L3 | (true/false) |
-| Wallbox Phases * | e3dc/wallbox/number_phases | |
+| Wallbox Phases * | e3dc/wallbox/number_phases | (1/3) |
+| Wallbox Phases * | e3dc/wallbox/auto_phase_switch | (true/false) |
 | Wallbox Plugged * | e3dc/wallbox/plugged | (true/false) |
 | Wallbox Power All | e3dc/wallbox/solar/power | [W] |
 | Wallbox Power Solar | e3dc/wallbox/total/power | [W] |
@@ -134,6 +135,17 @@ mosquitto_pub -h localhost -p 1883 -t "e3dc/set/wallbox/2/number_phases" -m 1 #
 mosquitto_pub -h localhost -p 1883 -t "e3dc/set/wallbox/8/number_phases" -m 1 # for the eighth wallbox
 ```
 
+Set auto phase switch (true/1/false/0)
+```
+mosquitto_pub -h localhost -p 1883 -t "e3dc/set/wallbox/auto_phase_switch" -m true
+# 
+# or if more than one wallbox is available
+mosquitto_pub -h localhost -p 1883 -t "e3dc/set/wallbox/1/auto_phase_switch" -m true # for the first wallbox
+mosquitto_pub -h localhost -p 1883 -t "e3dc/set/wallbox/2/auto_phase_switch" -m true # for the second wallbox
+# ...
+mosquitto_pub -h localhost -p 1883 -t "e3dc/set/wallbox/8/auto_phase_switch" -m true # for the eighth wallbox
+```
+
 The following settings apply to all available wallboxes:
 
 Set battery to car mode (true/1/false/0)