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

Reverted some MQTT changes

Browse Source
This commit is contained in:
Gunnar Skjold
2025-10-01 11:21:47 +02:00
parent 7f96c80b81
commit 04d73b2db0
7 changed files with 67 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/PriceService/src/PriceService.cpp
View File

@@ -113,7 +113,7 @@ uint8_t PriceService::getResolutionInMinutes() {
}
uint8_t PriceService::getNumberOfPointsAvailable() {
if(today == NULL) return 0;
if(today == NULL) return getResolutionInMinutes() == 15 ? 96 : 24;
if(tomorrow != NULL) return today->getNumberOfPoints() + tomorrow->getNumberOfPoints();
return today->getNumberOfPoints();
}
@@ -768,10 +768,8 @@ bool PriceService::timeIsInPeriod(tmElements_t tm, PriceConfig pc) {
}
uint8_t PriceService::getCurrentPricePointIndex() {
if(today == NULL) return 0;
time_t ts = time(nullptr);
tmElements_t tm;
breakTime(tz->toLocal(ts), tm);
return ((tm.Hour * 60) + tm.Minute) / today->getResolutionInMinutes();
return ((tm.Hour * 60) + tm.Minute) / getResolutionInMinutes();
}