Merge pull request #1791 from cshagen/update-colors-display

Colors theme (display): Fix battery priority setting
openWB · Jul 29, 2024 · 42babd4 · 42babd4
2 parents 0e807d1 + c746fc4
commit 42babd4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/modules/display_themes/colors/source/src/assets/js/processMessages.ts b/packages/modules/display_themes/colors/source/src/assets/js/processMessages.ts
@@ -202,8 +202,8 @@ function processPvConfigMessages(topic: string, message: string) {
 	const elements = topic.split('/')
 	if (elements.length > 0) {
 		switch (elements[4]) {
-			case 'bat_prio':
-				globalData.updatePvBatteryPriority(message == 'true')
+			case 'bat_mode':
+				globalData.updatePvBatteryPriority(JSON.parse(message))
 				break
 			default:
 			// console.warn('Ignored PV CONFIG msg: [' + topic + '] ' + message)

diff --git a/packages/modules/display_themes/colors/source/src/assets/js/sendMessages.ts b/packages/modules/display_themes/colors/source/src/assets/js/sendMessages.ts
@@ -15,7 +15,7 @@ const topics: { [topic: string]: string } = {
 	cpTimedCharging:
 		'openWB/set/vehicle/template/charge_template/%/time_charging/active',
 	pvBatteryPriority:
-		'openWB/set/general/chargemode_config/pv_charging/bat_prio',
+		'openWB/set/general/chargemode_config/pv_charging/bat_mode',
 	cpVehicle: 'openWB/set/chargepoint/%/config/ev',
 	cpInstantChargeLimitMode:
 		'openWB/set/vehicle/template/charge_template/%/chargemode/instant_charging/limit/selected',

diff --git a/...hemes/colors/web/assets/index-C7OqKIN-.js → ...hemes/colors/web/assets/index-CiuX3rgu.js b/...hemes/colors/web/assets/index-C7OqKIN-.js → ...hemes/colors/web/assets/index-CiuX3rgu.js
diff --git a/packages/modules/display_themes/colors/web/index.html b/packages/modules/display_themes/colors/web/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>openWB Display</title>
-    <script type="module" crossorigin src="/openWB/web/display/themes/colors/assets/index-C7OqKIN-.js"></script>
+    <script type="module" crossorigin src="/openWB/web/display/themes/colors/assets/index-CiuX3rgu.js"></script>
     <link rel="modulepreload" crossorigin href="/openWB/web/display/themes/colors/assets/vendor-DkUHBf2M.js">
     <link rel="stylesheet" crossorigin href="/openWB/web/display/themes/colors/assets/index-DFLtCAa8.css">
   </head>