expose action_group

Author: andrei-lazarov

src/devices/eglo.ts

@@ -269,7 +269,7 @@ export const definitions: DefinitionWithExtend[] = [
                 "recall_2",
                 "recall_2_long",
             ]),
-            e.numeric("action_group", ea.STATE),
+            e.action_group(),
             e.action_level(),
             e.numeric("action_color_temperature", ea.STATE),
         ],

src/devices/iluminize.ts

@@ -6,7 +6,6 @@ import * as sunricher from "../lib/sunricher";
 import type {DefinitionWithExtend} from "../lib/types";
 
 const e = exposes.presets;
-const ea = exposes.access;
 
 export const definitions: DefinitionWithExtend[] = [
     {
@@ -247,7 +246,7 @@ export const definitions: DefinitionWithExtend[] = [
                 "enhanced_move_to_hue_and_saturation",
                 "hue_stop",
             ]),
-            e.numeric("action_group", ea.STATE).withDescription("Shows the zigbee2mqtt group bound to the active data point EP(1-4)."),
+            e.action_group(),
             e.action_step_size(),
             e.action_transition_time(),
             e.action_rate(),

src/devices/ls.ts

@@ -34,7 +34,7 @@ const fzLocal = {
 const lsModernExtend = {
     groupIdExpose(): ModernExtend {
         const result: ModernExtend = {
-            exposes: [e.numeric("action_group", ea.STATE).withDescription("Group where the action was triggered on")],
+            exposes: [e.action_group()],
             isModernExtend: true,
         };
 

src/devices/shelly.ts

@@ -2123,10 +2123,6 @@ export const definitions: DefinitionWithExtend[] = [
         model: "SBRC-005B-B",
         vendor: "Shelly",
         description: "BLU Remote Control ZB",
-        exposes: [
-            e.action(["on", "off", "brightness_step_up", "brightness_step_down"]),
-            e.numeric("action_group", ea.STATE).withDescription("Group ID associated with the action command."),
-        ],
         extend: [
             m.battery(),
             m.commandsOnOff({commands: ["on", "off"]}),

src/devices/tuya.ts

@@ -23882,7 +23882,7 @@ export const definitions: DefinitionWithExtend[] = [
                 .withValueMax(4)
                 .withCategory("diagnostic")
                 .withDescription("Button number from last action"),
-            e.numeric("action_group", ea.STATE).withCategory("diagnostic").withDescription("Group ID from last action"),
+            e.action_group(),
             e.enum("bind_all_scene", ea.SET, ["bind"]).withCategory("config").withDescription("Bind all buttons to Scene mode (red LED)"),
             e.enum("bind_all_light", ea.SET, ["bind"]).withCategory("config").withDescription("Bind all buttons to Light mode (green LED)"),
             e.enum("bind_all_curtain", ea.SET, ["bind"]).withCategory("config").withDescription("Bind all buttons to Curtain mode (blue LED)"),

src/index.ts

@@ -356,7 +356,7 @@ function processExtensions(definition: DefinitionWithExtend): Definition {
         }
 
         // De-duplicate and sort action parameters
-        const actionParamOrder = ["action_level", "action_step_size", "action_transition_time", "action_rate"];
+        const actionParamOrder = ["action_group", "action_level", "action_step_size", "action_transition_time", "action_rate"];
         const actionParamExposes = new Map<string, Expose>();
 
         for (const e of allExposes) {

src/lib/exposes.ts

@@ -967,7 +967,13 @@ export const presets = {
         new Enum("action", access.STATE, values).withDescription("Triggered action (e.g. a button click)").withCategory("diagnostic"),
     action_duration: () =>
         new Numeric("action_duration", access.STATE).withUnit("s").withDescription("Triggered action duration in seconds").withCategory("diagnostic"),
-    action_group: () => new Numeric("action_group", access.STATE).withDescription("Group where the action was triggered on"),
+    action_group: () =>
+        new Numeric("action_group", access.STATE)
+            .withDescription("Target group of the action")
+            .withValueMin(0)
+            .withValueMax(65535)
+            .withValueStep(1)
+            .withCategory("diagnostic"),
     action_level: () =>
         new Numeric("action_level", access.STATE)
             .withDescription("Target brightness of Move to level command")

src/lib/modernExtend.ts

@@ -654,7 +654,7 @@ export function commandsOnOff(args: CommandsOnOffArgs = {}): ModernExtend {
     if (endpointNames) {
         actions = commands.flatMap((c) => endpointNames.map((e) => `${c}_${e}`));
     }
-    const exposes: Expose[] = [e.action(actions)];
+    const exposes: Expose[] = [e.action(actions), e.action_group()];
 
     const actionPayloadLookup: KeyValueString = {
         commandOn: "on",
@@ -1379,7 +1379,7 @@ export function commandsLevelCtrl(args: CommandsLevelCtrl = {}): ModernExtend {
     if (endpointNames) {
         actions = commands.flatMap((c) => endpointNames.map((e) => `${c}_${e}`));
     }
-    const exposes: Expose[] = [e.action(actions)];
+    const exposes: Expose[] = [e.action(actions), e.action_group()];
 
     if (commands.includes("brightness_move_to_level")) {
         exposes.push(e.action_level());
@@ -1460,7 +1460,7 @@ export function commandsColorCtrl(args: CommandsColorCtrl = {}): ModernExtend {
     if (endpointNames) {
         actions = commands.flatMap((c) => endpointNames.map((e) => `${c}_${e}`));
     }
-    const exposes: Expose[] = [e.action(actions)];
+    const exposes: Expose[] = [e.action(actions), e.action_group()];
 
     // TODO: e.action_hue, e.action_enhanced_hue, e.action_direction, e.action_saturation,
     // e.action_color, e.action_stepx, e.action_stepy, e.action_colortemp, e.action_minimum, e.action_maximum etc.
@@ -1673,7 +1673,7 @@ export function commandsWindowCovering(args: CommandsWindowCoveringArgs = {}): M
     if (endpointNames) {
         actions = commands.flatMap((c) => endpointNames.map((e) => `${c}_${e}`));
     }
-    const exposes: Expose[] = [e.action(actions)];
+    const exposes: Expose[] = [e.action(actions), e.action_group()];
 
     const actionPayloadLookup: KeyValueString = {
         commandUpOpen: "open",
@@ -2614,7 +2614,7 @@ export function commandsScenes(args: CommandsScenesArgs = {}) {
     if (endpointNames) {
         actions = commands.flatMap((c) => endpointNames.map((e) => `${c}_${e}`));
     }
-    const exposesArray = [e.action(actions)];
+    const exposesArray = [e.action(actions), e.action_group()];
 
     const actionPayloadLookup: {[key: string]: string} = {
         commandRecall: "recall",
@@ -3103,7 +3103,7 @@ export function actionEnumLookup<
         } satisfies Fz.Converter<Cl, Custom, Cos extends undefined ? ["attributeReport", "readResponse"] : Cos>,
     ];
 
-    return {exposes: [expose], fromZigbee, isModernExtend: true};
+    return {exposes: [expose, e.action_group()], fromZigbee, isModernExtend: true};
 }
 
 export interface QuirkAddEndpointClusterArgs {