Skip to content
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.

Sign up for GitHub

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

Zigbee2mqtt: Adding IKEA e1524/e1810 #2120

Merged
merged 15 commits into from
Nov 11, 2024
Merged

Zigbee2mqtt: Adding IKEA e1524/e1810 #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
31e577c
Update enumType.js for IKEA E1524/E1810
paddyponchero May 28, 2024
e17e4bd
Update constants.js for IKEA E1524/E1810
paddyponchero May 28, 2024
4daedef
Update enumType.js
paddyponchero May 28, 2024
4a77821
Update en.json for IKEA E1524/E1810
paddyponchero May 28, 2024
65c5803
Update en.json typo
paddyponchero May 28, 2024
45ca411
Update fr.json IKEA E1524/E1810
paddyponchero May 28, 2024
c128eac
Update de.json for IKEA E1524/E1810
paddyponchero May 28, 2024
5eae34d
Update de.json typo
paddyponchero May 28, 2024
6767a17
Update fr.json typo
paddyponchero May 28, 2024
4d38854
Merge branch 'GladysAssistant:master' into adding-IKEA-E1524/E1810
paddyponchero Aug 10, 2024
f8c048c
Merge branch 'GladysAssistant:master' into adding-IKEA-E1524/E1810
paddyponchero Sep 8, 2024
828ede5
Merge branch 'GladysAssistant:master' into adding-IKEA-E1524/E1810
paddyponchero Sep 17, 2024
3f505f1
Merge branch 'GladysAssistant:master' into adding-IKEA-E1524/E1810
paddyponchero Nov 9, 2024
ffab50b
prettified
Nov 9, 2024
dbfe104
Merge branch 'master' into adding-IKEA-E1524/E1810
paddyponchero Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion front/src/config/i18n/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2862,7 +2862,15 @@
"48": "Langer Druck",
"49": "Kurzes Loslassen",
"50": "Langes Loslassen",
"51": "Doppeltes Drücken"
"51": "Doppeltes Drücken",
"52": "Umschalten",
"53": "Umschalten Gehalten",
"54": "Helligkeit Auf-Taste gedrückt",
"55": "Helligkeit Auf-Taste gehalten",
"56": "Helligkeit Auf-Taste Loslassen",
"57": "Helligkeit Ab-Taste gedrückt",
"58": "Helligkeit Ab-Taste gehalten",
"59": "Helligkeit Ab-Taste Loslassen"
}
},
"heater": {
Expand Down
10 changes: 9 additions & 1 deletion front/src/config/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2862,7 +2862,15 @@
"48": "Long press",
"49": "Short release",
"50": "Long release",
"51": "Double press"
"51": "Double press",
"52": "Toggle",
"53": "Toggle Hold",
"54": "Brightness Up Click",
"55": "Brightness Up Hold",
"56": "Brightness Up Release",
"57": "Brightness Down Click",
"58": "Brightness Down Hold",
"59": "Brightness Down Release"
}
},
"heater": {
Expand Down
10 changes: 9 additions & 1 deletion front/src/config/i18n/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2862,7 +2862,15 @@
"48": "Pression longue",
"49": "Relâchement court",
"50": "Relâchement long",
"51": "Pression double"
"51": "Pression double",
"52": "Bouton Bascule",
"53": "Bouton Bascule maintenu",
"54": "Luminosité Plus Clic",
"55": "Luminosité Plus Maintenu",
"56": "Luminosité Plus Relâchée",
"57": "Luminosité Moins Clic",
"58": "Luminosité Moins Maintenu",
"59": "Luminosité Moins Relâchée"
}
},
"heater": {
Expand Down
9 changes: 9 additions & 0 deletions server/services/zigbee2mqtt/exposes/enumType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@ addMapping('action', BUTTON_STATUS.SHORT_RELEASE, 'short_release');
addMapping('action', BUTTON_STATUS.LONG_RELEASE, 'long_release');
addMapping('action', BUTTON_STATUS.DOUBLE_PRESS, 'double_press');

addMapping('action', BUTTON_STATUS.TOGGLE, 'toggle');
addMapping('action', BUTTON_STATUS.TOGGLE_HOLD, 'toggle_hold');
addMapping('action', BUTTON_STATUS.BRIGHTNESS_UP_CLICK, 'brightness_up_click');
addMapping('action', BUTTON_STATUS.BRIGHTNESS_UP_HOLD, 'brightness_up_hold');
addMapping('action', BUTTON_STATUS.BRIGHTNESS_UP_RELEASE, 'brightness_up_release');
addMapping('action', BUTTON_STATUS.BRIGHTNESS_DOWN_CLICK, 'brightness_down_click');
addMapping('action', BUTTON_STATUS.BRIGHTNESS_DOWN_HOLD, 'brightness_down_hold');
addMapping('action', BUTTON_STATUS.BRIGHTNESS_DOWN_RELEASE, 'brightness_down_release');

addMapping('state', COVER_STATE.OPEN, 'OPEN');
addMapping('state', COVER_STATE.CLOSE, 'CLOSE');
addMapping('state', COVER_STATE.STOP, 'STOP');
Expand Down
8 changes: 8 additions & 0 deletions server/utils/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ const BUTTON_STATUS = {
SHORT_RELEASE: 49,
LONG_RELEASE: 50,
DOUBLE_PRESS: 51,
TOGGLE: 52,
TOGGLE_HOLD: 53,
BRIGHTNESS_UP_CLICK: 54,
BRIGHTNESS_UP_HOLD: 55,
BRIGHTNESS_UP_RELEASE: 56,
BRIGHTNESS_DOWN_CLICK: 57,
BRIGHTNESS_DOWN_HOLD: 58,
BRIGHTNESS_DOWN_RELEASE: 59,
};

const COVER_STATE = {
Expand Down
Loading