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

More v2.2

Browse Source
This commit is contained in:
Gunnar Skjold
2022-12-04 14:12:35 +01:00
parent b07ed075f4
commit b48a0f13fe
10 changed files with 488 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/AmsToMqttBridge.ino
View File

@@ -1715,6 +1715,7 @@ void configFileParse() {
0, 0, // Peak 4
0, 0 // Peak 5
};
uint8_t peak = 0;
char * pch = strtok (buf+17," ");
while (pch != NULL) {
if(ead.version < 5) {
@@ -1740,13 +1741,17 @@ void configFileParse() {
ead.costLastMonth = val;
} else if(i >= 6 && i < 18) {
uint8_t hour = i-6;
if(hour%2 == 0) {
{
long val = String(pch).toInt();
ead.peaks[hour/2].day = val;
} else {
ead.peaks[peak].day = val;
}
pch = strtok (NULL, " ");
i++;
{
double val = String(pch).toDouble();
ead.peaks[hour/2].value = val * 100;
ead.peaks[peak].value = val * 100;
}
peak++;
}
} else {
if(i == 1) {
@@ -1754,41 +1759,41 @@ void configFileParse() {
ead.month = val;
} else if(i == 2) {
double val = String(pch).toDouble();
if(val > 0.0) {
ead.peaks[0] = { 1, (uint16_t) (val*100) };
}
ead.costYesterday = val * 10;
} else if(i == 3) {
double val = String(pch).toDouble();
ead.costYesterday = val * 10;
ead.costThisMonth = val;
} else if(i == 4) {
double val = String(pch).toDouble();
ead.costThisMonth = val;
ead.costLastMonth = val;
} else if(i == 5) {
double val = String(pch).toDouble();
ead.costLastMonth = val;
ead.incomeYesterday= val * 10;
} else if(i == 6) {
double val = String(pch).toDouble();
ead.incomeYesterday= val * 10;
ead.incomeThisMonth = val;
} else if(i == 7) {
double val = String(pch).toDouble();
ead.incomeThisMonth = val;
} else if(i == 8) {
double val = String(pch).toDouble();
ead.incomeLastMonth = val;
} else if(i >= 9 && i < 21) {
uint8_t hour = i-9;
if(hour%2 == 0) {
} else if(i >= 8 && i < 20) {
uint8_t hour = i-8;
{
long val = String(pch).toInt();
ead.peaks[hour/2].day = val;
} else {
ead.peaks[peak].day = val;
}
pch = strtok (NULL, " ");
i++;
{
double val = String(pch).toDouble();
ead.peaks[hour/2].value = val * 100;
ead.peaks[peak].value = val * 100;
}
peak++;
}
}
pch = strtok (NULL, " ");
i++;
}
ead.version = 5;
ea.setData(ead);
sEa = true;
}