modified 0166-WebUI-Fix-PowermeterControl WebUI patch to show m3/h unit

for the gas power unit which better fits the expected unit.
jens-maus · Oct 29, 2023 · fe02398 · fe02398
1 parent 89f3a27
commit fe02398
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/buildroot-external/patches/occu/0166-WebUI-Fix-PowermeterControl.patch b/buildroot-external/patches/occu/0166-WebUI-Fix-PowermeterControl.patch
@@ -1,5 +1,23 @@
 --- occu/WebUI/www/rega/esp/controls/powermeter.fn.orig
 +++ occu/WebUI/www/rega/esp/controls/powermeter.fn
+@@ -339,7 +339,7 @@
+                         WriteLine("<td>");
+                           !WriteLine("<span id='"#chnId#"Power'>"#oPower.Value().ToString(2)#" "#oPower.ValueUnit()#"</span>");
+                           WriteLine("<div name='"#chnId#"sensor' class='hidden'><span id='"#chnId#"Power'>"#oPower.Value().ToString(2)#" "#oPower.ValueUnit()#"</span></div>");
+-                          WriteLine("<div name='"#chnId#"sensorGas' class='hidden'><span id='"#chnId#"PowerGas'>"#oPowerGas.Value().ToString(2)#" m<sup>3</span></div>");
++                          WriteLine("<div name='"#chnId#"sensorGas' class='hidden'><span id='"#chnId#"PowerGas'>"#oPowerGas.Value().ToString(2)#" m<sup>3</span>/h</div>");
+                         WriteLine("</td>");
+                       WriteLine("</tr>");
+                     WriteLine("</table>");
+@@ -768,7 +768,7 @@
+                       if (oPower && oPowerGas) {
+                         if (sLastControlName != "POWERMETER_IEC2.") {
+                           WriteLine("<div name='"#chnId#"sensor' class='hidden'><span id='"#chnId#"Power'>"#oPower.Value().ToString(2)#" "#oPower.ValueUnit()#"</span></div>");
+-                          WriteLine("<div name='"#chnId#"sensorGas' class='hidden'><span id='"#chnId#"PowerGas'>"#oPowerGas.Value().ToString(2)#" m<sup>3</span></div>");
++                          WriteLine("<div name='"#chnId#"sensorGas' class='hidden'><span id='"#chnId#"PowerGas'>"#oPowerGas.Value().ToString(2)#" m<sup>3</span>/h</div>");
+                         }
+                       }
+                       WriteLine("<div name='"#chnId#"sensorIEC' class='hidden'><span id='"#chnId#"PowerIEC'>"#oPowerIEC.Value().ToString(decimalPlace)#" "#oPowerIEC.ValueUnit()#"</span></div>");
 @@ -814,23 +814,31 @@
      WriteLine("opts.devFirmwareMinor = '"#devFwMinor#"';");
      WriteLine("opts.devFirmwarePatch = '"#devFwPatch#"';");

diff --git a/...ches/occu/0166-WebUI-Fix-PowermeterControl/occu/WebUI/www/rega/esp/controls/powermeter.fn b/...ches/occu/0166-WebUI-Fix-PowermeterControl/occu/WebUI/www/rega/esp/controls/powermeter.fn
@@ -339,7 +339,7 @@ function ::CreatePowermeterIGLControl() {
                         WriteLine("<td>");
                           !WriteLine("<span id='"#chnId#"Power'>"#oPower.Value().ToString(2)#" "#oPower.ValueUnit()#"</span>");
                           WriteLine("<div name='"#chnId#"sensor' class='hidden'><span id='"#chnId#"Power'>"#oPower.Value().ToString(2)#" "#oPower.ValueUnit()#"</span></div>");
-                          WriteLine("<div name='"#chnId#"sensorGas' class='hidden'><span id='"#chnId#"PowerGas'>"#oPowerGas.Value().ToString(2)#" m<sup>3</span></div>");
+                          WriteLine("<div name='"#chnId#"sensorGas' class='hidden'><span id='"#chnId#"PowerGas'>"#oPowerGas.Value().ToString(2)#" m<sup>3</span>/h</div>");
                         WriteLine("</td>");
                       WriteLine("</tr>");
                     WriteLine("</table>");
@@ -768,7 +768,7 @@ function ::CreatePowermeterIECControl() {
                       if (oPower && oPowerGas) {
                         if (sLastControlName != "POWERMETER_IEC2.") {
                           WriteLine("<div name='"#chnId#"sensor' class='hidden'><span id='"#chnId#"Power'>"#oPower.Value().ToString(2)#" "#oPower.ValueUnit()#"</span></div>");
-                          WriteLine("<div name='"#chnId#"sensorGas' class='hidden'><span id='"#chnId#"PowerGas'>"#oPowerGas.Value().ToString(2)#" m<sup>3</span></div>");
+                          WriteLine("<div name='"#chnId#"sensorGas' class='hidden'><span id='"#chnId#"PowerGas'>"#oPowerGas.Value().ToString(2)#" m<sup>3</span>/h</div>");
                         }
                       }
                       WriteLine("<div name='"#chnId#"sensorIEC' class='hidden'><span id='"#chnId#"PowerIEC'>"#oPowerIEC.Value().ToString(decimalPlace)#" "#oPowerIEC.ValueUnit()#"</span></div>");