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

Fixed negative month cost in realtime calculation

Browse Source
This commit is contained in:
Gunnar Skjold
2023-06-11 08:20:09 +02:00
parent 538624b6eb
commit 06a0366762
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/EnergyAccounting/include/EnergyAccounting.h
View File

@@ -14,12 +14,12 @@ struct EnergyAccountingPeak {
struct EnergyAccountingData { struct EnergyAccountingData {
uint8_t version; uint8_t version;
uint8_t month; uint8_t month;
uint32_t costYesterday; int32_t costYesterday;
uint32_t costThisMonth; int32_t costThisMonth;
uint32_t costLastMonth; int32_t costLastMonth;
uint32_t incomeYesterday; int32_t incomeYesterday;
uint32_t incomeThisMonth; int32_t incomeThisMonth;
uint32_t incomeLastMonth; int32_t incomeLastMonth;
uint32_t lastMonthImport; uint32_t lastMonthImport;
uint32_t lastMonthExport; uint32_t lastMonthExport;
uint8_t lastMonthAccuracy; uint8_t lastMonthAccuracy;

2
lib/SvelteUi/app/dist/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/SvelteUi/app/src/lib/BarChart.svelte
View File

@@ -14,7 +14,7 @@
heightAvailable = height-(config.title ? 20 : 0); heightAvailable = height-(config.title ? 20 : 0);
let innerWidth = width - (config.padding.left + config.padding.right); let innerWidth = width - (config.padding.left + config.padding.right);
barWidth = innerWidth / config.points.length; barWidth = innerWidth / config.points.length;
labelOffset = barWidth < vertSwitch ? 30 : 10; labelOffset = barWidth < vertSwitch ? 30 : 15;
let yPerUnit = (heightAvailable-config.padding.top-config.padding.bottom)/(config.y.max-config.y.min); let yPerUnit = (heightAvailable-config.padding.top-config.padding.bottom)/(config.y.max-config.y.min);