Skip to content

Commit ef1eb13

Browse files
authored
Merge pull request #40 from Grizzelbee/development
v1.3.5
2 parents 74e3dc0 + 07b21f6 commit ef1eb13

19 files changed

+1210
-1238
lines changed

.ncurc.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"upgrade": true,
3+
"reject": ["chai", "eslint"]
4+
}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2023 braindead1 <os.braindead1@gmail.com>, grizzelbee <open.source@hingsen.de>
3+
Copyright (c) 2024 braindead1 <os.braindead1@gmail.com>, grizzelbee <open.source@hingsen.de>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,27 @@ The mode of the lawn mower can be controlled by changing robonect.0.status.mode.
6161

6262
It is possible to control the extensions GPIO 1, GPIO 2, OUT 1 and OUT 2 of the Robonect module. Requirement is that the mode of the extension is configured as "API" via the Robonect Web-UI. If for example LEDs are connected to OUT1, it is possible to switch them on in the night and off in the morning by setting Robonect.0.extension.out1.status to "true" or "false".
6363

64+
## Known Issues:
65+
* To ensure the robonect is reachable - the adapter pings the device first before sending any requests.
66+
This ping may fail especially if ioBroker is installed in a container.
67+
It's not an issue with the adapter itself, but since it may happen, and it's pretty difficult to find a solution try
68+
executing `sudo chmod 4755 /bin/ping` in a shell inside the ioBroker container. This solution assumes that there is a
69+
permission issue between the iobroker user and the ping utility.
70+
6471
## Changelog
6572

6673
### Work in progress
67-
* Add timePickers to Admin UI for rest times as soon as they work properly
6874

75+
### 1.3.5 (2024-06-04)
76+
77+
* (grizzelbee) Upd: Dependencies got updated
78+
* (grizzelbee) Upd: Requires at least admin v6.13.16
79+
* (grizzelbee) Upd: Requires at least nodeJs v18.0.2
80+
* (grizzelbee) Upd: Updated translations
81+
* (grizzelbee) Upd: Reorganized Admin-UI
82+
* (grizzelbee) New: Added Ping-Option to admin
83+
84+
6985
### 1.3.4 (2023-10-10)
7086

7187
* (grizzelbee) Chg: massive code refactoring
@@ -229,7 +245,7 @@ It is possible to control the extensions GPIO 1, GPIO 2, OUT 1 and OUT 2 of the
229245

230246
The MIT License (MIT)
231247

232-
Copyright (c) 2020 braindead1
248+
Copyright (c) 2024 grizzelbee
233249

234250
Permission is hereby granted, free of charge, to any person obtaining a copy
235251
of this software and associated documentation files (the "Software"), to deal

