Skip to content

Commit 2f1cd68

Browse files
authored
Merge pull request #3226 from benderl/secondary-displays
fix status on secondary displays
2 parents 1f13b2d + 64cf354 commit 2f1cd68

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

packages/modules/display_themes/cards/source/src/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ export default {
6464
"openWB/general/chargemode_config/pv_charging/bat_mode",
6565
"openWB/optional/ep/configured",
6666
"openWB/optional/ep/get/prices",
67+
"openWB/optional/int_display/only_local_charge_points",
6768
"openWB/optional/int_display/theme",
6869
"openWB/optional/int_display/standby",
6970
"openWB/optional/rfid/active",

packages/modules/display_themes/cards/source/src/stores/mqtt.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ export const useMqttStore = defineStore("mqtt", {
1919

2020
getChargePointFilter: (state) => {
2121
let filter = [];
22-
if (state.settings.parentChargePoint1 !== undefined) {
23-
filter.push(state.settings.parentChargePoint1);
24-
}
25-
if (state.settings.parentChargePoint2 !== undefined) {
26-
filter.push(state.settings.parentChargePoint2);
22+
if (state.topics["openWB/optional/int_display/only_local_charge_points"] === true) {
23+
if (state.settings.parentChargePoint1 !== undefined) {
24+
filter.push(state.settings.parentChargePoint1);
25+
}
26+
if (state.settings.parentChargePoint2 !== undefined) {
27+
filter.push(state.settings.parentChargePoint2);
28+
}
2729
}
2830
return filter;
2931
},

web/display/processAllMqttMsg.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ function setIframeSource() {
5959
const theme = data["openWB/optional/int_display/theme"].type;
6060
const searchParams = new URLSearchParams(location.search);
6161

62-
if (data["openWB/optional/int_display/only_local_charge_points"]) {
63-
if (searchParams.has("data")) {
64-
query.append("data", searchParams.get("data"));
65-
}
62+
if (searchParams.has("data")) {
63+
console.warn("Detected query parameters! Forwarding data to display theme:", searchParams.get("data"));
64+
query.append("data", searchParams.get("data"));
6665
}
6766
if (credentialsFetched) {
6867
query.append("hide_login", "1");

0 commit comments

Comments
 (0)