From 31e577c3375edc0bc06a34d597726efa0e6a00fb Mon Sep 17 00:00:00 2001 From: paddyponchero Date: Tue, 28 May 2024 22:53:37 +0100 Subject: [PATCH 01/10] Update enumType.js for IKEA E1524/E1810 --- server/services/zigbee2mqtt/exposes/enumType.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/services/zigbee2mqtt/exposes/enumType.js b/server/services/zigbee2mqtt/exposes/enumType.js index 335cd216e9..6ef4702418 100644 --- a/server/services/zigbee2mqtt/exposes/enumType.js +++ b/server/services/zigbee2mqtt/exposes/enumType.js @@ -77,6 +77,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.RIGHTNESS_UP_HOLD, 'brightness_up_hold'); +addMapping('action', BUTTON_STATUS.RIGHTNESS_UP_RELEASE, 'brightness_up_release'); +addMapping('action', BUTTON_STATUS.RIGHTNESS_DOWN_CLICK, 'brightness_down_click'); +addMapping('action', BUTTON_STATUS.RIGHTNESS_DOWN_HOLD, 'brightness_down_hold'); +addMapping('action', BUTTON_STATUS.RIGHTNESS_DOWN_RELEASE, 'brightness_down_release'); + addMapping('state', COVER_STATE.OPEN, 'OPEN'); addMapping('state', COVER_STATE.CLOSE, 'CLOSE'); addMapping('state', COVER_STATE.STOP, 'STOP'); From e17e4bd86a64d077e25a97204e3e0dda082c3ea7 Mon Sep 17 00:00:00 2001 From: paddyponchero Date: Tue, 28 May 2024 22:59:02 +0100 Subject: [PATCH 02/10] Update constants.js for IKEA E1524/E1810 --- server/utils/constants.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/server/utils/constants.js b/server/utils/constants.js index 7312489248..2e32185551 100644 --- a/server/utils/constants.js +++ b/server/utils/constants.js @@ -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 = { From 4daedefe9c9ae8fa59cf462a78d65f2a3eddcd45 Mon Sep 17 00:00:00 2001 From: paddyponchero Date: Tue, 28 May 2024 22:59:50 +0100 Subject: [PATCH 03/10] Update enumType.js --- server/services/zigbee2mqtt/exposes/enumType.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/services/zigbee2mqtt/exposes/enumType.js b/server/services/zigbee2mqtt/exposes/enumType.js index 6ef4702418..5f5859041a 100644 --- a/server/services/zigbee2mqtt/exposes/enumType.js +++ b/server/services/zigbee2mqtt/exposes/enumType.js @@ -80,11 +80,11 @@ 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.RIGHTNESS_UP_HOLD, 'brightness_up_hold'); -addMapping('action', BUTTON_STATUS.RIGHTNESS_UP_RELEASE, 'brightness_up_release'); -addMapping('action', BUTTON_STATUS.RIGHTNESS_DOWN_CLICK, 'brightness_down_click'); -addMapping('action', BUTTON_STATUS.RIGHTNESS_DOWN_HOLD, 'brightness_down_hold'); -addMapping('action', BUTTON_STATUS.RIGHTNESS_DOWN_RELEASE, 'brightness_down_release'); +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'); From 4a778210c01563d567b2641d07920ba53f243d30 Mon Sep 17 00:00:00 2001 From: paddyponchero Date: Tue, 28 May 2024 23:07:50 +0100 Subject: [PATCH 04/10] Update en.json for IKEA E1524/E1810 --- front/src/config/i18n/en.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json index b198184a57..f4e574fb8d 100644 --- a/front/src/config/i18n/en.json +++ b/front/src/config/i18n/en.json @@ -2768,7 +2768,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", } }, "opening-sensor": { From 65c58038905f95fdb6158ae6596c7441ea75f300 Mon Sep 17 00:00:00 2001 From: paddyponchero Date: Tue, 28 May 2024 23:09:22 +0100 Subject: [PATCH 05/10] Update en.json typo --- front/src/config/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/config/i18n/en.json b/front/src/config/i18n/en.json index f4e574fb8d..8ac4d15fe3 100644 --- a/front/src/config/i18n/en.json +++ b/front/src/config/i18n/en.json @@ -2776,7 +2776,7 @@ "56": "Brightness Up Release", "57": "Brightness Down Click", "58": "Brightness Down Hold", - "59": "Brightness Down Release", + "59": "Brightness Down Release" } }, "opening-sensor": { From 45ca411b885a7e261de774995011df46d993e10d Mon Sep 17 00:00:00 2001 From: paddyponchero Date: Tue, 28 May 2024 23:15:10 +0100 Subject: [PATCH 06/10] Update fr.json IKEA E1524/E1810 --- front/src/config/i18n/fr.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json index 3cf77e714a..88ef4acb8b 100644 --- a/front/src/config/i18n/fr.json +++ b/front/src/config/i18n/fr.json @@ -2768,7 +2768,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", } }, "opening-sensor": { From c128eac1dba7f34560d0d49a43af530f9225654c Mon Sep 17 00:00:00 2001 From: paddyponchero Date: Tue, 28 May 2024 23:22:10 +0100 Subject: [PATCH 07/10] Update de.json for IKEA E1524/E1810 --- front/src/config/i18n/de.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json index e8bad61f59..5810825ef4 100644 --- a/front/src/config/i18n/de.json +++ b/front/src/config/i18n/de.json @@ -2768,7 +2768,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", } }, "opening-sensor": { From 5eae34d7fcacf3f341377cb912592e67d188a426 Mon Sep 17 00:00:00 2001 From: paddyponchero Date: Tue, 28 May 2024 23:22:54 +0100 Subject: [PATCH 08/10] Update de.json typo --- front/src/config/i18n/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/config/i18n/de.json b/front/src/config/i18n/de.json index 5810825ef4..65f7c054c9 100644 --- a/front/src/config/i18n/de.json +++ b/front/src/config/i18n/de.json @@ -2776,7 +2776,7 @@ "56": "Helligkeit Auf-Taste Loslassen", "57": "Helligkeit Ab-Taste gedrückt", "58": "Helligkeit Ab-Taste gehalten", - "59": "Helligkeit Ab-Taste Loslassen", + "59": "Helligkeit Ab-Taste Loslassen" } }, "opening-sensor": { From 6767a17bab0151fc5f019cb8a379831c46ce214e Mon Sep 17 00:00:00 2001 From: paddyponchero Date: Tue, 28 May 2024 23:27:52 +0100 Subject: [PATCH 09/10] Update fr.json typo --- front/src/config/i18n/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/config/i18n/fr.json b/front/src/config/i18n/fr.json index 88ef4acb8b..95a8ce2642 100644 --- a/front/src/config/i18n/fr.json +++ b/front/src/config/i18n/fr.json @@ -2776,7 +2776,7 @@ "56": "Luminosité Plus Relâchée", "57": "Luminosité Moins Clic", "58": "Luminosité Moins Maintenu", - "59": "Luminosité Moins Relâchée", + "59": "Luminosité Moins Relâchée" } }, "opening-sensor": { From ffab50ba170dbf28b0382b0db328590913b92527 Mon Sep 17 00:00:00 2001 From: paddyp Date: Sat, 9 Nov 2024 01:54:25 +0000 Subject: [PATCH 10/10] prettified --- server/utils/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/utils/constants.js b/server/utils/constants.js index e4bb1632bc..59db22a747 100644 --- a/server/utils/constants.js +++ b/server/utils/constants.js @@ -55,7 +55,7 @@ const BUTTON_STATUS = { SHORT_RELEASE: 49, LONG_RELEASE: 50, DOUBLE_PRESS: 51, - TOGGLE:52, + TOGGLE: 52, TOGGLE_HOLD: 53, BRIGHTNESS_UP_CLICK: 54, BRIGHTNESS_UP_HOLD: 55,