admin/i18n/de/translations.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"Network": "Netzwerk",
3-
"Polling configuration": "Arten der Abfrage",
3+
"Ping device before polling": "Pinge das Gerät vor der Abfrage an",
4+
"Polling configuration": "Polling-Konfiguration",
5+
"Robonect device": "Robonect-Gerät",
46
"IP address_desc": "IP-Adresse oder Hostname Ihres Robonect",
57
"pushService_desc": "Nutzen Sie den Push-Service von Robonect. Erfordert zusätzliche Konfiguration in Ihrem Robonect.",
68
"batteryPollType_desc": "Abfragetyp für Batteriekonfigurationsdaten",
@@ -13,15 +15,15 @@
1315
"pushServicePort_desc": "Der Port, den dieser Adapter überwacht. Muss auch in Ihrem Robonect konfiguriert werden. Format: 192.168.x.x:55443",
1416
"gpsPollType_desc": "Abfragetyp für GPS-Konfigurationsdaten",
1517
"hoursPollType_desc": "Abfragetyp für Stundenkonfigurationsdaten",
16-
"Polling": "Abfrage",
18+
"Polling": "Intervalle der Polling-Typen für die Polling-Konfiguration",
1719
"motorPollType_desc": "Abfragetyp für Motorkonfigurationsdaten",
1820
"portalPollType_desc": "Abfragetyp für Portalkonfigurationsdaten",
1921
"pollTimeInfo_desc": "Intervall für Abfragetyp „Info“ (in Sekunden)",
2022
"pollTimeStatus_desc": "Intervall für Abfragetyp „Status“ (in Sekunden)",
2123
"pushPollType_desc": "Abfragetyp für Push-Konfigurationsdaten",
2224
"timerPollType_desc": "Abfragetyp für Timer-Konfigurationsdaten",
2325
"No polling times": "Ruhezeiten",
24-
"versionPollType_desc": "Abfragetyp für Versionskonfigurationsdaten",
26+
"versionPollType_desc": "Abfragetyp für Versionsinformationsdaten",
2527
"weatherPollType_desc": "Abfragetyp für Wetterkonfigurationsdaten",
2628
"restPeriodStart_desc": "Hier können Sie zwei Zeitfenster definieren, in denen keine Abfrage erfolgt. Hilft, die Belastung des ioBroker-Servers zu reduzieren. Beginn der Ruhezeit.",
2729
"wlanPollType_desc": "Abfragetyp für WLAN-Konfigurationsdaten",
@@ -30,7 +32,8 @@
3032
"pushService": "Push-Service",
3133
"batteryPollType": "Batterie",
3234
"doorPollType": "Garagentor",
33-
"Username": "Nutzername",
35+
"enabled": "ermöglicht",
36+
"Username": "Benutzername der Web-UI",
3437
"pushServiceIp": "Listener-IP-Adresse",
3538
"errorsPollType": "Fehler",
3639
"extensionPollType": "Erweiterungen",
@@ -40,20 +43,20 @@
4043
"hoursPollType": "Std",
4144
"motorPollType": "Motor",
4245
"portalPollType": "Portal",
43-
"pollTimeInfo": "Abfragetyp „Info“ (in Sekunden)",
46+
"pollTimeInfo": "Umfragetyp „Info“ (in Sekunden)",
4447
"pollTimeStatus": "Abfragetyp „Status“ (in Sekunden)",
45-
"pushPollType": "Push",
48+
"pushPollType": "Push-Service",
4649
"timerPollType": "Timer",
47-
"versionPollType": "Version",
50+
"versionPollType": "Versionsinformation",
4851
"weatherPollType": "Wetter",
4952
"wlanPollType": "WLAN",
50-
"No poll": "Keine Abfrage",
51-
"Status": "Status",
52-
"Info": "Die Info",
53-
"NoPoll": "Keine Abfrage",
5453
"restPeriod1Start": "Beginn der ersten Ruhezeit",
5554
"restPeriod2Start": "Beginn der zweiten Ruhezeit",
5655
"restPeriod1End": "Ende der ersten Ruhephase",
5756
"restPeriod2End": "Ende der zweiten Ruhephase",
57+
"No poll": "Keine Umfrage",
58+
"NoPoll": "Keine Umfrage",
59+
"Status": "Status",
60+
"Info": "Die Info",
5861
"GarageDoor": "Garagentor"
5962
}

