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

Add backup, restore, clearing of 'fixedPrice'

Browse Source
This commit is contained in:
david-beinder 2023-04-28 22:32:44 +02:00
parent c1701c8ee9
commit a3dcd2cfb2
No known key found for this signature in database
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/AmsConfiguration/src/AmsConfiguration.cpp
View File

@ -580,6 +580,7 @@ void AmsConfiguration::clearEntsoe(EntsoeConfig& config) {
strcpy(config.currency, "");
config.multiplier = 1000;
config.enabled = false;
config.fixedPrice = 0;
}
bool AmsConfiguration::isEntsoeChanged() {

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

@ -2019,6 +2019,7 @@ void AmsWebServer::configFileDownload() {
server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("entsoeArea %s\n"), entsoe.area));
server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("entsoeCurrency %s\n"), entsoe.currency));
server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("entsoeMultiplier %.3f\n"), entsoe.multiplier / 1000.0));
server.sendContent(buf, snprintf_P(buf, BufferSize, PSTR("entsoeFixedPrice %.3f\n"), entsoe.fixedPrice / 1000.0));
}
if(includeThresholds) {

3
src/AmsToMqttBridge.ino
View File

@ -1967,6 +1967,9 @@ void configFileParse() {
} else if(strncmp_P(buf, PSTR("entsoeMultiplier "), 17) == 0) {
if(!lEntsoe) { config.getEntsoeConfig(entsoe); lEntsoe = true; };
entsoe.multiplier = String(buf+17).toFloat() * 1000;
} else if(strncmp_P(buf, PSTR("entsoeFixedPrice "), 17) == 0) {
if(!lEntsoe) { config.getEntsoeConfig(entsoe); lEntsoe = true; };
entsoe.fixedPrice = String(buf+17).toFloat() * 1000;
} else if(strncmp_P(buf, PSTR("thresholds "), 11) == 0) {
if(!lEac) { config.getEnergyAccountingConfig(eac); lEac = true; };
int i = 0;