Merge pull request #1584 from benderl/fixes

Fixes
openWB · Apr 26, 2024 · 4f82aa6 · 4f82aa6
2 parents 4821642 + a4c1824
commit 4f82aa6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py
@@ -193,7 +193,9 @@ class UpdateConfig:
         "^openWB/general/chargemode_config/pv_charging/phases_to_use$",
         "^openWB/general/chargemode_config/pv_charging/min_bat_soc$",
         "^openWB/general/chargemode_config/pv_charging/bat_power_discharge$",
+        "^openWB/general/chargemode_config/pv_charging/bat_power_discharge_active$",
         "^openWB/general/chargemode_config/pv_charging/bat_power_reserve$",
+        "^openWB/general/chargemode_config/pv_charging/bat_power_reserve_active$",
         "^openWB/general/chargemode_config/retry_failed_phase_switches$",
         "^openWB/general/chargemode_config/scheduled_charging/phases_to_use$",
         "^openWB/general/chargemode_config/instant_charging/phases_to_use$",
@@ -419,8 +421,10 @@ class UpdateConfig:
         ("openWB/general/chargemode_config/instant_charging/phases_to_use", 3),
         ("openWB/general/chargemode_config/pv_charging/bat_mode", BatConsiderationMode.EV_MODE.value),
         ("openWB/general/chargemode_config/pv_charging/bat_power_discharge", 1000),
+        ("openWB/general/chargemode_config/pv_charging/bat_power_discharge_active", True),
         ("openWB/general/chargemode_config/pv_charging/min_bat_soc", 50),
         ("openWB/general/chargemode_config/pv_charging/bat_power_reserve", 200),
+        ("openWB/general/chargemode_config/pv_charging/bat_power_reserve_active", True),
         ("openWB/general/chargemode_config/pv_charging/control_range", [0, 230]),
         ("openWB/general/chargemode_config/pv_charging/switch_off_threshold", 50),
         ("openWB/general/chargemode_config/pv_charging/switch_off_delay", 60),

diff --git a/packages/modules/web_themes/standard_legacy/web/index.html b/packages/modules/web_themes/standard_legacy/web/index.html
@@ -164,14 +164,14 @@
 								<div class="col-md-8 btn-group btn-group-toggle bat-consideration-mode"
 									data-toggle="buttons" data-name="bat_consideration_mode"
 									data-topic="openWB/set/general/chargemode_config/pv_charging/bat_mode">
-									<label class="btn btn-outline-primary btn-toggle">
-										<input type="radio" name="bat_mode_name" data-option="ev_mode">Fahrzeuge
+									<label class="btn btn-outline-primary btn-toggle" title="Fahrzeuge">
+										<input type="radio" name="bat_mode_name" data-option="ev_mode"><i class="fas fa-car-side"></i>
 									</label>
-									<label class="btn btn-outline-warning btn-toggle">
-										<input type="radio" name="bat_mode_name" data-option="bat_mode">Speicher
+									<label class="btn btn-outline-warning btn-toggle" title="Speicher">
+										<input type="radio" name="bat_mode_name" data-option="bat_mode"><i class="fas fa-car-battery"></i>
 									</label>
-									<label class="btn btn-outline-success btn-toggle">
-										<input type="radio" name="bat_mode_name" data-option="min_soc_bat_mode">Mindest-SoC
+									<label class="btn btn-outline-success btn-toggle" title="Mindest-SoC des Speichers">
+										<input type="radio" name="bat_mode_name" data-option="min_soc_bat_mode"><i class="fas fa-battery-half"></i>
 									</label>
 								</div>
 							</div>