Skip to content

Commit

Permalink
Merge pull request #40 from Grizzelbee/development
Browse files Browse the repository at this point in the history
v1.3.5
  • Loading branch information
Grizzelbee authored Jun 4, 2024
2 parents 74e3dc0 + 07b21f6 commit ef1eb13
Show file tree
Hide file tree
Showing 19 changed files with 1,210 additions and 1,238 deletions.
4 changes: 4 additions & 0 deletions .ncurc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"upgrade": true,
"reject": ["chai", "eslint"]
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2023 braindead1 <[email protected]>, grizzelbee <[email protected]>
Copyright (c) 2024 braindead1 <[email protected]>, grizzelbee <[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
20 changes: 18 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,27 @@ The mode of the lawn mower can be controlled by changing robonect.0.status.mode.

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".

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

## Changelog

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

### 1.3.5 (2024-06-04)

* (grizzelbee) Upd: Dependencies got updated
* (grizzelbee) Upd: Requires at least admin v6.13.16
* (grizzelbee) Upd: Requires at least nodeJs v18.0.2
* (grizzelbee) Upd: Updated translations
* (grizzelbee) Upd: Reorganized Admin-UI
* (grizzelbee) New: Added Ping-Option to admin


### 1.3.4 (2023-10-10)

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

The MIT License (MIT)

Copyright (c) 2020 braindead1
Copyright (c) 2024 grizzelbee

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
25 changes: 14 additions & 11 deletions admin/i18n/de/translations.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"Network": "Netzwerk",
"Polling configuration": "Arten der Abfrage",
"Ping device before polling": "Pinge das Gerät vor der Abfrage an",
"Polling configuration": "Polling-Konfiguration",
"Robonect device": "Robonect-Gerät",
"IP address_desc": "IP-Adresse oder Hostname Ihres Robonect",
"pushService_desc": "Nutzen Sie den Push-Service von Robonect. Erfordert zusätzliche Konfiguration in Ihrem Robonect.",
"batteryPollType_desc": "Abfragetyp für Batteriekonfigurationsdaten",
Expand All @@ -13,15 +15,15 @@
"pushServicePort_desc": "Der Port, den dieser Adapter überwacht. Muss auch in Ihrem Robonect konfiguriert werden. Format: 192.168.x.x:55443",
"gpsPollType_desc": "Abfragetyp für GPS-Konfigurationsdaten",
"hoursPollType_desc": "Abfragetyp für Stundenkonfigurationsdaten",
"Polling": "Abfrage",
"Polling": "Intervalle der Polling-Typen für die Polling-Konfiguration",
"motorPollType_desc": "Abfragetyp für Motorkonfigurationsdaten",
"portalPollType_desc": "Abfragetyp für Portalkonfigurationsdaten",
"pollTimeInfo_desc": "Intervall für Abfragetyp „Info“ (in Sekunden)",
"pollTimeStatus_desc": "Intervall für Abfragetyp „Status“ (in Sekunden)",
"pushPollType_desc": "Abfragetyp für Push-Konfigurationsdaten",
"timerPollType_desc": "Abfragetyp für Timer-Konfigurationsdaten",
"No polling times": "Ruhezeiten",
"versionPollType_desc": "Abfragetyp für Versionskonfigurationsdaten",
"versionPollType_desc": "Abfragetyp für Versionsinformationsdaten",
"weatherPollType_desc": "Abfragetyp für Wetterkonfigurationsdaten",
"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.",
"wlanPollType_desc": "Abfragetyp für WLAN-Konfigurationsdaten",
Expand All @@ -30,7 +32,8 @@
"pushService": "Push-Service",
"batteryPollType": "Batterie",
"doorPollType": "Garagentor",
"Username": "Nutzername",
"enabled": "ermöglicht",
"Username": "Benutzername der Web-UI",
"pushServiceIp": "Listener-IP-Adresse",
"errorsPollType": "Fehler",
"extensionPollType": "Erweiterungen",
Expand All @@ -40,20 +43,20 @@
"hoursPollType": "Std",
"motorPollType": "Motor",
"portalPollType": "Portal",
"pollTimeInfo": "Abfragetyp „Info“ (in Sekunden)",
"pollTimeInfo": "Umfragetyp „Info“ (in Sekunden)",
"pollTimeStatus": "Abfragetyp „Status“ (in Sekunden)",
"pushPollType": "Push",
"pushPollType": "Push-Service",
"timerPollType": "Timer",
"versionPollType": "Version",
"versionPollType": "Versionsinformation",
"weatherPollType": "Wetter",
"wlanPollType": "WLAN",
"No poll": "Keine Abfrage",
"Status": "Status",
"Info": "Die Info",
"NoPoll": "Keine Abfrage",
"restPeriod1Start": "Beginn der ersten Ruhezeit",
"restPeriod2Start": "Beginn der zweiten Ruhezeit",
"restPeriod1End": "Ende der ersten Ruhephase",
"restPeriod2End": "Ende der zweiten Ruhephase",
"No poll": "Keine Umfrage",
"NoPoll": "Keine Umfrage",
"Status": "Status",
"Info": "Die Info",
"GarageDoor": "Garagentor"
}
25 changes: 14 additions & 11 deletions admin/i18n/en/translations.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
{
"Network": "Network",
"Polling configuration": "Types of polling",
"Ping device before polling": "Ping device before polling",
"Polling configuration": "polling configuration",
"Robonect device": "Robonect device",
"IP address_desc": "IP Address or hostname of your Robonect",
"pushService_desc": "Use the Push Service of Robonect. Requires additional configurationn in your Robonect.",
"pushService_desc": "Use the Push Service of Robonect. Requires additional configuration in your Robonect.",
"batteryPollType_desc": "Polling type for battery config data",
"doorPollType_desc": "Polling type for door config data",
"Username_desc": "Username for the WebUI of your Robonect",
"pushServiceIp_desc": "The IP address this adapter is listening to. Needs to configurted in your Robonect as well. Format: 192.168.x.x:55443",
"pushServiceIp_desc": "The IP address this adapter is listening to. Needs to configured in your Robonect as well. Format: 192.168.x.x:55443",
"errorsPollType_desc": "Polling type for errors config data",
"extensionPollType_desc": "Polling type for extension config data",
"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.",
"pushServicePort_desc": "The port this adapter is listening to. Needs to configurted in your Robonect as well. Format: 192.168.x.x:55443",
"pushServicePort_desc": "The port this adapter is listening to. Needs to be configured in your Robonect as well. Format: 192.168.x.x:55443",
"gpsPollType_desc": "Polling type for GPS config data",
"hoursPollType_desc": "Polling type for hours config data",
"Polling": "Polling",
"Polling": "Intervalls of polling types used for polling configuration",
"motorPollType_desc": "Polling type for motor config data",
"portalPollType_desc": "Polling type for portal config data",
"pollTimeInfo_desc": "Interval for polling type 'Info' (in seconds)",
"pollTimeStatus_desc": "Interval for polling type 'Status' (in seconds)",
"pushPollType_desc": "Polling type for push config data",
"timerPollType_desc": "Polling type for timer config data",
"No polling times": "Rest periods",
"versionPollType_desc": "Polling type for version config data",
"versionPollType_desc": "Polling type for version information data",
"weatherPollType_desc": "Polling type for weather config data",
"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.",
"wlanPollType_desc": "Polling type for WLAN config data",
Expand All @@ -30,7 +32,8 @@
"pushService": "Push-Service",
"batteryPollType": "Battery",
"doorPollType": "Garage door",
"Username": "Username",
"enabled": "enabled",
"Username": "Web-UI username",
"pushServiceIp": "Listener IP address",
"errorsPollType": "Errors",
"extensionPollType": "Extensions",
Expand All @@ -42,17 +45,17 @@
"portalPollType": "Portal",
"pollTimeInfo": "Polling type 'Info' (in seconds)",
"pollTimeStatus": "Polling type 'Status' (in seconds)",
"pushPollType": "Push",
"pushPollType": "Push-Service",
"timerPollType": "Timer",
"versionPollType": "Version",
"versionPollType": "Version information",
"weatherPollType": "Weather",
"wlanPollType": "WLAN",
"restPeriod1Start": "Start of first rest period",
"restPeriod2Start": "Start of second rest period",
"restPeriod1End": "End of rest first period",
"restPeriod2End": "End of rest second period",
"No poll": "No poll",
"NoPoll": "No poll",
"No poll": "No polling",
"NoPoll": "No polling",
"Status": "Status",
"Info": "Info",
"GarageDoor":"Garage door"
Expand Down
55 changes: 29 additions & 26 deletions admin/i18n/es/translations.json
Original file line number Diff line number Diff line change
@@ -1,59 +1,62 @@
{
"Network": "Red",
"Polling configuration": "Tipos de encuestas",
"Ping device before polling": "Dispositivo de ping antes de sondear",
"Polling configuration": "configuración de sondeo",
"Robonect device": "Dispositivo Robonect",
"IP address_desc": "Dirección IP o nombre de host de su Robonect",
"pushService_desc": "Utilice el Servicio Push de Robonect. Requiere configuración adicional en su Robonect.",
"batteryPollType_desc": "Tipo de sondeo para datos de configuración de batería",
"pushService_desc": "Utilice el servicio Push de Robonect. Requiere configuración adicional en su Robonect.",
"batteryPollType_desc": "Tipo de sondeo para datos de configuración de la batería",
"doorPollType_desc": "Tipo de sondeo para datos de configuración de puerta",
"Username_desc": "Nombre de usuario para la WebUI de su Robonect",
"pushServiceIp_desc": "La dirección IP que escucha este adaptador. También debe configurarse en su Robonect. Formato: 192.168.x.x:55443",
"pushServiceIp_desc": "La dirección IP que escucha este adaptador. También debe configurarse en su Robonect. Formato: 192.168.xx:55443",
"errorsPollType_desc": "Tipo de sondeo para datos de configuración de errores",
"extensionPollType_desc": "Tipo de sondeo para datos de configuración de extensión",
"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.",
"pushServicePort_desc": "El puerto que escucha este adaptador. También debe configurarse en su Robonect. Formato: 192.168.x.x:55443",
"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.",
"pushServicePort_desc": "El puerto que escucha este adaptador. También debe configurarse en su Robonect. Formato: 192.168.xx:55443",
"gpsPollType_desc": "Tipo de sondeo para datos de configuración de GPS",
"hoursPollType_desc": "Tipo de sondeo para datos de configuración de horas",
"Polling": "Votación",
"Polling": "Intervalos de tipos de sondeo utilizados para la configuración de sondeo",
"motorPollType_desc": "Tipo de sondeo para datos de configuración del motor",
"portalPollType_desc": "Tipo de sondeo para datos de configuración del portal",
"pollTimeInfo_desc": "Intervalo para el tipo de sondeo 'Info' (en segundos)",
"pollTimeStatus_desc": "Intervalo para el tipo de sondeo 'Estado' (en segundos)",
"pushPollType_desc": "Tipo de sondeo para datos de configuración push",
"timerPollType_desc": "Tipo de sondeo para datos de configuración del temporizador",
"No polling times": "Períodos de descanso",
"versionPollType_desc": "Tipo de sondeo para datos de configuración de versión",
"No polling times": "Periodos de descanso",
"versionPollType_desc": "Tipo de sondeo para datos de información de versión",
"weatherPollType_desc": "Tipo de sondeo para datos de configuración meteorológica",
"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.",
"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.",
"wlanPollType_desc": "Tipo de sondeo para datos de configuración de WLAN",
"restPeriodEnd_desc": "Fin del período de descanso.",
"restPeriodEnd_desc": "Fin del periodo de descanso.",
"IP address": "Dirección IP o nombre de host/FQDN",
"pushService": "Utilice el Servicio Push",
"pushService": "Servicio de envio",
"batteryPollType": "Batería",
"doorPollType": "Puerta de la cochera",
"Username": "Nombre de usuario",
"enabled": "activado",
"Username": "Nombre de usuario de la interfaz de usuario web",
"pushServiceIp": "Dirección IP del oyente",
"errorsPollType": "errores",
"extensionPollType": "Extensión",
"password": "Contraseña de interfaz de usuario web.",
"pushServicePort": "puerto de escucha",
"errorsPollType": "Errores",
"extensionPollType": "Extensiones",
"password": "Contraseña de la interfaz de usuario web.",
"pushServicePort": "Puerto de escucha",
"gpsPollType": "GPS",
"hoursPollType": "Horas",
"motorPollType": "Motor",
"portalPollType": "Portal",
"pollTimeInfo": "Tipo de sondeo 'Info' (en segundos)",
"pollTimeInfo": "Tipo de sondeo 'Información' (en segundos)",
"pollTimeStatus": "Tipo de sondeo 'Estado' (en segundos)",
"pushPollType": "Empujar",
"pushPollType": "Servicio de envio",
"timerPollType": "Temporizador",
"versionPollType": "Versión",
"versionPollType": "Información de versión",
"weatherPollType": "Clima",
"wlanPollType": "WiFi",
"restPeriod1Start": "Comienzo del descanso 1",
"restPeriod2Start": "Inicio del descanso 2",
"restPeriod1End": "Fin del período de descanso 1",
"restPeriod2End": "Fin del período de descanso 2",
"No poll": "Sin encuesta",
"restPeriod1Start": "Inicio del primer periodo de descanso",
"restPeriod2Start": "Inicio del segundo periodo de descanso",
"restPeriod1End": "Fin del descanso primer periodo",
"restPeriod2End": "Fin del descanso segundo tiempo",
"No poll": "Sin encuestas",
"NoPoll": "Sin encuestas",
"Status": "Estado",
"Info": "Información",
"NoPoll": "Sin encuesta",
"GarageDoor": "Puerta de la cochera"
}
Loading

0 comments on commit ef1eb13

Please sign in to comment.