geändert: README.md

geändert: admin/i18n/de/translations.json geändert: admin/i18n/en/translations.json geändert: admin/i18n/es/translations.json geändert: admin/i18n/fr/translations.json geändert: admin/i18n/it/translations.json geändert: admin/i18n/nl/translations.json geändert: admin/i18n/pl/translations.json geändert: admin/i18n/pt/translations.json geändert: admin/i18n/ru/translations.json geändert: admin/i18n/uk/translations.json geändert: admin/i18n/zh-cn/translations.json geändert: admin/jsonConfig.json geändert: admin/words.js geändert: io-package.json geändert: main.js
SKB-CGN · Nov 12, 2024 · 628ab1e · 628ab1e
1 parent 982adea
commit 628ab1e
Show file tree

Hide file tree

Showing 16 changed files with 183 additions and 95 deletions.
diff --git a/README.md b/README.md
@@ -36,6 +36,13 @@ If you like the adapter and want to support me, you can do so here:
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### **WORK IN PROGRESS**
+- Added: Migration to jsonConfig in Adapter-settings
+- Added: New state "car_connected", which indicates, that a car is connected
+- Added: Resume, Pause check - less error messages (e.g. if Wallbox is in Pause Mode and should be set to pause, don't throw any error)
+- Added: Option, to unlock the wallbox first if it should enter the resume mode (Default: wallbox will not resume, if locked)
+- Added: Some minor improvements, updates dependencies and smal cosmetics
+
 ### 1.1.1 (2024-09-18)
 - updated dependencies
 

diff --git a/admin/i18n/de/translations.json b/admin/i18n/de/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Seriennummer Ihrer Wallbox",
-    "default_settings": "Standardeinstellungen",
+    "charger_id": "Seriennummer Ihrer Wallbox",
     "donate": "Wenn Ihnen dieser Adapter gefällt, denken Sie bitte über eine Spende nach, um meine Arbeit zu unterstützen.",
     "email": "E-Mail",
-    "ex_charger_serial": "Zu finden auf:",
+    "ex_charger_id": "Zu finden auf:",
+    "ex_unlock_before_resume": "(Sonst: Wallbox muss zuvor über den Status „control.locked“ entsperrt werden)",
+    "main_settings": "Haupteinstellungen",
     "password": "Passwort",
     "poll_time": "Poll-Zeit in Sekunden (min. 30 Sekunden)",
-    "wallbox adapter settings": "Adaptereinstellungen für Wallbox"
+    "unlock_before_resume": "Entsperren Sie die Wallbox automatisch, wenn die Aktion „Fortsetzen“ ausgelöst wird"
 }
diff --git a/admin/i18n/en/translations.json b/admin/i18n/en/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Serial Number of your Wallbox",
-    "default_settings": "Standard settings",
+    "charger_id": "Serial Number of your Wallbox",
     "donate": "If you like this adapter, please consider making a donation to support my work.",
     "email": "E-Mail",
-    "ex_charger_serial": "Can be found on:",
+    "ex_charger_id": "Can be found on:",
+    "ex_unlock_before_resume": "(Else: Wallbox needs to be unlocked before via the 'control.locked' state)",
+    "main_settings": "Main Settings",
     "password": "Password",
     "poll_time": "Poll-Time in Seconds (min. 30 seconds)",
-    "wallbox adapter settings": "Adapter settings for wallbox"
+    "unlock_before_resume": "Unlock the Wallbox automatically when the 'resume' action is triggered"
 }
diff --git a/admin/i18n/es/translations.json b/admin/i18n/es/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Número de serie de su Wallbox",
-    "default_settings": "Configuraciones estándar",
+    "charger_id": "Número de serie de tu Wallbox",
     "donate": "Si le gusta este adaptador, considere hacer una donación para apoyar mi trabajo.",
     "email": "Correo electrónico",
-    "ex_charger_serial": "Se puede encontrar en:",
-    "password": "Clave",
-    "poll_time": "Tiempo de sondeo en segundos (mín. 30 segundos)",
-    "wallbox adapter settings": "Ajustes del adaptador para Wallbox"
+    "ex_charger_id": "Se puede encontrar en:",
+    "ex_unlock_before_resume": "(De lo contrario: Wallbox debe desbloquearse antes mediante el estado 'control.locked')",
+    "main_settings": "Configuración principal",
+    "password": "Contraseña",
+    "poll_time": "Tiempo de encuesta en segundos (mínimo 30 segundos)",
+    "unlock_before_resume": "Desbloquea el Wallbox automáticamente cuando se activa la acción 'reanudar'"
 }
diff --git a/admin/i18n/fr/translations.json b/admin/i18n/fr/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Numéro de série de votre Wallbox",
-    "default_settings": "Paramètres standards",
+    "charger_id": "Numéro de série de votre Wallbox",
     "donate": "Si vous aimez cet adaptateur, pensez à faire un don pour soutenir mon travail.",
     "email": "E-mail",
