updates

Author: kerpz

ArduinoEnergyLogger.ino

@@ -107,6 +107,8 @@ uint16_t post_error = 0;
 uint16_t http_error = 0;
 int http_code = 0;
 
+uint16_t run_time = 0;
+
 // timing
 uint8_t second = 0;
 //uint8_t minute;
@@ -222,6 +224,7 @@ void execEverySecond() {
       if (post_enable == 1) postCsv();
       else if (post_enable == 2) postInflux();
       second = 0;
+      run_time++;
     }
     else {
       second++;

ct.ino

@@ -24,7 +24,6 @@ void extractCT() {
     }
     double I_RATIO = ct_calibration * ((SupplyVoltage / 1000.0) / (ADC_COUNTS));
     ct_current = I_RATIO * sqrt(sumI / Number_of_Samples);
-    sumI = 0;
-    
+
     ct_power = (ct_current * ct_voltage * ct_pf); // watts / power apparent
 }

post.ino

@@ -116,7 +116,7 @@ int postInflux() {
       postStr += ",inv_in_frequency=" + String(inv_in_frequency);
       postStr += ",inv_cell_voltage=" + String(inv_cell_voltage);
       postStr += ",inv_temperature=" + String(inv_temperature);
-      //postStr += ",inv_flags=" + String(inv_flags);
+      postStr += ",inv_flags=" + String(inv_flags);
 
       postStr += "\n\n";
       int httpCode = http.POST(postStr);
@@ -149,3 +149,79 @@ int postInflux() {
   }
   return ret;
 }
+
+int postJson() {
+  int ret = 0;
+  // http
+  WiFiClient client;
+  HTTPClient http;
+
+  if (WiFi.status() == WL_CONNECTED) {
+    // https insecure
+    //client.setFingerprint(fingerprint);
+    //client.setInsecure();
+
+    // http://localhost:8086/write?db=home_energy
+
+    if (http_timeout > 0) http.setTimeout(http_timeout); // ms
+    if (http.begin(client, api_url)) {
+      http.addHeader("Content-Type", "application/json");
+
+      // home_energy,api_key=NIJCG7UI28O9CAYD ct_voltage=$P1,ct_power=$P2,pv_voltage=$P3,pv_power=$P4,battery_voltage=$P5,battery_charge=$P6,mppt_voltage=$P7,mppt_power=$P8,battery_temperature=$P9,mppt_temperature=$P10,dc_voltage=$P11,dc_power=$P12,input_voltage=$P13,input_fault_voltage=$P14,inv_voltage=$P15,inv_power=$P16,input_frequency=$P17,cell_voltage=$P18,inv_temperature=$P19" -database="home_energy"
+      String postStr = "{api_key:" + String(api_key);
+
+      // json
+      postStr += ",ct_voltage:" + String(ct_voltage);
+      postStr += ",ct_power:" + String(ct_power);
+
+      postStr += ",pv_voltage:" + String(pv_voltage);
+      postStr += ",pv_voltage:" + String(pv_power);
+      postStr += ",battery_voltage:" + String(battery_voltage);
+      postStr += ",battery_charge:" + String(battery_charge);
+      postStr += ",mppt_voltage:" + String(mppt_voltage);
+      postStr += ",mppt_power:" + String(mppt_power);
+      postStr += ",battery_temperature:" + String(battery_temperature);
+      postStr += ",mppt_temperature:" + String(mppt_temperature);
+      postStr += ",dc_voltage:" + String(dc_voltage);
+      postStr += ",dc_power:" + String(dc_power);
+
+      postStr += ",inv_in_voltage:" + String(inv_in_voltage);
+      postStr += ",inv_in_fault_voltage:" + String(inv_in_fault_voltage);
+      postStr += ",inv_out_voltage:" + String(inv_out_voltage);
+      postStr += ",inv_out_power:" + String(inv_out_power); // watts
+      postStr += ",inv_in_frequency:" + String(inv_in_frequency);
+      postStr += ",inv_cell_voltage:" + String(inv_cell_voltage);
+      postStr += ",inv_temperature:" + String(inv_temperature);
+      postStr += ",inv_flags:" + String(inv_flags);
+
+      postStr += "}\n\n";
+      int httpCode = http.POST(postStr);
+
+      if (httpCode == HTTP_CODE_OK) {
+        //Serial.printf("[HTTP] POST... code: %d\n", httpCode);
+        String payload = http.getString();
+        //Serial.println("received payload:\n<<");
+        //Serial.println(payload);
+        //Serial.println(">>");
+
+        if (payload == "") {
+          post_error++;
+          ret = -1;
+        }
+        //Serial.print("error: ");
+        //Serial.println(error);
+      } else {
+        //Serial.printf("[HTTP] POST... failed, error: %s\n", http.errorToString(httpCode).c_str());
+        http_error++;
+        http_code=httpCode;
+        ret = -1;
+      }
+      http.end();
+    }
+  }
+  else {
+    wifi_error++;
+    ret = -1;
+  }
+  return ret;
+}

webserver.ino

@@ -166,8 +166,8 @@ void handleInfo() {
   body += F(" amps</td></tr><tr><td>CT Voltage</td><td>");
   body += String(ct_voltage);
   body += F(" volts</td></tr><tr><td>CT Power</td><td>");
-  body += String(ct_power);
-  body += F(" watts</td></tr><tr><td>CT Pf</td><td>");
+  body += String(ct_power / 1000.0, 3);
+  body += F(" kW</td></tr><tr><td>CT Pf</td><td>");
   body += String(ct_pf);
   body += F("</td></tr></tbody></table><br>");
 
@@ -224,6 +224,8 @@ void handleInfo() {
   body += String(http_error);
   body += F("</td></tr><tr><td>Http Code</td><td>");
   body += String(http_code);
+  body += F("</td></tr><tr><td>Run Time (minutes)</td><td>");
+  body += String(run_time);
   body += F("</td></tr></tbody></table><br><br>");
 
   body += F( "<a class=\"btn\" href=\"/reset\">Reset</a><br>" );
@@ -389,6 +391,8 @@ void handleReset() {
   modbus_error = 0;
   megatec_error = 0;
 
+  run_time = 0;
+
   webServer.sendHeader("Location", "/", true);
   webServer.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
   webServer.sendHeader("Pragma", "no-cache");