Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/control/chargepoint/chargepoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,8 @@ def chargemode_support_phase_switch(self) -> bool:
control_parameter = self.data.control_parameter
pv_auto_switch = ((control_parameter.chargemode == Chargemode.PV_CHARGING or
control_parameter.chargemode == Chargemode.ECO_CHARGING) and
control_parameter.submode == Chargemode.PV_CHARGING and
(control_parameter.submode == Chargemode.PV_CHARGING or
control_parameter.submode == Chargemode.INSTANT_CHARGING) and
self.data.set.charge_template.data.chargemode.pv_charging.phases_to_use == 0)
for p in self.data.set.charge_template.data.chargemode.scheduled_charging.plans:
if p.id == self.data.control_parameter.current_plan:
Expand Down
12 changes: 11 additions & 1 deletion packages/modules/web_themes/koala/source/quasar.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { defineConfig } from '#q-app/wrappers';

export default defineConfig((/* ctx */) => {
export default defineConfig((ctx) => {
return {
// https://v2.quasar.dev/quasar-cli-vite/prefetch-feature
// preFetch: true,
Expand Down Expand Up @@ -56,6 +56,16 @@ export default defineConfig((/* ctx */) => {
distDir: '../web/',

// extendViteConf (viteConf) {},
extendViteConf(viteConf) {
if (ctx.prod === true) {
// drop console statements in production build
viteConf.esbuild = {
...viteConf.esbuild,
drop: ['debugger'],
pure: ['console.log', 'console.info', 'console.debug', 'console.table'],
};
}
},
// viteVuePluginOptions: {},

vitePlugins: [
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import{b as t}from"./index-CmDneGoC.js";import{u as o}from"./mqtt-store-CdQu5WWJ.js";const s=t(()=>{o().initialize()});export{s as default};

This file was deleted.

2 changes: 1 addition & 1 deletion packages/modules/web_themes/koala/web/index.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!doctype html><html><head><title>openWB</title><meta charset=utf-8><meta name=description content="Koala web theme for openWB software2"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=mobile-web-app-capable content=yes><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png sizes=128x128 href=/openWB/web/themes/koala/icons/favicon-128x128.png><link rel=icon type=image/png sizes=96x96 href=/openWB/web/themes/koala/icons/favicon-96x96.png><link rel=icon type=image/png sizes=32x32 href=/openWB/web/themes/koala/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/openWB/web/themes/koala/icons/favicon-16x16.png><link rel=icon type=image/ico href=/openWB/web/themes/koala/favicon.ico> <script type="module" crossorigin src="/openWB/web/themes/koala/assets/index-BBNHe89s.js"></script>
<!doctype html><html><head><title>openWB</title><meta charset=utf-8><meta name=description content="Koala web theme for openWB software2"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=mobile-web-app-capable content=yes><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png sizes=128x128 href=/openWB/web/themes/koala/icons/favicon-128x128.png><link rel=icon type=image/png sizes=96x96 href=/openWB/web/themes/koala/icons/favicon-96x96.png><link rel=icon type=image/png sizes=32x32 href=/openWB/web/themes/koala/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/openWB/web/themes/koala/icons/favicon-16x16.png><link rel=icon type=image/ico href=/openWB/web/themes/koala/favicon.ico> <script type="module" crossorigin src="/openWB/web/themes/koala/assets/index-CmDneGoC.js"></script>
<link rel="stylesheet" crossorigin href="/openWB/web/themes/koala/assets/index-CQyGg22l.css">
</head><body><div id=q-app></div></body></html>
17 changes: 12 additions & 5 deletions runs/factory_reset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ fi
case "$1" in
"clearall")
echo "checking for configured cloud bridge..."
cloud_bridge=$(timeout 1 mosquitto_sub -t 'openWB/system/mqtt/bridge/+' | grep -E '"is_openwb_cloud": ?true')
cloud_bridge=$(timeout 1 mosquitto_sub -v -t 'openWB/system/mqtt/bridge/+' | grep -E '"is_openwb_cloud": ?true')
echo "$cloud_bridge"
if [ -n "$cloud_bridge" ]; then
echo "cloud bridge is configured"
cloud_bridge_index=$(echo "$cloud_bridge" | cut -d' ' -f1 | cut -d'/' -f5)
cloud_bridge_configuration=$(echo "$cloud_bridge" | cut -d' ' -f2-)
echo "cloud bridge is configured with index \"$cloud_bridge_index\""
echo "configuration: $cloud_bridge_configuration"
valid_partner_ids=$(timeout 1 mosquitto_sub -t 'openWB/system/mqtt/valid_partner_ids' -C 1)
php -f "$OPENWBBASEDIR/runs/save_mqtt.php" "$cloud_bridge_index" ''
else
echo "no cloud bridge configured"
fi
Expand All @@ -25,10 +30,12 @@ case "$1" in
echo "reset display rotation"
sudo sed -i "s/^lcd_rotate=[0-3]$/lcd_rotate=0/" "/boot/config.txt"
if [ -n "$cloud_bridge" ]; then
echo "restore cloud bridge configuration: $cloud_bridge"
mosquitto_pub -t 'openWB/command/max_id/mqtt_bridge' -r -m 1 -p 1886
new_cloud_bridge_index=0
echo "restore cloud bridge configuration at index \"$new_cloud_bridge_index\": $cloud_bridge_configuration"
mosquitto_pub -t 'openWB/command/max_id/mqtt_bridge' -r -m $new_cloud_bridge_index -p 1886
mosquitto_pub -t 'openWB/system/mqtt/valid_partner_ids' -r -m "$valid_partner_ids" -p 1886
mosquitto_pub -t 'openWB/system/mqtt/bridge/0' -r -m "$cloud_bridge" -p 1886
mosquitto_pub -t "openWB/system/mqtt/bridge/$new_cloud_bridge_index" -r -m "$cloud_bridge_configuration" -p 1886
php -f "$OPENWBBASEDIR/runs/save_mqtt.php" "$new_cloud_bridge_index" "$cloud_bridge_configuration"
fi
echo "all done";;
*)
Expand Down
Loading