-    "ex_charger_serial": "A retrouver sur :",
+    "ex_charger_id": "Peut être trouvé sur :",
+    "ex_unlock_before_resume": "(Sinon : la Wallbox doit être déverrouillée au préalable via l'état « control.locked »)",
+    "main_settings": "Paramètres principaux",
     "password": "Mot de passe",
-    "poll_time": "Temps d'interrogation en secondes (min. 30 secondes)",
-    "wallbox adapter settings": "Paramètres de l'adaptateur pour wallbox"
+    "poll_time": "Durée d'interrogation en secondes (min. 30 secondes)",
+    "unlock_before_resume": "Déverrouillez automatiquement la Wallbox lorsque l'action « reprendre » est déclenchée"
 }
diff --git a/admin/i18n/it/translations.json b/admin/i18n/it/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Numero di serie della tua Wallbox",
-    "default_settings": "Impostazioni standard",
+    "charger_id": "Numero di serie della tua Wallbox",
     "donate": "Se ti piace questo adattatore, considera di fare una donazione per sostenere il mio lavoro.",
     "email": "E-mail",
-    "ex_charger_serial": "Può essere trovato su:",
-    "password": "Parola d'ordine",
+    "ex_charger_id": "Può essere trovato su:",
+    "ex_unlock_before_resume": "(Altrimenti: la Wallbox deve essere sbloccata prima tramite lo stato 'control.locked')",
+    "main_settings": "Impostazioni principali",
+    "password": "Password",
     "poll_time": "Tempo di polling in secondi (min. 30 secondi)",
-    "wallbox adapter settings": "Impostazioni dell'adattatore per wallbox"
+    "unlock_before_resume": "Sblocca automaticamente la Wallbox quando viene attivata l'azione \"riprendi\"."
 }
diff --git a/admin/i18n/nl/translations.json b/admin/i18n/nl/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Serienummer van je Wallbox",
-    "default_settings": "Standaard instellingen",
+    "charger_id": "Serienummer van uw Wallbox",
     "donate": "Als je deze adapter leuk vindt, overweeg dan een donatie te doen om mijn werk te ondersteunen.",
     "email": "E-mail",
-    "ex_charger_serial": "Te vinden op:",
+    "ex_charger_id": "Te vinden op:",
+    "ex_unlock_before_resume": "(Anders: Wallbox moet eerst worden ontgrendeld via de status 'control.locked')",
+    "main_settings": "Hoofdinstellingen",
     "password": "Wachtwoord",
     "poll_time": "Poll-tijd in seconden (min. 30 seconden)",
-    "wallbox adapter settings": "Adapterinstellingen voor wallbox"
+    "unlock_before_resume": "Ontgrendel de Wallbox automatisch wanneer de 'hervatten'-actie wordt geactiveerd"
 }
diff --git a/admin/i18n/pl/translations.json b/admin/i18n/pl/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Numer seryjny Twojego Wallbox",
-    "default_settings": "Ustawienia standardowe",
+    "charger_id": "Numer seryjny Twojej stacji Wallbox",
     "donate": "Jeśli podoba Ci się ten adapter, rozważ przekazanie darowizny na wsparcie mojej pracy.",
     "email": "E-mail",
-    "ex_charger_serial": "Można znaleźć na:",
+    "ex_charger_id": "Można znaleźć na:",
+    "ex_unlock_before_resume": "(W przeciwnym razie: Wallbox musi zostać wcześniej odblokowany w stanie „control.locked”)",
+    "main_settings": "Główne ustawienia",
     "password": "Hasło",
     "poll_time": "Czas odpytywania w sekundach (min. 30 sekund)",
-    "wallbox adapter settings": "Ustawienia adaptera do Wallbox"
+    "unlock_before_resume": "Odblokuj Wallbox automatycznie po uruchomieniu akcji „wznów”."
 }
diff --git a/admin/i18n/pt/translations.json b/admin/i18n/pt/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Número de série da Wallbox",
-    "default_settings": "Configurações padrão",
+    "charger_id": "Número de série da sua Wallbox",
     "donate": "Se você gosta deste adaptador, considere fazer uma doação para apoiar meu trabalho.",
     "email": "E-mail",
-    "ex_charger_serial": "Pode ser encontrado em:",
+    "ex_charger_id": "Pode ser encontrado em:",
+    "ex_unlock_before_resume": "(Senão: a Wallbox precisa ser desbloqueada antes através do estado 'control.locked')",
+    "main_settings": "Configurações principais",
     "password": "Senha",
-    "poll_time": "Tempo de pesquisa em segundos (mín. 30 segundos)",
-    "wallbox adapter settings": "Configurações do adaptador para wallbox"
+    "poll_time": "Tempo de pesquisa em segundos (min. 30 segundos)",
+    "unlock_before_resume": "Desbloqueie a Wallbox automaticamente quando a ação 'reiniciar' for acionada"
 }
