diff --git a/Firmware/EggbotWireless/include/Config.h b/Firmware/EggbotWireless/include/Config.h index 27f4128..24e152e 100644 --- a/Firmware/EggbotWireless/include/Config.h +++ b/Firmware/EggbotWireless/include/Config.h @@ -4,6 +4,9 @@ constexpr int pin12v{5}; constexpr int i2cTimeout{10}, i2cTimeoutTries{10}; constexpr int lastStsTTL{10}; + +constexpr float battR1{12}, battR2{2.2}; + constexpr unsigned long powerTimeout{20000}, powerStartupDelay{100}; constexpr const char *defSSID{"eggbot"}, *defPass{"eggbotwi"}, diff --git a/Firmware/EggbotWireless/src/WebAPI.cpp b/Firmware/EggbotWireless/src/WebAPI.cpp index ac64cbc..a35aa1b 100644 --- a/Firmware/EggbotWireless/src/WebAPI.cpp +++ b/Firmware/EggbotWireless/src/WebAPI.cpp @@ -1,10 +1,13 @@ #include "WebAPI.h" +#include "Config.h" #include "QueueManager.h" ESP8266WebServer server(80); WebAPI::WebAPI() {} +float getVin(float r1, float r2, float vout) { return ((r1 + r2) * vout) / r2; } + String WebAPI::getStatusJson() { StaticJsonDocument<256> doc; Status status = executor.status(); @@ -17,7 +20,7 @@ String WebAPI::getStatusJson() { doc["mmS"] = status.mmS; doc["pEng"] = status.pEng; doc["xLim"] = status.xLim; - doc["batt"] = analogRead(A0); + doc["batt"] = getVin(battR1, battR2, analogRead(A0) / 1000.0); String out; serializeJson(doc, out);