v3.25

pvtom · Jun 8, 2024 · dd00f6e · dd00f6e
1 parent 5dd43df
commit dd00f6e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -153,19 +153,19 @@ or to show the help page
 If everything works properly, you will see something like this:
 
 ```
-rscp2mqtt [3.24]
+rscp2mqtt [3.25]
 E3DC system >192.168.178.111:5033< user: >your E3DC user<
 MQTT broker >localhost:1883< qos = >0< retain = >false< tls >✗< client id >✗< prefix >e3dc<
 Fetching data every second.
 Requesting PVI ✓ | PM (0) | DCB ✓ (1 battery string) | Wallbox (0) ✗ | Autorefresh ✓
 Log Level = 2 (BUFFERED)
 Stdout to terminal
 
-[2024-06-01 09:00:00] pid=30240 ppid=1 RscpMqttMain.cpp(3022) Connecting to server 192.168.178.111:5033
-[2024-06-01 09:00:00] pid=30240 ppid=1 RscpMqttMain.cpp(3029) Success: E3DC connected.
-[2024-06-01 09:00:00] pid=30240 ppid=1 RscpMqttMain.cpp(1903) RSCP authentication level 10
-[2024-06-01 09:00:00] pid=30240 ppid=1 RscpMqttMain.cpp(2435) Connecting to broker localhost:1883
-[2024-06-01 09:00:00] pid=30240 ppid=1 RscpMqttMain.cpp(2456) Success: MQTT broker connected.
+[2024-06-08 08:00:00] pid=30250 ppid=1 RscpMqttMain.cpp(3022) Connecting to server 192.168.178.111:5033
+[2024-06-08 08:00:00] pid=30250 ppid=1 RscpMqttMain.cpp(3029) Success: E3DC connected.
+[2024-06-08 08:00:00] pid=30250 ppid=1 RscpMqttMain.cpp(1903) RSCP authentication level 10
+[2024-06-08 08:00:00] pid=30250 ppid=1 RscpMqttMain.cpp(2435) Connecting to broker localhost:1883
+[2024-06-08 08:00:00] pid=30250 ppid=1 RscpMqttMain.cpp(2456) Success: MQTT broker connected.
 ```
 
 Check the configuration if the connections are not established.
@@ -238,6 +238,7 @@ Set the charging and discharging power limits in [W]
 ```
 mosquitto_pub -h localhost -p 1883 -t "e3dc/set/max_charge_power" -m 2300
 mosquitto_pub -h localhost -p 1883 -t "e3dc/set/max_discharge_power" -m 4500
+mosquitto_pub -h localhost -p 1883 -t "e3dc/set/discharge_start_power" -m 65
 ```
 
 ### Idle Periods

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,5 +1,10 @@
 ## Release Notes
 
+### Release v3.25 (08.06.2024)
+
+Features:
+- Issue #74: Min. Charge/Discharge Limit
+
 ### Release v3.24 (01.06.2024)
 
 Bug fixes:

diff --git a/RscpMqttMain.cpp b/RscpMqttMain.cpp
@@ -21,7 +21,7 @@
 #include <regex>
 #include <mutex>
 
-#define RSCP2MQTT_VERSION       "3.24"
+#define RSCP2MQTT_VERSION       "3.25"
 
 #define AES_KEY_SIZE            32
 #define AES_BLOCK_SIZE          32