admin/i18n/en/translations.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
{
22
"Network": "Network",
3-
"Polling configuration": "Types of polling",
3+
"Ping device before polling": "Ping device before polling",
4+
"Polling configuration": "polling configuration",
5+
"Robonect device": "Robonect device",
46
"IP address_desc": "IP Address or hostname of your Robonect",
5-
"pushService_desc": "Use the Push Service of Robonect. Requires additional configurationn in your Robonect.",
7+
"pushService_desc": "Use the Push Service of Robonect. Requires additional configuration in your Robonect.",
68
"batteryPollType_desc": "Polling type for battery config data",
79
"doorPollType_desc": "Polling type for door config data",
810
"Username_desc": "Username for the WebUI of your Robonect",
9-
"pushServiceIp_desc": "The IP address this adapter is listening to. Needs to configurted in your Robonect as well. Format: 192.168.x.x:55443",
11+
"pushServiceIp_desc": "The IP address this adapter is listening to. Needs to configured in your Robonect as well. Format: 192.168.x.x:55443",
1012
"errorsPollType_desc": "Polling type for errors config data",
1113
"extensionPollType_desc": "Polling type for extension config data",
1214
"password_desc": "Password for the WebUI of your Robonect. Avoid special and forbidden characters like '/', '#' and others in your password. It's better to use a pretty simple password or a long one without special characters.",
13-
"pushServicePort_desc": "The port this adapter is listening to. Needs to configurted in your Robonect as well. Format: 192.168.x.x:55443",
15+
"pushServicePort_desc": "The port this adapter is listening to. Needs to be configured in your Robonect as well. Format: 192.168.x.x:55443",
1416
"gpsPollType_desc": "Polling type for GPS config data",
1517
"hoursPollType_desc": "Polling type for hours config data",
16-
"Polling": "Polling",
18+
"Polling": "Intervalls of polling types used for polling configuration",
1719
"motorPollType_desc": "Polling type for motor config data",
1820
"portalPollType_desc": "Polling type for portal config data",
1921
"pollTimeInfo_desc": "Interval for polling type 'Info' (in seconds)",
2022
"pollTimeStatus_desc": "Interval for polling type 'Status' (in seconds)",
2123
"pushPollType_desc": "Polling type for push config data",
2224
"timerPollType_desc": "Polling type for timer config data",
2325
"No polling times": "Rest periods",
24-
"versionPollType_desc": "Polling type for version config data",
26+
"versionPollType_desc": "Polling type for version information data",
2527
"weatherPollType_desc": "Polling type for weather config data",
2628
"restPeriodStart_desc": "Here you may define 2 time slots where no polling is done. Helps to reduce load on ioBroker server. Start of rest period.",
2729
"wlanPollType_desc": "Polling type for WLAN config data",
@@ -30,7 +32,8 @@
3032
"pushService": "Push-Service",
3133
"batteryPollType": "Battery",
3234
"doorPollType": "Garage door",
33-
"Username": "Username",
35+
"enabled": "enabled",
36+
"Username": "Web-UI username",
3437
"pushServiceIp": "Listener IP address",
3538
"errorsPollType": "Errors",
3639
"extensionPollType": "Extensions",
@@ -42,17 +45,17 @@
4245
"portalPollType": "Portal",
4346
"pollTimeInfo": "Polling type 'Info' (in seconds)",
4447
"pollTimeStatus": "Polling type 'Status' (in seconds)",
45-
"pushPollType": "Push",
48+
"pushPollType": "Push-Service",
4649
"timerPollType": "Timer",
47-
"versionPollType": "Version",
50+
"versionPollType": "Version information",
4851
"weatherPollType": "Weather",
4952
"wlanPollType": "WLAN",
5053
"restPeriod1Start": "Start of first rest period",
5154
"restPeriod2Start": "Start of second rest period",
5255
"restPeriod1End": "End of rest first period",
5356
"restPeriod2End": "End of rest second period",
54-
"No poll": "No poll",
55-
"NoPoll": "No poll",
57+
"No poll": "No polling",
58+
"NoPoll": "No polling",
5659
"Status": "Status",
5760
"Info": "Info",
5861
"GarageDoor":"Garage door"

admin/i18n/es/translations.json

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,62 @@
11
{
22
"Network": "Red",
3-
"Polling configuration": "Tipos de encuestas",
3+
"Ping device before polling": "Dispositivo de ping antes de sondear",
4+
"Polling configuration": "configuración de sondeo",
5+
"Robonect device": "Dispositivo Robonect",
46
"IP address_desc": "Dirección IP o nombre de host de su Robonect",
5-
"pushService_desc": "Utilice el Servicio Push de Robonect. Requiere configuración adicional en su Robonect.",
6-
"batteryPollType_desc": "Tipo de sondeo para datos de configuración de batería",
7+
"pushService_desc": "Utilice el servicio Push de Robonect. Requiere configuración adicional en su Robonect.",
8+
"batteryPollType_desc": "Tipo de sondeo para datos de configuración de la batería",
79
"doorPollType_desc": "Tipo de sondeo para datos de configuración de puerta",
810
"Username_desc": "Nombre de usuario para la WebUI de su Robonect",
9-
"pushServiceIp_desc": "La dirección IP que escucha este adaptador. También debe configurarse en su Robonect. Formato: 192.168.x.x:55443",
11+
"pushServiceIp_desc": "La dirección IP que escucha este adaptador. También debe configurarse en su Robonect. Formato: 192.168.xx:55443",
1012
"errorsPollType_desc": "Tipo de sondeo para datos de configuración de errores",
1113
"extensionPollType_desc": "Tipo de sondeo para datos de configuración de extensión",
12-
"password_desc": "Contraseña para la WebUI de su Robonect. Evite caracteres especiales y prohibidos como '/', '#' y otros en su contraseña. Es mejor usar una contraseña bastante simple o una larga sin caracteres especiales.",
13-
"pushServicePort_desc": "El puerto que escucha este adaptador. También debe configurarse en su Robonect. Formato: 192.168.x.x:55443",
14+
"password_desc": "Contraseña para la WebUI de tu Robonect. Evite caracteres especiales y prohibidos como '/', '#' y otros en su contraseña. Es mejor utilizar una contraseña bastante sencilla o una larga sin caracteres especiales.",
15+
"pushServicePort_desc": "El puerto que escucha este adaptador. También debe configurarse en su Robonect. Formato: 192.168.xx:55443",
1416
"gpsPollType_desc": "Tipo de sondeo para datos de configuración de GPS",
1517
"hoursPollType_desc": "Tipo de sondeo para datos de configuración de horas",
16-
"Polling": "Votación",
18+
"Polling": "Intervalos de tipos de sondeo utilizados para la configuración de sondeo",
1719
"motorPollType_desc": "Tipo de sondeo para datos de configuración del motor",
1820
"portalPollType_desc": "Tipo de sondeo para datos de configuración del portal",
1921
"pollTimeInfo_desc": "Intervalo para el tipo de sondeo 'Info' (en segundos)",
2022
"pollTimeStatus_desc": "Intervalo para el tipo de sondeo 'Estado' (en segundos)",
2123
"pushPollType_desc": "Tipo de sondeo para datos de configuración push",
2224
"timerPollType_desc": "Tipo de sondeo para datos de configuración del temporizador",
23-
"No polling times": "Períodos de descanso",
24-
"versionPollType_desc": "Tipo de sondeo para datos de configuración de versión",
25+
"No polling times": "Periodos de descanso",
26+
"versionPollType_desc": "Tipo de sondeo para datos de información de versión",
2527
"weatherPollType_desc": "Tipo de sondeo para datos de configuración meteorológica",
26-
"restPeriodStart_desc": "Aquí puede definir 2 intervalos de tiempo en los que no se realizan sondeos. Ayuda a reducir la carga en el servidor ioBroker. Inicio del período de descanso.",
28+
"restPeriodStart_desc": "Aquí puede definir 2 franjas horarias en las que no se realiza ninguna encuesta. Ayuda a reducir la carga en el servidor ioBroker. Inicio del periodo de descanso.",
2729
"wlanPollType_desc": "Tipo de sondeo para datos de configuración de WLAN",
28-
"restPeriodEnd_desc": "Fin del período de descanso.",
30+
"restPeriodEnd_desc": "Fin del periodo de descanso.",
2931
"IP address": "Dirección IP o nombre de host/FQDN",
30-
"pushService": "Utilice el Servicio Push",
32+
"pushService": "Servicio de envio",
3133
"batteryPollType": "Batería",
3234
"doorPollType": "Puerta de la cochera",
33-
"Username": "Nombre de usuario",
35+
"enabled": "activado",
36+
"Username": "Nombre de usuario de la interfaz de usuario web",
3437
"pushServiceIp": "Dirección IP del oyente",
35-
"errorsPollType": "errores",
36-
"extensionPollType": "Extensión",
37-
"password": "Contraseña de interfaz de usuario web.",
38-
"pushServicePort": "puerto de escucha",
38+
"errorsPollType": "Errores",
39+
"extensionPollType": "Extensiones",
40+
"password": "Contraseña de la interfaz de usuario web.",
41+
"pushServicePort": "Puerto de escucha",
3942
"gpsPollType": "GPS",
4043
"hoursPollType": "Horas",
4144
"motorPollType": "Motor",
4245
"portalPollType": "Portal",
43-
"pollTimeInfo": "Tipo de sondeo 'Info' (en segundos)",
46+
"pollTimeInfo": "Tipo de sondeo 'Información' (en segundos)",
4447
"pollTimeStatus": "Tipo de sondeo 'Estado' (en segundos)",
45-
"pushPollType": "Empujar",
48+
"pushPollType": "Servicio de envio",
4649
"timerPollType": "Temporizador",
47-
"versionPollType": "Versión",
50+
"versionPollType": "Información de versión",
4851
"weatherPollType": "Clima",
4952
"wlanPollType": "WiFi",
50-
"restPeriod1Start": "Comienzo del descanso 1",
51-
"restPeriod2Start": "Inicio del descanso 2",
52-
"restPeriod1End": "Fin del período de descanso 1",
53-
"restPeriod2End": "Fin del período de descanso 2",
54-
"No poll": "Sin encuesta",
53+
"restPeriod1Start": "Inicio del primer periodo de descanso",
54+
"restPeriod2Start": "Inicio del segundo periodo de descanso",
55+
"restPeriod1End": "Fin del descanso primer periodo",
56+
"restPeriod2End": "Fin del descanso segundo tiempo",
57+
"No poll": "Sin encuestas",
58+
"NoPoll": "Sin encuestas",
5559
"Status": "Estado",
5660
"Info": "Información",
57-
"NoPoll": "Sin encuesta",
5861
"GarageDoor": "Puerta de la cochera"
5962
}

0 commit comments

Comments
 (0)