-
Notifications
You must be signed in to change notification settings - Fork 14
Add extended KNX smoke alarm support (Gira): extra fault channels, temperature, siren control, and fault acknowledge #85
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
33487c1
Support smoke alarms that expose multiple sensors
wlcrs 8cfccb6
Merge branch 'athombv:master' into extended_smoke_alarm_support
wlcrs 0a0411d
Add icons for new smoke-sensor capabilities
LaurensVanAcker 022eaf5
Update locale labels for renamed acknowledge_fault GA (ar/da/de/en)
LaurensVanAcker 1c5cc29
Update locale labels for renamed acknowledge_fault GA (es/fr/it/ko/nl)
LaurensVanAcker 3ad2651
Update locale labels for renamed acknowledge_fault GA (no/pl/ru/sv)
LaurensVanAcker 8226866
Revert format churn in pairing UI; keep only smoke-sensor additions
LaurensVanAcker File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "type": "boolean", | ||
| "uiComponent": "button", | ||
| "title": { | ||
| "en": "Acknowledge fault", | ||
| "nl": "Fout bevestigen", | ||
| "da": "Bekræft fejl", | ||
| "de": "Fehler quittieren", | ||
| "es": "Reconocer fallo", | ||
| "fr": "Acquitter le défaut", | ||
| "it": "Conferma guasto", | ||
| "no": "Bekreft feil", | ||
| "sv": "Bekräfta fel", | ||
| "pl": "Potwierdź usterkę", | ||
| "ru": "Подтвердить неисправность", | ||
| "ko": "오류 확인", | ||
| "ar": "تأكيد الخطأ" | ||
| }, | ||
| "getable": false, | ||
| "setable": true | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "type": "boolean", | ||
| "uiComponent": "toggle", | ||
| "title": { | ||
| "en": "Alarm signal", | ||
| "nl": "Alarmsignaal", | ||
| "da": "Alarmsignal", | ||
| "de": "Alarmsignal", | ||
| "es": "Señal de alarma", | ||
| "fr": "Signal d'alarme", | ||
| "it": "Segnale di allarme", | ||
| "no": "Alarmsignal", | ||
| "sv": "Larmsignal", | ||
| "pl": "Sygnał alarmu", | ||
| "ru": "Сигнал тревоги", | ||
| "ko": "경보 신호", | ||
| "ar": "إشارة الإنذار" | ||
| }, | ||
| "getable": true, | ||
| "setable": true, | ||
| "uiQuickAction": false | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "type": "boolean", | ||
| "uiComponent": "sensor", | ||
| "title": { | ||
| "en": "230V failure", | ||
| "nl": "230V storing", | ||
| "da": "230V fejl", | ||
| "de": "230V-Fehler", | ||
| "es": "Fallo de 230V", | ||
| "fr": "Défaut 230V", | ||
| "it": "Guasto 230V", | ||
| "no": "230V feil", | ||
| "sv": "230V fel", | ||
| "pl": "Awaria 230V", | ||
| "ru": "Неисправность 230В", | ||
| "ko": "230V 오류", | ||
| "ar": "عطل 230 فولت" | ||
| }, | ||
| "getable": true, | ||
| "setable": false | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "type": "boolean", | ||
| "uiComponent": "sensor", | ||
| "title": { | ||
| "en": "Smoke sensor failure", | ||
| "nl": "Rookmelder storing", | ||
| "da": "Røgdetektorfejl", | ||
| "de": "Rauchsensorfehler", | ||
| "es": "Fallo del sensor de humo", | ||
| "fr": "Défaut détecteur de fumée", | ||
| "it": "Guasto rilevatore di fumo", | ||
| "no": "Røykdetektorfeil", | ||
| "sv": "Rökdetektorfel", | ||
| "pl": "Awaria czujnika dymu", | ||
| "ru": "Неисправность датчика дыма", | ||
| "ko": "연기 센서 오류", | ||
| "ar": "عطل مستشعر الدخان" | ||
| }, | ||
| "getable": true, | ||
| "setable": false | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "type": "boolean", | ||
| "uiComponent": "sensor", | ||
| "title": { | ||
| "en": "Temperature sensor failure", | ||
| "nl": "Temperatuursensor storing", | ||
| "da": "Temperatursensorfejl", | ||
| "de": "Temperatursensorfehler", | ||
| "es": "Fallo del sensor de temperatura", | ||
| "fr": "Défaut capteur de température", | ||
| "it": "Guasto sensore temperatura", | ||
| "no": "Temperatursensorfeil", | ||
| "sv": "Temperatursensorfel", | ||
| "pl": "Awaria czujnika temperatury", | ||
| "ru": "Неисправность датчика температуры", | ||
| "ko": "온도 센서 오류", | ||
| "ar": "عطل مستشعر درجة الحرارة" | ||
| }, | ||
| "getable": true, | ||
| "setable": false | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just for clarification what does this button do? The title is not very clear to me
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ttherbrink, It resets the fault thrown
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this makes the fault reset to false it would make more sense to me to name it
reset faults. this makes it clearer to the user what happens when the button is pressenThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good call — renamed in 0a0411d: the capability title is now
Reset faults(translated to all 13 languages), and the pairing-UI GA label is nowReset faults address. Capability ID and setting key are kept asknx_acknowledge_fault/ga_acknowledge_faultto stay aligned with the KNX object name on the bus.