diff --git a/RscpMqttMapping.h b/RscpMqttMapping.h
@@ -485,8 +485,12 @@ rec_cache_t rec_cache[] = {
     { 0, TAG_EMS_REQ_START_MANUAL_CHARGE, "set/manual_charge", PAYLOAD_REGEX_5_DIGIT, "", "", "", "", UNIT_W, RSCP::eTypeUInt32, -1, false, true },
     { TAG_EMS_REQ_SET_POWER_SETTINGS, TAG_EMS_WEATHER_REGULATED_CHARGE_ENABLED, "set/weather_regulation", "^true|on|1$", "1", "^false|off|0$", "0", "", UNIT_NONE, RSCP::eTypeUChar8, -1, false, true },
     { TAG_EMS_REQ_SET_POWER_SETTINGS, TAG_EMS_POWER_LIMITS_USED, "set/power_limits", "^true|on|1$", "true", "^false|off|0$", "false", "", UNIT_NONE, RSCP::eTypeBool, -1, false, true },
+    { TAG_EMS_REQ_SET_POWER_SETTINGS, TAG_EMS_DISCHARGE_START_POWER, "set/discharge_start_power",  PAYLOAD_REGEX_5_DIGIT, "", "", "", "", UNIT_W, RSCP::eTypeUInt32, -1, false, true },
+    { TAG_EMS_REQ_SET_POWER_SETTINGS, TAG_EMS_DISCHARGE_START_POWER, "set/discharge_start/power",  PAYLOAD_REGEX_5_DIGIT, "", "", "", "", UNIT_W, RSCP::eTypeUInt32, -1, false, true },
     { TAG_EMS_REQ_SET_POWER_SETTINGS, TAG_EMS_MAX_CHARGE_POWER, "set/max_charge_power", PAYLOAD_REGEX_5_DIGIT, "", "", "", "", UNIT_W, RSCP::eTypeUInt32, -1, false, true },
+    { TAG_EMS_REQ_SET_POWER_SETTINGS, TAG_EMS_MAX_CHARGE_POWER, "set/max_charge/power", PAYLOAD_REGEX_5_DIGIT, "", "", "", "", UNIT_W, RSCP::eTypeUInt32, -1, false, true },
     { TAG_EMS_REQ_SET_POWER_SETTINGS, TAG_EMS_MAX_DISCHARGE_POWER, "set/max_discharge_power", PAYLOAD_REGEX_5_DIGIT, "", "", "", "", UNIT_W, RSCP::eTypeUInt32, -1, false, true },
+   { TAG_EMS_REQ_SET_POWER_SETTINGS, TAG_EMS_MAX_DISCHARGE_POWER, "set/max_discharge/power", PAYLOAD_REGEX_5_DIGIT, "", "", "", "", UNIT_W, RSCP::eTypeUInt32, -1, false, true },
     { TAG_EMS_REQ_SET_POWER, TAG_EMS_REQ_SET_POWER_MODE, "power_mode: mode", "", "", "", "", "", UNIT_NONE, RSCP::eTypeUChar8, 0, false, true },
     { TAG_EMS_REQ_SET_POWER, TAG_EMS_REQ_SET_POWER_VALUE, "power_mode: value", "", "", "", "", "", UNIT_NONE, RSCP::eTypeInt32, 0, false, true },
     { TAG_SE_REQ_SET_EP_RESERVE, TAG_SE_PARAM_EP_RESERVE, "set/reserve/percent", PAYLOAD_REGEX_0_100, "", "", "", "", UNIT_PERCENT, RSCP::eTypeFloat32, -1, false, true },

diff --git a/TOPICS.md b/TOPICS.md
@@ -309,6 +309,7 @@ Please find detailled information and examples in the [README](README.md).
 | Set limits for battery charging and discharging | e3dc/set/power_limits | (true/false) |
 |  - set the charging and discharging power limits | e3dc/set/max_charge_power | [W] |
 |  - set the charging and discharging power limits | e3dc/set/max_discharge_power | [W] |
+|  - set the charging and discharging power limits | e3dc/set/discharge_start_power | [W] |
 | Set idle periods to lock battery charging or discharging | e3dc/set/idle_period | "day:mode:active:hh:mi-hh:mi", e.g. "sunday:charge:true:00:00-23:59" |
 | SOC Limiter | | |
 | Limit discharging of the house battery to SOC | e3dc/set/limit/discharge/soc | (0-100) |