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

Multipliers for HAN data

Browse Source
This commit is contained in:
Gunnar Skjold
2022-03-18 19:16:03 +01:00
parent b9234f6f64
commit 40016f314e
10 changed files with 151 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/AmsConfiguration.cpp
View File

@@ -645,6 +645,14 @@ bool AmsConfiguration::hasConfig() {
configVersion = 0;
return false;
}
case 93:
configVersion = -1; // Prevent loop
if(relocateConfig93()) {
configVersion = 94;
} else {
configVersion = 0;
return false;
}
case EEPROM_CHECK_SUM:
return true;
default:
@@ -775,8 +783,6 @@ bool AmsConfiguration::relocateConfig91() {
}
bool AmsConfiguration::relocateConfig92() {
saveToFs();
WiFiConfig wifi;
EEPROM.begin(EEPROM_SIZE);
EEPROM.get(CONFIG_WIFI_START, wifi);
@@ -797,6 +803,21 @@ bool AmsConfiguration::relocateConfig92() {
return ret;
}
bool AmsConfiguration::relocateConfig93() {
MeterConfig meter;
EEPROM.begin(EEPROM_SIZE);
EEPROM.get(CONFIG_METER_START_93, meter);
meter.wattageMultiplier = 0;
meter.voltageMultiplier = 0;
meter.amperageMultiplier = 0;
meter.accumulatedMultiplier = 0;
EEPROM.put(CONFIG_METER_START, meter);
EEPROM.put(EEPROM_CONFIG_ADDRESS, 94);
bool ret = EEPROM.commit();
EEPROM.end();
return ret;
}
bool AmsConfiguration::save() {
EEPROM.begin(EEPROM_SIZE);
EEPROM.put(EEPROM_CONFIG_ADDRESS, EEPROM_CHECK_SUM);