Continued work with v1.1.0

- Merge branch 'low_power' into dev-v1.1.0
- Corrected accumulated import/export from Aidon
- Added VCC and RSSI to MQTT messages

Changes in UI:
- New top navbar
- Show VCC and WiFi information
- Show MQTT error messages
- Show ESP, HAN, WiFi and MQTT status badge
- Show accumulated Import/export
This commit is contained in:
Gunnar Skjold
2020-02-12 19:55:06 +01:00
6 changed files with 309 additions and 60 deletions

View File

@@ -2,6 +2,7 @@
#define _AMSWEBSERVER_h
#include <ArduinoJson.h>
#include <MQTT.h>
#include "configuration.h"
#if defined(ARDUINO) && ARDUINO >= 100
@@ -22,17 +23,18 @@
class AmsWebServer {
public:
void setup(configuration* config, Stream* debugger);
void setup(configuration* config, Stream* debugger, MQTTClient* mqtt);
void loop();
void setJson(StaticJsonDocument<500> json);
private:
configuration* config;
Stream* debugger;
MQTTClient* mqtt;
StaticJsonDocument<500> json;
int maxPwr;
int p;
double u1, u2, u3, i1, i2, i3;
double u1, u2, u3, i1, i2, i3, tpi, tpo, tqi, tqo;
#if defined(ESP8266)
ESP8266WebServer server;