Request for review a commited fix: eWeLink CK-BL702-AL-01_1

src/converters/toZigbee.ts

@@ -1140,6 +1140,7 @@ export const light_onoff_brightness: Tz.Converter = {
         const {message} = meta;
         const transition = utils.getTransition(entity, "brightness", meta);
         const turnsOffAtBrightness1 = utils.getMetaValue(entity, meta.mapped, "turnsOffAtBrightness1", "allEqual", false);
+        const moveToLevelWithOnOffDisable = utils.getMetaValue(entity, meta.mapped, "moveToLevelWithOnOffDisable", "allEqual", false);
         let state = message.state !== undefined ? (typeof message.state === "string" ? message.state.toLowerCase() : null) : undefined;
         let brightness: number;
         if (message.brightness != null) {
@@ -1259,7 +1260,7 @@ export const light_onoff_brightness: Tz.Converter = {
         }
         await entity.command(
             "genLevelCtrl",
-            state === null ? "moveToLevel" : "moveToLevelWithOnOff",
+            state === null || moveToLevelWithOnOffDisable ? "moveToLevel" : "moveToLevelWithOnOff",
             {level: Number(brightness), transtime: transition.time},
             utils.getOptions(meta.mapped, entity),
         );
@@ -1268,7 +1269,7 @@ export const light_onoff_brightness: Tz.Converter = {
         if (publishBrightness) {
             result.state.brightness = Number(brightness);
         }
-        if (state !== null) {
+        if (state !== null && !moveToLevelWithOnOffDisable) {
             result.state.state = brightness === 0 ? "OFF" : "ON";
         }
         return result;

src/devices/tuya.ts

@@ -1940,9 +1940,16 @@ export const definitions: DefinitionWithExtend[] = [
         model: "CK-BL702-AL-01_1",
         vendor: "eWeLink",
         description: "Zigbee 3.0 15W led light bulb E27 RGBCW",
-        toZigbee: [tz.on_off, tzLocal.led_control, tuya.tz.do_not_disturb],
-        fromZigbee: [fz.on_off, fz.tuya_led_controller, fz.brightness, fz.ignore_basic_report],
-        exposes: [e.light_brightness_colortemp_colorhs([50, 1000]).removeFeature("color_temp_startup"), tuya.exposes.doNotDisturb()],
+        toZigbee: [tuya.tz.do_not_disturb],
+        extend: [
+            m.light({
+                colorTemp: {range: [50, 500], startup: true},
+                effect: true,
+                powerOnBehavior: true,
+                color: {modes: ["xy", "hs"], enhancedHue: false, moveToLevelWithOnOffDisable: true},
+            }),
+        ],
+        exposes: [tuya.exposes.doNotDisturb()],
         configure: (device, coordinatorEndpoint) => {
             device.getEndpoint(1).saveClusterAttributeKeyValue("lightingColorCtrl", {colorCapabilities: 29});
         },

src/lib/modernExtend.ts

@@ -1022,7 +1022,7 @@ export interface LightArgs {
     effect?: boolean;
     powerOnBehavior?: boolean;
     colorTemp?: {startup?: boolean; range: Range};
-    color?: boolean | {modes?: ("xy" | "hs")[]; applyRedFix?: boolean; enhancedHue?: boolean};
+    color?: boolean | {modes?: ("xy" | "hs")[]; applyRedFix?: boolean; enhancedHue?: boolean; moveToLevelWithOnOffDisable?: boolean};
     turnsOffAtBrightness1?: boolean;
     configureReporting?: boolean;
     endpointNames?: string[];
@@ -1051,6 +1051,7 @@ export function light(args: LightArgs = {}): ModernExtend {
               modes: ["xy"] satisfies ("xy" | "hs")[],
               applyRedFix: false,
               enhancedHue: true,
+              moveToLevelWithOnOffDisable: false,
               ...(isObject(color) ? color : {}),
           }
         : false;
@@ -1097,6 +1098,9 @@ export function light(args: LightArgs = {}): ModernExtend {
         if (!argsColor.enhancedHue) {
             meta.supportsEnhancedHue = false;
         }
+        if (argsColor.moveToLevelWithOnOffDisable) {
+            meta.moveToLevelWithOnOffDisable = true;
+        }
     }
 
     if (levelConfig) {

src/lib/types.ts

@@ -182,6 +182,7 @@ export interface DefinitionMeta {
      * @defaultValue false
      */
     turnsOffAtBrightness1?: boolean;
+    moveToLevelWithOnOffDisable?: boolean;
     tuyaThermostatPreset?: {[s: number]: string};
     /** Tuya specific thermostat options */
     tuyaThermostatSystemMode?: {[s: number]: string};