Add min,max; Changed Display formatting, minor fixes
This commit is contained in:
parent
ce64646347
commit
3a6c1ca884
BIN
.pioenvs/.sconsign.dblite
Normal file
BIN
.pioenvs/.sconsign.dblite
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/Esp.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/Esp.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/HardwareSerial.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/HardwareSerial.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/IPAddress.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/IPAddress.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/IPv6Address.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/IPv6Address.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/MD5Builder.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/MD5Builder.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/Print.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/Print.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/Stream.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/Stream.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/StreamString.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/StreamString.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/WMath.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/WMath.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/WString.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/WString.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/base64.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/base64.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/cbuf.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/cbuf.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-adc.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-adc.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-bt.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-bt.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-dac.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-dac.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-gpio.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-gpio.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-i2c.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-i2c.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-ledc.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-ledc.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-matrix.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-matrix.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-misc.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-misc.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-psram.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-psram.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-sigmadelta.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-sigmadelta.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-spi.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-spi.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-time.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-time.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-timer.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-timer.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-touch.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-touch.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-uart.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/esp32-hal-uart.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/libb64/cdecode.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/libb64/cdecode.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/libb64/cencode.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/libb64/cencode.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/main.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/main.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/stdlib_noniso.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/stdlib_noniso.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/wiring_pulse.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/wiring_pulse.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/wiring_shift.c.o
Normal file
BIN
.pioenvs/nodemcu-32s/FrameworkArduino/wiring_shift.c.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/firmware.bin
Normal file
BIN
.pioenvs/nodemcu-32s/firmware.bin
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/firmware.elf
Normal file
BIN
.pioenvs/nodemcu-32s/firmware.elf
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib0a7/DNSServer/DNSServer.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib0a7/DNSServer/DNSServer.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib0a7/libDNSServer.a
Normal file
BIN
.pioenvs/nodemcu-32s/lib0a7/libDNSServer.a
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib178/EEPROM/EEPROM.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib178/EEPROM/EEPROM.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib178/libEEPROM.a
Normal file
BIN
.pioenvs/nodemcu-32s/lib178/libEEPROM.a
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/ETH.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/ETH.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFi.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFi.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiAP.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiAP.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiClient.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiClient.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiGeneric.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiGeneric.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiMulti.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiMulti.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiSTA.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiSTA.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiScan.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiScan.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiServer.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiServer.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiUdp.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/WiFi/WiFiUdp.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib250/libWiFi.a
Normal file
BIN
.pioenvs/nodemcu-32s/lib250/libWiFi.a
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib3a9/libESP Async WebServer_ID306.a
Normal file
BIN
.pioenvs/nodemcu-32s/lib3a9/libESP Async WebServer_ID306.a
Normal file
Binary file not shown.
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib3e8/libESP8266FtpServer_ID992.a
Normal file
BIN
.pioenvs/nodemcu-32s/lib3e8/libESP8266FtpServer_ID992.a
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib69d/SPIFFS/SPIFFS.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib69d/SPIFFS/SPIFFS.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib69d/libSPIFFS.a
Normal file
BIN
.pioenvs/nodemcu-32s/lib69d/libSPIFFS.a
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib886/Wire/Wire.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib886/Wire/Wire.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib886/libWire.a
Normal file
BIN
.pioenvs/nodemcu-32s/lib886/libWire.a
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib939/ArduinoINA219_ID411/INA219.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/lib939/ArduinoINA219_ID411/INA219.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/lib939/libArduinoINA219_ID411.a
Normal file
BIN
.pioenvs/nodemcu-32s/lib939/libArduinoINA219_ID411.a
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/libFrameworkArduino.a
Normal file
BIN
.pioenvs/nodemcu-32s/libFrameworkArduino.a
Normal file
Binary file not shown.
1
.pioenvs/nodemcu-32s/libFrameworkArduinoVariant.a
Normal file
1
.pioenvs/nodemcu-32s/libFrameworkArduinoVariant.a
Normal file
|
@ -0,0 +1 @@
|
||||||
|
!<arch>
|
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/libb23/libLiquidCrystal_I2C_ID576.a
Normal file
BIN
.pioenvs/nodemcu-32s/libb23/libLiquidCrystal_I2C_ID576.a
Normal file
Binary file not shown.
1
.pioenvs/nodemcu-32s/libbe8/libTaskScheduler_ID721.a
Normal file
1
.pioenvs/nodemcu-32s/libbe8/libTaskScheduler_ID721.a
Normal file
|
@ -0,0 +1 @@
|
||||||
|
!<arch>
|
BIN
.pioenvs/nodemcu-32s/libc3f/FS/FS.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/libc3f/FS/FS.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/libc3f/FS/vfs_api.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/libc3f/FS/vfs_api.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/libc3f/libFS.a
Normal file
BIN
.pioenvs/nodemcu-32s/libc3f/libFS.a
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/libc9f/AsyncTCP_ID1826/AsyncTCP.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/libc9f/AsyncTCP_ID1826/AsyncTCP.cpp.o
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/libc9f/libAsyncTCP_ID1826.a
Normal file
BIN
.pioenvs/nodemcu-32s/libc9f/libAsyncTCP_ID1826.a
Normal file
Binary file not shown.
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/libdb7/libESPAsyncWifiManager_ID1438.a
Normal file
BIN
.pioenvs/nodemcu-32s/libdb7/libESPAsyncWifiManager_ID1438.a
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/partitions.bin
Normal file
BIN
.pioenvs/nodemcu-32s/partitions.bin
Normal file
Binary file not shown.
BIN
.pioenvs/nodemcu-32s/src/PowerAnalyzer.ino.cpp.o
Normal file
BIN
.pioenvs/nodemcu-32s/src/PowerAnalyzer.ino.cpp.o
Normal file
Binary file not shown.
|
@ -51,11 +51,12 @@ void data_logging();
|
||||||
|
|
||||||
//Globale Variablen
|
//Globale Variablen
|
||||||
float shuntvoltage_V = 0, shuntvoltage_mV = 0, busvoltage_V = 0, busvoltage_mV = 0, current_A = 0, current_mA = 0, power_W = 0, power_mW = 0;
|
float shuntvoltage_V = 0, shuntvoltage_mV = 0, busvoltage_V = 0, busvoltage_mV = 0, current_A = 0, current_mA = 0, power_W = 0, power_mW = 0;
|
||||||
|
float shuntvoltage_V_max = 0, current_A_max = 0, power_W_max = 0, shuntvoltage_V_min = 0, current_A_min = 0, power_W_min = 0;
|
||||||
float Ah = 0, mAh = 0, Wh = 0, mWh = 0;
|
float Ah = 0, mAh = 0, Wh = 0, mWh = 0;
|
||||||
float battery_voltage, battery_average;
|
float battery_voltage, battery_average;
|
||||||
int i_header = 0;
|
int i_header = 0;
|
||||||
bool button1, button2, button3;
|
bool button1, button2, button3;
|
||||||
bool lcd_light = true;
|
bool lcd_light = true, wifi_enabled = true;
|
||||||
bool measuring_run = false, reset_actual = false, reset_minmax =false, battery_low = false;
|
bool measuring_run = false, reset_actual = false, reset_minmax =false, battery_low = false;
|
||||||
unsigned long lastread = 0;
|
unsigned long lastread = 0;
|
||||||
unsigned long tick;
|
unsigned long tick;
|
||||||
|
@ -174,6 +175,7 @@ void setup() {
|
||||||
lcd.print("Done");
|
lcd.print("Done");
|
||||||
} else {
|
} else {
|
||||||
lcd.print("Wi-Fi disabled");
|
lcd.print("Wi-Fi disabled");
|
||||||
|
wifi_enabled = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Init ina219s
|
//Init ina219s
|
||||||
|
@ -197,7 +199,6 @@ void setup() {
|
||||||
task.addTask(t3);
|
task.addTask(t3);
|
||||||
task.addTask(t4);
|
task.addTask(t4);
|
||||||
task.addTask(t5);
|
task.addTask(t5);
|
||||||
t1.enable();
|
|
||||||
t2.enable();
|
t2.enable();
|
||||||
t3.enable();
|
t3.enable();
|
||||||
t4.enable();
|
t4.enable();
|
||||||
|
@ -223,6 +224,15 @@ void setup() {
|
||||||
lcd.setCursor(0,3);
|
lcd.setCursor(0,3);
|
||||||
lcd.print("Done. Starting up...");
|
lcd.print("Done. Starting up...");
|
||||||
delay(1500);
|
delay(1500);
|
||||||
|
//Display IP address
|
||||||
|
if (wifi_enabled) {
|
||||||
|
lcd.clear();
|
||||||
|
lcd.setCursor(6,1);
|
||||||
|
lcd.print("IP address");
|
||||||
|
lcd.setCursor(5,2);
|
||||||
|
lcd.print(WiFi.localIP());
|
||||||
|
delay(1500);
|
||||||
|
}
|
||||||
//Load Default Screen
|
//Load Default Screen
|
||||||
lcd_init();
|
lcd_init();
|
||||||
}
|
}
|
||||||
|
@ -244,7 +254,8 @@ void lcd_print() {
|
||||||
lcd.print(busvoltage_V);
|
lcd.print(busvoltage_V);
|
||||||
if (current_A > 10) {lcd.setCursor(1,1);} else if (current_A < 0) {lcd.setCursor(1,1);} else {lcd.setCursor(1,1); lcd.print(" ");}
|
if (current_A > 10) {lcd.setCursor(1,1);} else if (current_A < 0) {lcd.setCursor(1,1);} else {lcd.setCursor(1,1); lcd.print(" ");}
|
||||||
lcd.print(current_A);
|
lcd.print(current_A);
|
||||||
if (power_W > 10) {lcd.setCursor(1,2);} else if (power_W < 0){lcd.setCursor(1,2);} else {lcd.setCursor(1,2); lcd.print(" ");}
|
lcd.setCursor(0,2);
|
||||||
|
if (power_W < 100 && power_W > 10) {lcd.print(" ")}; else if (power_W < 10) {lcd.print(" ")};
|
||||||
lcd.print(power_W);
|
lcd.print(power_W);
|
||||||
if (Ah > 10) {lcd.setCursor(13,1);} else if (Ah < 0){lcd.setCursor(11,1);} else {lcd.setCursor(11,1); lcd.print(" ");}
|
if (Ah > 10) {lcd.setCursor(13,1);} else if (Ah < 0){lcd.setCursor(11,1);} else {lcd.setCursor(11,1); lcd.print(" ");}
|
||||||
lcd.print(Ah);
|
lcd.print(Ah);
|
||||||
|
@ -377,12 +388,37 @@ void readCurrent() {
|
||||||
mAh = Ah * 1000;
|
mAh = Ah * 1000;
|
||||||
Wh += (power_W * tick)/3600000.0;
|
Wh += (power_W * tick)/3600000.0;
|
||||||
mWh = Wh * 1000;
|
mWh = Wh * 1000;
|
||||||
|
|
||||||
|
if (shuntvoltage_V_max < shuntvoltage_V) {
|
||||||
|
shuntvoltage_V_max = shuntvoltage_V;
|
||||||
|
}
|
||||||
|
if (current_A_max < current_A) {
|
||||||
|
current_A_max = current_A;
|
||||||
|
}
|
||||||
|
if (power_W_max < power_W) {
|
||||||
|
power_W_max = power_W;
|
||||||
|
}
|
||||||
|
if (shuntvoltage_V_min > shuntvoltage_V) {
|
||||||
|
shuntvoltage_V_min = shuntvoltage_V;
|
||||||
|
}
|
||||||
|
if (current_A_min > current_A) {
|
||||||
|
current_A_min = current_A;
|
||||||
|
}
|
||||||
|
if (power_W_min > power_W) {
|
||||||
|
power_W_min = power_W;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (reset_actual) {
|
if (reset_actual) {
|
||||||
Ah = 0;
|
Ah = 0;
|
||||||
Wh = 0;
|
Wh = 0;
|
||||||
data_timestamp = 0;
|
data_timestamp = 0;
|
||||||
reset_actual = false;
|
reset_actual = false;
|
||||||
|
shuntvoltage_V_max = 0;
|
||||||
|
current_A_max = 0;
|
||||||
|
power_W_max = 0;
|
||||||
|
shuntvoltage_V_min = 0;
|
||||||
|
current_A_min = 0;
|
||||||
|
power_W_min = 0;
|
||||||
}
|
}
|
||||||
lastread = newtime;
|
lastread = newtime;
|
||||||
ina219.recalibrate();
|
ina219.recalibrate();
|
||||||
|
@ -460,17 +496,19 @@ void web_measuring_reset(AsyncWebServerRequest *request) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void web_get_values(AsyncWebServerRequest *request) {
|
void web_get_values(AsyncWebServerRequest *request) {
|
||||||
request->send( 200, "application/json", "{\"voltage\":" + String(busvoltage_V) + ", \"current\":" + String(current_A) + ", \"power\":" + String(power_W) + ", \"Ah\":" + String(Ah) + ", \"Wh\":" + String(Wh) + ", \"battery\":" + String(battery_voltage) + ", \"run\":" + String(measuring_run) + "}");
|
request->send( 200, "application/json", "{\"voltage\":" + String(busvoltage_V) + ", \"current\":" + String(current_A) + ", \"power\":" + String(power_W) + ", \"Ah\":" + String(Ah) + ", \"Wh\":" + String(Wh) + ", \"battery\":" + String(battery_voltage) + ", \"run\":" + String(measuring_run) + ", \"run\":" + String(shuntvoltage_V_max) + ", \"run\":" + String(shuntvoltage_V_min) + ", \"run\":" + String(current_A_max) + ", \"run\":" + String(current_A_min) + ", \"run\":" + String(power_W_max) + ", \"run\":" + String(power_W_min) + "}");
|
||||||
}
|
}
|
||||||
|
|
||||||
void data_logging() {
|
void data_logging() {
|
||||||
if (measuring_run) {
|
if (measuring_run) {
|
||||||
File tempLog = SPIFFS.open("/datalog.csv", "a");
|
File datalog = SPIFFS.open("/datalog.csv", "a");
|
||||||
tempLog.print(data_timestamp); tempLog.print(',');
|
datalog.print(data_timestamp); datalog.print(',');
|
||||||
tempLog.print(busvoltage_V); tempLog.print(',');
|
datalog.print(busvoltage_V); datalog.print(',');
|
||||||
tempLog.print(current_A); tempLog.print(',');
|
datalog.print(current_A); datalog.print(',');
|
||||||
tempLog.println(power_W);
|
datalog.println(power_W); datalog.print(',');
|
||||||
tempLog.close();
|
datalog.println(Ah); datalog.print(',');
|
||||||
|
datalog.println(Wh);
|
||||||
|
datalog.close();
|
||||||
data_timestamp++;
|
data_timestamp++;
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue