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

Fixed amperage plot

Browse Source
This commit is contained in:
Gunnar Skjold
2024-06-06 15:55:43 +02:00
parent eeaaf088ac
commit 5eeab2ba89
3 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

30
lib/SvelteUi/app/src/lib/Dashboard.svelte
View File

@@ -25,10 +25,14 @@
$: {
it = formatUnit(data?.ic * 1000, "Wh");
et = formatUnit(data?.ec * 1000, "Wh");
l1e = data?.l1?.u > 0.0 || data?.l1?.i > 0.0 || data?.l1?.p > 0.0 || data?.l1?.q > 0.0;
l2e = data?.l2?.u > 0.0 || data?.l2?.i > 0.0 || data?.l2?.p > 0.0 || data?.l2?.q > 0.0;
l3e = data?.l3?.u > 0.0 || data?.l3?.i > 0.0 || data?.l3?.p > 0.0 || data?.l3?.q > 0.0;
threePhase = l1e && l2e && l3e;
if(data?.l1?.u == 0.0 && data?.l2?.u == 0.0 && data?.l3?.u == 0.0) {
l1e = l2e = l3e = threePhase = true;
} else {
l1e = data?.l1?.u > 0.0 || data?.l1?.i > 0.0 || data?.l1?.p > 0.0 || data?.l1?.q > 0.0;
l2e = data?.l2?.u > 0.0 || data?.l2?.i > 0.0 || data?.l2?.p > 0.0 || data?.l2?.q > 0.0;
l3e = data?.l3?.u > 0.0 || data?.l3?.i > 0.0 || data?.l3?.p > 0.0 || data?.l3?.q > 0.0;
threePhase = l1e && l2e && l3e;
}
}
</script>
@@ -68,9 +72,9 @@
<PerPhasePlot title={translations.common?.amperage ?? "Amp"} unit="A" importColorFn={ampcol} exportColorFn={exportcol}
maxImport={data.mf}
maxExport={data.om ? threePhase ? data.om / 0.4 / Math.sqrt(3) : data.om / 0.23 : 0}
l1={data.l1 && data.l1.u > 100}
l2={data.l2 && data.l2.u > 100}
l3={data.l3 && data.l3.u > 100}
l1={l1e}
l2={l2e}
l3={l3e}
l2x={data.l2.e}
l1i={Math.max(data.l1.i,0)}
l2i={Math.max(data.l2.i,0)}
@@ -88,9 +92,9 @@
<PerPhasePlot title={translations.dashboard?.phase ?? "Phase"} unit="W" importColorFn={ampcol} exportColorFn={exportcol}
maxImport={(data.mf ? data.mf : 32) * 230}
maxExport={data.om ? threePhase ? (data.om * 1000) / Math.sqrt(3) : data.om * 1000 : 0}
l1={data.l1 && data.l1.u > 100}
l2={data.l2 && data.l2.u > 100}
l3={data.l3 && data.l3.u > 100}
l1={l1e}
l2={l2e}
l3={l3e}
l1i={data.l1.p}
l2i={data.l2.p}
l3i={data.l3.p}
@@ -106,9 +110,9 @@
{#if data.l1}
<PerPhasePlot title={translations.dashboard?.pf ?? "Pf"} importColorFn={exportcol} exportColorFn={exportcol}
maxImport={1.0}
l1={data.l1 && data.l1.u > 100}
l2={data.l2 && data.l2.u > 100}
l3={data.l3 && data.l3.u > 100}
l1={l1e}
l2={l2e}
l3={l3e}
l1i={data.l1.f}
l2i={data.l2.f}
l3i={data.l3.f}

27
src/LNG.cpp
View File

@@ -182,6 +182,33 @@ LNG::LNG(AmsData& meterState, const char* payload, uint8_t useMeterType, MeterCo
lastUpdateMillis = millis64();
}
lastUpdateMillis = millis64();
if(meterConfig->wattageMultiplier > 0) {
activeImportPower = activeImportPower > 0 ? activeImportPower * (meterConfig->wattageMultiplier / 1000.0) : 0;
activeExportPower = activeExportPower > 0 ? activeExportPower * (meterConfig->wattageMultiplier / 1000.0) : 0;
reactiveImportPower = reactiveImportPower > 0 ? reactiveImportPower * (meterConfig->wattageMultiplier / 1000.0) : 0;
reactiveExportPower = reactiveExportPower > 0 ? reactiveExportPower * (meterConfig->wattageMultiplier / 1000.0) : 0;
}
if(meterConfig->voltageMultiplier > 0) {
l1voltage = l1voltage > 0 ? l1voltage * (meterConfig->voltageMultiplier / 1000.0) : 0;
l2voltage = l2voltage > 0 ? l2voltage * (meterConfig->voltageMultiplier / 1000.0) : 0;
l3voltage = l3voltage > 0 ? l3voltage * (meterConfig->voltageMultiplier / 1000.0) : 0;
}
if(meterConfig->amperageMultiplier > 0) {
l1current = l1current > 0 ? l1current * (meterConfig->amperageMultiplier / 1000.0) : 0;
l2current = l2current > 0 ? l2current * (meterConfig->amperageMultiplier / 1000.0) : 0;
l3current = l3current > 0 ? l3current * (meterConfig->amperageMultiplier / 1000.0) : 0;
}
if(meterConfig->accumulatedMultiplier > 0) {
activeImportCounter = activeImportCounter > 0 ? activeImportCounter * (meterConfig->accumulatedMultiplier / 1000.0) : 0;
activeExportCounter = activeExportCounter > 0 ? activeExportCounter * (meterConfig->accumulatedMultiplier / 1000.0) : 0;
reactiveImportCounter = reactiveImportCounter > 0 ? reactiveImportCounter * (meterConfig->accumulatedMultiplier / 1000.0) : 0;
reactiveExportCounter = reactiveExportCounter > 0 ? reactiveExportCounter * (meterConfig->accumulatedMultiplier / 1000.0) : 0;
}
threePhase = l1voltage > 0 && l2voltage > 0 && l3voltage > 0;
if(!threePhase)
twoPhase = (l1voltage > 0 && l2voltage > 0) || (l2voltage > 0 && l3voltage > 0) || (l3voltage > 0 && l1voltage > 0);
}
}