From fdc9bf57839600e5b3aae296eeec42ac26025808 Mon Sep 17 00:00:00 2001 From: Charles Crossan Date: Mon, 11 Jan 2021 20:25:02 -0500 Subject: [PATCH 1/3] add power statistics for #635 --- src/mesh/wifi/WebServer.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mesh/wifi/WebServer.cpp b/src/mesh/wifi/WebServer.cpp index 8eb88808..385d57e6 100644 --- a/src/mesh/wifi/WebServer.cpp +++ b/src/mesh/wifi/WebServer.cpp @@ -1,6 +1,7 @@ #include "mesh/wifi/WebServer.h" #include "NodeDB.h" #include "PowerFSM.h" +#include "power.h" #include "airtime.h" #include "main.h" #include "mesh/wifi/ContentHelper.h" @@ -1169,7 +1170,14 @@ void handleReport(HTTPRequest *req, HTTPResponse *res) res->println("},"); - res->println("\"test\": 123"); + res->println("\"power\": {"); +#define BoolToString(x) ((x)?"true":"false") + res->printf("\"battery_percent\": %u,\n", powerStatus->getBatteryChargePercent()); + res->printf("\"battery_voltage_mv\": %u,\n", powerStatus->getBatteryVoltageMv()); + res->printf("\"has_battery\": %s,\n", BoolToString(powerStatus->getHasBattery())); + res->printf("\"has_usb\": %s,\n", BoolToString(powerStatus->getHasUSB())); + res->printf("\"is_charging\": %s\n", BoolToString(powerStatus->getIsCharging())); + res->println("}"); res->println("},"); From 0f573901d520ad0e7b176fbaba272a41114d0fdb Mon Sep 17 00:00:00 2001 From: Charles Crossan Date: Mon, 11 Jan 2021 20:28:09 -0500 Subject: [PATCH 2/3] didn't need power.h --- src/mesh/wifi/WebServer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mesh/wifi/WebServer.cpp b/src/mesh/wifi/WebServer.cpp index 385d57e6..2f263e21 100644 --- a/src/mesh/wifi/WebServer.cpp +++ b/src/mesh/wifi/WebServer.cpp @@ -1,7 +1,6 @@ #include "mesh/wifi/WebServer.h" #include "NodeDB.h" #include "PowerFSM.h" -#include "power.h" #include "airtime.h" #include "main.h" #include "mesh/wifi/ContentHelper.h" From 95c502c658be2c425246d826aaec2af351ae0092 Mon Sep 17 00:00:00 2001 From: Charles Crossan Date: Mon, 11 Jan 2021 20:30:02 -0500 Subject: [PATCH 3/3] fix typo --- src/PowerStatus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PowerStatus.h b/src/PowerStatus.h index e9c192fb..a276be59 100644 --- a/src/PowerStatus.h +++ b/src/PowerStatus.h @@ -11,7 +11,7 @@ namespace meshtastic */ enum OptionalBool { OptFalse = 0, OptTrue = 1, OptUnknown = 2 }; -/// Describes the state of the GPS system. +/// Describes the state of the Power system. class PowerStatus : public Status {