iobroker.go-e-charger 1.6.0 → 1.7.0
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.
- package/LICENSE +1 -1
- package/README.md +39 -18
- package/admin/i18n/de.json +3 -0
- package/admin/i18n/en.json +3 -0
- package/admin/i18n/es.json +3 -0
- package/admin/i18n/fr.json +3 -0
- package/admin/i18n/it.json +3 -0
- package/admin/i18n/nl.json +3 -0
- package/admin/i18n/pl.json +3 -0
- package/admin/i18n/pt.json +3 -0
- package/admin/i18n/ru.json +3 -0
- package/admin/i18n/uk.json +3 -0
- package/admin/i18n/zh-cn.json +3 -0
- package/admin/jsonConfig.json +13 -0
- package/build/lib/chargeManagerUtils.js +70 -23
- package/build/lib/chargeManagerUtils.js.map +1 -1
- package/build/lib/projectUtils.js.map +1 -1
- package/build/main.js +81 -30
- package/build/main.js.map +1 -1
- package/io-package.json +27 -27
- package/package.json +4 -4
package/LICENSE
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
MIT License
|
|
2
2
|
|
|
3
|
-
Copyright (c) 2020-2026 Hombach <
|
|
3
|
+
Copyright (c) 2020-2026 C.Hombach <go-e-charger@homba.ch>
|
|
4
4
|
|
|
5
5
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
6
|
of this software and associated documentation files (the "Software"), to deal
|
package/README.md
CHANGED
|
@@ -39,7 +39,7 @@ For more information about the go-e Charger hardware, visit the manufacturer's w
|
|
|
39
39
|
- **ChargeNOW** – start charging immediately at a configurable current
|
|
40
40
|
- **ChargeManager** – automatic PV surplus charging: the charging current is continuously adjusted to the available solar power, taking house consumption and the state of charge of your home battery into account. Charging of your EV can be delayed until the home battery has reached a configurable minimum state of charge.
|
|
41
41
|
|
|
42
|
-
> **Note:**
|
|
42
|
+
> **Note:** When ChargeManager is enabled on several chargers at the same time, the available surplus is split between them in the order of the wallbox list – see [Several wallboxes on one PV surplus](#several-wallboxes-on-one-pv-surplus).
|
|
43
43
|
|
|
44
44
|
- switching between 1-phase and 3-phase charging (hardware generation 3 and newer)
|
|
45
45
|
- energy statistics per RFID card (card name, ID, and charged energy)
|
|
@@ -131,6 +131,14 @@ The **maximum charging current** [A] (default 16, up to 32) is configured on the
|
|
|
131
131
|
|
|
132
132
|
In the battery-aware modes, EV charging is disabled below `Settings.Setpoint_HomeBatSoC` so that the home battery has priority. Charging starts once the internal target reaches 10 A (or the minimum current if it is set higher). The calculated current is limited to the configured maximum, and the internal current target changes by at most 1 A per poll cycle to reduce sudden changes.
|
|
133
133
|
|
|
134
|
+
#### Several wallboxes on one PV surplus
|
|
135
|
+
|
|
136
|
+
The surplus is a single shared resource, so it is split between the wallboxes rather than offered to each of them in full. The wallboxes are served in the **order of the wallbox list**, which is therefore also their priority: the first entry takes as much surplus as it can use, and the following entries only see what is left. Reorder the list to change which car is charged first.
|
|
137
|
+
|
|
138
|
+
A wallbox only reserves surplus while a vehicle is connected to it. An empty wallbox is skipped, so it cannot hold back surplus that another wallbox could use right now.
|
|
139
|
+
|
|
140
|
+
The per-wallbox current limits described above still apply to each box individually, which lets you cap a single charger even when it is first in the list.
|
|
141
|
+
|
|
134
142
|
#### Enabling ChargeManager
|
|
135
143
|
|
|
136
144
|
After the adapter has started, use the writable states below. Replace instance `0` and wallbox number `0` where necessary.
|
|
@@ -147,13 +155,23 @@ For surplus charging, set `ChargeNOW` to `false` and `ChargeManager` to `true`.
|
|
|
147
155
|
|
|
148
156
|
#### One-phase and three-phase charging
|
|
149
157
|
|
|
150
|
-
|
|
158
|
+
On hardware generation 3 and newer, `Charge3Phase` selects the phase mode:
|
|
151
159
|
|
|
152
160
|
- `false`: one-phase charging
|
|
153
161
|
- `true`: three-phase charging
|
|
154
162
|
|
|
155
163
|
Because the current implementation starts charging when its internal target exceeds 9 A, the effective starting point is 10 A. This requires approximately 2.3 kW in one-phase mode or 6.9 kW in three-phase mode after the reserve and battery adjustments. One-phase mode therefore provides a wider operating range for smaller PV systems or variable weather.
|
|
156
164
|
|
|
165
|
+
##### Automatic phase switching
|
|
166
|
+
|
|
167
|
+
Enable **automatic 1-/3-phase switching** per wallbox (gen 3+ only, off by default) to let ChargeManager pick the phase mode from the available surplus:
|
|
168
|
+
|
|
169
|
+
- It switches **up to three phases** once one-phase charging is saturated (the surplus exceeds the one-phase maximum), giving access to the higher three-phase ceiling.
|
|
170
|
+
- It switches **down to one phase** once the surplus can no longer sustain the three-phase minimum (~4.1 kW at 6 A), so a shrinking surplus keeps charging one-phase instead of stopping.
|
|
171
|
+
- The gap between those thresholds plus a dwell time prevents rapid back-and-forth switching, which would interrupt charging each time.
|
|
172
|
+
|
|
173
|
+
While the option is enabled the adapter controls `Charge3Phase` for that wallbox; leave it disabled to keep selecting the phase mode manually. Because a switch briefly interrupts charging and not every vehicle handles it gracefully, it is opt-in.
|
|
174
|
+
|
|
157
175
|
#### Operating modes
|
|
158
176
|
|
|
159
177
|
| ChargeNOW | ChargeManager | Result |
|
|
@@ -179,7 +197,7 @@ Before relying on automatic charging, verify the selected input states in the io
|
|
|
179
197
|
|
|
180
198
|
Charging may take several poll cycles to start because the internal target increases by only 1 A per cycle. With the default 10-second cycle and an initial target of 0 A, reaching the default 10 A starting point can take approximately 100 seconds.
|
|
181
199
|
|
|
182
|
-
ChargeManager
|
|
200
|
+
When ChargeManager runs several wallboxes at once, the PV surplus is shared between them in wallbox-list order, so the first entry has priority and later ones only receive the remaining surplus (see [PV surplus charging with ChargeManager](#pv-surplus-charging-with-chargemanager) above). The adapter does **not** yet enforce a combined current limit across all wallboxes against a shared fuse or supply line, so make sure the sum of the per-wallbox maximum currents stays within your installation's capacity.
|
|
183
201
|
|
|
184
202
|
## Sentry
|
|
185
203
|
|
|
@@ -196,6 +214,23 @@ If you enjoyed this project – or are just feeling generous – consider buying
|
|
|
196
214
|
Placeholder for the next version (at the beginning of the line):
|
|
197
215
|
### **WORK IN PROGRESS**
|
|
198
216
|
-->
|
|
217
|
+
### 1.7.0 (2026-09-18)
|
|
218
|
+
|
|
219
|
+
- (typhosj) admin: the wallbox list now explains that its order is the ChargeManager priority - the first entry receives the PV surplus first, later entries only the remainder
|
|
220
|
+
- (typhosj) ChargeManager: the PV surplus is now shared between all wallboxes instead of being offered to each one in full; wallboxes are served in configuration order, so the first entry has priority and later ones only receive the remaining surplus
|
|
221
|
+
- (typhosj) ChargeManager: a wallbox without a connected vehicle no longer reserves surplus and can no longer starve a wallbox that has a car waiting
|
|
222
|
+
- (hombach) ChargeManager: optional automatic 1-/3-phase switching per wallbox (gen 3+, off by default) - switches up when one-phase charging saturates and back down when the surplus can no longer sustain three phases, with a dwell time to prevent flapping
|
|
223
|
+
- (hombach) fixed: automatic phase switching no longer overwrites the manual `Settings.Charge3Phase` request - the automatic decision is now tracked internally, so the user's manual 1-/3-phase setting is preserved (and no longer persisted across restarts as if the user had set it)
|
|
224
|
+
- (hombach) docs: clarified the multi-wallbox behaviour (list order = priority) and noted that no combined current limit across wallboxes is enforced yet
|
|
225
|
+
- (hombach) updated axios
|
|
226
|
+
- (hombach) switch to iobroker testing 6.x
|
|
227
|
+
- (hombach) fixed repochecker warnings
|
|
228
|
+
- (hombach) added node 26 tests
|
|
229
|
+
|
|
230
|
+
### 1.6.1 (2026-09-04)
|
|
231
|
+
|
|
232
|
+
- (typhosj) fixed: a wallbox whose effective maximum charging current is below 10 A - e.g. an 8 A coded cable or a per-wallbox maximum of 8 A - was rejected as invalid ChargeManager input and never charged from PV surplus. Such a wallbox now starts charging at its own maximum
|
|
233
|
+
|
|
199
234
|
### 1.6.0 (2026-08-29)
|
|
200
235
|
|
|
201
236
|
- (hombach) added optional per-wallbox minimum and maximum charging current, applied to both ChargeManager and ChargeNOW and always kept within the installation-wide maximum
|
|
@@ -218,27 +253,13 @@ If you enjoyed this project – or are just feeling generous – consider buying
|
|
|
218
253
|
- (hombach) fixed vulnerabilities
|
|
219
254
|
- (hombach) updated dependencies
|
|
220
255
|
|
|
221
|
-
### 1.4.0 (2026-08-10)
|
|
222
|
-
|
|
223
|
-
- (hombach) added info.unlockedByRFIDName with the name of the current session's RFID card, in parallel to unlockedByRFIDNo (#634)
|
|
224
|
-
- (hombach) projectUtils: use extendObject instead of setObject in forceMode so user customizations survive restarts
|
|
225
|
-
- (hombach) projectUtils: fixed min/max/step value of 0 being dropped from number state definitions
|
|
226
|
-
- (hombach) updated dependencies
|
|
227
|
-
|
|
228
|
-
### 1.3.1 (2026-08-06)
|
|
229
|
-
|
|
230
|
-
- (hombach) fixed "unlocked by RFID" always 0 on gen 3+ chargers: API V2 uses the "trx" key instead of "uby" (#634)
|
|
231
|
-
- (hombach) live data is now refreshed every cycle in all modes, so read-only monitoring stays up to date
|
|
232
|
-
- (hombach) API V2 not being reachable is now a single warning instead of an error (normal on hardware gen 1/2)
|
|
233
|
-
- (typhosj) use generic go-e brand logo as adapter icon (#843)
|
|
234
|
-
|
|
235
256
|
[Older changelogs can be found there](CHANGELOG_OLD.md)
|
|
236
257
|
|
|
237
258
|
## License
|
|
238
259
|
|
|
239
260
|
MIT License
|
|
240
261
|
|
|
241
|
-
Copyright (c) 2020-2026 C.Hombach
|
|
262
|
+
Copyright (c) 2020-2026 C.Hombach <go-e-charger@homba.ch>
|
|
242
263
|
|
|
243
264
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
244
265
|
of this software and associated documentation files (the "Software"), to deal
|
package/admin/i18n/de.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "Maximalstrom muss größer oder gleich dem Mindeststrom sein",
|
|
3
3
|
"ERR_minCurrentAboveMax": "Mindeststrom muss kleiner oder gleich dem Maximalstrom sein",
|
|
4
|
+
"LBL_autoPhaseSwitch": "Automatische 1-/3-phasige Umschaltung (Hardware Gen 3+)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "Lässt den ChargeManager diese Wallbox je nach verfügbarem Überschuss zwischen 1- und 3-phasigem Laden umschalten. Nur ab Hardware-Generation 3; unterbricht das Laden bei jedem Wechsel kurz.",
|
|
4
6
|
"LBL_batteryMode": "Modus der Hausbatterie",
|
|
5
7
|
"LBL_batteryModeDisabled": "Deaktiviert",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "Hausbatterie ignorieren; kein SoC-Objekt erforderlich",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "Objekt-ID der aktuell verfügbaren Solarleistung [W]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "Wallbox-Verbrauch ist im Hausstromverbrauch enthalten",
|
|
28
30
|
"LBL_wallBoxList": "Wallbox-Liste",
|
|
31
|
+
"LBL_wallBoxListHelp": "Der ChargeManager bedient die Wallboxen von oben nach unten: Der erste Eintrag erhält den PV-Überschuss zuerst, spätere Einträge nur noch den Rest. Mit den Pfeiltasten lässt sich die Priorität ändern.",
|
|
29
32
|
"LBL_wallboxMaxAmp": "Maximaler Ladestrom dieser Wallbox [A] (0 = Anlagenlimit)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "Höchster Strom für diese Wallbox, z. B. zum Drosseln. 0 nutzt das anlagenweite Maximum und überschreitet nie das Anlagenlimit.",
|
|
31
34
|
"LBL_wallboxMinAmp": "Minimaler Ladestrom dieser Wallbox [A] (0 = Standard)",
|
package/admin/i18n/en.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "Maximum current must be greater than or equal to minimum current",
|
|
3
3
|
"ERR_minCurrentAboveMax": "Minimum current must be less than or equal to maximum current",
|
|
4
|
+
"LBL_autoPhaseSwitch": "Automatic 1-/3-phase switching (hardware gen 3+)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "Let the ChargeManager switch this wallbox between one-phase and three-phase charging based on the available surplus. Only for hardware generation 3 and newer; briefly interrupts charging on each switch.",
|
|
4
6
|
"LBL_batteryMode": "Home battery mode",
|
|
5
7
|
"LBL_batteryModeDisabled": "Disabled",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "Ignore the home battery; no SOC state is required",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "Object ID for the currently available solar power [W]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "Charger consumption is included in the home power consumption value",
|
|
28
30
|
"LBL_wallBoxList": "Wallbox list",
|
|
31
|
+
"LBL_wallBoxListHelp": "The ChargeManager serves the wallboxes from top to bottom: the first entry receives the PV surplus first, later entries only get what is left over. Use the arrow buttons to change the priority.",
|
|
29
32
|
"LBL_wallboxMaxAmp": "Maximum charging current for this wallbox [A] (0 = installation limit)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "Highest current for this wallbox, e.g. to throttle it. 0 uses the installation-wide maximum. Never exceeds the installation limit.",
|
|
31
34
|
"LBL_wallboxMinAmp": "Minimum charging current for this wallbox [A] (0 = default)",
|
package/admin/i18n/es.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "La corriente máxima debe ser mayor o igual que la mínima",
|
|
3
3
|
"ERR_minCurrentAboveMax": "La corriente mínima debe ser menor o igual que la máxima",
|
|
4
|
+
"LBL_autoPhaseSwitch": "Conmutación automática 1/3 fases (hardware gen 3+)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "Permite que ChargeManager cambie esta wallbox entre carga monofásica y trifásica según el excedente disponible. Solo para hardware de generación 3 o posterior; interrumpe brevemente la carga en cada cambio.",
|
|
4
6
|
"LBL_batteryMode": "Modo de batería doméstica",
|
|
5
7
|
"LBL_batteryModeDisabled": "Desactivado",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "Ignora la batería doméstica; no hace falta un estado de SoC",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "ID de objeto de la potencia solar disponible [W]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "El consumo del cargador ya está incluido en el consumo del hogar",
|
|
28
30
|
"LBL_wallBoxList": "Lista de wallbox",
|
|
31
|
+
"LBL_wallBoxListHelp": "El ChargeManager atiende las wallbox de arriba abajo: la primera entrada recibe primero el excedente FV, las siguientes solo lo que sobra. Cambia la prioridad con los botones de flecha.",
|
|
29
32
|
"LBL_wallboxMaxAmp": "Corriente de carga máxima de esta wallbox [A] (0 = límite de la instalación)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "Corriente más alta de esta wallbox, p. ej. para limitarla. 0 usa el máximo de la instalación. Nunca supera el límite de la instalación.",
|
|
31
34
|
"LBL_wallboxMinAmp": "Corriente de carga mínima de esta wallbox [A] (0 = predeterminada)",
|
package/admin/i18n/fr.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "Le courant maximal doit être supérieur ou égal au courant minimal",
|
|
3
3
|
"ERR_minCurrentAboveMax": "Le courant minimal doit être inférieur ou égal au courant maximal",
|
|
4
|
+
"LBL_autoPhaseSwitch": "Commutation automatique 1/3 phases (matériel gén. 3+)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "Permet à ChargeManager de basculer cette wallbox entre charge monophasée et triphasée selon le surplus disponible. Uniquement pour le matériel de génération 3 et plus ; interrompt brièvement la charge à chaque commutation.",
|
|
4
6
|
"LBL_batteryMode": "Mode batterie domestique",
|
|
5
7
|
"LBL_batteryModeDisabled": "Désactivé",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "Ignorer la batterie domestique ; aucun état de SoC n'est requis",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "ID d'objet de la puissance solaire disponible [W]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "La consommation du chargeur est incluse dans la consommation du domicile",
|
|
28
30
|
"LBL_wallBoxList": "Liste des wallbox",
|
|
31
|
+
"LBL_wallBoxListHelp": "Le ChargeManager sert les wallbox de haut en bas : la première entrée reçoit le surplus PV en premier, les suivantes seulement le reste. Modifiez la priorité avec les boutons fléchés.",
|
|
29
32
|
"LBL_wallboxMaxAmp": "Courant de charge maximal de cette wallbox [A] (0 = limite de l'installation)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "Courant le plus élevé pour cette wallbox, par ex. pour la brider. 0 applique le maximum de l'installation. Ne dépasse jamais la limite de l'installation.",
|
|
31
34
|
"LBL_wallboxMinAmp": "Courant de charge minimal de cette wallbox [A] (0 = par défaut)",
|
package/admin/i18n/it.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "La corrente massima deve essere maggiore o uguale a quella minima",
|
|
3
3
|
"ERR_minCurrentAboveMax": "La corrente minima deve essere minore o uguale a quella massima",
|
|
4
|
+
"LBL_autoPhaseSwitch": "Commutazione automatica 1/3 fasi (hardware gen 3+)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "Consente a ChargeManager di commutare questa wallbox tra carica monofase e trifase in base al surplus disponibile. Solo per hardware di generazione 3 o successiva; interrompe brevemente la carica a ogni commutazione.",
|
|
4
6
|
"LBL_batteryMode": "Modalità batteria di casa",
|
|
5
7
|
"LBL_batteryModeDisabled": "Disattivata",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "Ignora la batteria di casa; non serve alcuno stato SoC",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "ID oggetto della potenza solare disponibile [W]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "Il consumo della wallbox è già incluso nel consumo di casa",
|
|
28
30
|
"LBL_wallBoxList": "Elenco wallbox",
|
|
31
|
+
"LBL_wallBoxListHelp": "Il ChargeManager serve le wallbox dall alto verso il basso: la prima voce riceve per prima il surplus FV, le successive solo ciò che resta. Cambia la priorità con i pulsanti freccia.",
|
|
29
32
|
"LBL_wallboxMaxAmp": "Corrente di carica massima per questa wallbox [A] (0 = limite dell'impianto)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "Corrente più alta per questa wallbox, ad es. per limitarla. Con 0 si usa il massimo dell'impianto. Non supera mai il limite dell'impianto.",
|
|
31
34
|
"LBL_wallboxMinAmp": "Corrente di carica minima per questa wallbox [A] (0 = predefinita)",
|
package/admin/i18n/nl.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "Maximale stroom mag niet lager zijn dan de minimale stroom",
|
|
3
3
|
"ERR_minCurrentAboveMax": "Minimale stroom mag niet hoger zijn dan de maximale stroom",
|
|
4
|
+
"LBL_autoPhaseSwitch": "Automatische 1-/3-fasen-omschakeling (hardware gen 3+)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "Laat ChargeManager deze wallbox tussen 1- en 3-fasen laden schakelen op basis van het beschikbare overschot. Alleen voor hardwaregeneratie 3 en nieuwer; onderbreekt het laden kort bij elke omschakeling.",
|
|
4
6
|
"LBL_batteryMode": "Modus thuisbatterij",
|
|
5
7
|
"LBL_batteryModeDisabled": "Uitgeschakeld",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "Negeer de thuisbatterij; er is geen SoC-status nodig",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "Object-ID van het beschikbare zonnevermogen [W]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "Verbruik van de wallbox zit al in het huisverbruik",
|
|
28
30
|
"LBL_wallBoxList": "Wallboxlijst",
|
|
31
|
+
"LBL_wallBoxListHelp": "De ChargeManager bedient de wallboxen van boven naar beneden: de eerste vermelding krijgt het PV-overschot als eerste, latere alleen wat overblijft. Wijzig de prioriteit met de pijlknoppen.",
|
|
29
32
|
"LBL_wallboxMaxAmp": "Maximale laadstroom voor deze wallbox [A] (0 = installatielimiet)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "Hoogste stroom voor deze wallbox, bijv. om te begrenzen. 0 gebruikt het maximum van de installatie. Overschrijdt nooit de installatielimiet.",
|
|
31
34
|
"LBL_wallboxMinAmp": "Minimale laadstroom voor deze wallbox [A] (0 = standaard)",
|
package/admin/i18n/pl.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "Prąd maksymalny musi być większy lub równy prądowi minimalnemu",
|
|
3
3
|
"ERR_minCurrentAboveMax": "Prąd minimalny musi być mniejszy lub równy prądowi maksymalnemu",
|
|
4
|
+
"LBL_autoPhaseSwitch": "Automatyczne przełączanie 1/3 fazy (sprzęt gen 3+)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "Pozwala ChargeManager przełączać ten wallbox między ładowaniem 1- i 3-fazowym w zależności od dostępnej nadwyżki. Tylko dla sprzętu generacji 3 i nowszego; każde przełączenie na chwilę przerywa ładowanie.",
|
|
4
6
|
"LBL_batteryMode": "Tryb baterii domowej",
|
|
5
7
|
"LBL_batteryModeDisabled": "Wyłączony",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "Pomijaj baterię domową; stan naładowania (SoC) nie jest wymagany",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "ID obiektu z aktualnie dostępną mocą fotowoltaiki [W]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "Pobór ładowarki jest wliczony w zużycie energii w domu",
|
|
28
30
|
"LBL_wallBoxList": "Lista wallboxów",
|
|
31
|
+
"LBL_wallBoxListHelp": "ChargeManager obsługuje wallboxy od góry do dołu: pierwszy wpis otrzymuje nadwyżkę PV jako pierwszy, kolejne tylko to, co zostanie. Priorytet zmienisz przyciskami strzałek.",
|
|
29
32
|
"LBL_wallboxMaxAmp": "Maksymalny prąd ładowania dla tego wallboxa [A] (0 = limit instalacji)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "Najwyższy prąd dla tego wallboxa, np. w celu jego ograniczenia. 0 oznacza maksimum całej instalacji. Nigdy nie przekracza limitu instalacji.",
|
|
31
34
|
"LBL_wallboxMinAmp": "Minimalny prąd ładowania dla tego wallboxa [A] (0 = domyślny)",
|
package/admin/i18n/pt.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "A corrente máxima deve ser maior ou igual à mínima",
|
|
3
3
|
"ERR_minCurrentAboveMax": "A corrente mínima deve ser menor ou igual à máxima",
|
|
4
|
+
"LBL_autoPhaseSwitch": "Comutação automática 1/3 fases (hardware ger. 3+)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "Permite que o ChargeManager alterne esta wallbox entre carregamento monofásico e trifásico conforme o excedente disponível. Apenas para hardware de geração 3 ou mais recente; interrompe brevemente o carregamento a cada comutação.",
|
|
4
6
|
"LBL_batteryMode": "Modo da bateria doméstica",
|
|
5
7
|
"LBL_batteryModeDisabled": "Desativado",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "Ignora a bateria doméstica; não é necessário um estado de SoC",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "ID de objeto da potência solar disponível [W]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "O consumo do carregador já está incluído no consumo da casa",
|
|
28
30
|
"LBL_wallBoxList": "Lista de wallboxes",
|
|
31
|
+
"LBL_wallBoxListHelp": "O ChargeManager atende as wallboxes de cima para baixo: a primeira entrada recebe o excedente FV primeiro, as seguintes apenas o que sobra. Altere a prioridade com os botões de seta.",
|
|
29
32
|
"LBL_wallboxMaxAmp": "Corrente máxima de carga desta wallbox [A] (0 = limite da instalação)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "Corrente mais alta desta wallbox, p. ex. para limitá-la. 0 usa o máximo de toda a instalação. Nunca excede o limite da instalação.",
|
|
31
34
|
"LBL_wallboxMinAmp": "Corrente mínima de carga desta wallbox [A] (0 = padrão)",
|
package/admin/i18n/ru.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "Максимальный ток не должен быть меньше минимального",
|
|
3
3
|
"ERR_minCurrentAboveMax": "Минимальный ток не должен превышать максимальный",
|
|
4
|
+
"LBL_autoPhaseSwitch": "Автоматическое переключение 1/3 фаз (оборудование gen 3+)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "Позволяет ChargeManager переключать эту зарядную станцию между одно- и трёхфазной зарядкой в зависимости от доступного избытка. Только для оборудования 3-го поколения и новее; при каждом переключении заряд ненадолго прерывается.",
|
|
4
6
|
"LBL_batteryMode": "Режим домашнего аккумулятора",
|
|
5
7
|
"LBL_batteryModeDisabled": "Отключён",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "Не учитывать домашний аккумулятор; уровень заряда не требуется",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "ID объекта с доступной мощностью солнечных панелей [Вт]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "Потребление станции уже учтено в энергопотреблении дома",
|
|
28
30
|
"LBL_wallBoxList": "Список зарядных станций",
|
|
31
|
+
"LBL_wallBoxListHelp": "ChargeManager обслуживает станции сверху вниз: первая запись получает избыток солнечной энергии первой, следующие — только остаток. Приоритет меняется кнопками со стрелками.",
|
|
29
32
|
"LBL_wallboxMaxAmp": "Максимальный ток зарядки для этой станции [А] (0 = лимит установки)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "Наибольший ток для этой станции, например для её ограничения. При 0 используется общий максимум установки. Лимит установки не превышается.",
|
|
31
34
|
"LBL_wallboxMinAmp": "Минимальный ток зарядки для этой станции [А] (0 = по умолчанию)",
|
package/admin/i18n/uk.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "Максимальний струм має бути не меншим за мінімальний",
|
|
3
3
|
"ERR_minCurrentAboveMax": "Мінімальний струм має бути не більшим за максимальний",
|
|
4
|
+
"LBL_autoPhaseSwitch": "Автоматичне перемикання 1/3 фаз (обладнання gen 3+)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "Дозволяє ChargeManager перемикати цю зарядну станцію між одно- та трифазним заряджанням залежно від доступного надлишку. Лише для обладнання 3-го покоління та новішого; кожне перемикання ненадовго перериває заряджання.",
|
|
4
6
|
"LBL_batteryMode": "Режим домашньої батареї",
|
|
5
7
|
"LBL_batteryModeDisabled": "Вимкнено",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "Не враховувати домашню батарею; рівень заряду не потрібен",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "ID об'єкта з поточною доступною сонячною потужністю [Вт]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "Споживання зарядної станції враховане в енергоспоживанні будинку",
|
|
28
30
|
"LBL_wallBoxList": "Список зарядних станцій",
|
|
31
|
+
"LBL_wallBoxListHelp": "ChargeManager обслуговує зарядні станції згори вниз: перший запис отримує надлишок сонячної енергії першим, наступні — лише залишок. Пріоритет змінюється кнопками зі стрілками.",
|
|
29
32
|
"LBL_wallboxMaxAmp": "Максимальний струм заряджання цієї зарядної станції [А] (0 = обмеження установки)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "Найбільший струм для цієї зарядної станції, напр. для обмеження. 0 = максимум установки. Ніколи не перевищує обмеження установки.",
|
|
31
34
|
"LBL_wallboxMinAmp": "Мінімальний струм заряджання цієї зарядної станції [А] (0 = за замовчуванням)",
|
package/admin/i18n/zh-cn.json
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"ERR_maxCurrentBelowMin": "最大电流不得小于最小电流",
|
|
3
3
|
"ERR_minCurrentAboveMax": "最小电流不得大于最大电流",
|
|
4
|
+
"LBL_autoPhaseSwitch": "自动 1/3 相切换(硬件第 3 代及以上)",
|
|
5
|
+
"LBL_autoPhaseSwitchHelp": "让 ChargeManager 根据可用盈余在单相和三相充电之间切换此充电桩。仅适用于第 3 代及以上硬件;每次切换会短暂中断充电。",
|
|
4
6
|
"LBL_batteryMode": "家庭电池模式",
|
|
5
7
|
"LBL_batteryModeDisabled": "已禁用",
|
|
6
8
|
"LBL_batteryModeDisabledDescription": "忽略家庭电池;无需配置电量状态",
|
|
@@ -26,6 +28,7 @@
|
|
|
26
28
|
"LBL_stateHomeSolarPower": "当前可用光伏功率的对象 ID [W]",
|
|
27
29
|
"LBL_subtractSelfConsumption": "家庭用电量中已包含充电桩的耗电",
|
|
28
30
|
"LBL_wallBoxList": "充电桩列表",
|
|
31
|
+
"LBL_wallBoxListHelp": "ChargeManager 从上到下依次分配:列表中的第一项优先获得光伏余电,靠后的充电桩只能获得剩余部分。用箭头按钮调整优先级。",
|
|
29
32
|
"LBL_wallboxMaxAmp": "此充电桩的最大充电电流 [A](0 = 装置上限)",
|
|
30
33
|
"LBL_wallboxMaxAmpHelp": "此充电桩的最大电流,例如用于限流。0 表示使用整个装置的最大值,且绝不超过装置上限。",
|
|
31
34
|
"LBL_wallboxMinAmp": "此充电桩的最小充电电流 [A](0 = 默认值)",
|
package/admin/jsonConfig.json
CHANGED
|
@@ -42,6 +42,7 @@
|
|
|
42
42
|
"type": "accordion",
|
|
43
43
|
"titleAttr": "chargerName",
|
|
44
44
|
"label": "LBL_wallBoxList",
|
|
45
|
+
"help": "LBL_wallBoxListHelp",
|
|
45
46
|
"xs": 12,
|
|
46
47
|
"sm": 12,
|
|
47
48
|
"md": 12,
|
|
@@ -112,6 +113,18 @@
|
|
|
112
113
|
"md": 6,
|
|
113
114
|
"lg": 6,
|
|
114
115
|
"xl": 4
|
|
116
|
+
},
|
|
117
|
+
{
|
|
118
|
+
"type": "checkbox",
|
|
119
|
+
"label": "LBL_autoPhaseSwitch",
|
|
120
|
+
"help": "LBL_autoPhaseSwitchHelp",
|
|
121
|
+
"attr": "autoPhaseSwitch",
|
|
122
|
+
"xs": 12,
|
|
123
|
+
"sm": 12,
|
|
124
|
+
"md": 12,
|
|
125
|
+
"lg": 12,
|
|
126
|
+
"xl": 12,
|
|
127
|
+
"newLine": true
|
|
115
128
|
}
|
|
116
129
|
]
|
|
117
130
|
}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DEFAULT_MAXIMUM_BATTERY_BONUS = exports.DEFAULT_RESERVE_POWER = exports.SHUTDOWN_DELAY_CYCLES = exports.START_CHARGE_CURRENT = exports.MAX_CHARGE_CURRENT = exports.MIN_CHARGE_CURRENT = void 0;
|
|
3
|
+
exports.PHASE_SWITCH_DELAY_CYCLES = exports.PHASE_VOLTAGE = exports.DEFAULT_MAXIMUM_BATTERY_BONUS = exports.DEFAULT_RESERVE_POWER = exports.SHUTDOWN_DELAY_CYCLES = exports.START_CHARGE_CURRENT = exports.MAX_CHARGE_CURRENT = exports.MIN_CHARGE_CURRENT = void 0;
|
|
4
4
|
exports.resolveWallboxCurrentLimits = resolveWallboxCurrentLimits;
|
|
5
5
|
exports.evaluateBatteryAvailability = evaluateBatteryAvailability;
|
|
6
|
+
exports.calculateAvailableSurplusPower = calculateAvailableSurplusPower;
|
|
6
7
|
exports.calculateOptimalChargeCurrent = calculateOptimalChargeCurrent;
|
|
7
8
|
exports.stepChargeCurrent = stepChargeCurrent;
|
|
8
9
|
exports.updateShutdownDelay = updateShutdownDelay;
|
|
9
10
|
exports.decideChargeManager = decideChargeManager;
|
|
11
|
+
exports.decideChargeManagerFleet = decideChargeManagerFleet;
|
|
12
|
+
exports.decidePhaseSwitch = decidePhaseSwitch;
|
|
10
13
|
exports.buildChargerCommands = buildChargerCommands;
|
|
11
14
|
exports.MIN_CHARGE_CURRENT = 6;
|
|
12
15
|
exports.MAX_CHARGE_CURRENT = 32;
|
|
@@ -14,6 +17,8 @@ exports.START_CHARGE_CURRENT = 10;
|
|
|
14
17
|
exports.SHUTDOWN_DELAY_CYCLES = 12;
|
|
15
18
|
exports.DEFAULT_RESERVE_POWER = 100;
|
|
16
19
|
exports.DEFAULT_MAXIMUM_BATTERY_BONUS = 2000;
|
|
20
|
+
exports.PHASE_VOLTAGE = 230;
|
|
21
|
+
exports.PHASE_SWITCH_DELAY_CYCLES = 12;
|
|
17
22
|
function resolveWallboxCurrentLimits(input) {
|
|
18
23
|
const isUsable = (value) => typeof value === "number" && Number.isFinite(value) && value > 0;
|
|
19
24
|
const installationMax = Number.isFinite(input.installationMaxCurrent) && input.installationMaxCurrent > 0 ? Math.floor(input.installationMaxCurrent) : exports.MAX_CHARGE_CURRENT;
|
|
@@ -64,25 +69,9 @@ function evaluateBatteryAvailability(input) {
|
|
|
64
69
|
batterySoc: input.batterySoc,
|
|
65
70
|
};
|
|
66
71
|
}
|
|
67
|
-
function
|
|
68
|
-
const numericInputs = [
|
|
69
|
-
|
|
70
|
-
input.houseConsumption,
|
|
71
|
-
input.chargerPower,
|
|
72
|
-
input.reservePower,
|
|
73
|
-
input.maximumBatteryBonus,
|
|
74
|
-
input.maximumChargeCurrent,
|
|
75
|
-
input.phases,
|
|
76
|
-
];
|
|
77
|
-
if (!numericInputs.every(value => Number.isFinite(value))) {
|
|
78
|
-
return null;
|
|
79
|
-
}
|
|
80
|
-
if ((input.phases !== 1 && input.phases !== 3) ||
|
|
81
|
-
input.reservePower < 0 ||
|
|
82
|
-
input.maximumBatteryBonus < 0 ||
|
|
83
|
-
!Number.isInteger(input.maximumChargeCurrent) ||
|
|
84
|
-
input.maximumChargeCurrent < exports.START_CHARGE_CURRENT ||
|
|
85
|
-
input.maximumChargeCurrent > exports.MAX_CHARGE_CURRENT) {
|
|
72
|
+
function calculateAvailableSurplusPower(input) {
|
|
73
|
+
const numericInputs = [input.solarPower, input.houseConsumption, input.chargerPower, input.reservePower, input.maximumBatteryBonus];
|
|
74
|
+
if (!numericInputs.every(value => Number.isFinite(value)) || input.reservePower < 0 || input.maximumBatteryBonus < 0) {
|
|
86
75
|
return null;
|
|
87
76
|
}
|
|
88
77
|
if (input.batteryMode !== "disabled" &&
|
|
@@ -98,8 +87,22 @@ function calculateOptimalChargeCurrent(input) {
|
|
|
98
87
|
const batteryOffset = input.batteryMode === "priority" && input.batterySoc !== null && input.minBatterySoc < 100
|
|
99
88
|
? Math.max(0, (input.maximumBatteryBonus / (100 - input.minBatterySoc)) * (input.batterySoc - input.minBatterySoc))
|
|
100
89
|
: 0;
|
|
101
|
-
|
|
102
|
-
|
|
90
|
+
return input.solarPower - input.houseConsumption + (input.subtractChargerPower ? input.chargerPower : 0) - input.reservePower + batteryOffset;
|
|
91
|
+
}
|
|
92
|
+
function calculateOptimalChargeCurrent(input) {
|
|
93
|
+
if (!Number.isFinite(input.phases) ||
|
|
94
|
+
!Number.isFinite(input.maximumChargeCurrent) ||
|
|
95
|
+
(input.phases !== 1 && input.phases !== 3) ||
|
|
96
|
+
!Number.isInteger(input.maximumChargeCurrent) ||
|
|
97
|
+
input.maximumChargeCurrent < exports.MIN_CHARGE_CURRENT ||
|
|
98
|
+
input.maximumChargeCurrent > exports.MAX_CHARGE_CURRENT) {
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
const availablePower = calculateAvailableSurplusPower(input);
|
|
102
|
+
if (availablePower === null) {
|
|
103
|
+
return null;
|
|
104
|
+
}
|
|
105
|
+
const calculatedCurrent = Math.floor(availablePower / exports.PHASE_VOLTAGE / input.phases);
|
|
103
106
|
return Math.max(0, Math.min(calculatedCurrent, input.maximumChargeCurrent));
|
|
104
107
|
}
|
|
105
108
|
function stepChargeCurrent(current, target, maximum = exports.MAX_CHARGE_CURRENT) {
|
|
@@ -135,7 +138,7 @@ function decideChargeManager(input) {
|
|
|
135
138
|
};
|
|
136
139
|
}
|
|
137
140
|
const currentAmp = stepChargeCurrent(input.state.currentAmp, optimalCurrent, input.maximumChargeCurrent);
|
|
138
|
-
const startChargeCurrent = Math.max(exports.START_CHARGE_CURRENT, input.minimumChargeCurrent);
|
|
141
|
+
const startChargeCurrent = Math.min(Math.max(exports.START_CHARGE_CURRENT, input.minimumChargeCurrent), input.maximumChargeCurrent);
|
|
139
142
|
const isRampingToRaisedMinimum = input.minimumChargeCurrent > exports.START_CHARGE_CURRENT && optimalCurrent >= input.minimumChargeCurrent && currentAmp < input.minimumChargeCurrent;
|
|
140
143
|
let shutdownDelay = isRampingToRaisedMinimum ? 0 : updateShutdownDelay(currentAmp, input.minimumChargeCurrent, input.state.shutdownDelay);
|
|
141
144
|
if (currentAmp >= startChargeCurrent) {
|
|
@@ -170,6 +173,50 @@ function decideChargeManager(input) {
|
|
|
170
173
|
nextState: { currentAmp, shutdownDelay },
|
|
171
174
|
};
|
|
172
175
|
}
|
|
176
|
+
function decideChargeManagerFleet(shared, participants) {
|
|
177
|
+
let claimedPower = 0;
|
|
178
|
+
return participants.map(participant => {
|
|
179
|
+
const surplus = { ...shared, solarPower: shared.solarPower - claimedPower };
|
|
180
|
+
const decision = decideChargeManager({
|
|
181
|
+
...surplus,
|
|
182
|
+
maximumChargeCurrent: participant.maximumChargeCurrent,
|
|
183
|
+
minimumChargeCurrent: participant.minimumChargeCurrent,
|
|
184
|
+
phases: participant.phases,
|
|
185
|
+
state: participant.state,
|
|
186
|
+
});
|
|
187
|
+
const availablePower = calculateAvailableSurplusPower(surplus) ?? 0;
|
|
188
|
+
if (participant.claimsPower) {
|
|
189
|
+
const reservedCurrent = Math.max(decision.optimalCurrent ?? 0, decision.nextState.currentAmp);
|
|
190
|
+
claimedPower += reservedCurrent * exports.PHASE_VOLTAGE * participant.phases;
|
|
191
|
+
}
|
|
192
|
+
return { ...decision, availablePower };
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
function decidePhaseSwitch(input) {
|
|
196
|
+
if ((input.currentPhases !== 1 && input.currentPhases !== 3) ||
|
|
197
|
+
!Number.isFinite(input.availablePower) ||
|
|
198
|
+
!Number.isFinite(input.minimumChargeCurrent) ||
|
|
199
|
+
!Number.isFinite(input.maximumChargeCurrent)) {
|
|
200
|
+
return { targetPhases: input.currentPhases, switchDelay: 0 };
|
|
201
|
+
}
|
|
202
|
+
const threePhaseMinPower = input.minimumChargeCurrent * 3 * exports.PHASE_VOLTAGE;
|
|
203
|
+
const upThreshold = Math.max(input.maximumChargeCurrent * exports.PHASE_VOLTAGE, threePhaseMinPower);
|
|
204
|
+
let targetPhases = input.currentPhases;
|
|
205
|
+
if (input.currentPhases === 1 && input.availablePower >= upThreshold) {
|
|
206
|
+
targetPhases = 3;
|
|
207
|
+
}
|
|
208
|
+
else if (input.currentPhases === 3 && input.availablePower < threePhaseMinPower) {
|
|
209
|
+
targetPhases = 1;
|
|
210
|
+
}
|
|
211
|
+
if (targetPhases === input.currentPhases) {
|
|
212
|
+
return { targetPhases: input.currentPhases, switchDelay: 0 };
|
|
213
|
+
}
|
|
214
|
+
const switchDelay = input.switchDelay + 1;
|
|
215
|
+
if (switchDelay > exports.PHASE_SWITCH_DELAY_CYCLES) {
|
|
216
|
+
return { targetPhases, switchDelay: 0 };
|
|
217
|
+
}
|
|
218
|
+
return { targetPhases: input.currentPhases, switchDelay };
|
|
219
|
+
}
|
|
173
220
|
function buildChargerCommands(allow, ampere, firmware) {
|
|
174
221
|
if (!allow) {
|
|
175
222
|
return [{ parameter: "alw", value: 0 }];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chargeManagerUtils.js","sourceRoot":"","sources":["../../src/lib/chargeManagerUtils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"chargeManagerUtils.js","sourceRoot":"","sources":["../../src/lib/chargeManagerUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectUtils.js","sourceRoot":"","sources":["../../src/lib/projectUtils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"projectUtils.js","sourceRoot":"","sources":["../../src/lib/projectUtils.ts"],"names":[],"mappings":"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"}
|
package/build/main.js
CHANGED
|
@@ -120,14 +120,17 @@ class go_e_charger extends utils.Adapter {
|
|
|
120
120
|
ChargeCurrent: 6,
|
|
121
121
|
ChargePower: 0,
|
|
122
122
|
Charge3Phase: false,
|
|
123
|
+
ManagedCharge3Phase: false,
|
|
123
124
|
EnabledPhases: 0,
|
|
124
125
|
MeasuredMaxChargeAmp: 0,
|
|
125
126
|
BatteryReady: false,
|
|
127
|
+
CarState: 0,
|
|
126
128
|
MinAmp: 6,
|
|
127
129
|
MaxAmp: maxChargeCurrent,
|
|
128
130
|
HardwareMaxAmp: 0,
|
|
129
131
|
HardwareMinAmp: 0,
|
|
130
132
|
DelayOff: 0,
|
|
133
|
+
PhaseSwitchDelay: 0,
|
|
131
134
|
CurrentHysteresis: 0,
|
|
132
135
|
SetOptAmp: 5,
|
|
133
136
|
SetOptAllow: false,
|
|
@@ -407,6 +410,9 @@ class go_e_charger extends utils.Adapter {
|
|
|
407
410
|
if (this.wallboxInfoList[iWB].HardwareMin3) {
|
|
408
411
|
await this.Read_ChargerAPIV2(iWB);
|
|
409
412
|
}
|
|
413
|
+
}
|
|
414
|
+
const chargePlans = await this.planChargeManagerCycle();
|
|
415
|
+
for (let iWB = 0; iWB < this.config.wallBoxList.length; iWB++) {
|
|
410
416
|
if (this.wallboxInfoList[iWB].ChargeNOW) {
|
|
411
417
|
const chargeNowCurrent = Math.min(Math.max(this.wallboxInfoList[iWB].ChargeCurrent, this.wallboxInfoList[iWB].MinAmp), this.wallboxInfoList[iWB].MaxAmp);
|
|
412
418
|
await this.Charge_Config("1", chargeNowCurrent, `activate go-eCharger for forced charging`, iWB);
|
|
@@ -416,25 +422,17 @@ class go_e_charger extends utils.Adapter {
|
|
|
416
422
|
}
|
|
417
423
|
}
|
|
418
424
|
else if (this.wallboxInfoList[iWB].ChargeManager) {
|
|
419
|
-
const
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
maximumAgeSeconds: chargeManagerBatterySocMaxAgeSeconds,
|
|
426
|
-
hysteresis: chargeManagerBatterySocHysteresis,
|
|
427
|
-
wasReady: this.wallboxInfoList[iWB].BatteryReady,
|
|
428
|
-
});
|
|
429
|
-
this.wallboxInfoList[iWB].BatteryReady = batteryDecision.ready;
|
|
430
|
-
if (batteryDecision.ready) {
|
|
431
|
-
await this.Switch_3Phases(this.wallboxInfoList[iWB].Charge3Phase, iWB);
|
|
432
|
-
await this.Charge_Manager(iWB, batteryDecision.batterySoc);
|
|
425
|
+
const plan = chargePlans[iWB];
|
|
426
|
+
if (plan?.decision) {
|
|
427
|
+
const useAutoPhase = this.config.wallBoxList[iWB].autoPhaseSwitch && this.wallboxInfoList[iWB].HardwareMin3;
|
|
428
|
+
const targetPhase = useAutoPhase ? this.wallboxInfoList[iWB].ManagedCharge3Phase : this.wallboxInfoList[iWB].Charge3Phase;
|
|
429
|
+
await this.Switch_3Phases(targetPhase, iWB);
|
|
430
|
+
await this.Charge_Manager(iWB, plan.decision);
|
|
433
431
|
}
|
|
434
|
-
else if (
|
|
432
|
+
else if (plan?.batteryReason === "stale") {
|
|
435
433
|
await this.stopChargeManager(`Battery state of charge is stale`, iWB);
|
|
436
434
|
}
|
|
437
|
-
else if (
|
|
435
|
+
else if (plan?.batteryReason === "below-minimum") {
|
|
438
436
|
await this.stopChargeManager(`Charging home battery until ${minHomeBatVal}%`, iWB);
|
|
439
437
|
}
|
|
440
438
|
else {
|
|
@@ -548,6 +546,7 @@ class go_e_charger extends utils.Adapter {
|
|
|
548
546
|
void this.projectUtils.checkAndSetValueNumber(`${basePath}.statistics.rebootCounter`, Number(status.rbc), `Counter for system reboot events`, "", "value");
|
|
549
547
|
void this.projectUtils.checkAndSetValueNumber(`${basePath}.statistics.rebootTimer`, Math.floor(status.rbt / 1000 / 3600), `Time since last reboot`, "h", "value");
|
|
550
548
|
void this.projectUtils.checkAndSetValueNumber(`${basePath}.info.carState`, Number(status.car), `State of connected car`, "", "value");
|
|
549
|
+
this.wallboxInfoList[iWB].CarState = Number(status.car) || 0;
|
|
551
550
|
switch (status.car) {
|
|
552
551
|
case "1":
|
|
553
552
|
await this.projectUtils.checkAndSetValue(`${basePath}.info.carStateString`, `Wallbox ready, no car`, `State of connected car`, "text");
|
|
@@ -724,36 +723,88 @@ class go_e_charger extends utils.Adapter {
|
|
|
724
723
|
}
|
|
725
724
|
}
|
|
726
725
|
}
|
|
727
|
-
async
|
|
726
|
+
async planChargeManagerCycle() {
|
|
727
|
+
const plans = new Array(this.config.wallBoxList.length).fill(undefined);
|
|
728
|
+
const candidates = [...this.config.wallBoxList.keys()].filter(iWB => this.wallboxInfoList[iWB].ChargeManager && !this.wallboxInfoList[iWB].ChargeNOW);
|
|
729
|
+
if (!candidates.length) {
|
|
730
|
+
return plans;
|
|
731
|
+
}
|
|
728
732
|
solarPower = await this.projectUtils.asyncGetForeignStateVal(this.config.stateHomeSolarPower);
|
|
729
733
|
this.log.debug(`Got external state of solar power: ${solarPower} W`);
|
|
730
734
|
houseConsumption = await this.projectUtils.asyncGetForeignStateVal(this.config.stateHomePowerConsumption);
|
|
731
735
|
this.log.debug(`Got external state of house power consumption: ${houseConsumption} W`);
|
|
736
|
+
const batteryState = chargeManagerBatteryMode === "disabled" ? null : await this.projectUtils.asyncGetForeignState(this.config.stateHomeBatSoc);
|
|
737
|
+
const batterySocAgeMs = batteryState ? Date.now() - batteryState.ts : null;
|
|
738
|
+
let batterySoc = null;
|
|
739
|
+
const participants = [];
|
|
740
|
+
const served = [];
|
|
741
|
+
let fleetChargePower = 0;
|
|
742
|
+
for (const iWB of candidates) {
|
|
743
|
+
this.wallboxInfoList[iWB].ChargePower = await this.projectUtils.getStateValue(`Wallbox_${iWB}.Power.Charge`);
|
|
744
|
+
const batteryDecision = (0, chargeManagerUtils_1.evaluateBatteryAvailability)({
|
|
745
|
+
mode: chargeManagerBatteryMode,
|
|
746
|
+
batterySoc: batteryState?.val,
|
|
747
|
+
minimumBatterySoc: minHomeBatVal,
|
|
748
|
+
batterySocAgeMs,
|
|
749
|
+
maximumAgeSeconds: chargeManagerBatterySocMaxAgeSeconds,
|
|
750
|
+
hysteresis: chargeManagerBatterySocHysteresis,
|
|
751
|
+
wasReady: this.wallboxInfoList[iWB].BatteryReady,
|
|
752
|
+
});
|
|
753
|
+
this.wallboxInfoList[iWB].BatteryReady = batteryDecision.ready;
|
|
754
|
+
if (!batteryDecision.ready) {
|
|
755
|
+
plans[iWB] = { decision: null, batteryReason: batteryDecision.reason };
|
|
756
|
+
continue;
|
|
757
|
+
}
|
|
758
|
+
batterySoc = batteryDecision.batterySoc;
|
|
759
|
+
const phases = this.wallboxInfoList[iWB].HardwareMin3 && this.wallboxInfoList[iWB].EnabledPhases
|
|
760
|
+
? this.wallboxInfoList[iWB].EnabledPhases
|
|
761
|
+
: this.wallboxInfoList[iWB].GridPhases;
|
|
762
|
+
const carState = this.wallboxInfoList[iWB].CarState;
|
|
763
|
+
participants.push({
|
|
764
|
+
phases,
|
|
765
|
+
maximumChargeCurrent: this.wallboxInfoList[iWB].MaxAmp,
|
|
766
|
+
minimumChargeCurrent: Math.min(Math.max(chargeManagerMinCurrent, this.wallboxInfoList[iWB].MinAmp), this.wallboxInfoList[iWB].MaxAmp),
|
|
767
|
+
state: { currentAmp: this.wallboxInfoList[iWB].SetAmp, shutdownDelay: this.wallboxInfoList[iWB].DelayOff },
|
|
768
|
+
claimsPower: carState === 2 || carState === 3,
|
|
769
|
+
});
|
|
770
|
+
served.push(iWB);
|
|
771
|
+
fleetChargePower += this.wallboxInfoList[iWB].ChargePower;
|
|
772
|
+
}
|
|
732
773
|
if (batterySoc !== null) {
|
|
733
774
|
this.log.debug(`Got external state of battery SoC: ${batterySoc}%`);
|
|
734
775
|
}
|
|
735
|
-
|
|
736
|
-
const Phases = this.wallboxInfoList[iWB].HardwareMin3 && this.wallboxInfoList[iWB].EnabledPhases
|
|
737
|
-
? this.wallboxInfoList[iWB].EnabledPhases
|
|
738
|
-
: this.wallboxInfoList[iWB].GridPhases;
|
|
739
|
-
const decision = (0, chargeManagerUtils_1.decideChargeManager)({
|
|
776
|
+
const decisions = (0, chargeManagerUtils_1.decideChargeManagerFleet)({
|
|
740
777
|
solarPower,
|
|
741
778
|
houseConsumption,
|
|
742
|
-
chargerPower:
|
|
779
|
+
chargerPower: fleetChargePower,
|
|
743
780
|
subtractChargerPower: this.config.subtractSelfConsumption,
|
|
744
781
|
batterySoc,
|
|
745
782
|
minBatterySoc: minHomeBatVal,
|
|
746
783
|
batteryMode: chargeManagerBatteryMode,
|
|
747
784
|
reservePower: chargeManagerReservePower,
|
|
748
785
|
maximumBatteryBonus: chargeManagerMaxBatteryBonus,
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
|
|
786
|
+
}, participants);
|
|
787
|
+
served.forEach((iWB, index) => {
|
|
788
|
+
plans[iWB] = { decision: decisions[index], batteryReason: "available" };
|
|
789
|
+
if (this.config.wallBoxList[iWB].autoPhaseSwitch && this.wallboxInfoList[iWB].HardwareMin3) {
|
|
790
|
+
const participant = participants[index];
|
|
791
|
+
const phaseDecision = (0, chargeManagerUtils_1.decidePhaseSwitch)({
|
|
792
|
+
currentPhases: this.wallboxInfoList[iWB].EnabledPhases,
|
|
793
|
+
availablePower: decisions[index].availablePower,
|
|
794
|
+
minimumChargeCurrent: participant.minimumChargeCurrent,
|
|
795
|
+
maximumChargeCurrent: participant.maximumChargeCurrent,
|
|
796
|
+
switchDelay: this.wallboxInfoList[iWB].PhaseSwitchDelay,
|
|
797
|
+
});
|
|
798
|
+
this.wallboxInfoList[iWB].PhaseSwitchDelay = phaseDecision.switchDelay;
|
|
799
|
+
this.wallboxInfoList[iWB].ManagedCharge3Phase = phaseDecision.targetPhases === 3;
|
|
800
|
+
if (phaseDecision.targetPhases !== this.wallboxInfoList[iWB].EnabledPhases) {
|
|
801
|
+
this.log.info(`ChargeManager: switching charger ${iWB} to ${phaseDecision.targetPhases}-phase charging (surplus ${Math.round(decisions[index].availablePower)} W)`);
|
|
802
|
+
}
|
|
803
|
+
}
|
|
756
804
|
});
|
|
805
|
+
return plans;
|
|
806
|
+
}
|
|
807
|
+
async Charge_Manager(iWB, decision) {
|
|
757
808
|
if (decision.optimalCurrent === null) {
|
|
758
809
|
this.log.warn(`ChargeManager inputs are invalid for charger ${iWB}; charging will be disabled`);
|
|
759
810
|
await this.stopChargeManager(`Invalid ChargeManager input`, iWB);
|
package/build/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,34 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "go-e-charger",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.7.0",
|
|
5
5
|
"news": {
|
|
6
|
+
"1.7.0": {
|
|
7
|
+
"en": "admin: the wallbox list now explains that its order is the ChargeManager priority - the first entry receives the PV surplus first, later entries only the remainder\nChargeManager: the PV surplus is now shared between all wallboxes instead of being offered to each one in full; wallboxes are served in configuration order, so the first entry has priority and later ones only receive the remaining surplus\nChargeManager: a wallbox without a connected vehicle no longer reserves surplus and can no longer starve a wallbox that has a car waiting\nChargeManager: optional automatic 1-/3-phase switching per wallbox (gen 3+, off by default) - switches up when one-phase charging saturates and back down when the surplus can no longer sustain three phases, with a dwell time to prevent flapping\nfixed: automatic phase switching no longer overwrites the manual `Settings.Charge3Phase` request - the automatic decision is now tracked internally, so the user's manual 1-/3-phase setting is preserved (and no longer persisted across restarts as if the user had set it)\ndocs: clarified the multi-wallbox behaviour (list order = priority) and noted that no combined current limit across wallboxes is enforced yet\nupdated axios\nswitch to iobroker testing 6.x\nfixed repochecker warnings\nadded node 26 tests",
|
|
8
|
+
"de": "Admin: Die Wallbox-Liste erklärt jetzt, dass sie ChargeManager-Priorität hat — zuerst erhält der PV-Überschuss, später nur den Rest\nChargeManager: Der PV-Überschuss wird nun auf alle Wallboxen aufgeteilt und nicht mehr auf alle Wallboxen verteilt. Die Wallboxen werden in der Reihenfolge bedient, die anderen erhalten nur den Rest.\nChargeManager: Eine Wallbox ohne vernetztes Fahrzeug reserviert keinen Überschuss mehr und verhungert keine Wallbox mehr, auf die ein Auto wartet\nChargeManager: optionale 1-/3-phasige Umschaltung pro Wallbox (Gen 3+, standardmäßig aus) — schaltet hoch, wenn einphasiges Laden voll ist, und wieder runter, wenn der Überschuss drei Phasen überdauert, mit Haltezeit\nBehoben: Die automatische Phasenumschaltung überschreibt nicht mehr die manuelle Anfrage `Settings.Charge3Phase` — die automatische Entscheidung wird nun intern verfolgt, sodass die 1-/3-Phasen-Einstellung beibehalten wird (und nicht mehr bei Neustarts so, als ob der Nutzer sie gesetzt hätte)\nDocs: hat das Verhalten mehrerer Wallboxen geklärt (Reihenfolge = Priorität) und festgestellt, dass es noch kein Limit gibt\nAxios aktualisiert\nzu iobroker test 6.x wechseln\nRepocheckerwarnungen behoben\nNode 26 Tests hinzugefügt",
|
|
9
|
+
"ru": "admin: теперь в списке настенных ящиков указано, что приоритет отдается ChargeManager: первая запись сначала получает избыток фотоэлектрических систем, а затем — только остаток\nChargeManager: избыток фотоэлектрических систем теперь распределяется между всеми настенными боксами, а не продается каждому из них в полном объеме; настенные боксы обслуживаются в порядке конфигурации, поэтому первая запись имеет приоритет, а последующие получают только оставшийся избыток\nChargeManager: настенный бокс без подключенного автомобиля больше не накапливает излишки и больше не может морить голодом настенный бокс, в котором ждет машина\nChargeManager: опциональное автоматическое однофазное или трехфазное переключение на настенную коробку (поколение 3+, по умолчанию выключено) — включается при насыщении однофазной зарядки и отключается, когда избыток больше не может выдерживать три фазы, с временем ожидания для предотвращения взмахов\nисправлено: автоматическое переключение фаз больше не перезаписывает ручной запрос `Settings.Charge3Phase` — автоматическое решение теперь отслеживается внутренне, поэтому ручная настройка 1-/3-фазных фаз сохраняется (и больше не сохраняется при перезапуске, как если бы ее установил пользователь)\nдокументы: разъяснил поведение нескольких настенных боксов (порядок списка = приоритет) и отметил, что суммарное ограничение тока для всех настенных боксов пока не введено\nобновленные аксиомы\nперейти к тестированию iobroker 6.x\nисправлены предупреждения repochecker\nдобавлен узел 26 тестов",
|
|
10
|
+
"pt": "admin: a lista de wallbox agora explica que sua ordem é a prioridade do ChargeManager - a primeira entrada recebe o excedente, depois só o restante\nChargeManager: o excedente fotovoltaico agora é dividido entre todas as caixas de parede em vez de ser distribuído por inteiro; as caixas são servidas em ordem de configuração, então a primeira entrada tem prioridade e as posteriores só recebem o excedente\nChargeManager: uma caixa de parede sem um veículo conectado não reserva mais excedentes e não pode mais morrer de fome\nChargeManager: troca automática opcional de 1/3 por caixa de parede (geração 3+, desligada por padrão) - liga quando o carregamento monofásico satura e desliga quando o excedente não aguenta mais três fases, com tempo de espera para evitar oscilações\ncorrigido: a mudança automática de fase não substitui mais a solicitação manual `Settings.Charge3Phase` - a decisão automática agora é rastreada internamente, preservando a configuração manual de 1/3 do usuário (e não é mais reinicializada como se o usuário a tivesse definido)\ndocs: esclareceu o comportamento de várias wallboxes (ordem de lista = prioridade) e notou que ainda não há limite atual combinado\naxios novos\nvá para o teste iobroker 6.x\navisos fixos do repochecker\nadicionou testes",
|
|
11
|
+
"nl": "admin: in de wallboxlijst wordt nu uitgelegd dat de volgorde de ChargeManager-prioriteit is: de eerste invoer ontvangt eerst het PV-overschot, later alleen de rest\nChargeManager: het PV-overschot wordt nu verdeeld over alle wallboxen in plaats van dat het volledig wordt aangeboden; wallboxen worden in volgorde van configuratie bediend, dus de eerste invoer heeft prioriteit en latere exemplaren krijgen alleen het resterende overschot\nChargeManager: een wallbox zonder aangesloten voertuig reserveert niet langer een overschot en kan een wallbox waar een auto staat te wachten niet langer uithongeren\nChargeManager: optionele automatische 1-/3-fasige omschakeling per wallbox (gen 3+, standaard uitgeschakeld) - schakelt omhoog wanneer het opladen in één fase verzadigd is en weer naar beneden wanneer het overschot niet langer drie fasen aankan, met een verblijftijd om klapperen te voorkomen\nopgelost: automatische faseomschakeling overschrijft niet langer het handmatige verzoek „Settings.Charge3Phase” - de automatische beslissing wordt nu intern bijgehouden, zodat de 1-/3-fase-instelling van de gebruiker behouden blijft (en niet langer wordt gehandhaafd tijdens het opnieuw opstarten alsof de gebruiker die had ingesteld)\ndocs: verduidelijkte het gedrag van meerdere wallboxen (lijstvolgorde = prioriteit) en merkte op dat er nog geen gecombineerde stroomlimiet voor alle wallboxen wordt gehandhaafd\naxios bijgewerkt\noverschakelen naar iobroker testing 6.x\nRepochecker-waarschuwingen opgelost\nKnooppunt 26 tests toegevoegd",
|
|
12
|
+
"fr": "admin : la liste des boîtiers explique maintenant que son ordre est la priorité de ChargeManager : la première entrée reçoit le surplus PV, puis le reste\nChargeManager : le surplus photovoltaïque est désormais partagé entre toutes les wallbox au lieu d'être offert à chacun dans son intégralité ; les wallbox sont servis par ordre de configuration, donc la première entrée est prioritaire et les suivantes ne reçoivent que le surplus restant\nChargeManager : un boîtier mural sans véhicule connecté ne réserve plus de surplus et ne peut plus affamer un boîtier mural où une voiture attend\nChargeManager : commutation automatique monophasée en option par boîtier mural (génération 3 et plus, désactivée par défaut). Elle s'active lorsque la charge monophasée est saturée et redémarre lorsque le surplus ne peut plus tenir trois phases, avec un temps d'arrêt pour éviter les battements\ncorrigé : le changement de phase automatique ne remplace plus la requête manuelle « Settings.Charge3Phase ». La décision automatique est désormais suivie en interne, donc le réglage manuel des phases 1 et 3 de l'utilisateur est préservé (et n'est plus persistant aux redémarrages comme si c'était lui qui l'avait réglé)\ndocs : a clarifié le comportement des wallbox (ordre des listes = priorité) et a noté qu'aucune limite de courant combinée n'est encore imposée\naxios mis à jour\npasser à iobroker testing 6.x\nalertes Repochecker fixes\najout de 26 tests",
|
|
13
|
+
"it": "admin: la wallbox list ora spiega che il suo ordine è la priorità di ChargeManager: la prima voce riceve prima il surplus FV, dopo solo il resto\nChargeManager: l'eccedenza fotovoltaica è ora condivisa tra tutte le wallbox invece di essere offerta per intero; le wallbox sono servite in ordine di configurazione, quindi la prima voce ha la priorità e le successive solo\nChargeManager: una wallbox senza veicolo connesso non riserva più eccedenze e non può più far morire di fame una con un'auto in attesa\nChargeManager: commutazione automatica monofase opzionale per wallbox (gen 3+, disattivata di default): si attiva quando la carica monofase è satura e si spegne quando l'eccedenza non può più sostenere tre fasi, con un tempo di sosta\nrisolto: il cambio di fase automatico non sovrascrive più la richiesta manuale `Settings.Charge3Phase`: la decisione automatica è ora tracciata internamente, quindi l'impostazione manuale a una fase e non persiste dopo i riavvii come se l'utente l'avesse impostata\ndocumenti: ha chiarito il comportamento dei multi-wallbox (ordine di lista = priorità) e non è ancora applicato alcun limite\naxios aggiornato\npassare a iobroker testing 6.x\navvisi repochecker fissi\naggiunto nodo 26",
|
|
14
|
+
"es": "admin: la lista mural explica ahora que su orden es la prioridad de ChargeManager: la primera entrada recibe primero el superávit fotovoltaico y, después, solo el resto\nChargeManager: El excedente fotovoltaico ahora se comparte entre todas las cajas de pared en lugar de ofrecérselo a cada una en su totalidad; las cajas de pared se sirven por orden de configuración, por lo que la primera entrada tiene prioridad y las posteriores solo reciben el sobrante\nChargeManager: una caja de pared sin un vehículo conectado ya no reserva el superávit ni puede matar de hambre a una caja de pared con un coche esperando\nChargeManager: cambio automático monofásico opcional por caja de pared (gen 3+, desactivado por defecto): se activa cuando la carga monofásica se satura y se reduce cuando el sobrante ya no puede soportar tres fases, con un tiempo de permanencia para evitar aleteos\nfijo: el cambio de fase automático ya no sobrescribe la solicitud manual de «Settings.Charge3Phase». La decisión automática ahora se rastrea internamente, por lo que se conserva el ajuste manual de 1 fase y 3 fases del usuario (y ya no persiste en los reinicios como si lo hubiera establecido el usuario)\ndocs: aclaró el comportamiento de las cajas múltiples (orden de lista = prioridad) y señaló que aún no se aplica ningún límite de corriente combinada entre las cajas\nactualizó axios\ncambiar a iobroker testing 6.x\navisos de repochecker fijos\nañadió nodo 26 pruebas",
|
|
15
|
+
"pl": "admin: lista wallbox wyjaśnia teraz, że jej kolejność jest priorytetem ChargeManager - pierwszy wpis najpierw otrzymuje nadwyżkę PV, późniejsze wpisy tylko resztę\nChargeManager: nadwyżka fotowoltaiczna jest teraz dzielona między wszystkie skrzynki ścienne zamiast być oferowana każdemu z nich w całości; skrzynki ścienne są obsługiwane w kolejności konfiguracji, więc pierwszy wpis ma priorytet, a późniejsze otrzymują tylko pozostałą nadwyżkę\nChargeManager: skrzynka ścienna bez podłączonego pojazdu nie rezerwuje już nadwyżki i nie może już zagłodzić skrzynki ściennej, na której czeka samochód\nChargeManager: opcjonalne automatyczne przełączanie 1-/3-fazowe na skrzynkę ścienną (gen 3+, domyślnie wyłączone) - włącza się, gdy ładowanie jednofazowe nasyca się i wycofuje, gdy nadwyżka nie może dłużej wytrzymać trzech faz, z czasem zatrzymania, aby zapobiec trzepowaniu\nnaprawiono: automatyczne przełączanie fazy nie zastępuje już ręcznego żądania „Settings.Charge3Phase” - automatyczna decyzja jest teraz śledzona wewnętrznie, więc ręczne ustawienie 1-/3-fazowe użytkownika jest zachowane (i nie utrzymuje się już podczas restartów tak, jakby użytkownik je ustawił)\ndocs: wyjaśniono zachowanie wielu ścian (kolejność listy = priorytet) i zauważyłem, że żaden łączny limit prądu w skrzynkach ściennych nie jest jeszcze wymuszony\nzaktualizowane axios\nprzejdź do testowania iobroker 6.x\nnaprawiono ostrzeżenia repochecker\ndodano testy węzła 26",
|
|
16
|
+
"uk": "admin: список wallbox тепер пояснює, що його порядок є пріоритетом ChargeManager - перший запис отримує надлишок PV спочатку, пізніше записи лише решту\nChargeManager: надлишок PV тепер поділяється між усіма wallboxами замість того, щоб пропонуватися кожному в повному обсязі; wallboxи подаються в порядку конфігурації, тому перший запис має пріоритет, а пізніші отримують лише залишок надлишку\nChargeManager: настінний бокс без підключеного транспортного засобу більше не резервує надлишок і більше не може голодувати настінний бокс, на якому чекає автомобіль\nChargeManager: додаткове автоматичне 1-/3-фазне перемикання на настінну коробку (покоління 3+, вимкнено за замовчуванням) - перемикається, коли однофазна зарядка насичується, і повертається назад, коли надлишок більше не може витримати три фази, з часом затримки для запобігання помаху\nвиправлено: автоматичне перемикання фаз більше не перезаписує ручний запит `Settings.Charge3Phase` - автоматичне рішення тепер відстежується внутрішньо, тому налаштування 1-/3-фазного посібника користувача зберігається (і більше не зберігається під час перезапуску, як якщо б користувач це встановив)\ndocs: уточнив поведінку кількох стінових скриньок (порядок списку = пріоритет) та зазначив, що поки що не застосовується комбіноване поточне обмеження між wallboxами\nоновлений аксіос\nпереключитися на тестування іоброкера 6.x\nвиправлені попередження про повторну перевірку\nдодано вузол 26 тестів",
|
|
17
|
+
"zh-cn": "管理员:wallbox 列表现在解释其顺序是 ChargeManager 的优先级-第一个条目首先获得剩余的 PV,后面的条目只收到剩余的 PV\nChargeManager:现在,剩余的光伏在所有墙箱之间共享,而不是全部提供给每个墙箱;墙箱按配置顺序提供,因此第一个条目具有优先权,后续的只能获得剩余的剩余部分\nChargeManager:没有联网车辆的墙箱不再储备剩余,也无法再饿死有汽车在等着的墙箱\nChargeManager:每个壁箱可选的自动单相/三相切换(第 3 代以上,默认情况下处于关闭状态)-当单相充电饱和时向上切换,当剩余电量无法再维持三相时向下切换,并有停留时间以防止抖动\n修复:自动相位切换不再覆盖手动 “Settings.Charge3Phase” 请求-现在内部会跟踪自动决策,因此保留了用户手动的1-/3相设置(并且在重启后不再像用户设置的那样保留)\n文档:阐明了多墙盒的行为(列表顺序 = 优先级),并指出尚未强制执行跨墙盒的组合电流限制\n更新的 axios\n切换到 iobroker 测试 6.x\n修复了 repochecker 警告\n添加了节点 26 测试"
|
|
18
|
+
},
|
|
19
|
+
"1.6.1": {
|
|
20
|
+
"en": "fixed: a wallbox whose effective maximum charging current is below 10 A - e.g. an 8 A coded cable or a per-wallbox maximum of 8 A - was rejected as invalid ChargeManager input and never charged from PV surplus. Such a wallbox now starts charging at its own maximum",
|
|
21
|
+
"de": "Behoben: Eine Wallbox mit maximalem Ladestrom unter 10 A — z. B. ein 8-A-Kabel oder maximal 8 A pro Wallbox — wurde als Lademanager-Eingang abgelehnt und nie mit PV-Überschuss geladen. So eine Wallbox lädt sich jetzt maximal auf.",
|
|
22
|
+
"ru": "исправлено: настенный бокс с эффективным максимальным зарядным током ниже 10 А (например, кабель с кодировкой 8 А или максимум 8 А на каждую настенную коробку) был отклонен как неправильный вход ChargeManager и так и не был заряжен от избытка фотоэлектрической энергии. Теперь такой настенный бокс начинает заряжаться на максимуме",
|
|
23
|
+
"pt": "fixa: uma caixa de parede cuja corrente máxima efetiva é inferior a 10 A - por exemplo, um cabo codificado de 8 A ou 8 A por caixa - foi rejeitada como entrada inválida do ChargeManager e nunca carregada. Essa caixa agora começa a carregar no máximo",
|
|
24
|
+
"nl": "opgelost: een wallbox waarvan de effectieve maximale laadstroom lager is dan 10 A - bijvoorbeeld een gecodeerde kabel van 8 A of een maximum van 8 A per wallbox - werd afgewezen als ongeldige ChargeManager-ingang en werd nooit opgeladen op basis van een PV-overschot. Zo'n wallbox begint nu maximaal op te laden",
|
|
25
|
+
"fr": "fixe : un boîtier mural dont le courant de charge maximal effectif est inférieur à 10 A, par exemple un câble codé de 8 A ou un maximum de 8 A par boîtier, a été rejetée car entrée ChargeManager non valide et n'a jamais été rechargée avec un surplus photovoltaïque. Une telle wallbox commence à se recharger à son maximum",
|
|
26
|
+
"it": "fisso: una wallbox la cui corrente di carica massima effettiva è inferiore a 10 A, ad esempio un cavo codificato da 8 A o 8 A per wallbox, è stata rifiutata come input ChargeManager non valido Una wallbox ora inizia a caricarsi al massimo",
|
|
27
|
+
"es": "fijo: una caja de pared cuya corriente de carga máxima efectiva es inferior a 10 A (por ejemplo, un cable codificado de 8 A o un máximo de 8 A por caja de pared) fue rechazada por entrada de ChargeManager no válida y nunca se cargó con el excedente fotovoltaico. Una caja de pared así ahora empieza a cargarse al máximo",
|
|
28
|
+
"pl": "naprawiono: skrzynka ścienna, której efektywny maksymalny prąd ładowania wynosi poniżej 10 A - np. kabel kodowany 8 A lub maksymalnie 8 A na ścianę - został odrzucony jako nieprawidłowe wejście ChargeManager i nigdy nie został naładowany z nadwyżki fotowoltaicznej. Taki ścienny box zaczyna ładować się maksymalnie",
|
|
29
|
+
"uk": "фіксовано: настінна коробка, максимальний ефективний струм зарядки якої нижче 10 А - наприклад, кодований кабель 8 А або максимальний розмір 8 А для кожної настінної коробки - був відхилений як недійсний вхід ChargeManager і ніколи не заряджався від надлишку PV. Такий wallbox тепер починає заряджатися на своєму максимумі",
|
|
30
|
+
"zh-cn": "已修复:有效最大充电电流低于 10 A 的墙箱(例如 8 A 的编码电缆或每壁箱的最大电流为 8 A)因无效的 ChargeManager 输入而被拒绝,并且从未从剩余的光伏中充电。这样的墙盒现在开始以自己的最大电量充电"
|
|
31
|
+
},
|
|
6
32
|
"1.6.0": {
|
|
7
33
|
"en": "added optional per-wallbox minimum and maximum charging current, applied to both ChargeManager and ChargeNOW and always kept within the installation-wide maximum\nthe per-wallbox current limits now also respect the charger's reported hardware caps (absolute max, cable limit, minimum charging current), published as `info.hardwareMaxChargeCurrent` / `info.hardwareMinChargeCurrent`\nChargeManager: added home-battery modes (disabled, minimum SoC, battery priority); installations without a home battery no longer need a constant helper state\nChargeManager: added a battery SoC hysteresis and an optional maximum SoC age so surplus control stops on stale battery data\nadmin: moved the maximum charging current to the standard settings tab and clarified that it is an installation-wide limit of the shared power supply, valid for all wallboxes and both charging modes",
|
|
8
34
|
"de": "Es wurde eine optionale Einstellung für minimale und maximale Ladeströme pro Wallbox hinzugefügt, die sowohl für ChargeManager als auch für ChargeNOW gilt und stets innerhalb des installationsweiten Maximalwerts liegt.\nDie Strombegrenzungen pro Wanddose berücksichtigen nun auch die vom Ladegerät gemeldeten Hardware-Grenzwerte (absoluter Maximalwert, Kabelbegrenzung, minimaler Ladestrom), die als `info.hardwareMaxChargeCurrent` / `info.hardwareMinChargeCurrent` veröffentlicht werden.\nChargeManager: Heimbatteriemodi hinzugefügt (deaktiviert, minimaler SoC, Batteriepriorität); Installationen ohne Heimbatterie benötigen keinen permanenten Hilfszustand mehr.\nChargeManager: Eine Hysterese des Batterieladezustands (SoC) und ein optionales maximales SoC-Alter wurden hinzugefügt, sodass die Steuerung bei veralteten Batteriedaten überflüssig wird.\nAdmin: Der maximale Ladestrom wurde in die Standardeinstellungen verschoben und klargestellt, dass es sich um eine installationsweite Begrenzung des gemeinsamen Netzteils handelt, die für alle Wallboxen und beide Lademodi gilt.",
|
|
@@ -67,32 +93,6 @@
|
|
|
67
93
|
"pl": "naprawiono błąd „odblokowane przez RFID” zawsze wynoszący 0 na ładowarkach gen. 3+: API V2 używa klucza „trx” zamiast „uby” (#634)\ndane na żywo są teraz odświeżane w każdym cyklu we wszystkich trybach, dzięki czemu monitorowanie w trybie tylko do odczytu pozostaje aktualne\nBrak dostępu do API V2 jest teraz sygnalizowany pojedynczym ostrzeżeniem zamiast błędu (co jest normalne w przypadku sprzętu generacji 1/2)\nużyj ogólnego logo marki go-e jako ikony adaptera (#843)",
|
|
68
94
|
"uk": "виправлено помилку «розблоковано RFID» завжди на 0 на зарядних пристроях покоління 3+: API V2 використовує ключ «trx» замість «uby» (#634)\nДані в реальному часі тепер оновлюються кожного циклу у всіх режимах, тому моніторинг лише для читання залишається актуальним\nНедоступність API V2 тепер відображається як окреме попередження, а не помилка (звичайно на апаратному забезпеченні покоління 1/2).\nвикористовувати загальний логотип бренду go-e як значок адаптера (#843)",
|
|
69
95
|
"zh-cn": "修复了第三代及以后充电器上“通过 RFID 解锁”始终为 0 的问题:API V2 使用“trx”密钥而不是“uby”密钥(#634)\n现在所有模式下的实时数据都会在每个周期刷新,因此只读监控也能保持最新状态。\nAPI V2 无法访问现在只会显示一个警告,而不是错误(在第一代/第二代硬件上属于正常情况)。\n使用通用的 go-e 品牌标志作为适配器图标(#843)"
|
|
70
|
-
},
|
|
71
|
-
"1.3.0": {
|
|
72
|
-
"en": "added info.accessControlState (go-e access_state: 0 = open, 1 = RFID/App required, 2 = price/automatic) (#634)\ntightened TypeScript types for go-e API response fields (removed any)\nupdated dependencies",
|
|
73
|
-
"de": "hinzugefügt info.accessControlState (go-e access_state: 0 = offen, 1 = RFID/App erforderlich, 2 = Preis/automatisch) (#634)\nVerschärfung der TypeScript-Typen für go-e API-Antwortfelder (alles entfernt)\naktualisierte Abhängigkeiten",
|
|
74
|
-
"ru": "Добавлено info.accessControlState (go-e access_state: 0 = открыто, 1 = требуется RFID/приложение, 2 = цена/автоматический режим) (#634)\nУжесточена типизация TypeScript для полей ответа API go-e (удалены все типы).\nобновленные зависимости",
|
|
75
|
-
"pt": "Adicionada informação.accessControlState (go-e access_state: 0 = aberto, 1 = RFID/Aplicativo necessário, 2 = preço/automático) (#634)\nTipos TypeScript mais rigorosos para os campos de resposta da API go-e (todos os tipos incompletos foram removidos).\ndependências atualizadas",
|
|
76
|
-
"nl": "toegevoegde info.accessControlState (go-e access_state: 0 = open, 1 = RFID/App vereist, 2 = prijs/automatisch) (#634)\nDe TypeScript-typen voor de responsvelden van de go-e API zijn aangescherpt (alle typen zijn verwijderd).\nbijgewerkte afhankelijkheden",
|
|
77
|
-
"fr": "ajout d'info.accessControlState (go-e access_state : 0 = ouvert, 1 = RFID/application requis, 2 = prix/automatique) (#634)\nTypes TypeScript plus stricts pour les champs de réponse de l'API go-e (suppression de « any »)\ndépendances mises à jour",
|
|
78
|
-
"it": "aggiunto info.accessControlState (go-e access_state: 0 = aperto, 1 = RFID/App richiesto, 2 = prezzo/automatico) (#634)\nTipi TypeScript più rigorosi per i campi di risposta dell'API go-e (rimossi tutti)\ndipendenze aggiornate",
|
|
79
|
-
"es": "Se agregó info.accessControlState (go-e access_state: 0 = abierto, 1 = RFID/Aplicación requerida, 2 = precio/automático) (#634)\nSe han ajustado los tipos de TypeScript para los campos de respuesta de la API de go-e (se han eliminado todos).\ndependencias actualizadas",
|
|
80
|
-
"pl": "dodano info.accessControlState (go-e access_state: 0 = otwarty, 1 = wymagany RFID/aplikacja, 2 = cena/automatyczny) (#634)\nzaostrzono typy TypeScript dla pól odpowiedzi API go-e (usunięto wszystkie)\nzaktualizowane zależności",
|
|
81
|
-
"uk": "додано info.accessControlState (go-e access_state: 0 = відкрито, 1 = RFID/потрібна програма, 2 = ціна/автоматично) (#634)\nуточнено типи TypeScript для полів відповіді go-e API (видалено будь-які)\nоновлені залежності",
|
|
82
|
-
"zh-cn": "添加了 info.accessControlState(go-e access_state:0 = 打开,1 = 需要 RFID/App,2 = 价格/自动)(#634)\n加强了 go-e API 响应字段的 TypeScript 类型定义(移除了所有类型定义)\n更新依赖项"
|
|
83
|
-
},
|
|
84
|
-
"1.2.1": {
|
|
85
|
-
"en": "made ChargeManager surplus control more fail-safe: input validation, current clamped to 0-16 A, resilience of state-machine loop (#841)\nadded support for firmware V60.5 (#800) and V60.6 (#844)\nadded ChargeManager PV surplus configuration guide (#842)\ncorrected no-battery helper-state recommendation for ChargeManager\nupdated dependencies",
|
|
86
|
-
"de": "machte ChargeManager Überschusskontrolle ausfallsicherer: Eingangsvalidierung, Strom auf 0-16 A geklemmt, Widerstandsfähigkeit der State-Machine-Schleife (#841)\nzusätzliche Unterstützung für Firmware V60.5 (#800) und V60.6 (#844)\nzusätzliches ChargeManager PV Überschusskonfigurationshandbuch (#842)\nkorrigierte No-Battery-Helfer-State-Empfehlung für ChargeManager\naktualisierte abhängigkeiten",
|
|
87
|
-
"ru": "сделал избыточный контроль ChargeManager более отказоустойчивым: валидация входа, ток, зажатый до 0-16 А, устойчивость петли государственной машины (#841)\nдобавлена поддержка прошивки V60.5 (#800) и V60.6 (#844)\nруководство по конфигурации излишков зарядного устройства ChargeManager PV (#842)\nисправлена рекомендация штата без батареи для ChargeManager\nобновленные зависимости",
|
|
88
|
-
"pt": "feito ChargeManager superávit controle mais fail-safe: validação de entrada, corrente fixada a 0-16 A, resiliência do estado-máquina loop (#841)\nsuporte adicionado para firmware V60.5 (# 800) e V60.6 (# 844)\nguia de configuração do excedente PV do ChargeManager (# 842)\nrecomendação de estado de ajuda não-bateria corrigida para ChargeManager\ndependências atualizadas",
|
|
89
|
-
"nl": "chargeManager overtollige controle meer fail-safe: input validatie, stroom geklemd op 0-16 A, veerkracht van state-machine loop (#841)\ntoegevoegde ondersteuning voor firmware V60.5 (#800) en V60,6 (#844)\ntoegevoegde ChargeManager PV surplus configuratie gids (#842)\ngecorrigeerde no-battery helper-state aanbeveling voor ChargeManager\nbijgewerkte afhankelijkheden",
|
|
90
|
-
"fr": "made ChargeManager contrôle de surplus plus sûr-échec: validation d'entrée, courant serré à 0-16 A, résilience de la boucle de machine d'état (#841)\nsoutien supplémentaire au firmware V60.5 (#800) et V60.6 (#844)\najouté ChargeManager PV surplus guide de configuration (#842)\ncorrection de la recommandation de l'aide sans batterie pour ChargeManager\ndépendances actualisées",
|
|
91
|
-
"it": "ha reso ChargeManager il controllo in eccesso più sicuro: la validazione dell'ingresso, la corrente bloccata a 0-16 A, la resilienza del loop della macchina statale (#841)\nsupporto aggiunto per firmware V60.5 (#800) e V60.6 (#844)\naggiunto ChargeManager PV surplus di configurazione guida (#842)\nraccomandazione corretto no-battery helper-stato per ChargeManager\ndipendenze aggiornate",
|
|
92
|
-
"es": "hecho ChargeManager control de excedentes más seguro de fallo: validación de entrada, corriente sujeta a 0-16 A, resiliencia del bucle de máquina de estado (#841)\nsoporte añadido para firmware V60.5 (#800) y V60.6 (#844)\nañadido ChargeManager PV guía de configuración sobrante (#842)\ncorregido recomendación de estado-ayuda de no-batería para ChargeManager\ndependencias actualizadas",
|
|
93
|
-
"pl": "sprawiła, że kontrola nadmiaru ChargeManager była bardziej bezpieczna: walidacja wejścia, prąd zaciśnięty do 0-16 A, odporność pętli state- machine (# 841)\ndodane wsparcie dla firmware V60.5 (# 800) i V60.6 (# 844)\ndodany poradnik konfiguracji nadwyżek PV ChargeManager (# 842)\npoprawiona rekomendacja dla ChargeManager\nzaktualizowane zależności",
|
|
94
|
-
"uk": "зроблено ChargeManager надлишок управління більш небезпечним: вентиляція введення, затисканий до 0-16 А, стійкість петля державного двигуна (#841)\nдодана підтримка прошивки V60.5 (#800) і V60.6 (#844)\nдоданий контролер для налаштування Surplus ChargeManager PV (#842)\nвиправлено no-battery helper-state рекомендації для ChargeManager\nоновлені залежності",
|
|
95
|
-
"zh-cn": "使充电管理器剩余控制更安全:输入验证,当前被夹到0-16 A,国家机器循环的弹性(# 841)\n添加对固件 V60.5 (# 800) 和 V60.6 (# 844)的支持\n添加充电管理器 PV 剩余配置指南 (# 842)\n纠正关于充电管理器的无电池助手状态建议\n更新的依赖关系"
|
|
96
96
|
}
|
|
97
97
|
},
|
|
98
98
|
"titleLang": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.go-e-charger",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0",
|
|
4
4
|
"description": "Adapter for reading go-eCharger data",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Hombach",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@iobroker/adapter-core": "^3.4.3",
|
|
27
|
-
"axios": "^1.
|
|
27
|
+
"axios": "^1.20.0"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@alcalzone/release-script": "^5.2.1",
|
|
@@ -33,10 +33,10 @@
|
|
|
33
33
|
"@alcalzone/release-script-plugin-manual-review": "^5.2.0",
|
|
34
34
|
"@iobroker/adapter-dev": "^1.5.0",
|
|
35
35
|
"@iobroker/eslint-config": "^2.3.4",
|
|
36
|
-
"@iobroker/testing": "^
|
|
36
|
+
"@iobroker/testing": "^6.2.1",
|
|
37
37
|
"@iobroker/types": "^7.2.2",
|
|
38
38
|
"@tsconfig/node22": "^22.0.6",
|
|
39
|
-
"@types/node": "^22.20.
|
|
39
|
+
"@types/node": "^22.20.2",
|
|
40
40
|
"source-map-support": "^0.5.21",
|
|
41
41
|
"ts-node": "^10.9.2",
|
|
42
42
|
"typescript": "^6.0.3"
|