Fix SYMFONISK v2 remote quirk automation triggers (#4257)

* Fix IKEA Symfonisk remote command name

* Use the command name instead of a constant

* Remove duplicated cluster

* Plural

Author: puddly

zhaquirks/ikea/__init__.py

@@ -19,7 +19,6 @@
 
 IKEA_SHORTCUT_CLUSTER_V1_ID = 0xFC7F  # decimal = 64639 Shortcut V1 commands
 IKEA_MATTER_SWITCH_CLUSTER_ID = 0xFC80  # decimal = 64640 Shortcut V2 commands
-COMMAND_SHORTCUT_V1 = "shortcut_v1_events"
 
 # PowerConfiguration cluster attributes
 BATTERY_VOLTAGE = PowerConfiguration.attributes_by_name["battery_voltage"].id
@@ -61,7 +60,7 @@ class ShortcutV1Cluster(EventableCluster):
     class ServerCommandDefs(BaseCommandDefs):
         """Server command definitions."""
 
-        shortcut_v1 = foundation.ZCLCommandDef(
+        shortcut_v1_events = foundation.ZCLCommandDef(
             id=0x01,
             schema={
                 "shortcut_button": t.int8s,

zhaquirks/ikea/symfonisk2.py

@@ -48,7 +48,6 @@
     TOGGLE,
 )
 from zhaquirks.ikea import (
-    COMMAND_SHORTCUT_V1,
     IKEA,
     IKEA_CLUSTER_ID,
     WWAH_CLUSTER_ID,
@@ -153,7 +152,6 @@ class IkeaSymfoniskGen2v1(CustomDevice):
                     PollControl.cluster_id,
                     LightLink.cluster_id,
                     WWAH_CLUSTER_ID,
-                    ShortcutV1Cluster,
                 ],
                 OUTPUT_CLUSTERS: [
                     Identify.cluster_id,
@@ -174,27 +172,27 @@ class IkeaSymfoniskGen2v1(CustomDevice):
     device_automation_triggers.update(
         {
             (SHORT_PRESS, BUTTON_1): {
-                COMMAND: COMMAND_SHORTCUT_V1,
+                COMMAND: ShortcutV1Cluster.ServerCommandDefs.shortcut_v1_events.name,
                 PARAMS: {"shortcut_button": 1, "shortcut_event": 1},
             },
             (DOUBLE_PRESS, BUTTON_1): {
-                COMMAND: COMMAND_SHORTCUT_V1,
+                COMMAND: ShortcutV1Cluster.ServerCommandDefs.shortcut_v1_events.name,
                 PARAMS: {"shortcut_button": 1, "shortcut_event": 2},
             },
             (LONG_PRESS, BUTTON_1): {
-                COMMAND: COMMAND_SHORTCUT_V1,
+                COMMAND: ShortcutV1Cluster.ServerCommandDefs.shortcut_v1_events.name,
                 PARAMS: {"shortcut_button": 1, "shortcut_event": 3},
             },
             (SHORT_PRESS, BUTTON_2): {
-                COMMAND: COMMAND_SHORTCUT_V1,
+                COMMAND: ShortcutV1Cluster.ServerCommandDefs.shortcut_v1_events.name,
                 PARAMS: {"shortcut_button": 2, "shortcut_event": 1},
             },
             (DOUBLE_PRESS, BUTTON_2): {
-                COMMAND: COMMAND_SHORTCUT_V1,
+                COMMAND: ShortcutV1Cluster.ServerCommandDefs.shortcut_v1_events.name,
                 PARAMS: {"shortcut_button": 2, "shortcut_event": 2},
             },
             (LONG_PRESS, BUTTON_2): {
-                COMMAND: COMMAND_SHORTCUT_V1,
+                COMMAND: ShortcutV1Cluster.ServerCommandDefs.shortcut_v1_events.name,
                 PARAMS: {"shortcut_button": 2, "shortcut_event": 3},
             },
         },