iobroker.nexowatt-ui 0.8.64 → 0.8.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
3
|
*
|
|
4
4
|
* Quelle: src-ts/runtime-executables/ems/modules/charging-management.ts
|
|
5
|
-
* Quell-Hash: sha256:
|
|
5
|
+
* Quell-Hash: sha256:126a37740822f06673249514b3a0a1b7a32eff2caeab6d6377ebef3d94aaef5c
|
|
6
6
|
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
7
|
*
|
|
8
8
|
* Zweck:
|
|
@@ -7537,24 +7537,56 @@ if (components.length) {
|
|
|
7537
7537
|
// Central EMS Budget & Gates: EVCS is the first flexible consumer group.
|
|
7538
7538
|
// This does not change EVCS allocation; it only reserves the already decided target/usage
|
|
7539
7539
|
// for downstream apps (thermal, heating rod, generic loads) in the same tick.
|
|
7540
|
+
// 0.8.65: EVCS-Reservierung nur bei aktivem Ladebedarf mit realer Istleistung
|
|
7541
|
+
// oder zugewiesener Ladeleistung. Eine wartende Wallbox ohne Watt-Bedarf erzeugt
|
|
7542
|
+
// keinen künstlichen 0-W-Consumer im zentralen EMS-Budget mehr.
|
|
7540
7543
|
try {
|
|
7541
7544
|
const rt = this.adapter && this.adapter._emsBudget;
|
|
7542
7545
|
if (rt && typeof rt.reserve === 'function') {
|
|
7543
7546
|
const evcsActualW = Math.max(0, Math.round(Number(totalFreshActualPowerW || 0)));
|
|
7544
7547
|
const evcsReserveW = Math.max(0, Math.round(Number.isFinite(budgetW) ? usedW : totalTargetPowerW));
|
|
7545
7548
|
const evcsPvReserveW = Math.max(0, Math.min(evcsReserveW, (pvAvailableState ? Math.round(pvEvcsUsedWForBudget || 0) : 0)));
|
|
7546
|
-
|
|
7547
|
-
|
|
7548
|
-
|
|
7549
|
-
|
|
7550
|
-
|
|
7551
|
-
|
|
7552
|
-
|
|
7553
|
-
reserveW: evcsReserveW,
|
|
7554
|
-
pvReserveW: evcsPvReserveW,
|
|
7555
|
-
pvOnly: false,
|
|
7556
|
-
mode: String(mode || ''),
|
|
7549
|
+
const evcsHasWallboxDemand = (Array.isArray(wbList) ? wbList : []).some((w) => {
|
|
7550
|
+
if (!w || w.enabled !== true || w.online !== true) return false;
|
|
7551
|
+
if (w.vehiclePlugged === false) return false;
|
|
7552
|
+
const actualW = Math.max(0, Math.abs(Number(w.actualPowerW || 0)));
|
|
7553
|
+
return w.charging === true
|
|
7554
|
+
|| actualW > Math.max(0, Number(activityThresholdW || 0))
|
|
7555
|
+
|| w.goalActive === true;
|
|
7557
7556
|
});
|
|
7557
|
+
const evcsHasActiveChargingNeed = !!(evcsActualW > 0 || evcsReserveW > 0 || evcsPvReserveW > 0 || evcsHasWallboxDemand);
|
|
7558
|
+
const evcsShouldReserve = !!(evcsHasActiveChargingNeed && (evcsActualW > 0 || evcsReserveW > 0 || evcsPvReserveW > 0));
|
|
7559
|
+
|
|
7560
|
+
if (budgetDebug && typeof budgetDebug === 'object') {
|
|
7561
|
+
budgetDebug.evcsActiveChargingNeed = evcsHasActiveChargingNeed;
|
|
7562
|
+
budgetDebug.evcsBudgetReservationActive = evcsShouldReserve;
|
|
7563
|
+
budgetDebug.evcsBudgetReservationSkippedReason = evcsShouldReserve ? '' : (evcsHasActiveChargingNeed ? 'zero-watt-demand' : 'no-active-demand');
|
|
7564
|
+
budgetDebug.evcsBudgetReservationActualW = evcsActualW;
|
|
7565
|
+
budgetDebug.evcsBudgetReservationReserveW = evcsReserveW;
|
|
7566
|
+
budgetDebug.evcsBudgetReservationPvReserveW = evcsPvReserveW;
|
|
7567
|
+
}
|
|
7568
|
+
|
|
7569
|
+
if (evcsShouldReserve) {
|
|
7570
|
+
rt.reserve({
|
|
7571
|
+
key: 'evcs',
|
|
7572
|
+
app: 'chargingManagement',
|
|
7573
|
+
label: 'Ladepunkte',
|
|
7574
|
+
priority: 100,
|
|
7575
|
+
actualW: evcsActualW,
|
|
7576
|
+
requestedW: evcsReserveW,
|
|
7577
|
+
reserveW: evcsReserveW,
|
|
7578
|
+
pvReserveW: evcsPvReserveW,
|
|
7579
|
+
pvOnly: false,
|
|
7580
|
+
mode: String(mode || ''),
|
|
7581
|
+
});
|
|
7582
|
+
} else if (this.adapter && typeof this.adapter.setStateAsync === 'function') {
|
|
7583
|
+
// consumersJson bleibt in diesem Tick leer bzw. ohne EVCS; die Detailstates
|
|
7584
|
+
// werden nur auf 0 gesetzt, damit keine alte EVCS-Reservierung sichtbar bleibt.
|
|
7585
|
+
this.adapter.setStateAsync('ems.budget.consumers.evcs.usedW', 0, true).catch(() => {});
|
|
7586
|
+
this.adapter.setStateAsync('ems.budget.consumers.evcs.pvUsedW', 0, true).catch(() => {});
|
|
7587
|
+
this.adapter.setStateAsync('ems.budget.consumers.evcs.actualW', evcsActualW, true).catch(() => {});
|
|
7588
|
+
this.adapter.setStateAsync('ems.budget.consumers.evcs.mode', String(mode || ''), true).catch(() => {});
|
|
7589
|
+
}
|
|
7558
7590
|
}
|
|
7559
7591
|
} catch (_e) {
|
|
7560
7592
|
// budget diagnostics only
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "nexowatt-ui",
|
|
4
|
-
"version": "0.8.
|
|
4
|
+
"version": "0.8.65",
|
|
5
5
|
"news": {
|
|
6
|
+
"0.8.65": {
|
|
7
|
+
"de": "Version 0.8.65: EVCS-Reservierung im zentralen EMS-Budget nur noch bei aktivem Ladebedarf. Auto-Modus bleibt feldtesttauglich: Zeit-Zielladen, PV-Erzeugung, Tarif-/Netzentgeltlogik, Notfall-Netzladen sowie harte Netz-/Phasen-/§14a-Limits bleiben getrennt aktiv.",
|
|
8
|
+
"en": "Version 0.8.65: EVCS reservation in the central EMS budget is now written only when there is active charging demand. Auto mode remains field-test ready: timed target charging, PV generation, tariff/grid-fee logic, emergency grid charging and hard grid/phase/§14a limits stay active independently."
|
|
9
|
+
},
|
|
6
10
|
"0.8.64": {
|
|
7
11
|
"de": "Version 0.8.64: Budget-Konsistenzmonitor und EVCS-Ist/Reservierung-Korrektur. PV-Budget bleibt physikalisch durch aktuelle PV-Erzeugung geklemmt; EVCS-Ist wird nicht mehr aus Reservierung oder Setpoint angezeigt.",
|
|
8
12
|
"en": "Version 0.8.64: Budget consistency monitor and EVCS actual/reservation correction. PV budget remains physically capped by current PV generation; EVCS actual is no longer displayed from reservation or setpoint values."
|
|
@@ -26,10 +30,6 @@
|
|
|
26
30
|
"0.8.59": {
|
|
27
31
|
"de": "Version 0.8.59: Release-Schutz / Regression Safety Gate ergänzt. Der App-Center Save-Payload schützt Speicherfarm, Ladepunkte, Mesh/Microgrid-Knoten und Zielgruppen vor versehentlichem Leerüberschreiben durch stale/fehlerhaft gerenderte UI.",
|
|
28
32
|
"en": "Version 0.8.59: Adds release protection / regression safety gate. App Center save payload protects storage farm, charging stations, mesh/microgrid nodes and target groups from accidental empty overwrites caused by stale or broken UI rendering."
|
|
29
|
-
},
|
|
30
|
-
"0.8.58": {
|
|
31
|
-
"de": "Version 0.8.58: Hotfix für Speicherfarm-App-Center. Behebt leeren Speicherfarm-Reiter durch fehlende Escape-Funktion und stellt Speicher auch aus storagesStatusJson/storagesTotal wieder her, damit vorhandene Speicher wieder sichtbar und neu anbindbar sind.",
|
|
32
|
-
"en": "Version 0.8.58: Storage farm App Center hotfix. Fixes the empty storage farm tab caused by a missing escape helper and restores storages from storagesStatusJson/storagesTotal when needed, so existing storages become visible and bindable again."
|
|
33
33
|
}
|
|
34
34
|
},
|
|
35
35
|
"title": "NexoWatt UI",
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* AUTO-GENERATED FILE - NICHT MANUELL BEARBEITEN.
|
|
5
5
|
*
|
|
6
6
|
* Quelle: src-ts/ems/charging-management/charging-management-runtime.ts
|
|
7
|
-
* Quell-Hash: sha256:
|
|
7
|
+
* Quell-Hash: sha256:0ecc4dcc6a83ed9756b14e69c2225677a6c2fd6e5c8738e5f02ea7d5922be336
|
|
8
8
|
* Erzeugung: npm run sync:ts-ems-mirrors
|
|
9
9
|
*
|
|
10
10
|
* Zweck:
|
|
@@ -90,8 +90,12 @@ function normalizeChargingMode(mode) {
|
|
|
90
90
|
function buildChargingReservationPlan(input) {
|
|
91
91
|
const usedW = toNonNegativeWatt(input.usedW ?? input.totalTargetPowerW ?? 0);
|
|
92
92
|
const targetW = toNonNegativeWatt(input.totalTargetPowerW ?? usedW);
|
|
93
|
-
const
|
|
94
|
-
const
|
|
93
|
+
const actualW = toNonNegativeWatt(input.actualW ?? 0);
|
|
94
|
+
const rawReserveW = Math.max(usedW, targetW);
|
|
95
|
+
const activeChargingNeed = input.activeChargingNeed === true || actualW > 0 || rawReserveW > 0;
|
|
96
|
+
const reserveW = activeChargingNeed ? rawReserveW : 0;
|
|
97
|
+
const pvReserveW = activeChargingNeed ? Math.max(0, Math.min(reserveW, toNonNegativeWatt(input.pvEvcsUsedWForBudget ?? 0))) : 0;
|
|
98
|
+
const reservationActive = activeChargingNeed && (actualW > 0 || reserveW > 0 || pvReserveW > 0);
|
|
95
99
|
return {
|
|
96
100
|
key: 'evcs',
|
|
97
101
|
app: 'chargingManagement',
|
|
@@ -100,6 +104,10 @@ function buildChargingReservationPlan(input) {
|
|
|
100
104
|
requestedW: reserveW,
|
|
101
105
|
reserveW,
|
|
102
106
|
pvReserveW,
|
|
107
|
+
actualW,
|
|
108
|
+
activeChargingNeed,
|
|
109
|
+
reservationActive,
|
|
110
|
+
skippedReason: reservationActive ? '' : (activeChargingNeed ? 'zero-watt-demand' : 'no-active-demand'),
|
|
103
111
|
pvOnly: false,
|
|
104
112
|
mode: normalizeChargingMode(input.mode || 'auto'),
|
|
105
113
|
};
|
|
@@ -155,6 +163,8 @@ function buildChargingManagementRuntimePrep(input) {
|
|
|
155
163
|
remainingW,
|
|
156
164
|
pvEvcsUsedWForBudget: toNonNegativeWatt(input.pvEvcsUsedWForBudget ?? 0),
|
|
157
165
|
evcsHighLevelCapW: toFiniteNumber(input.evcsHighLevelCapW, null),
|
|
166
|
+
activeChargingNeed: reservation.activeChargingNeed,
|
|
167
|
+
reservationActive: reservation.reservationActive,
|
|
158
168
|
},
|
|
159
169
|
warnings,
|
|
160
170
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.nexowatt-ui",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.65",
|
|
4
4
|
"description": "Responsive NexoWatt EMS visualization adapter.",
|
|
5
5
|
"author": "NexoWatt",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -277,7 +277,8 @@
|
|
|
277
277
|
"test:loadmanagement-actual-vs-reserve": "node scripts/verify-loadmanagement-actual-vs-reserve.js",
|
|
278
278
|
"test:core-limits-pv-physical-cap": "node scripts/verify-core-limits-pv-physical-cap.js",
|
|
279
279
|
"test:loadmanagement-budget-consistency": "node scripts/verify-loadmanagement-budget-consistency.js",
|
|
280
|
-
"test:loadmanagement-summary-actual": "node scripts/verify-loadmanagement-summary-actual.js"
|
|
280
|
+
"test:loadmanagement-summary-actual": "node scripts/verify-loadmanagement-summary-actual.js",
|
|
281
|
+
"test:loadmanagement-evcs-active-demand-reserve": "node scripts/verify-loadmanagement-evcs-active-demand-reserve.js"
|
|
281
282
|
},
|
|
282
283
|
"dependencies": {
|
|
283
284
|
"@iobroker/adapter-core": "^3.4.1",
|
package/www/manifest.webmanifest
CHANGED
package/www/sw.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* AUTO-GENERATED RUNTIME FILE - NICHT MANUELL BEARBEITEN.
|
|
3
3
|
*
|
|
4
4
|
* Quelle: src-ts/runtime-executables/www/sw.ts
|
|
5
|
-
* Quell-Hash: sha256:
|
|
5
|
+
* Quell-Hash: sha256:5832ccfe2a051c7e4f3ad65ffc65badd3eaf2bc98100d48c01214aa49b302e4f
|
|
6
6
|
* Erzeugung: npm run sync:ts-runtime-executables
|
|
7
7
|
*
|
|
8
8
|
* Zweck:
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
|
|
43
43
|
// Increment cache name on releases so browser updates JS/HTML reliably.
|
|
44
44
|
// NOTE: Keep this monotonic to force SW updates on hotfixes.
|
|
45
|
-
const CACHE_NAME = 'nexowatt-cache-
|
|
45
|
+
const CACHE_NAME = 'nexowatt-cache-v365';
|
|
46
46
|
|
|
47
47
|
const OFFLINE_URLS = [
|
|
48
48
|
'./',
|