stepus53/EggbotWireless
1
0
Fork 0
mirror of https://github.com/usatiuk/EggbotWireless.git synced 2025-10-26 16:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

return actual battery voltage in status

Browse Source
This commit is contained in:
Stepan Usatiuk
2019-09-07 14:36:41 +03:00
parent 1df9fede9d
commit 26408bddde
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/EggbotWireless/include/Config.h
View File

@@ -4,6 +4,9 @@
constexpr int pin12v{5}; constexpr int pin12v{5};
constexpr int i2cTimeout{10}, i2cTimeoutTries{10}; constexpr int i2cTimeout{10}, i2cTimeoutTries{10};
constexpr int lastStsTTL{10}; constexpr int lastStsTTL{10};
constexpr float battR1{12}, battR2{2.2};
constexpr unsigned long powerTimeout{20000}, powerStartupDelay{100}; constexpr unsigned long powerTimeout{20000}, powerStartupDelay{100};
constexpr const char *defSSID{"eggbot"}, *defPass{"eggbotwi"}, constexpr const char *defSSID{"eggbot"}, *defPass{"eggbotwi"},

5
Firmware/EggbotWireless/src/WebAPI.cpp
View File

@@ -1,10 +1,13 @@
#include "WebAPI.h" #include "WebAPI.h"
#include "Config.h"
#include "QueueManager.h" #include "QueueManager.h"
ESP8266WebServer server(80); ESP8266WebServer server(80);
WebAPI::WebAPI() {} WebAPI::WebAPI() {}
float getVin(float r1, float r2, float vout) { return ((r1 + r2) * vout) / r2; }
String WebAPI::getStatusJson() { String WebAPI::getStatusJson() {
StaticJsonDocument<256> doc; StaticJsonDocument<256> doc;
Status status = executor.status(); Status status = executor.status();
@@ -17,7 +20,7 @@ String WebAPI::getStatusJson() {
doc["mmS"] = status.mmS; doc["mmS"] = status.mmS;
doc["pEng"] = status.pEng; doc["pEng"] = status.pEng;
doc["xLim"] = status.xLim; doc["xLim"] = status.xLim;
doc["batt"] = analogRead(A0); doc["batt"] = getVin(battR1, battR2, analogRead(A0) / 1000.0);
String out; String out;
serializeJson(doc, out); serializeJson(doc, out);