diff --git a/admin/i18n/ru/translations.json b/admin/i18n/ru/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Серийный номер вашего Wallbox",
-    "default_settings": "Стандартные настройки",
+    "charger_id": "Серийный номер вашего Wallbox",
     "donate": "Если вам нравится этот адаптер, пожалуйста, рассмотрите возможность сделать пожертвование в поддержку моей работы.",
     "email": "Электронная почта",
-    "ex_charger_serial": "Можно найти на:",
+    "ex_charger_id": "Можно найти на:",
+    "ex_unlock_before_resume": "(Иначе: перед этим необходимо разблокировать Wallbox через состояние «control.locked»).",
+    "main_settings": "Основные настройки",
     "password": "Пароль",
-    "poll_time": "Время опроса в секундах (мин. 30 секунд)",
-    "wallbox adapter settings": "Настройки адаптера для wallbox"
+    "poll_time": "Время опроса в секундах (минимум 30 секунд)",
+    "unlock_before_resume": "Автоматически разблокируйте Wallbox при срабатывании действия «возобновить»"
 }
diff --git a/admin/i18n/uk/translations.json b/admin/i18n/uk/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Серійний номер вашої Wallbox",
-    "default_settings": "Стандартні налаштування",
+    "charger_id": "Серійний номер вашої Wallbox",
     "donate": "Якщо вам подобається цей адаптер, зробіть пожертву на підтримку моєї роботи.",
     "email": "Електронна пошта",
-    "ex_charger_serial": "Можна знайти на:",
+    "ex_charger_id": "Можна знайти на:",
+    "ex_unlock_before_resume": "(Інакше: перед цим Wallbox потрібно розблокувати за допомогою стану «control.locked»)",
+    "main_settings": "Основні налаштування",
     "password": "Пароль",
     "poll_time": "Час опитування в секундах (мін. 30 секунд)",
-    "wallbox adapter settings": "Налаштування адаптера для Wallbox"
+    "unlock_before_resume": "Розблокуйте Wallbox автоматично, коли активується дія «відновити»."
 }
diff --git a/admin/i18n/zh-cn/translations.json b/admin/i18n/zh-cn/translations.json
@@ -1,10 +1,11 @@
 {
-    "charger_serial": "Wallbox 的序列号",
-    "default_settings": "标准设置",
+    "charger_id": "Wallbox 的序列号",
     "donate": "如果您喜欢这个适配器，请考虑捐赠以支持我的工作。",
     "email": "电子邮件",
-    "ex_charger_serial": "可以在以下位置找到：",
+    "ex_charger_id": "可以在以下位置找到：",
+    "ex_unlock_before_resume": "（否则：Wallbox 需要先通过“control.locked”状态解锁）",
+    "main_settings": "主要设置",
     "password": "密码",
-    "poll_time": "轮询时间以秒为单位（最少 30 秒）",
-    "wallbox adapter settings": "墙盒的适配器设置"
+    "poll_time": "轮询时间（以秒为单位）（最短 30 秒）",
+    "unlock_before_resume": "触发“恢复”操作时自动解锁 Wallbox"
 }
diff --git a/admin/jsonConfig.json b/admin/jsonConfig.json
@@ -7,7 +7,7 @@
    "items": {
       "_StandardTab": {
          "type": "panel",
-         "label": "default_settings",
+         "label": "main_settings",
          "items": {
             "email": {
                "type": "text",
@@ -31,14 +31,35 @@
             },
             "charger_id": {
                "type": "text",
-               "label": "charger_serial",
+               "label": "charger_id",
                "xs": 12,
                "sm": 12,
                "md": 12,
                "lg": 6,
                "xl": 6,
                "newLine": true
             },
+            "ex_charger_id": {
+               "type": "staticText",
+               "text": "ex_charger_id",
+               "xs": 12,
+               "sm": 12,
+               "md": 12,
+               "lg": 12,
+               "xl": 12,
+               "newLine": true
+            },
+            "ex_charger_link": {
+               "type": "staticLink",
+               "label": "https://my.wallbox.com/chargers",
+               "href": "https://my.wallbox.com/chargers",
+               "xs": 12,
+               "sm": 12,
+               "md": 12,
+               "lg": 12,
+               "xl": 12,
+               "newLine": false
+            },
             "poll_time": {
                "type": "number",
                "label": "poll_time",
@@ -51,6 +72,20 @@
                "xl": 6,
                "newLine": true
             },
+            "unlock_before_resume": {
+               "type": "checkbox",
+               "label": "unlock_before_resume"
+            },
+            "ex_unlock_before_resume": {
+               "type": "staticText",
+               "text": "ex_unlock_before_resume",
+               "xs": 12,
+               "sm": 12,
+               "md": 12,
+               "lg": 12,
+               "xl": 12,
+               "newLine": false
+            },
             "_divider0": {
                "newLine": true,
                "type": "divider",