Merge branch 'dev-v1.0.1' into dev-v1.1.0

This commit is contained in:
Gunnar Skjold
2020-02-14 16:07:54 +01:00
4 changed files with 18 additions and 18 deletions

View File

@@ -42,7 +42,7 @@ void AmsWebServer::loop() {
server.handleClient();
}
void AmsWebServer::setJson(StaticJsonDocument<500> json) {
void AmsWebServer::setJson(StaticJsonDocument<1024> json) {
if(!json.isNull()) {
p = json["data"]["P"].as<int>();

View File

@@ -25,13 +25,13 @@ class AmsWebServer {
public:
void setup(configuration* config, Stream* debugger, MQTTClient* mqtt);
void loop();
void setJson(StaticJsonDocument<500> json);
void setJson(StaticJsonDocument<1024> json);
private:
configuration* config;
Stream* debugger;
MQTTClient* mqtt;
StaticJsonDocument<500> json;
StaticJsonDocument<1024> json;
int maxPwr;
int p;
double u1, u2, u3, i1, i2, i3, tpi, tpo, tqi, tqo;