github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-13 15:37:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Default multiplier 1.0

Browse Source
This commit is contained in:
Gunnar Skjold 2023-12-04 12:20:59 +01:00
parent 9efc19090e
commit 1c5303e771
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/SvelteUi/src/AmsWebServer.cpp
View File

@ -802,6 +802,17 @@ void AmsWebServer::configurationJson() {
if(!checkSecurity(1))
return;
bool multEnable = false;
if(meterConfig->wattageMultiplier != 1.0 && meterConfig->wattageMultiplier != 0.0)
multEnable = true;
if(meterConfig->voltageMultiplier != 1.0 && meterConfig->voltageMultiplier != 0.0)
multEnable = true;
if(meterConfig->amperageMultiplier != 1.0 && meterConfig->amperageMultiplier != 0.0)
multEnable = true;
if(meterConfig->accumulatedMultiplier != 1.0 && meterConfig->accumulatedMultiplier != 0.0)
multEnable = true;
SystemConfig sysConfig;
config->getSystemConfig(sysConfig);
@ -870,11 +881,11 @@ void AmsWebServer::configurationJson() {
encen ? "true" : "false",
toHex(meterConfig->encryptionKey, 16).c_str(),
toHex(meterConfig->authenticationKey, 16).c_str(),
meterConfig->wattageMultiplier > 1 || meterConfig->voltageMultiplier > 1 || meterConfig->amperageMultiplier > 1 || meterConfig->accumulatedMultiplier > 1 ? "true" : "false",
meterConfig->wattageMultiplier / 1000.0,
meterConfig->voltageMultiplier / 1000.0,
meterConfig->amperageMultiplier / 1000.0,
meterConfig->accumulatedMultiplier / 1000.0
multEnable ? "true" : "false",
meterConfig->wattageMultiplier == 0.0 ? 1.0 : meterConfig->wattageMultiplier / 1000.0,
meterConfig->voltageMultiplier == 0.0 ? 1.0 : meterConfig->voltageMultiplier / 1000.0,
meterConfig->amperageMultiplier == 0.0 ? 1.0 : meterConfig->amperageMultiplier / 1000.0,
meterConfig->accumulatedMultiplier == 0.0 ? 1.0 : meterConfig->accumulatedMultiplier / 1000.0
);
server.sendContent(buf);