Merge pull request #53 from crossan007/master

add power statistics for #635

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
 {
 

src/mesh/wifi/WebServer.cpp

@@ -1169,7 +1169,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("},");