Skip to content

Commit

Permalink
Use JSON config UI
Browse files Browse the repository at this point in the history
  • Loading branch information
pdbjjens committed Jan 22, 2024
1 parent b30d25d commit 0853356
Show file tree
Hide file tree
Showing 21 changed files with 778 additions and 509 deletions.
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ iobroker.*.tgz
package-lock.json

# i18n intermediate files
admin/i18n
# admin/i18n

# maintenance scripts
maintenance/**
2 changes: 1 addition & 1 deletion .releaseconfig.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"plugins": ["iobroker", "license"]
"plugins": ["iobroker", "license", "manual-review"]
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Jens-Peter Jensen [email protected]
Copyright (c) 2024 Jens-Peter Jensen [email protected]

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
19 changes: 14 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ This adapter connects ioBroker to various VBus-based devices using resol-vbus, a

* The default setting for the connection type is VBus/LAN, but it must be explicitly selected even for VBus/LAN, otherwise no connection will be established.
* The correct settings for direct LAN access for VBus/LAN, DL3, DL2, KM2 are:
* Connection type: VBus/LAN or KM2 or DL2 or DL3
* Connection type: VBus/LAN or KM2/DL2 or DL3/DL2Plus
* Connection identifier: IP address (e.g. 192.168.178.188) or FullyQualifiedHostName (e.g. host1.example.com)
* VBus password: YourVBusPassword (default: vbus)
* Connection port: Default setting 7053 should not be changed
* DL3 channel: Only relevant for DL3 (values 1-6, channel 0 can not be read out)
* DL3 channel: Only relevant for DL3/DL2Plus (values 1-6, channel 0 can not be read out)
* Update interval: Time between updates of the measured values (default 30s)
* The correct settings for the DL3, DL2, KM2 access via VBus.net are:
* Connection type: DL3 or DL2 or KM2
* Connection type: DL3/DL2Plus or DL2/KM2
* Connection identifier: vbus.net (or vbus.io) - both without http:// and Via identifier!
* Connection port: Default setting 7053 should not be changed
* VBus password: YourVBusPassword (default: vbus)
* DL3 channel: Only relevant for DL3 (values: 1-6, channel 0 cannot be read out)
* DL3 channel: Only relevant for DL3/DL2Plus (values: 1-6, channel 0 cannot be read out)
* Via identifier: YourViaIdentifier (e.g. d1234567890) - without http:// before or .vbus.io behind
* Update interval: Time between the update of the measured values (default 30s)

Expand All @@ -51,6 +51,15 @@ This adapter connects ioBroker to various VBus-based devices using resol-vbus, a
Placeholder for the next version (at the beginning of the line):
### **WORK IN PROGRESS**
-->

**WORK IN PROGRESS**

* (pdbjjens) New: Support ioBroker discovery
* (pdbjjens) Change: node>=16, js-contoller>=4 and admin>=6 required
* (pdbjjens) New: Use JSON config UI
* (pdbjjens) Updated dependencies
* (pdbjjens) Fix: Set info.connection false when reconnecting

### 0.2.5 (2023-03-14)

* (pdbjjens) Updated dependencies
Expand Down Expand Up @@ -89,7 +98,7 @@ The authors are in no way endorsed by or affiliated with RESOL GmbH, or any asso

MIT License

Copyright (c) 2023 Jens-Peter Jensen <[email protected]>
Copyright (c) 2024 Jens-Peter Jensen <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
50 changes: 24 additions & 26 deletions admin/i18n/de/translations.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
{
"Connection Device": "Verbindungsgerät",
"Connection Identifier": "Verbindungskennung",
"Connection Port": "Verbindungs-Port",
"DL2/KM2": "DL2 / KM2",
"DL3": "DL3",
"DL3 Channel": "DL3-Kanal",
"DL3 Channel 0": "DL3-Kanal 0",
"DL3 Channel 1": "DL3-Kanal 1",
"DL3 Channel 2": "DL3-Kanal 2",
"DL3 Channel 3": "DL3-Kanal 3",
"DL3 Channel 4": "DL3-Kanal 4",
"DL3 Channel 5": "DL3-Kanal 5",
"DL3 Channel 6": "DL3-Kanal 6",
"Default: 7053": "Standard: 7053",
"Default: vbus": "Standard: vbus",
"Force Adapter Reinitialization": "Reinitialisierung des Adapters erzwingen",
"Host address (IP or FQDN) for local LAN and for VBus.net or Serial Port Id for VBus/USB access": "Hostadresse (IP oder FQDN) für lokales LAN und für VBus.net oder serielle Port-ID für VBus/USB-Zugriff",
"If Force Adapter Reinitialization is set, the adapter restarts with new configuration immediately on save": "Wenn Adapter Reinitialization gesetzt ist, wird der Adapter sofort nach dem Speichern mit einer neuen Konfiguration neu gestartet",
"Required for DL3 only": "Nur für DL3 erforderlich",
"Required only for VBus.net access via DLx/KMx": "Nur für den VBus.net-Zugriff über DLx / KMx erforderlich",
"Select VBus Connection Device Type": "Wählen Sie den VBus-Verbindungsgerätetyp (VBus/LAN, DL3 usw.).",
"Serial/LANGW": "Seriell/LANGW",
"VBus Interval": "VBus-Aktualisierungsintervall (in Sekunden)",
"VBus Password": "VBus Passwort",
"DL3 Channel 0": "DL3 Kanal 0",
"DL3 Channel 1": "DL3 Kanal 1",
"DL3 Channel 2": "DL3 Kanal 2",
"DL3 Channel 3": "DL3 Kanal 3",
"DL3 Channel 4": "DL3 Kanal 4",
"DL3 Channel 5": "DL3 Kanal 5",
"DL3 Channel 6": "DL3 Kanal 6",
"Desc_ConnectionDevice": "Gerät oder Dienst, mit dem Sie eine Verbindung zu Ihrem Resol-Controller herstellen.",
"Desc_ConnectionPort": "TCP-Verbindungsport Ihres Geräts – Standard: 7053",
"Desc_DL3Channel": "Nur für DL3 erforderlich – Belassen Sie es auf „Keine“, wenn Sie kein DL3 verwenden.",
"Desc_DeviceAddress": "Hostadresse (IP oder FQDN) Ihres Geräts in Ihrem LAN oder Port-ID Ihres seriellen/USB-Ports – leer, wenn vbus.net.",
"Desc_DevicePassword": "Passwort Ihres VBus-Geräts – Standard: vbus",
"Desc_Pollintervall": "Aktualisierungsintervall in Sekunden.",
"Desc_Via-tag": "Nur für VBus.net-Zugriff über KM2 / DLx erforderlich – z. B.: d01234567890.vbus.io",
"Lbl_ConnectionDevice": "Verbindungsgerät/Dienst",
"Lbl_ConnectionPort": "TCP-Verbindungsport",
"Lbl_DL3Channel": "DL3-Kanal",
"Lbl_DeviceAddress": "Geräteadresse",
"Lbl_DevicePassword": "Gerätepasswort",
"Lbl_Pollintervall": "Updateintervall",
"Lbl_Via-tag": "Via-Tag",
"Serial to LAN-Gateway": "Seriell zum LAN-Gateway",
"VBus/LAN": "VBus/LAN",
"VBus/USB": "VBus/USB",
"Via tag": "Via-Kennung"
"none": "Keiner",
"Basic settings": "Grundeinstellungen"
}
38 changes: 18 additions & 20 deletions admin/i18n/en/translations.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
{
"Connection Device": "Connection Device",
"Connection Identifier": "Connection Identifier",
"Connection Port": "Connection Port",
"DL2/KM2": "DL2 / KM2",
"DL3": "DL3",
"DL3 Channel": "DL3 Channel",
"DL3 Channel 0": "DL3 Channel 0",
"DL3 Channel 1": "DL3 Channel 1",
"DL3 Channel 2": "DL3 Channel 2",
"DL3 Channel 3": "DL3 Channel 3",
"DL3 Channel 4": "DL3 Channel 4",
"DL3 Channel 5": "DL3 Channel 5",
"DL3 Channel 6": "DL3 Channel 6",
"Default: 7053": "Default: 7053",
"Default: vbus": "Default: vbus",
"Force Adapter Reinitialization": "Force Adapter Reinitialization",
"Host address (IP or FQDN) for local LAN and for VBus.net or Serial Port Id for VBus/USB access": "Host address (IP or FQDN) for local LAN and for VBus.net or Serial Port Id for VBus/USB access",
"If Force Adapter Reinitialization is set, the adapter restarts with new configuration immediately on save": "If Force Adapter Reinitialization is set, the adapter restarts with new configuration immediately on save",
"Required for DL3 only": "Required for DL3 only",
"Required only for VBus.net access via DLx/KMx": "Required only for VBus.net access via DLx / KMx",
"Select VBus Connection Device Type": "Select VBus Connection Device Type (VBus/LAN, DL3 etc.)",
"Serial/LANGW": "Serial/LANGW",
"VBus Interval": "VBus Update Interval (in seconds)",
"VBus Password": "VBus Password",
"Desc_ConnectionDevice": "Device or service you are using to connect to your Resol controller.",
"Desc_ConnectionPort": "TCP Connection port of your device - Default: 7053",
"Desc_DL3Channel": "Required for DL3 only - Leave to none if you do not use a DL3.",
"Desc_DeviceAddress": "Host address (IP or FQDN) of your device in your LAN or Port-ID of your Serial/USB-Port - Empty if vbus.net.",
"Desc_DevicePassword": "Password of your VBus device - Default: vbus",
"Desc_Pollintervall": "Update interval in seconds.",
"Desc_Via-tag": "Required only for VBus.net access via KM2 / DLx - eg: d01234567890.vbus.io",
"Lbl_ConnectionDevice": "Connection Device / Service",
"Lbl_ConnectionPort": "TCP Connection Port",
"Lbl_DL3Channel": "DL3 Channel",
"Lbl_DeviceAddress": "Device Address",
"Lbl_DevicePassword": "Device Password",
"Lbl_Pollintervall": "Update Interval",
"Lbl_Via-tag": "Via-tag",
"Serial to LAN-Gateway": "Serial to LAN-Gateway",
"VBus/LAN": "VBus/LAN",
"VBus/USB": "VBus/USB",
"Via tag": "Via tag"
}
"none": "None",
"Basic settings": "Basic settings"
}
36 changes: 17 additions & 19 deletions admin/i18n/es/translations.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
{
"Connection Device": "Dispositivo de conexión",
"Connection Identifier": "Identificador de conexión",
"Connection Port": "Puerto de conexión",
"DL2/KM2": "DL2 / KM2",
"DL3": "DL3",
"DL3 Channel": "Canal DL3",
"DL3 Channel 0": "DL3 Canal 0",
"DL3 Channel 1": "DL3 Canal 1",
"DL3 Channel 2": "DL3 Canal 2",
"DL3 Channel 3": "DL3 Canal 3",
"DL3 Channel 4": "DL3 Canal 4",
"DL3 Channel 5": "DL3 Canal 5",
"DL3 Channel 6": "DL3 Canal 6",
"Default: 7053": "Predeterminado: 7053",
"Default: vbus": "Predeterminado: vbus",
"Force Adapter Reinitialization": "Reinicialización del adaptador de fuerza",
"Host address (IP or FQDN) for local LAN and for VBus.net or Serial Port Id for VBus/USB access": "Dirección de host (IP o FQDN) para LAN local y para VBus.net o Id. De puerto serie para acceso VBus/USB",
"If Force Adapter Reinitialization is set, the adapter restarts with new configuration immediately on save": "Si se establece Forzar reinicialización del adaptador, el adaptador se reinicia con una nueva configuración inmediatamente al guardar",
"Required for DL3 only": "Requerido solo para DL3",
"Required only for VBus.net access via DLx/KMx": "Se requiere solo para el acceso a VBus.net a través de DLx / KMx",
"Select VBus Connection Device Type": "Seleccione el tipo de dispositivo de conexión VBus (VBus/LAN, DL3, etc.)",
"Serial/LANGW": "Serie/LANGW",
"VBus Interval": "Intervalo de actualización de VBus (en segundos)",
"VBus Password": "Contraseña de VBus",
"Desc_ConnectionDevice": "Dispositivo o servicio que estás utilizando para conectarte a tu controlador Resol.",
"Desc_ConnectionPort": "Puerto de conexión TCP de su dispositivo - Predeterminado: 7053",
"Desc_DL3Channel": "Requerido solo para DL3: déjelo en ninguno si no usa un DL3.",
"Desc_DeviceAddress": "Dirección de host (IP o FQDN) de su dispositivo en su LAN o ID de puerto de su puerto serie/USB: vacío si es vbus.net.",
"Desc_DevicePassword": "Contraseña de su dispositivo VBus - Predeterminada: vbus",
"Desc_Pollintervall": "Intervalo de actualización en segundos.",
"Desc_Via-tag": "Requerido solo para acceso a VBus.net a través de KM2 / DLx - por ejemplo: d01234567890.vbus.io",
"Lbl_ConnectionDevice": "Dispositivo/servicio de conexión",
"Lbl_ConnectionPort": "Puerto de conexión TCP",
"Lbl_DL3Channel": "Canal DL3",
"Lbl_DeviceAddress": "Dirección del dispositivo",
"Lbl_DevicePassword": "Contraseña del dispositivo",
"Lbl_Pollintervall": "Intervalo de actualización",
"Lbl_Via-tag": "Etiqueta vía",
"Serial to LAN-Gateway": "Serial a LAN-Gateway",
"VBus/LAN": "VBus/LAN",
"VBus/USB": "VBus/USB",
"Via tag": "Vía etiqueta"
"none": "Ninguno",
"Basic settings": "Ajustes básicos"
}
50 changes: 24 additions & 26 deletions admin/i18n/fr/translations.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
{
"Connection Device": "Dispositif de connexion",
"Connection Identifier": "Identifiant de connexion",
"Connection Port": "Port de connexion",
"DL2/KM2": "DL2 / KM2",
"DL3": "DL3",
"DL3 Channel": "Canal DL3",
"DL3 Channel 0": "DL3 Channel 0",
"DL3 Channel 1": "DL3 Channel 1",
"DL3 Channel 2": "DL3 Channel 2",
"DL3 Channel 3": "DL3 Channel 3",
"DL3 Channel 4": "DL3 Channel 4",
"DL3 Channel 5": "DL3 Channel 5",
"DL3 Channel 6": "DL3 Channel 6",
"Default: 7053": "Par défaut: 7053",
"Default: vbus": "Par défaut: vbus",
"Force Adapter Reinitialization": "Forcer la réinitialisation de l'adaptateur",
"Host address (IP or FQDN) for local LAN and for VBus.net or Serial Port Id for VBus/USB access": "Adresse d'hôte (IP ou FQDN) pour le LAN local et pour VBus.net ou ID de port série pour l'accès VBus/USB",
"If Force Adapter Reinitialization is set, the adapter restarts with new configuration immediately on save": "Si Forcer la réinitialisation de l'adaptateur est défini, l'adaptateur redémarre avec la nouvelle configuration immédiatement lors de l'enregistrement",
"Required for DL3 only": "Requis pour DL3 uniquement",
"Required only for VBus.net access via DLx/KMx": "Requis uniquement pour l'accès à VBus.net via DLx / KMx",
"Select VBus Connection Device Type": "Sélectionnez le type de périphérique de connexion VBus (VBus/LAN, DL3, etc.)",
"Serial/LANGW": "Série/LANGW",
"VBus Interval": "Intervalle de mise à jour VBus (en secondes)",
"VBus Password": "Mot de passe VBus",
"DL3 Channel 0": "DL3 Canal 0",
"DL3 Channel 1": "DL3 Canal 1",
"DL3 Channel 2": "DL3 Canal 2",
"DL3 Channel 3": "DL3 Canal 3",
"DL3 Channel 4": "DL3 Canal 4",
"DL3 Channel 5": "DL3 Canal 5",
"DL3 Channel 6": "DL3 Canal 6",
"Desc_ConnectionDevice": "Appareil ou service que vous utilisez pour vous connecter à votre contrôleur Resol.",
"Desc_ConnectionPort": "Port de connexion TCP de votre appareil - Par défaut : 7053",
"Desc_DL3Channel": "Obligatoire pour DL3 uniquement - Ne choisissez aucun si vous n'utilisez pas de DL3.",
"Desc_DeviceAddress": "Adresse hôte (IP ou FQDN) de votre appareil dans votre réseau local ou ID de port de votre port série/USB - Vide si vbus.net.",
"Desc_DevicePassword": "Mot de passe de votre appareil VBus - Par défaut : vbus",
"Desc_Pollintervall": "Intervalle de mise à jour en secondes.",
"Desc_Via-tag": "Requis uniquement pour l'accès à VBus.net via KM2 / DLx - par exemple : d01234567890.vbus.io",
"Lbl_ConnectionDevice": "Appareil de connexion/service",
"Lbl_ConnectionPort": "Port de connexion TCP",
"Lbl_DL3Channel": "Canal DL3",
"Lbl_DeviceAddress": "Adresse de l'appareil",
"Lbl_DevicePassword": "Mot de passe de l'appareil",
"Lbl_Pollintervall": "Intervalle de mise à jour",
"Lbl_Via-tag": "Via-tag",
"Serial to LAN-Gateway": "Passerelle série vers LAN",
"VBus/LAN": "VBus/LAN",
"VBus/USB": "VBus/USB",
"Via tag": "Via tag"
"none": "Aucun",
"Basic settings": "Paramètres de base"
}
50 changes: 24 additions & 26 deletions admin/i18n/it/translations.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
{
"Connection Device": "Dispositivo di connessione",
"Connection Identifier": "Identificatore di connessione",
"Connection Port": "Porta di connessione",
"DL2/KM2": "DL2 / KM2",
"DL3": "DL3",
"DL3 Channel": "Canale DL3",
"DL3 Channel 0": "Canale DL3 0",
"DL3 Channel 1": "Canale DL3 1",
"DL3 Channel 2": "Canale DL3 2",
"DL3 Channel 3": "Canale DL3 3",
"DL3 Channel 4": "Canale DL3 4",
"DL3 Channel 5": "Canale DL3 5",
"DL3 Channel 6": "Canale DL3 6",
"Default: 7053": "Predefinito: 7053",
"Default: vbus": "Predefinito: vbus",
"Force Adapter Reinitialization": "Reinizializzazione dell'adattatore di forza",
"Host address (IP or FQDN) for local LAN and for VBus.net or Serial Port Id for VBus/USB access": "Indirizzo host (IP o FQDN) per LAN locale e per VBus.net o ID porta seriale per accesso VBus/USB",
"If Force Adapter Reinitialization is set, the adapter restarts with new configuration immediately on save": "Se si imposta Reinizializzazione forzata adattatore, l'adattatore si riavvia con una nuova configurazione immediatamente al momento del salvataggio",
"Required for DL3 only": "Richiesto solo per DL3",
"Required only for VBus.net access via DLx/KMx": "Richiesto solo per l'accesso VBus.net tramite DLx / KMx",
"Select VBus Connection Device Type": "Seleziona il tipo di dispositivo di connessione VBus (VBus/LAN, DL3 ecc.)",
"Serial/LANGW": "Serial/LANGW",
"VBus Interval": "Intervallo di aggiornamento VBus (in secondi)",
"VBus Password": "Password VBus",
"DL3 Channel 0": "DL3 Canale 0",
"DL3 Channel 1": "DL3 Canale 1",
"DL3 Channel 2": "DL3 Canale 2",
"DL3 Channel 3": "DL3 Canale 3",
"DL3 Channel 4": "DL3 Canale 4",
"DL3 Channel 5": "DL3 Canale 5",
"DL3 Channel 6": "DL3 Canale 6",
"Desc_ConnectionDevice": "Dispositivo o servizio che stai utilizzando per connetterti al controller Resol.",
"Desc_ConnectionPort": "Porta di connessione TCP del tuo dispositivo - Predefinita: 7053",
"Desc_DL3Channel": "Richiesto solo per DL3: non selezionare nessuno se non si utilizza un DL3.",
"Desc_DeviceAddress": "Indirizzo host (IP o FQDN) del tuo dispositivo nella tua LAN o ID porta della tua porta seriale/USB - Vuoto se vbus.net.",
"Desc_DevicePassword": "Password del tuo dispositivo VBus - Predefinita: vbus",
"Desc_Pollintervall": "Intervallo di aggiornamento in secondi.",
"Desc_Via-tag": "Richiesto solo per l'accesso VBus.net tramite KM2 / DLx - ad esempio: d01234567890.vbus.io",
"Lbl_ConnectionDevice": "Dispositivo/Servizio di connessione",
"Lbl_ConnectionPort": "Porta di connessione TCP",
"Lbl_DL3Channel": "Canale DL3",
"Lbl_DeviceAddress": "Indirizzo del dispositivo",
"Lbl_DevicePassword": "Password del dispositivo",
"Lbl_Pollintervall": "Intervallo di aggiornamento",
"Lbl_Via-tag": "Via-tag",
"Serial to LAN-Gateway": "Gateway da seriale a LAN",
"VBus/LAN": "VBus/LAN",
"VBus/USB": "VBus/USB",
"Via tag": "Tramite tag"
"none": "Nessuno",
"Basic settings": "Impostazioni di base"
}
Loading

0 comments on commit 0853356

Please sign in to comment.