Skip to content

Commit bc176c6

Browse files
authored
Merge pull request #71 from walli545/dev
Release 2.1.0
2 parents 7a96938 + 4c7ac39 commit bc176c6

File tree

98 files changed

+2802
-894
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+2802
-894
lines changed

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
[![NPM version](http://img.shields.io/npm/v/iobroker.time-switch.svg)](https://www.npmjs.com/package/iobroker.time-switch)
55
[![Downloads](https://img.shields.io/npm/dm/iobroker.time-switch.svg)](https://www.npmjs.com/package/iobroker.time-switch)
6+
[![Installs](https://camo.githubusercontent.com/5d62363be94ae20ae8302ef5dc2f3c533268742d/687474703a2f2f696f62726f6b65722e6c6976652f6261646765732f74696d652d7377697463682d696e7374616c6c65642e737667)]()
67
[![Dependency Status](https://img.shields.io/david/walli545/iobroker.time-switch.svg)](https://david-dm.org/walli545/iobroker.time-switch)
78
[![Known Vulnerabilities](https://snyk.io/test/github/walli545/ioBroker.time-switch/badge.svg)](https://snyk.io/test/github/walli545/ioBroker.time-switch)
89
[![Travis-CI](http://img.shields.io/travis/walli545/ioBroker.time-switch/master.svg)](https://travis-ci.org/walli545/ioBroker.time-switch)
@@ -16,7 +17,8 @@
1617
This adapter allows the user to switch devices on and off using time schedules.
1718
The schedules can be fully configured by a vis widget.
1819
One schedule switches one or more ioBroker states and consists of one or more triggers that define when and how the state should be switched.
19-
It is possible to configure at which time and on which weekdays the trigger should be triggered. There can be custom on/off values also.
20+
It is possible to configure at which time and on which weekdays the trigger should be triggered. Astro triggers can also be created.
21+
There can be custom on/off values also.
2022
In the widget the schedule can be disabled temporarily and the switched state can be controlled manually.
2123

2224
![Preview](widgets/time-switch/img/prev/prev-device-schedule.jpg)
@@ -34,6 +36,13 @@ For setup instructions visit the [wiki](https://github.com/walli545/ioBroker.tim
3436

3537
## Changelog
3638

39+
### 2.1.0
40+
* (walli545)
41+
* Added astro triggers which can trigger on sunrise, noon, sunset with +- 120 min offset (#30)
42+
* Added custom styling via css custom properties
43+
* Fixed a bug which lead to undefined button behaviour when the widget is used together with material design theme by Uhula (#62)
44+
* Changed state listening to be a be ack based and removed unused on object change listener (#6)
45+
3746
### 2.0.0
3847
**Attention**: Due to breaking changes in the schedule data structure, schedules created with versions 1.x are not compatible with 2.x.
3948

admin/i18n/de/translations.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"Thursday": "Donnerstag",
88
"Tuesday": "Dienstag",
99
"Wednesday": "Mittwoch",
10+
"addAstroTrigger": "Astro Trigger",
11+
"addTimeTrigger": "Time trigger",
1012
"addTrigger": "Auslöser hinzufügen",
1113
"allOff": "Alle aus",
1214
"allOn": "Alle an",
@@ -19,6 +21,8 @@
1921
"editTrigger": "Auslöser bearbeiten",
2022
"enabled": "Aktiv",
2123
"false": "nein",
24+
"inputAstroTime": "Astrozeit:",
25+
"inputShiftInMinutes": "Verschoben um (in Minuten):",
2226
"manualSwitching": "Manuelles Schalten",
2327
"name": "Name",
2428
"needToEnterValidNumberOff": "Geben Sie eine gültige Zahl als Aus-Wert ein, wenn Typ Zahl ist!",
@@ -39,14 +43,18 @@
3943
"scheduleId": "Schaltplandaten Id",
4044
"showId": "Anzeigen des geschaltenen States",
4145
"showManualSwitch": "Anzeigen der manuellen Schalter",
46+
"solarNoon": "Mittag",
4247
"stateId": "Id vom geschaltenen State",
4348
"statesCount": "Anzahl geschaltener States",
4449
"string": "Zeichenkette",
50+
"sunrise": "Sonnenaufgang",
51+
"sunset": "Sonnenuntergang",
4552
"switchedType": "Geschaltener Datentyp",
46-
"switchedValue": "Geschalteter Wert",
53+
"switchedValue": "Geschaltener Wert",
4754
"time-switch adapter settings": "Adaptereinstellungen für time-switch",
4855
"trigger": "Auslöser",
4956
"trigger count": "Anzahl Auslöser",
5057
"true": "ja",
58+
"useAstroIcons": "Astro Icons verwenden",
5159
"valueType": "Werttyp"
5260
}

admin/i18n/en/translations.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"Thursday": "Thursday",
88
"Tuesday": "Tuesday",
99
"Wednesday": "Wednesday",
10+
"addAstroTrigger": "Astro trigger",
11+
"addTimeTrigger": "Time trigger",
1012
"addTrigger": "Add trigger",
1113
"allOff": "All off",
1214
"allOn": "All on",
@@ -19,6 +21,8 @@
1921
"editTrigger": "Edit trigger",
2022
"enabled": "Enabled",
2123
"false": "false",
24+
"inputAstroTime": "Astro time: ",
25+
"inputShiftInMinutes": "Shift in minutes:",
2226
"manualSwitching": "Manual switching",
2327
"name": "Name",
2428
"needToEnterValidNumberOff": "Enter a valid number for switched off value when type is number!",
@@ -39,14 +43,18 @@
3943
"scheduleId": "Schedule data id",
4044
"showId": "Show switched state id",
4145
"showManualSwitch": "Show manual switch",
46+
"solarNoon": "Noon",
4247
"stateId": "Switched state id",
4348
"statesCount": "Count of switched states",
4449
"string": "string",
50+
"sunrise": "Sunrise",
51+
"sunset": "Sunset",
4552
"switchedType": "Switched type",
4653
"switchedValue": "Switched value",
4754
"time-switch adapter settings": "Adapter settings for time-switch",
4855
"trigger": "Trigger",
4956
"trigger count": "Trigger count",
5057
"true": "true",
58+
"useAstroIcons": "Use astro icons",
5159
"valueType": "Value type"
5260
}

admin/i18n/es/translations.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"Thursday": "jueves",
88
"Tuesday": "martes",
99
"Wednesday": "miércoles",
10+
"addAstroTrigger": "Astro gatillo",
11+
"addTimeTrigger": "Disparador de tiempo",
1012
"addTrigger": "Agregar disparador",
1113
"allOff": "Todo apagado",
1214
"allOn": "Todo en",
@@ -19,6 +21,8 @@
1921
"editTrigger": "Editar disparador",
2022
"enabled": "Habilitado",
2123
"false": "falso",
24+
"inputAstroTime": "Tiempo astro:",
25+
"inputShiftInMinutes": "Turno en minutos:",
2226
"manualSwitching": "Cambio manual",
2327
"name": "Nombre",
2428
"needToEnterValidNumberOff": "¡Ingrese un número válido para el valor apagado cuando type es number!",
@@ -39,14 +43,18 @@
3943
"scheduleId": "Programar ID de datos",
4044
"showId": "Mostrar ID de estado cambiado",
4145
"showManualSwitch": "Mostrar interruptor manual",
46+
"solarNoon": "Mediodía",
4247
"stateId": "ID de estado conmutado",
4348
"statesCount": "Conteo de estados conmutados",
4449
"string": "cuerda",
50+
"sunrise": "amanecer",
51+
"sunset": "Puesta de sol",
4552
"switchedType": "Tipo conmutado",
4653
"switchedValue": "Valor conmutado",
4754
"time-switch adapter settings": "Ajustes del adaptador para time-switch",
4855
"trigger": "Desencadenar",
4956
"trigger count": "Recuento de disparadores",
5057
"true": "cierto",
58+
"useAstroIcons": "Usar íconos astro",
5159
"valueType": "Tipo de valor"
5260
}

admin/i18n/fr/translations.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"Thursday": "Jeudi",
88
"Tuesday": "Mardi",
99
"Wednesday": "Mercredi",
10+
"addAstroTrigger": "Déclenchement astro",
11+
"addTimeTrigger": "Déclencheur temporel",
1012
"addTrigger": "Ajouter un déclencheur",
1113
"allOff": "Tout éteint",
1214
"allOn": "Tout sur",
@@ -19,6 +21,8 @@
1921
"editTrigger": "Modifier le déclencheur",
2022
"enabled": "Activée",
2123
"false": "faux",
24+
"inputAstroTime": "Heure Astro:",
25+
"inputShiftInMinutes": "Décalage en minutes:",
2226
"manualSwitching": "Commutation manuelle",
2327
"name": "Nom",
2428
"needToEnterValidNumberOff": "Entrez un nombre valide pour la valeur désactivée lorsque le type est un nombre!",
@@ -39,14 +43,18 @@
3943
"scheduleId": "Planifier l'identifiant des données",
4044
"showId": "Afficher l'ID de l'état commuté",
4145
"showManualSwitch": "Afficher le commutateur manuel",
46+
"solarNoon": "Le midi",
4247
"stateId": "Identifiant d'état commuté",
4348
"statesCount": "Nombre d'états commutés",
4449
"string": "chaîne",
50+
"sunrise": "lever du soleil",
51+
"sunset": "Le coucher du soleil",
4552
"switchedType": "Type commuté",
4653
"switchedValue": "Valeur commutée",
4754
"time-switch adapter settings": "Paramètres d'adaptateur pour time-switch",
4855
"trigger": "Déclencheur",
4956
"trigger count": "Nombre de déclencheurs",
5057
"true": "vrai",
58+
"useAstroIcons": "Utiliser des icônes astro",
5159
"valueType": "Type de valeur"
5260
}

admin/i18n/it/translations.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"Thursday": "giovedi",
88
"Tuesday": "martedì",
99
"Wednesday": "mercoledì",
10+
"addAstroTrigger": "Astro trigger",
11+
"addTimeTrigger": "Innesco temporale",
1012
"addTrigger": "Aggiungi trigger",
1113
"allOff": "Tutto fuori",
1214
"allOn": "Tutto acceso",
@@ -19,6 +21,8 @@
1921
"editTrigger": "Modifica trigger",
2022
"enabled": "Abilitato",
2123
"false": "falso",
24+
"inputAstroTime": "Tempo di Astro:",
25+
"inputShiftInMinutes": "Spostamento in pochi minuti:",
2226
"manualSwitching": "Commutazione manuale",
2327
"name": "Nome",
2428
"needToEnterValidNumberOff": "Inserisci un numero valido per il valore disattivato quando type è number!",
@@ -39,14 +43,18 @@
3943
"scheduleId": "Pianifica ID dati",
4044
"showId": "Mostra ID stato commutato",
4145
"showManualSwitch": "Mostra interruttore manuale",
46+
"solarNoon": "Mezzogiorno",
4247
"stateId": "ID stato commutato",
4348
"statesCount": "Conteggio degli stati commutati",
4449
"string": "corda",
50+
"sunrise": "Alba",
51+
"sunset": "Tramonto",
4552
"switchedType": "Tipo commutato",
4653
"switchedValue": "Valore commutato",
4754
"time-switch adapter settings": "Impostazioni dell'adattatore per time-switch",
4855
"trigger": "grilletto",
4956
"trigger count": "Conteggio dei trigger",
5057
"true": "vero",
58+
"useAstroIcons": "Usa le icone astro",
5159
"valueType": "Tipo di valore"
5260
}

admin/i18n/nl/translations.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"Thursday": "donderdag",
88
"Tuesday": "dinsdag",
99
"Wednesday": "woensdag",
10+
"addAstroTrigger": "Astro-trigger",
11+
"addTimeTrigger": "Tijd trigger",
1012
"addTrigger": "Trigger toevoegen",
1113
"allOff": "Allemaal uit",
1214
"allOn": "Allemaal aan",
@@ -19,6 +21,8 @@
1921
"editTrigger": "Trigger bewerken",
2022
"enabled": "Ingeschakeld",
2123
"false": "false",
24+
"inputAstroTime": "Astrotijd:",
25+
"inputShiftInMinutes": "Verschuiving in minuten:",
2226
"manualSwitching": "Handmatig schakelen",
2327
"name": "Naam",
2428
"needToEnterValidNumberOff": "Voer een geldig nummer in voor uitgeschakelde waarde als type nummer is!",
@@ -39,14 +43,18 @@
3943
"scheduleId": "Plan gegevens-ID",
4044
"showId": "Toon geschakelde status-ID",
4145
"showManualSwitch": "Handmatige schakelaar weergeven",
46+
"solarNoon": "Middag",
4247
"stateId": "Geschakelde status-ID",
4348
"statesCount": "Telling van geschakelde staten",
4449
"string": "draad",
50+
"sunrise": "zonsopkomst",
51+
"sunset": "Zonsondergang",
4552
"switchedType": "Geschakeld type",
4653
"switchedValue": "Geschakelde waarde",
4754
"time-switch adapter settings": "Adapterinstellingen voor time-switch",
4855
"trigger": "In gang zetten",
4956
"trigger count": "Aantal triggers",
5057
"true": "waar",
58+
"useAstroIcons": "Gebruik astropictogrammen",
5159
"valueType": "Waarde type"
5260
}

admin/i18n/pl/translations.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"Thursday": "czwartek",
88
"Tuesday": "wtorek",
99
"Wednesday": "środa",
10+
"addAstroTrigger": "Spust Astro",
11+
"addTimeTrigger": "Wyzwalacz czasowy",
1012
"addTrigger": "Dodaj wyzwalacz",
1113
"allOff": "Wszystko wyłączone",
1214
"allOn": "Wszystko włączone",
@@ -19,6 +21,8 @@
1921
"editTrigger": "Edytuj wyzwalacz",
2022
"enabled": "Włączone",
2123
"false": "fałszywe",
24+
"inputAstroTime": "Czas Astro:",
25+
"inputShiftInMinutes": "Zmiana w minutach:",
2226
"manualSwitching": "Przełączanie ręczne",
2327
"name": "Imię",
2428
"needToEnterValidNumberOff": "Wprowadź poprawny numer wyłączonej wartości, gdy typ jest liczbą!",
@@ -39,14 +43,18 @@
3943
"scheduleId": "Zaplanuj identyfikator danych",
4044
"showId": "Pokaż identyfikator stanu przełączonego",
4145
"showManualSwitch": "Pokaż przełącznik ręczny",
46+
"solarNoon": "Południe",
4247
"stateId": "Identyfikator stanu przełączonego",
4348
"statesCount": "Liczba przełączanych stanów",
4449
"string": "strunowy",
50+
"sunrise": "wschód słońca",
51+
"sunset": "Zachód słońca",
4552
"switchedType": "Typ przełączany",
4653
"switchedValue": "Wartość przełączana",
4754
"time-switch adapter settings": "Ustawienia adaptera dla time-switch",
4855
"trigger": "Wyzwalacz",
4956
"trigger count": "Liczba wyzwalaczy",
5057
"true": "prawdziwe",
58+
"useAstroIcons": "Użyj ikon astro",
5159
"valueType": "Typ wartości"
5260
}

admin/i18n/pt/translations.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"Thursday": "Quinta-feira",
88
"Tuesday": "terça",
99
"Wednesday": "Quarta-feira",
10+
"addAstroTrigger": "Astro trigger",
11+
"addTimeTrigger": "Gatilho de tempo",
1012
"addTrigger": "Adicionar gatilho",
1113
"allOff": "Tudo desligado",
1214
"allOn": "Tudo em cima",
@@ -19,6 +21,8 @@
1921
"editTrigger": "Editar gatilho",
2022
"enabled": "ativado",
2123
"false": "falso",
24+
"inputAstroTime": "Tempo Astro:",
25+
"inputShiftInMinutes": "Mudança em minutos:",
2226
"manualSwitching": "Comutação manual",
2327
"name": "Nome",
2428
"needToEnterValidNumberOff": "Digite um número válido para o valor desativado quando o tipo for número!",
@@ -39,14 +43,18 @@
3943
"scheduleId": "ID de dados da programação",
4044
"showId": "Mostrar ID do estado comutado",
4145
"showManualSwitch": "Mostrar interruptor manual",
46+
"solarNoon": "Meio-dia",
4247
"stateId": "ID do estado comutado",
4348
"statesCount": "Contagem de estados comutados",
4449
"string": "corda",
50+
"sunrise": "Nascer do sol",
51+
"sunset": "Pôr do sol",
4552
"switchedType": "Tipo comutado",
4653
"switchedValue": "Valor comutado",
4754
"time-switch adapter settings": "Configurações do adaptador para time-switch",
4855
"trigger": "Desencadear",
4956
"trigger count": "Contagem de gatilhos",
5057
"true": "verdade",
58+
"useAstroIcons": "Use ícones astro",
5159
"valueType": "Tipo de valor"
5260
}

admin/i18n/ru/translations.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"Thursday": "Четверг",
88
"Tuesday": "вторник",
99
"Wednesday": "среда",
10+
"addAstroTrigger": "Астро триггер",
11+
"addTimeTrigger": "Время запуска",
1012
"addTrigger": "Добавить триггер",
1113
"allOff": "Все выключить",
1214
"allOn": "Все на",
@@ -19,6 +21,8 @@
1921
"editTrigger": "Редактировать триггер",
2022
"enabled": "Включено",
2123
"false": "ложный",
24+
"inputAstroTime": "Астро время:",
25+
"inputShiftInMinutes": "Сдвиг в минутах:",
2226
"manualSwitching": "Ручное переключение",
2327
"name": "имя",
2428
"needToEnterValidNumberOff": "Введите действительное число для выключенного значения, когда тип является числом!",
@@ -39,14 +43,18 @@
3943
"scheduleId": "Расписание данных ID",
4044
"showId": "Показать идентификатор переключенного состояния",
4145
"showManualSwitch": "Показать ручной переключатель",
46+
"solarNoon": "Полдень",
4247
"stateId": "Идентификатор переключенного состояния",
4348
"statesCount": "Количество переключенных состояний",
4449
"string": "строка",
50+
"sunrise": "Восход",
51+
"sunset": "Закат солнца",
4552
"switchedType": "Коммутируемый тип",
4653
"switchedValue": "Переключаемое значение",
4754
"time-switch adapter settings": "Настройки адаптера для time-switch",
4855
"trigger": "Вызывать",
4956
"trigger count": "Количество триггеров",
5057
"true": "правда",
58+
"useAstroIcons": "Используйте значки Astro",
5159
"valueType": "Тип ценности"
5260
}

0 commit comments

Comments
 (0)