diff --git a/loadvars.sh b/loadvars.sh index 804e456a0..b0fa75ecb 100755 --- a/loadvars.sh +++ b/loadvars.sh @@ -1839,6 +1839,14 @@ loadvars(){ mqttconfvar["config/get/sofort/lp/6/etBasedCharging"]=lp6etbasedcharging mqttconfvar["config/get/sofort/lp/7/etBasedCharging"]=lp7etbasedcharging mqttconfvar["config/get/sofort/lp/8/etBasedCharging"]=lp8etbasedcharging + mqttconfvar["config/get/sofort/lp/1/etChargeMaxPrice"]=lp1etchargemaxprice + mqttconfvar["config/get/sofort/lp/2/etChargeMaxPrice"]=lp2etchargemaxprice + mqttconfvar["config/get/sofort/lp/3/etChargeMaxPrice"]=lp3etchargemaxprice + mqttconfvar["config/get/sofort/lp/4/etChargeMaxPrice"]=lp4etchargemaxprice + mqttconfvar["config/get/sofort/lp/5/etChargeMaxPrice"]=lp5etchargemaxprice + mqttconfvar["config/get/sofort/lp/6/etChargeMaxPrice"]=lp6etchargemaxprice + mqttconfvar["config/get/sofort/lp/7/etChargeMaxPrice"]=lp7etchargemaxprice + mqttconfvar["config/get/sofort/lp/8/etChargeMaxPrice"]=lp8etchargemaxprice mqttconfvar["config/get/pv/lp/1/socLimitation"]=stopchargepvatpercentlp1 mqttconfvar["config/get/pv/lp/2/socLimitation"]=stopchargepvatpercentlp2 mqttconfvar["config/get/pv/lp/1/maxSoc"]=stopchargepvpercentagelp1 @@ -1850,6 +1858,10 @@ loadvars(){ mqttconfvar["config/get/display/chartBatteryMinMax"]=displayspeichermax mqttconfvar["config/get/display/chartPvMax"]=displaypvmax mqttconfvar["config/get/display/showHouseConsumption"]=displayhausanzeigen + mqttconfvar["config/get/display/showPrice"]=displayshowprice + mqttconfvar["config/get/display/showRfidPad"]=displayshowrfidpad + mqttconfvar["config/get/display/pinRequired"]=displaypinaktiv + mqttconfvar["config/get/display/allowSetMaxPrice"]=displayallowsetmaxprice mqttconfvar["config/get/display/chartHouseConsumptionMax"]=displayhausmax mqttconfvar["config/get/display/chartLp/1/max"]=displaylp1max mqttconfvar["config/get/display/chartLp/2/max"]=displaylp2max diff --git a/modules/extopenwb/main.sh b/modules/extopenwb/main.sh index 912390e16..1a5f1242c 100755 --- a/modules/extopenwb/main.sh +++ b/modules/extopenwb/main.sh @@ -35,7 +35,9 @@ if [[ $(wc -l <"$outputname") -ge 5 ]]; then echo "$boolPlugStat" > "$RAMDISKDIR/plugstat" echo "$boolChargeStat" > "$RAMDISKDIR/chargestat" soc=$(<"$RAMDISKDIR/soc") + socEnabled=$(<"$RAMDISKDIR/socvorhanden") mosquitto_pub -h "$ip" -r -t "openWB/set/lp/$chargepcp/%Soc" -m "$soc" + mosquitto_pub -h "$ip" -r -t "openWB/set/lp/$chargepcp/boolSocConfigured" -m "$socEnabled" fi if (( chargep == "2" ));then echo "$VPhase1" > "$RAMDISKDIR/llvs11" @@ -49,7 +51,9 @@ if [[ $(wc -l <"$outputname") -ge 5 ]]; then echo "$boolPlugStat" > "$RAMDISKDIR/plugstats1" echo "$boolChargeStat" > "$RAMDISKDIR/chargestats1" soc=$(<"$RAMDISKDIR/soc1") + socEnabled=$(<"$RAMDISKDIR/soc1vorhanden") mosquitto_pub -h "$ip" -r -t "openWB/set/lp/$chargepcp/%Soc" -m "$soc" + mosquitto_pub -h "$ip" -r -t "openWB/set/lp/$chargepcp/boolSocConfigured" -m "$socEnabled" fi if (( chargep == "3" ));then echo "$VPhase1" > "$RAMDISKDIR/llvs21" @@ -80,6 +84,21 @@ if [[ $(wc -l <"$outputname") -ge 5 ]]; then mosquitto_pub -h "$ip" -r -t "openWB/set/isss/ClearRfid" -m "1" fi + cpEnabled=$(<"$RAMDISKDIR/lp${chargep}enabled") + etEnabled=$(<"$RAMDISKDIR/mqttetprovideraktiv") + etPriceList=$(<"$RAMDISKDIR/etprovidergraphlist") + etGlobalPrice=$(<"$RAMDISKDIR/etprovidermaxprice") + etCurrentPrice=$(<"$RAMDISKDIR/etproviderprice") + etMode=$(<"$RAMDISKDIR/mqttlp${chargep}etbasedcharging") + etLocalPrice=$(<"$RAMDISKDIR/mqttlp${chargep}etchargemaxprice") + mosquitto_pub -h "$ip" -r -t openWB/set/lp/$chargepcp/ChargePointEnabled -m "$cpEnabled" + mosquitto_pub -h "$ip" -r -t openWB/set/awattar/boolAwattarEnabled -m "$etEnabled" + mosquitto_pub -h "$ip" -r -t openWB/set/awattar/pricelist -m "$etPriceList" + mosquitto_pub -h "$ip" -r -t openWB/set/awattar/MaxPriceForCharging -m "$etGlobalPrice" + mosquitto_pub -h "$ip" -r -t openWB/set/awattar/ActualPriceForCharging -m "$etCurrentPrice" + mosquitto_pub -h "$ip" -r -t openWB/config/set/sofort/lp/$chargepcp/etBasedCharging -m "$etMode" + mosquitto_pub -h "$ip" -r -t openWB/config/set/sofort/lp/$chargepcp/etChargeMaxPrice -m "$etLocalPrice" + mosquitto_pub -h "$ip" -r -t "openWB/set/isss/parentWB" -m "$myipaddress" if (( chargepcp == "1" )); then mosquitto_pub -h "$ip" -r -t "openWB/set/isss/parentCPlp1" -m "$chargep" diff --git a/runs/initRamdisk.sh b/runs/initRamdisk.sh index cb1eb6e31..86c852ef6 100755 --- a/runs/initRamdisk.sh +++ b/runs/initRamdisk.sh @@ -535,6 +535,14 @@ initRamdisk(){ "mqttlp6etbasedcharging:-1" \ "mqttlp7etbasedcharging:-1" \ "mqttlp8etbasedcharging:-1" \ + "mqttlp1etchargemaxprice:-1" \ + "mqttlp2etchargemaxprice:-1" \ + "mqttlp3etchargemaxprice:-1" \ + "mqttlp4etchargemaxprice:-1" \ + "mqttlp5etchargemaxprice:-1" \ + "mqttlp6etchargemaxprice:-1" \ + "mqttlp7etchargemaxprice:-1" \ + "mqttlp8etchargemaxprice:-1" \ "mqttevuglaettungakt:-1" \ "mqtthausverbrauch:-1" \ "mqtthausverbrauchstat:-1" \ diff --git a/runs/mqttsub.py b/runs/mqttsub.py index 2f37133a8..8814976b9 100755 --- a/runs/mqttsub.py +++ b/runs/mqttsub.py @@ -171,6 +171,7 @@ def map_run(message: str, device_number: int, option: str): "device_speichersocbeforestop": create_topic_handler(int_range_validator(0, 100)), "device_maxeinschaltdauer": create_topic_handler(int_range_validator(0, 100000)), "device_mineinschaltdauer": create_topic_handler(int_range_validator(0, 100000)), + "device_mindayeinschaltdauer": create_topic_handler(int_range_validator(0, 100000)), "device_manual_control": create_topic_handler(int_range_validator(0, 1), ( write_ramdisk_action("smarthome_device_manual_control"), republish_action)), "mode": create_topic_handler(int_range_validator(0, 1), @@ -289,7 +290,7 @@ def on_message(client: mqtt.Client, userdata, msg: mqtt.MQTTMessage): f.write(msg.payload.decode("utf-8")) f.close() client.publish("openWB/config/get/SmartHome/maxBatteryPower", - msg.payload.decode("utf-8"), qos=0, retain=True) + msg.payload.decode("utf-8"), qos=0, retain=True) RAMDISK_PATH.joinpath("rereadsmarthomedevices").write_text("1") if (msg.topic == "openWB/config/set/SmartHome/logLevel"): if (int(msg.payload) >= 0 and int(msg.payload) <= 2): @@ -394,12 +395,20 @@ def on_message(client: mqtt.Client, userdata, msg: mqtt.MQTTMessage): subprocess.run(sendcommand) if (("openWB/config/set/sofort/lp" in msg.topic) and ("etBasedCharging" in msg.topic)): devicenumb = re.sub(r'\D', '', msg.topic) - if (1 <= int(devicenumb) <= 8 and 0 <= int(msg.payload) <= 1): + if (1 <= int(devicenumb) <= 8 and 0 <= int(msg.payload) <= 2): client.publish("openWB/config/get/sofort/lp/"+str(devicenumb)+"/etBasedCharging", msg.payload.decode("utf-8"), qos=0, retain=True) sendcommand = ["/var/www/html/openWB/runs/replaceinconfig.sh", "lp" + str(devicenumb)+"etbasedcharging=", msg.payload.decode("utf-8")] subprocess.run(sendcommand) + if (("openWB/config/set/sofort/lp" in msg.topic) and ("etChargeMaxPrice" in msg.topic)): + devicenumb = re.sub(r'\D', '', msg.topic) + if (1 <= int(devicenumb) <= 8 and float(msg.payload) >= -50 and float(msg.payload) <= 95): + client.publish("openWB/config/get/sofort/lp/"+str(devicenumb)+"/etChargeMaxPrice", + msg.payload.decode("utf-8"), qos=0, retain=True) + sendcommand = ["/var/www/html/openWB/runs/replaceinconfig.sh", "lp" + + str(devicenumb)+"etchargemaxprice=", msg.payload.decode("utf-8")] + subprocess.run(sendcommand) if (("openWB/config/set/sofort/lp" in msg.topic) and ("chargeLimitation" in msg.topic)): devicenumb = re.sub(r'\D', '', msg.topic) if (3 <= int(devicenumb) <= 8 and 0 <= int(msg.payload) <= 1): @@ -1236,11 +1245,27 @@ def on_message(client: mqtt.Client, userdata, msg: mqtt.MQTTMessage): f = open('/var/www/html/openWB/ramdisk/parentCPlp2', 'w') f.write(msg.payload.decode("utf-8")) f.close() + if (msg.topic == "openWB/set/awattar/boolAwattarEnabled"): + client.publish("openWB/global/awattar/boolAwattarEnabled", msg.payload.decode("utf-8"), qos=0, retain=True) + f = open('/var/www/html/openWB/ramdisk/mqttetprovideraktiv', 'w') + f.write(msg.payload.decode("utf-8")) + f.close() if (msg.topic == "openWB/set/awattar/MaxPriceForCharging"): if (float(msg.payload) >= -50 and float(msg.payload) <= 95): + client.publish("openWB/global/awattar/MaxPriceForCharging", msg.payload.decode("utf-8"), qos=0, retain=True) f = open('/var/www/html/openWB/ramdisk/etprovidermaxprice', 'w') f.write(msg.payload.decode("utf-8")) f.close() + if (msg.topic == "openWB/set/awattar/ActualPriceForCharging"): + client.publish("openWB/global/awattar/ActualPriceForCharging", msg.payload.decode("utf-8"), qos=0, retain=True) + f = open('/var/www/html/openWB/ramdisk/etproviderprice', 'w') + f.write(msg.payload.decode("utf-8")) + f.close() + if (msg.topic == "openWB/set/awattar/pricelist"): + client.publish("openWB/global/awattar/pricelist", msg.payload.decode("utf-8"), qos=0, retain=True) + f = open('/var/www/html/openWB/ramdisk/etprovidergraphlist', 'w') + f.write(msg.payload.decode("utf-8")) + f.close() if (msg.topic == "openWB/set/houseBattery/W"): if (float(msg.payload) >= -30000 and float(msg.payload) <= 30000): f = open('/var/www/html/openWB/ramdisk/speicherleistung', 'w') @@ -1329,14 +1354,26 @@ def on_message(client: mqtt.Client, userdata, msg: mqtt.MQTTMessage): client.publish("openWB/evu/faultStr", msg.payload.decode("utf-8"), qos=0, retain=True) if (msg.topic == "openWB/set/lp/1/%Soc"): if (float(msg.payload) >= 0 and float(msg.payload) <= 100): + client.publish("openWB/lp/1/%Soc", msg.payload.decode("utf-8"), qos=0, retain=True) f = open('/var/www/html/openWB/ramdisk/soc', 'w') f.write(msg.payload.decode("utf-8")) f.close() if (msg.topic == "openWB/set/lp/2/%Soc"): if (float(msg.payload) >= 0 and float(msg.payload) <= 100): + client.publish("openWB/lp/2/%Soc", msg.payload.decode("utf-8"), qos=0, retain=True) f = open('/var/www/html/openWB/ramdisk/soc1', 'w') f.write(msg.payload.decode("utf-8")) f.close() + if (msg.topic == "openWB/set/lp/1/boolSocConfigured"): + client.publish("openWB/lp/1/boolSocConfigured", msg.payload.decode("utf-8"), qos=0, retain=True) + f = open('/var/www/html/openWB/ramdisk/mqttsocvorhanden', 'w') + f.write(msg.payload.decode("utf-8")) + f.close() + if (msg.topic == "openWB/set/lp/2/boolSocConfigured"): + client.publish("openWB/lp/2/boolSocConfigured", msg.payload.decode("utf-8"), qos=0, retain=True) + f = open('/var/www/html/openWB/ramdisk/mqttsoc1vorhanden', 'w') + f.write(msg.payload.decode("utf-8")) + f.close() set_pv_match = re.match(r"^openWB/set/pv/([12])/(.*)$", msg.topic) if set_pv_match is not None: pv = files.pv[int(set_pv_match.group(1)) - 1] diff --git a/runs/updateConfig.sh b/runs/updateConfig.sh index 4e52964e1..2fedc38f6 100755 --- a/runs/updateConfig.sh +++ b/runs/updateConfig.sh @@ -1302,6 +1302,11 @@ updateConfig(){ echo "lp${i}etbasedcharging=1" >> $ConfigFile fi done + for i in $(seq 1 8); do + if ! grep -Fq "lp${i}etchargemaxprice=" $ConfigFile; then + echo "lp${i}etchargemaxprice=0" >> $ConfigFile + fi + done if ! grep -Fq "plz=" $ConfigFile; then echo "plz=36124" >> $ConfigFile fi @@ -1506,6 +1511,15 @@ updateConfig(){ if ! grep -Fq "displaylp2max=" $ConfigFile; then echo "displaylp2max=22000" >> $ConfigFile fi + if ! grep -Fq "displayshowprice=" $ConfigFile; then + echo "displayshowprice=0" >> $ConfigFile + fi + if ! grep -Fq "displayshowrfidpad=" $ConfigFile; then + echo "displayshowrfidpad=0" >> $ConfigFile + fi + if ! grep -Fq "displayallowsetmaxprice=" $ConfigFile; then + echo "displayallowsetmaxprice=0" >> $ConfigFile + fi if ! grep -Fq "displaypinaktiv=" $ConfigFile; then echo "displaypinaktiv=0" >> $ConfigFile fi diff --git a/sofortlademodus.sh b/sofortlademodus.sh index 891a52b24..bc4c170b7 100755 --- a/sofortlademodus.sh +++ b/sofortlademodus.sh @@ -10,28 +10,27 @@ sofortlademodus(){ fi if (( etprovideraktiv == 1 )); then actualprice=$( diff --git a/web/display/minimal/index.php b/web/display/minimal/index.php index fbd54a75f..f2a06abdf 100644 --- a/web/display/minimal/index.php +++ b/web/display/minimal/index.php @@ -1,5 +1,5 @@ - + @@ -19,15 +19,14 @@ + - - + - + +
- -
- - -
LP1
-
0
-
0
-
- - - +
+ +
+ + +
LP1
+
0
+
0
+
+ + + +
-
-
- - -
LP2
-
0
-
0
-
- - - +
+ + +
LP2
+
0
+
0
+
+ + + +
-
- -
- - -
0
-
0
-
- - - + +
+ + +
0
+
0
+
+ + + +
+ +
+ 0 && $displayshowrfidpadold > 0) { ?> +
+ +
+ + 0) { ?> +
+ + +
+ + 0) { ?> +
Preis: 25 ct/kWh
+
Limit LP1: 95 ct/kWh
+
Limit LP2: 95 ct/kWh
+
+ +
+ +
+
+ + + @@ -103,10 +182,10 @@
-
+
 
-
Code zur Freischaltung eingeben
+
Fahrzeugcode (RFID)
@@ -154,6 +233,121 @@ function submitForm(e) {
+ + + + + + - + diff --git a/web/display/minimal/minimal.css b/web/display/minimal/minimal.css index a215be247..0022b19ec 100644 --- a/web/display/minimal/minimal.css +++ b/web/display/minimal/minimal.css @@ -43,10 +43,12 @@ body { .PINbutton.clear { background-color: orange; + color: #ffffff; } .PINbutton.enter { background-color: green; + color: #ffffff; } .PINbutton:hover { @@ -82,10 +84,33 @@ body { box-shadow: 0px 5px 5px -0px rgba(0,0,0,0.3); } +.theme-gray { + --color-bg: #333333; + --color-charging: #1f78b4; + --color-axis: #666666; + --color-grid: black; + --color-fg: white; +} + .modal-dialog { max-width: 600px; } +.modal-content { + background-color: var(--color-bg); + color: #ffffff; +} + +.modal-header { + padding: 2px; + align-items: center; +} + +.modal-button { + font-size: 15px; + padding: 4px; +} + .modal-content, .modal-header, .modal-footer { @@ -96,3 +121,11 @@ body { .modal-content label { font-weight: normal; } + +.text-orange { + color: orange; +} + +.text-orangered { + color: #FF4500; +} diff --git a/web/display/minimal/minimalgauge.js b/web/display/minimal/minimalgauge.js index 08e2ad3e3..aff92d468 100644 --- a/web/display/minimal/minimalgauge.js +++ b/web/display/minimal/minimalgauge.js @@ -1,7 +1,40 @@ /*********** * LP1 gauge */ -var opts = { +function lpUpdateMaxValue(displaylpmax, lpopts, gaugelp) { + // switch range depending on magnitute of max value + if (displaylpmax > 999) { + var gaugeLpMaxValue = displaylpmax / 1000; + lpopts['staticLabels'] = { + font: "13px sans-serif", // Specifies font + labels: [0, gaugeLpMaxValue], // Print labels at these values + unit: "kW", // Optional: Label unit + color: "white", // Optional: Label text color + fractionDigits: 1 // Optional: Numerical precision. 0=round off. + } + } else { + var gaugeLpMaxValue = displaylpmax; + lpopts['staticLabels'] = { + font: "13px sans-serif", // Specifies font + labels: [0, gaugeLpMaxValue], // Print labels at these values + unit: "W", // Optional: Label unit + color: "white", // Optional: Label text color + fractionDigits: 0 // Optional: Numerical precision. 0=round off. + } + } + gaugelp.maxValue = gaugeLpMaxValue; // set max gauge value + gaugelp.setOptions(lpopts); +} + +function lp1UpdateMaxValue(displaylpmax) { + lpUpdateMaxValue(displaylpmax, lp1opts, gaugelp1); +} + +function lp2UpdateMaxValue(displaylpmax) { + lpUpdateMaxValue(displaylpmax, lp2opts, gaugelp2); +} + +var lp1opts = { lineWidth: 0.30, // The line thickness angle: 0, // The angle where gauge starts radiusScale: 1, // Relative radius @@ -20,37 +53,18 @@ var opts = { }; // Duo will only use a quarter circle -if (lastmanagementold != '1') { - opts['range'] = 1; // The span of the gauge arc +if (configuredChargePoints == 1) { + lp1opts['range'] = 1; // The span of the gauge arc } else { - opts['range'] = 0.5; // The span of the gauge arc + lp1opts['range'] = 0.5; // The span of the gauge arc } -// switch range depending on magnitute of max value -if (displaylp1max > 999) { - var gaugeLp1MaxValue = displaylp1max / 1000; - opts['staticLabels'] = { - font: "13px sans-serif", // Specifies font - labels: [0, gaugeLp1MaxValue], // Print labels at these values - unit: "kW", // Optional: Label unit - color: "white", // Optional: Label text color - fractionDigits: 1 // Optional: Numerical precision. 0=round off. - } -} else { - var gaugeLp1MaxValue = displaylp1max; - opts['staticLabels'] = { - font: "13px sans-serif", // Specifies font - labels: [0, gaugeLp1MaxValue], // Print labels at these values - unit: "W", // Optional: Label unit - color: "white", // Optional: Label text color - fractionDigits: 0 // Optional: Numerical precision. 0=round off. - } -} + var targetlp1 = document.getElementById('lp1'); // your canvas element -var gaugelp1 = new Gauge(targetlp1).setOptions(opts); // create sexy gauge! +var gaugelp1 = new Gauge(targetlp1).setOptions(lp1opts); // create sexy gauge! -gaugelp1.maxValue = gaugeLp1MaxValue; // set max gauge value +lp1UpdateMaxValue(displaylp1max); gaugelp1.setMinValue(0); // Prefer setter over gauge.minValue = 0 gaugelp1.animationSpeed = 5; // set animation speed (32 is default value) gaugelp1.set(0); // set actual value @@ -58,7 +72,7 @@ gaugelp1.set(0); // set actual value /*********** * LP1-SoC gauge */ -var opts = { +var lp1socopts = { lineWidth: 0.10, // The line thickness radiusScale: 0.66, // Relative radius angle: 0, // The angle where gauge starts @@ -84,15 +98,15 @@ var opts = { }; // Duo will only use a quarter circle -if (lastmanagementold != '1') { - opts['range'] = 1; // The span of the gauge arc - opts['percentColors'] = [[0.0, "#73c0FF"], [1.0, "#0000FF"]]; +if (configuredChargePoints == 1) { + lp1socopts['range'] = 1; // The span of the gauge arc + lp1socopts['percentColors'] = [[0.0, "#73c0FF"], [1.0, "#0000FF"]]; } else { - opts['range'] = 0.5; // The span of the gauge arc - opts['percentColors'] = [[0.0, "#B22222"], [0.5, "#DAA520"], [1.0, "#33A02C"]]; + lp1socopts['range'] = 0.5; // The span of the gauge arc + lp1socopts['percentColors'] = [[0.0, "#B22222"], [0.5, "#DAA520"], [1.0, "#33A02C"]]; } var targetlp1s = document.getElementById('lp1s'); // your canvas element -var gaugelp1s = new Gauge(targetlp1s).setOptions(opts); // create sexy gauge! +var gaugelp1s = new Gauge(targetlp1s).setOptions(lp1socopts); // create sexy gauge! gaugelp1s.maxValue = 100; // set max gauge value gaugelp1s.setMinValue(0); // Prefer setter over gauge.minValue = 0 @@ -100,11 +114,11 @@ gaugelp1s.animationSpeed = 5; // set animation speed (32 is default value) gaugelp1s.set(70); // set actual value -if (lastmanagementold == '1') { +if (configuredChargePoints > 1) { /*********** * LP2 gauge */ - var opts = { + var lp2opts = { angle: 0, // The angle where gauge starts range: 0.5, // The span of the gauge arc mirror: true, // start gauge from the right @@ -124,32 +138,10 @@ if (lastmanagementold == '1') { percentColors: [[0.0, "#73c0FF"], [1.0, "#0000FF"]], }; - // switch range depending on magnitute of max value - if (displaylp2max > 999) { - var gaugeLp2MaxValue = displaylp2max / 1000; - opts['staticLabels'] = { - font: "13px sans-serif", // Specifies font - labels: [0, gaugeLp2MaxValue], // Print labels at these values - unit: "kW", // Optional: Label unit - color: "white", // Optional: Label text color - fractionDigits: 1 // Optional: Numerical precision. 0=round off. - } - } else { - var gaugeLp2MaxValue = displaylp2max; - opts['staticLabels'] = { - font: "13px sans-serif", // Specifies font - labels: [0, gaugeLp2MaxValue], // Print labels at these values - unit: "W", // Optional: Label unit - color: "white", // Optional: Label text color - fractionDigits: 0 // Optional: Numerical precision. 0=round off. - } - } - - var targetlp2 = document.getElementById('lp2'); // your canvas element - var gaugelp2 = new Gauge(targetlp2).setOptions(opts); // create sexy gauge! + var gaugelp2 = new Gauge(targetlp2).setOptions(lp2opts); // create sexy gauge! - gaugelp2.maxValue = gaugeLp2MaxValue; // set max gauge value + lp2UpdateMaxValue(displaylp2max); gaugelp2.setMinValue(0); // Prefer setter over gauge.minValue = 0 gaugelp2.animationSpeed = 5; // set animation speed (32 is default value) gaugelp2.set(0); // set actual value @@ -157,7 +149,7 @@ if (lastmanagementold == '1') { /*********** * LP2-SoC gauge */ - var opts = { + var lp2socopts = { angle: 0, // The angle where gauge starts range: 0.5, // The span of the gauge arc mirror: true, // start gauge from the right @@ -185,7 +177,7 @@ if (lastmanagementold == '1') { } }; var targetlp2s = document.getElementById('lp2s'); // your canvas element - var gaugelp2s = new Gauge(targetlp2s).setOptions(opts); // create sexy gauge! + var gaugelp2s = new Gauge(targetlp2s).setOptions(lp2socopts); // create sexy gauge! gaugelp2s.maxValue = 100; // set max gauge value gaugelp2s.setMinValue(0); // Prefer setter over gauge.minValue = 0 gaugelp2s.animationSpeed = 5; // set animation speed (32 is default value) diff --git a/web/display/minimal/pricechart.js b/web/display/minimal/pricechart.js new file mode 100644 index 000000000..c3121a68c --- /dev/null +++ b/web/display/minimal/pricechart.js @@ -0,0 +1,222 @@ +class PriceChart { + + constructor() { + this.width = 400; + this.height = 80; + this.margin = { top: 5, bottom: 15, left: 30, right: 20 }; + } + + // initialize when application is loaded + init() { + const figure = d3.select("figure#priceChart"); + this.svg = figure.append("svg").attr("viewBox", `0 0 400 80`); + this.bgColor = 'var(--color-bg)'; + this.gridColor = 'var(--color-grid)'; + this.axisColor = 'var(--color-axis)'; + this.chargeColor = 'var(--color-charging)'; + this.noChargeColor = 'var(--color-axis)'; + etPriceList = ''; + } + + // update the view + update() { + var svg = this.createOrUpdateSvg(); + if (etPriceList != "") { + this.plotdata = etPriceList.split(/\r?\n|\r/); // split into lines + this.plotdata.shift(); // remove first line + this.plotdata = this.plotdata.map((line, i) => { // split lines into tuples [time,price] + return line.split(',') + }) .map(line => [line[0] * 1000, +line[1]]); // multiply timestamps by 1000 + this.drawGraph(svg); + } + } + + // clear the display area + createOrUpdateSvg() { + this.svg.selectAll("*").remove(); + const g = this.svg.append("g").attr("transform", "translate(" + this.margin.left + "," + this.margin.top + ")"); + return g + } + + // draw the graph + drawGraph(svg) { + let etMaxPriceMax = Math.max.apply(null, etMaxPricesFinal); + let etMaxPriceMin = Math.min.apply(null, etMaxPricesFinal); + + const height = this.height - this.margin.top - this.margin.bottom; + const width = this.width - this.margin.left - this.margin.right; + const barwidth = width / this.plotdata.length - 1; + + const xdomain = d3.extent(this.plotdata, (d) => d[0]); + const ydomain = d3.extent(this.plotdata, (d) => d[1]); + + xdomain[1] = xdomain[1] + 3600000; + ydomain[0] = Math.min(ydomain[0], etMaxPriceMin, 0); + ydomain[1] = Math.max(ydomain[1], etMaxPriceMax); + ydomain[1] = Math.floor(ydomain[1] + 1); + + this.xScale = d3.scaleTime().range([0, width]).domain(xdomain); + this.yScale = d3.scaleLinear().range([height, 0]).domain(ydomain); + + const bargroups = svg.selectAll("bar").data(this.plotdata).enter().append("g"); + bargroups.append("rect") + .attr("class", "bar") + .attr("x", (d) => this.xScale(d[0])) + .attr("y", (d) => this.yScale(d[1])) + .attr("width", barwidth) + .attr("height", (d) => height - this.yScale(d[1])) + .attr("fill", (d) => (d[1] <= etMaxPriceMax) ? this.chargeColor : this.noChargeColor); + + const generators = []; + const points = []; + const paths = []; + const lineColors = ["orange", "#FF4500"]; + for (let i = 0; i < etModes.length; i++) { + if (etModes[i] != 0) { + // Line for max price + generators[i] = d3.line(); + points[i] = [[0, this.yScale(etMaxPricesFinal[i])], [width, this.yScale(etMaxPricesFinal[i])]]; + paths[i] = generators[i](points[i]); + svg.append("path").attr('d', paths[i]).attr("stroke", lineColors[i]); + } + } + + // X Axis + const xAxisGenerator = d3.axisBottom(this.xScale) + .ticks(4) + .tickFormat(d3.timeFormat("%H:%M")); + const xAxis = this.svg.append("g").attr("class", "axis").call(xAxisGenerator); + xAxis.attr("transform", "translate(" + this.margin.left + "," + (height + this.margin.top) + ")"); + xAxis.selectAll(".tick").attr("font-size", 8).attr("color", "white"); + + // Y Axis + const yAxisGenerator = d3.axisLeft(this.yScale) + .ticks(6) + .tickSizeInner(-(this.width - this.margin.right - this.margin.left)) + .tickFormat((d) => d); + + const yAxis = this.svg.append("g").attr("class", "axis").call(yAxisGenerator); + yAxis.attr("transform", "translate(" + this.margin.left + "," + this.margin.top + ")"); + yAxis.selectAll(".tick").attr("font-size", 8).attr("color", "white"); + yAxis.selectAll(".tick line").attr("stroke", this.bgColor).attr("stroke-width", "0.5"); + yAxis.select(".domain").attr("stroke", this.bgColor); + } +} + +function updateSetPriceLabels() { + if (etEnabled == 1) { // show dynamic prices + if (configuredChargePoints == 1) { // not a DUO + $('#etCombineSelection').addClass("hide"); + $('#etPriceSetLp2').addClass("hide"); + if (etModes[0] == 0) { // price based charging disabled + $('#etPriceSetLp1').addClass("hide"); + } else { // etModeLp1 != 0 + $('#etPriceSetLp1').removeClass("hide"); + if (etModes[0] == 1) { // global price based charging + $('label[for="maxPriceLp1"].maxPriceLabelName').text("max. Preis (G):"); + etMaxPricesFinal[0] = etMaxPriceGlobal; + } else { // individual price based charging + $('label[for="maxPriceLp1"].maxPriceLabelName').text("max. Preis (L):"); + etMaxPricesFinal[0] = etMaxPricesLocal[0]; + } + } + } else { // configuredChargePoints > 1 i.e. DUO + if (etModes[0] == 1 && etModes[1] == 1) { // global price based charging on both -> only one selector + $('#etPriceSetLp1').removeClass("hide"); + $('#etPriceSetLp2').addClass("hide"); + $('label[for="maxPriceLp1"].maxPriceLabelName').text("Global:"); + etMaxPricesFinal[0] = etMaxPriceGlobal; + } else { + if (etModes[0] != 0 && etModes[1] != 0) { + $('#etCombineSelection').removeClass("hide"); + } else { + $('#etCombineSelection').addClass("hide"); + } + for (let i = 0; i < etModes.length; i++) { + let ipp = i + 1; + if (etModes[i] == 0) { // price based charging disabled + $('#etPriceSetLp' + ipp).addClass("hide"); + } else { // etModeLp1 != 0 + $('#etPriceSetLp' + ipp).removeClass("hide"); + if (etModes[i] == 1) { // global price based charging + $('label[for="maxPriceLp' + ipp + '"].maxPriceLabelName').text("LP" + ipp + " (G):"); + etMaxPricesFinal[i] = etMaxPriceGlobal; + } else { // individual price based charging + $('label[for="maxPriceLp' + ipp + '"].maxPriceLabelName').text("LP" + ipp + " (L):"); + etMaxPricesFinal[i] = etMaxPricesLocal[i]; + } + } + } + } + } + for (let i = 0; i < Math.min(etModes.length, configuredChargePoints); i++) { + let ipp = i + 1; + $('label[for="maxPriceLp' + ipp + '"].maxPriceLabelValue').text(etMaxPricesFinal[i] + " ct"); + if ($('#maxPriceLp' + ipp).val() != etMaxPricesFinal[i]) { + $('#maxPriceLp' + ipp).val(etMaxPricesFinal[i]); + } + } + } + priceChart.update(); +} + +function updateMainPriceLabels() { + let identifyer = ""; + if (showPrice == 1) { // if price display is off, none of these will exist + $('#currentPrice').removeClass("hide"); + $('#etsetprice').removeClass("hide"); + if (etEnabled == 1) { // show dynamic prices + $('#currentPrice').html("Preis: " + etCurrentPrice + " ct/kWh"); + if (configuredChargePoints == 1) { // not a DUO + $('#etPriceLimitLp2').addClass("hide"); + if (etModes[0] == 0) { // price based charging disabled + $('#etPriceLimitLp1').addClass("hide"); + } else { // etModeLp1 != 0 + $('#etPriceLimitLp1').removeClass("hide"); + if (etModes[0] == 1) { + etMaxPricesFinal[0] = etMaxPriceGlobal; + } else { + etMaxPricesFinal[0] = etMaxPricesLocal[0]; + } + $('#etPriceLimitLp1').html("Limit: " + etMaxPricesFinal[0] + " ct/kWh"); + } + } else { // configuredChargePoints > 1 i.e. DUO + if (etModes[0] == 1 && etModes[1] == 1) { // global price based charging on both -> only one selector + $('#etPriceLimitLp1').removeClass("hide"); + $('#etPriceLimitLp2').addClass("hide"); + $('#etPriceLimitLp1').html("Limit: " + etMaxPriceGlobal + " ct/kWh"); + } else { + for (let i = 0; i < etModes.length; i++) { + let ipp = i + 1; + if (etModes[i] == 0) { // price based charging disabled + $('#etPriceLimitLp' + ipp).addClass("hide"); + } else { // etMode != 0 + $('#etPriceLimitLp' + ipp).removeClass("hide"); + if (etModes[i] == 1) { + etMaxPricesFinal[i] = etMaxPriceGlobal; + } else { + etMaxPricesFinal[i] = etMaxPricesLocal[i]; + } + $('#etPriceLimitLp' + ipp).html("Limit LP" + ipp + ": " + etMaxPricesFinal[i] + " ct/kWh"); + } + } + } + } + for (let i = 0; i < Math.min(etModes.length, configuredChargePoints); i++) { + let ipp = i + 1; + if ( etCurrentPrice > etMaxPricesFinal[i] ) { + $('#etPriceLimitLp' + ipp).addClass('text-danger'); + } else { + $('#etPriceLimitLp' + ipp).removeClass('text-danger'); + } + } + } else { // we show preset value + $('#etPriceLimitLp1').addClass("hide"); + $('#etPriceLimitLp2').addClass("hide"); + $('#etsetprice').addClass("hide"); + $('#currentPrice').html("Preis: " + parseFloat(defaultPrice).toFixed(2) + " ct/kWh"); + } + } +} + +var priceChart = new PriceChart(); diff --git a/web/display/minimal/processAllMqttMsg.js b/web/display/minimal/processAllMqttMsg.js index 569ec7390..b2badd760 100644 --- a/web/display/minimal/processAllMqttMsg.js +++ b/web/display/minimal/processAllMqttMsg.js @@ -26,6 +26,8 @@ function handlevar(mqttmsg, mqttpayload) { // receives all messages and calls respective function to process them if (mqttmsg.match(/^openwb\/system\//i)) { processSystemMessages(mqttmsg, mqttpayload); } else if (mqttmsg.match(/^openwb\/lp\//i)) { processChargepointMessages(mqttmsg, mqttpayload); } + else if (mqttmsg.match(/^openwb\/global\/awattar\//i)) { processETMessages(mqttmsg, mqttpayload); } + else if (mqttmsg.match(/^openwb\/config\/get\/sofort\//i)) { processChargeNowMessages(mqttmsg, mqttpayload); } } // end handlevar function processSystemMessages(mqttmsg, mqttpayload) { @@ -35,6 +37,53 @@ function processSystemMessages(mqttmsg, mqttpayload) { if (mqttpayload == '1') { reloadDisplay(); } + } else if (mqttmsg == 'openWB/system/priceForKWh') { + let tmpValue = mqttpayload * 100; + if (defaultPrice != tmpValue) { + defaultPrice = tmpValue; + updateMainPriceLabels(); + } + } else if (mqttmsg == 'openWB/system/parentWB') { + if (parentWB != mqttpayload) { + parentWB = mqttpayload; + connectToParent(); + } + } else if (mqttmsg == 'openWB/system/parentCPlp1') { + if (parentCP[0] != mqttpayload) { + parentCP[0] = mqttpayload; + } + } else if (mqttmsg == 'openWB/system/parentCPlp2') { + if (parentCP[1] != mqttpayload) { + parentCP[1] = mqttpayload; + } + } +} + +function processETMessages(mqttmsg, mqttpayload) { + // processes mqttmsg for topic openWB/global/awattar + // called by handlevar + if ( mqttmsg == 'openWB/global/awattar/ActualPriceForCharging' ) { + etCurrentPrice = parseFloat(mqttpayload) + updateMainPriceLabels(); + } else if ( mqttmsg == 'openWB/global/awattar/pricelist' ) { + etPriceList = mqttpayload; + priceChart.update(); + } else if ( mqttmsg == 'openWB/global/awattar/MaxPriceForCharging' ) { + // if we are an external openWB and have sent an update within the last 20 seconds + // or we are just changing the value -> ignore it + if (Date.now() - 20000 > etParentGlobalPriceUpdated && ! maxPriceDelayTimers[0] && ! maxPriceDelayTimers[1]) { + if (etMaxPriceGlobal != mqttpayload) { + etMaxPriceGlobal = mqttpayload; + updateMainPriceLabels(); + updateSetPriceLabels(); + } + } + } else if ( mqttmsg == 'openWB/global/awattar/boolAwattarEnabled' ) { + if (etEnabled != mqttpayload) { + etEnabled = mqttpayload; + updateMainPriceLabels(); + updateSetPriceLabels(); + } } } @@ -46,7 +95,7 @@ function processChargepointMessages(mqttmsg, mqttpayload) { // last part of topic after / var topic = mqttmsg.substring(mqttmsg.lastIndexOf('/') + 1); var index = mqttmsg.match(/(\w+)\/(\d\d?)\//)[2]; - if (index != null) { + if (index != null && index <= configuredChargePoints) { if (topic == '%Soc') { eval("gaugelp" + index + "s.set(mqttpayload)"); $('#lp' + index + 'st').html(mqttpayload + "%"); @@ -93,3 +142,34 @@ function processChargepointMessages(mqttmsg, mqttpayload) { } } } + +function processChargeNowMessages(mqttmsg, mqttpayload) { + // processes mqttmsg for topic openWB/system + // called by handlevar + + // check if topic contains subgroup like /lp/1/ + // last part of topic after / + + var topic = mqttmsg.substring(mqttmsg.lastIndexOf('/') + 1); + var index = mqttmsg.match(/(\w+)\/(\d\d?)\//)[2]; + if (index != null) { + imm = index - 1; + if (topic == 'etBasedCharging') { + if (etModes[imm] != mqttpayload) { + etModes[imm] = mqttpayload; + updateMainPriceLabels(); + updateSetPriceLabels(); + } + } else if (topic == 'etChargeMaxPrice') { + // if we are an external openWB and have sent an update within the last 20 seconds + // or we are just changing the value -> ignore it + if (Date.now() - 20000 > etParentLocalPriceUpdated[imm] && ! maxPriceDelayTimers[imm]) { + if (etMaxPricesLocal[imm] != mqttpayload) { + etMaxPricesLocal[imm] = mqttpayload; + updateMainPriceLabels(); + updateSetPriceLabels(); + } + } + } + } +} diff --git a/web/display/minimal/setupMqttServices.js b/web/display/minimal/setupMqttServices.js index e4d674f87..d66c5b78a 100644 --- a/web/display/minimal/setupMqttServices.js +++ b/web/display/minimal/setupMqttServices.js @@ -11,6 +11,10 @@ var topicsToSubscribe = [ // system topics ["openWB/system/reloadDisplay", 1], + ["openWB/system/priceForKWh", 1], + ["openWB/system/parentWB", 1], + ["openWB/system/parentCPlp1", 0], + ["openWB/system/parentCPlp2", 0], ["openWB/lp/1/W", 1], ["openWB/lp/1/%Soc", 1], ["openWB/lp/1/boolSocConfigured"], @@ -23,6 +27,14 @@ var topicsToSubscribe = [ ["openWB/lp/2/boolPlugStat", 1], ["openWB/lp/2/ChargePointEnabled", 1], ["openWB/lp/2/boolChargeStat", 1], + ["openWB/global/awattar/boolAwattarEnabled", 0], + ["openWB/global/awattar/MaxPriceForCharging", 1], + ["openWB/global/awattar/ActualPriceForCharging", 1], + ["openWB/global/awattar/pricelist", 1], + ["openWB/config/get/sofort/lp/1/etBasedCharging", 1], + ["openWB/config/get/sofort/lp/2/etBasedCharging", 1], + ["openWB/config/get/sofort/lp/1/etChargeMaxPrice", 1], + ["openWB/config/get/sofort/lp/2/etChargeMaxPrice", 1] ]; // holds number of topics flagged 1 initially @@ -60,6 +72,7 @@ $(document).ready(function(){ client.onConnectionLost = function (responseObject) { client.connect(options); }; + //Gets called whenever you receive a message client.onMessageArrived = function (message) { handlevar(message.destinationName, message.payloadString); @@ -77,4 +90,45 @@ function publish(payload, topic) { message.qos = 2; message.retained = true; client.send(message); -} +}; + +var parentOptions = { + timeout: 5, + useSSL: isSSL, + //Gets Called if the connection could not be established + onFailure: function (message) { + client.connect(parentOptions); + } +}; + + +var offspringuid = "extopenwb" + clientuid; +var offspring = null; + +function connectToParent() { + if (offspring != null) { + offspring.disconnect(); + } + offspring = new Messaging.Client(parentWB, 9001, offspringuid); + + offspring.connect(parentOptions); + + //Gets called if the websocket/mqtt connection gets disconnected for any reason + offspring.onConnectionLost = function (responseObject) { + offspring.connect(parentOptions); + }; + +}; + +function publishToParent(payload, topic) { + var parentMessage = new Messaging.Message(payload); + parentMessage.destinationName = topic; + parentMessage.qos = 2; + parentMessage.retained = true; + offspring.send(parentMessage); + var parentMessage = new Messaging.Message("external openWB uid: " + clientuid + " sent: " + topic); + parentMessage.destinationName = "openWB/set/system/topicSender"; + parentMessage.qos = 2; + parentMessage.retained = true; + offspring.send(parentMessage); +}; diff --git a/web/settings/misc.php b/web/settings/misc.php index d46e19233..516978718 100644 --- a/web/settings/misc.php +++ b/web/settings/misc.php @@ -1285,7 +1285,7 @@ function visibility_ledsakt() { - +
@@ -1340,6 +1340,51 @@ function visibility_ledsakt() {
+
+
+ +
+
+
+ + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ +
+
+
+ + +
+
+
@@ -1393,12 +1438,18 @@ function visibility_displaypinaktiv() { function visibility_displaytheme() { switch ($('#displaytheme').val()) { case '0': // Cards + hideSection('#displayprice'); + hideSection('#displayrfidpad'); + hideSection('#displaysetmaxprice'); showSection('#displaygauge'); for (let cp = 1; cp < 9; cp++) { showSection('#displaylp' + cp); } break; case '2': // Minimal + showSection('#displayprice'); + showSection('#displayrfidpad'); + showSection('#displaysetmaxprice'); hideSection('#displaygauge'); for (let cp = 1; cp < 3; cp++) { showSection('#displaylp' + cp); @@ -1408,6 +1459,9 @@ function visibility_displaytheme() { } break; case '3': // Gauges + hideSection('#displayprice'); + hideSection('#displayrfidpad'); + hideSection('#displaysetmaxprice'); showSection('#displaygauge'); for (let cp = 1; cp < 3; cp++) { showSection('#displaylp' + cp); @@ -1417,6 +1471,9 @@ function visibility_displaytheme() { } break; default: + hideSection('#displayprice'); + hideSection('#displayrfidpad'); + hideSection('#displaysetmaxprice'); hideSection('#displaygauge'); for (let cp = 1; cp < 9; cp++) { hideSection('#displaylp' + cp); diff --git a/web/settings/sofortconfig.php b/web/settings/sofortconfig.php index 62c48eba2..0acc338d2 100644 --- a/web/settings/sofortconfig.php +++ b/web/settings/sofortconfig.php @@ -162,11 +162,14 @@ Aus +
- Aktiviert/Deaktiviert Preisbasiertes Laden + Aktiviert/Deaktiviert Preisbasiertes Laden. "Global": Limit gilt Ladepunktübergreifend. Lokal: Preis kann für jeden Ladpunkt individuelll eingestellt werden.