mirror of
https://github.com/UtilitechAS/amsreader-firmware.git
synced 2026-01-26 20:23:41 +00:00
Merge branch 'dev-v1.0.1' into dev-v1.1.0
This commit is contained in:
@@ -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>();
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user