github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-01 06:31:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Calculate max power when receiving json from reader

Browse Source
This commit is contained in:
Gunnar Skjold
2020-01-28 21:18:48 +01:00
parent 7e4047096b
commit 36b37eb2a6
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/AmsWebServer.cpp
View File

@@ -65,6 +65,16 @@ void AmsWebServer::setJson(StaticJsonDocument<500> json) {
i1 = json["data"]["I1"].as<double>();
i2 = json["data"]["I2"].as<double>();
i3 = json["data"]["I3"].as<double>();
if(config->hasConfig() && u1 > 0) {
maxPwr = config->fuseSize * u1;
if(u2 > 0) {
maxPwr += config->fuseSize * u2;
if(u3 > 0) {
maxPwr += config->fuseSize * u3;
}
}
}
}
}
}
@@ -230,23 +240,8 @@ void AmsWebServer::dataJson() {
if(!json.isNull()) {
println(" json has data");
int u1 = json["data"]["U1"].as<int>();
int u2 = json["data"]["U2"].as<int>();
int u3 = json["data"]["U3"].as<int>();
int pwr = json["data"]["P"].as<int>();
if(config->hasConfig() && u1 > 0) {
maxPwr = config->fuseSize * u1;
if(u2 > 0) {
maxPwr += config->fuseSize * u2;
if(u3 > 0) {
maxPwr += config->fuseSize * u3;
}
}
}
json["maxPower"] = maxPwr;
json["pct"] = min(pwr*100/maxPwr, 100);
json["pct"] = min(p*100/maxPwr, 100);
json["meterType"] = config->meterType;
json["currentMillis"] = millis();