diff --git a/package.json b/package.json index 586de4060..1dbbbe125 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "winston-transport": "^4.9.0", "ws": "^8.18.1", "zigbee-herdsman": "4.1.0", - "zigbee-herdsman-converters": "23.51.0", + "zigbee-herdsman-converters": "23.52.0", "zigbee2mqtt-frontend": "0.9.13", "zigbee2mqtt-windfront": "^1.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 84ce30599..2905e1ce1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -78,8 +78,8 @@ importers: specifier: 4.1.0 version: 4.1.0 zigbee-herdsman-converters: - specifier: 23.51.0 - version: 23.51.0 + specifier: 23.52.0 + version: 23.52.0 zigbee2mqtt-frontend: specifier: 0.9.13 version: 0.9.13 @@ -1447,8 +1447,8 @@ packages: utf-8-validate: optional: true - zigbee-herdsman-converters@23.51.0: - resolution: {integrity: sha512-PKYrE1vRc8pfksZPe1Zv6Mb+P9FRmhHgf4BH+DbEAI2TLGMPmCmnEf7wnrASeQ7V1HlYOmiU4vQVCaNcPW6YYw==} + zigbee-herdsman-converters@23.52.0: + resolution: {integrity: sha512-vplw45mPwc1qvpnGm4dKaymme/exTSsXVySIlSEaXdNieWK04kEWiI95Uv7PKgMKRLwzLxb9JnNQCSrhqi1daQ==} zigbee-herdsman@4.1.0: resolution: {integrity: sha512-GyouALsrr26mp9EM9BdkJ8XfCWWWJyHRJMS8RjHlKusOv3V3og/UlU5/5PqQwQimQupLM1xLtxy26mcg9okSHg==} @@ -2700,7 +2700,7 @@ snapshots: ws@8.18.2: {} - zigbee-herdsman-converters@23.51.0: + zigbee-herdsman-converters@23.52.0: dependencies: buffer-crc32: 1.0.0 iconv-lite: 0.6.3 diff --git a/test/extensions/bridge.test.ts b/test/extensions/bridge.test.ts index 480be836e..e4ac6ea1a 100644 --- a/test/extensions/bridge.test.ts +++ b/test/extensions/bridge.test.ts @@ -320,9 +320,9 @@ describe("Extension: Bridge", () => { ); }); - it("Should publish devices on startup", async () => { + it("onlythis Should publish devices on startup", async () => { await resetExtension(); - // console.log(mockMQTTPublishAsync.mock.calls.find((c) => c[0] === 'zigbee2mqtt/bridge/devices')[1]); + // console.log(mockMQTTPublishAsync.mock.calls.find((c) => c[0] === "zigbee2mqtt/bridge/devices")[1]); expect(mockMQTTPublishAsync).toHaveBeenCalledWith( "zigbee2mqtt/bridge/devices", stringify([ @@ -683,6 +683,27 @@ describe("Extension: Bridge", () => { property: "color", type: "composite", }, + { + access: 7, + description: "Configure genLevelCtrl", + features: [ + { + access: 7, + description: + 'this setting can affect the "on_level", "current_level_startup" or "brightness" setting', + label: "Execute if off", + name: "execute_if_off", + property: "execute_if_off", + type: "binary", + value_off: false, + value_on: true, + }, + ], + label: "Level config", + name: "level_config", + property: "level_config", + type: "composite", + }, ], type: "light", }, @@ -696,6 +717,27 @@ describe("Extension: Bridge", () => { type: "enum", values: ["off", "on", "toggle", "previous"], }, + { + access: 7, + category: "config", + description: "Advanced color behavior", + features: [ + { + access: 2, + description: "Controls whether color and color temperature can be set while light is off", + label: "Execute if off", + name: "execute_if_off", + property: "execute_if_off", + type: "binary", + value_off: false, + value_on: true, + }, + ], + label: "Color options", + name: "color_options", + property: "color_options", + type: "composite", + }, { access: 2, label: "Effect", diff --git a/test/extensions/frontend.test.ts b/test/extensions/frontend.test.ts index 3e2d17177..79f81f5e4 100644 --- a/test/extensions/frontend.test.ts +++ b/test/extensions/frontend.test.ts @@ -250,6 +250,7 @@ describe("Extension: Frontend", () => { state: "ON", effect: null, power_on_behavior: null, + color_options: null, linkquality: 20, update: {state: null, installed_version: -1, latest_version: -1}, }), @@ -272,6 +273,7 @@ describe("Extension: Frontend", () => { payload: { state: "ON", power_on_behavior: null, + color_options: null, effect: null, linkquality: 20, update: {state: null, installed_version: -1, latest_version: -1}, @@ -299,6 +301,7 @@ describe("Extension: Frontend", () => { state: "ON", brightness: 90, power_on_behavior: null, + color_options: null, effect: null, linkquality: 20, update: {state: null, installed_version: -1, latest_version: -1}, diff --git a/test/extensions/homeassistant.test.ts b/test/extensions/homeassistant.test.ts index e7207528a..0d2aaa048 100644 --- a/test/extensions/homeassistant.test.ts +++ b/test/extensions/homeassistant.test.ts @@ -1341,6 +1341,7 @@ describe("Extension: HomeAssistant", () => { linkquality: null, state: null, power_on_behavior: null, + color_options: null, update: {state: null, installed_version: -1, latest_version: -1}, }), {retain: false, qos: 0}, @@ -1363,6 +1364,7 @@ describe("Extension: HomeAssistant", () => { effect: null, linkquality: null, state: null, + color_options: null, power_on_behavior: null, update: {state: null, installed_version: -1, latest_version: -1}, }), @@ -1385,6 +1387,7 @@ describe("Extension: HomeAssistant", () => { effect: null, state: "ON", power_on_behavior: null, + color_options: null, update: {state: null, installed_version: -1, latest_version: -1}, }), {retain: false, qos: 0}, diff --git a/test/extensions/networkMap.test.ts b/test/extensions/networkMap.test.ts index 5e0f57b04..bede35b97 100644 --- a/test/extensions/networkMap.test.ts +++ b/test/extensions/networkMap.test.ts @@ -247,7 +247,7 @@ describe("Extension: NetworkMap", () => { description: "Hue Go", model: "7146060PH", supports: - "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, linkquality", + "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs, level_config), power_on_behavior, color_options, effect, linkquality", vendor: "Philips", }, failed: [], @@ -554,7 +554,7 @@ describe("Extension: NetworkMap", () => { description: "Hue Go", model: "7146060PH", supports: - "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, linkquality", + "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs, level_config), power_on_behavior, color_options, effect, linkquality", vendor: "Philips", }, failed: [], @@ -711,7 +711,7 @@ describe("Extension: NetworkMap", () => { description: "Hue Go", model: "7146060PH", supports: - "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs), power_on_behavior, effect, linkquality", + "light (state, brightness, color_temp, color_temp_startup, color_xy, color_hs, level_config), power_on_behavior, color_options, effect, linkquality", vendor: "Philips", }, failed: [],