bugfix #83

dewenni · Apr 5, 2024 · 850fad1 · 850fad1
1 parent 8b680d0
commit 850fad1
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 23 deletions.
diff --git a/lib/basicHelper/src/stringHelper.cpp b/lib/basicHelper/src/stringHelper.cpp
@@ -89,7 +89,7 @@ const char *floatToString(float value) {
 
 /**
  * *******************************************************************
- * @brief   create String from integer - with 3 digits
+ * @brief   create String from integer - with 4 digits
  * @param   value as float
  * @return  pointer to char array - pay attention, it is local static
  * *******************************************************************/
@@ -99,6 +99,18 @@ const char *floatToString4(float value) {
   return ret_str;
 }
 
+/**
+ * *******************************************************************
+ * @brief   create String from integer - with 8 digits
+ * @param   value as float
+ * @return  pointer to char array - pay attention, it is local static
+ * *******************************************************************/
+const char *floatToString8(float value) {
+  static char ret_str[64];
+  snprintf(ret_str, sizeof(ret_str), "%.8f", value);
+  return ret_str;
+}
+
 /**
  * *******************************************************************
  * @brief   create String from integer

diff --git a/lib/basicHelper/src/stringHelper.h b/lib/basicHelper/src/stringHelper.h
@@ -9,6 +9,7 @@ const char *uint64ToString(uint64_t value);
 const char *intmaxToString(intmax_t value);
 const char *floatToString(float value);
 const char *floatToString4(float value);
+const char *floatToString8(float value);
 const char *doubleToString(double value);
 bool stringToBool(const char *str);
 char *strcat_safe(char *dest, const char *src, size_t dest_size);

diff --git a/platformio.ini b/platformio.ini
@@ -18,17 +18,17 @@ extra_scripts =
 ; OPTION 1: direct cable upload
 ; ----------------------------------------------------------------
 ;upload_port = /dev/cu.usbserial-0258166D
-upload_port = /dev/cu.usbserial-576D0483281
+;upload_port = /dev/cu.usbserial-576D0483281
 ;upload_port = /dev/cu.usbserial-0001
 ;upload_port = /dev/cu.usbmodem01
 
 
 ; ----------------------------------------------------------------
 ; OPTION 2: wireless OTA Update
 ; ----------------------------------------------------------------
-;upload_protocol = espota
-;upload_speed = 115000
-;upload_port = 192.168.178.135   ; Conneted to Router
+upload_protocol = espota
+upload_speed = 115000
+upload_port = 192.168.178.135   ; Conneted to Router
 ;upload_port = 192.168.4.1      ; Setup Mode (ESP create Accesspoint)
 
 

diff --git a/src/webUIcallback.cpp b/src/webUIcallback.cpp
@@ -149,14 +149,9 @@ void webCallback(const char *elementId, const char *value) {
     km271sendCmd(KM271_SENDCMD_WW_PUMP_CYCLES, atoi(value));
   }
 
-  // store input of Oilcounter value
-  if (strcmp(elementId, "p02_oilmeter_set") == 0) {
-    oilmeterSetValue = strtol(value, NULL, 10);
-  }
-
   // Set new Oilcounter value
-  if (strcmp(elementId, "p02_oilmeter_btn") == 0) {
-    cmdSetOilmeter(oilmeterSetValue);
+  if (strcmp(elementId, "p02_oilmeter_set_cmd") == 0) {
+    cmdSetOilmeter(strtol(value, NULL, 10));
   }
 
   // WiFi
@@ -303,11 +298,8 @@ void webCallback(const char *elementId, const char *value) {
   if (strcmp(elementId, "p12_pushover_filter") == 0) {
     config.pushover.filter = strtoul(value, NULL, 10);
   }
-  if (strcmp(elementId, "p12_pushover_test_msg") == 0) {
-    snprintf(pushoverMessage, sizeof(pushoverMessage), value);
-  }
-  if (strcmp(elementId, "p12_pushover_test_btn") == 0) {
-    addPushoverMsg(pushoverMessage);
+  if (strcmp(elementId, "p12_pushover_test_msg_cmd") == 0) {
+    addPushoverMsg(value);
   }
 
   // Logamatic

diff --git a/src/webUIupdates.cpp b/src/webUIupdates.cpp
@@ -96,6 +96,10 @@ void addJsonValueFlt(char *buffer, size_t bufferSize, const char *elementID, flo
   addJsonElement(buffer, bufferSize, elementID, "v", floatToString(value));
 };
 
+void addJsonValueFlt8(char *buffer, size_t bufferSize, const char *elementID, float value) {
+  addJsonElement(buffer, bufferSize, elementID, "v", floatToString8(value));
+};
+
 void addJsonState(char *buffer, size_t bufferSize, const char *elementID, bool value) {
   addJsonElement(buffer, bufferSize, elementID, "c", (value ? "true" : "false"));
 };
@@ -176,12 +180,13 @@ void updateOilmeterElements(bool init) {
       snprintf(tmpMessage, sizeof(tmpMessage), "%0.2f  L", float(oilcounter) / 100);
       updateWebText("p01_hw_oilmeter", tmpMessage, false);
     }
-  } else if (config.oilmeter.use_virtual_meter) {
-    if (init || kmStatusCpy.BurnerCalcOilConsumption != oilcounterVirtOld) {
-      oilcounterVirtOld = kmStatusCpy.BurnerCalcOilConsumption;
+  }
+  if (config.oilmeter.use_virtual_meter) {
+    if (init || pkmStatus->BurnerCalcOilConsumption != oilcounterVirtOld) {
+      oilcounterVirtOld = pkmStatus->BurnerCalcOilConsumption;
 
       // Oilmeter value in dashboardTab
-      snprintf(tmpMessage, sizeof(tmpMessage), "%0.2f  L", float(oilcounter) / 100);
+      snprintf(tmpMessage, sizeof(tmpMessage), "%0.2f  L", float(pkmStatus->BurnerCalcOilConsumption) / 100);
       updateWebText("p01_v_oilmeter", tmpMessage, false);
     }
   }
@@ -232,8 +237,8 @@ void updateSettingsElements() {
   addJsonValueInt(jsonSet, sizeof(jsonSet), "p12_gpio_trig_oil", config.gpio.trigger_oilcounter);
   addJsonState(jsonSet, sizeof(jsonSet), "p12_oil_hw_enable", config.oilmeter.use_hardware_meter);
   addJsonState(jsonSet, sizeof(jsonSet), "p12_oil_virt_enable", config.oilmeter.use_virtual_meter);
-  addJsonValueFlt(jsonSet, sizeof(jsonSet), "p12_oil_par1_kg_h", config.oilmeter.consumption_kg_h);
-  addJsonValueFlt(jsonSet, sizeof(jsonSet), "p12_oil_par2_kg_l", config.oilmeter.oil_density_kg_l);
+  addJsonValueFlt8(jsonSet, sizeof(jsonSet), "p12_oil_par1_kg_h", config.oilmeter.consumption_kg_h);
+  addJsonValueFlt8(jsonSet, sizeof(jsonSet), "p12_oil_par2_kg_l", config.oilmeter.oil_density_kg_l);
   addJsonState(jsonSet, sizeof(jsonSet), "p12_sens1_enable", config.sensor.ch1_enable);
   addJsonValueTxt(jsonSet, sizeof(jsonSet), "p12_sens1_name", config.sensor.ch1_name);
   addJsonValueTxt(jsonSet, sizeof(jsonSet), "p12_sens1_description", config.sensor.ch1_description);

diff --git a/web/js/doc.js b/web/js/doc.js
@@ -175,4 +175,20 @@ document.addEventListener("DOMContentLoaded", function () {
       sendData(selectElement.id, selectElement.value);
     });
   });
+
+  // Event-Listener for pushover test-message
+  document
+    .getElementById("p12_pushover_test_btn")
+    .addEventListener("click", function () {
+      var text = document.getElementById("p12_pushover_test_msg").value;
+      sendData("p12_pushover_test_msg_cmd", text);
+    });
+
+  // Event-Listener for oilcounter set value
+  document
+    .getElementById("p02_oilmeter_btn")
+    .addEventListener("click", function () {
+      var text = document.getElementById("p02_oilmeter_set").value;
+      sendData("p02_oilmeter_set_cmd", text);
+    });
 });