Skip to content

Commit c82f932

Browse files
KoenkkKoenkk
authored
fix(ignore): update zigbee-herdsman-converters to 20.21.0 (#24172)
* fix(ignore): update zigbee-herdsman-converters to 20.21.0 * fix
1 parent 13e4937 commit c82f932

File tree

4 files changed

+114
-10
lines changed

4 files changed

+114
-10
lines changed

‎package-lock.json

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"winston-transport": "^4.8.0",
6262
"ws": "^8.18.0",
6363
"zigbee-herdsman": "2.1.3",
64-
"zigbee-herdsman-converters": "20.20.0",
64+
"zigbee-herdsman-converters": "20.21.0",
6565
"zigbee2mqtt-frontend": "0.7.4"
6666
},
6767
"devDependencies": {

‎test/bridge.test.js

+106-2
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ describe('Bridge', () => {
233233

234234
it('Should publish devices on startup', async () => {
235235
await resetExtension();
236-
// console.log(MQTT.publish.mock.calls.find((c) => c[0] === 'zigbee2mqtt/bridge/devices')[1])
236+
// console.log(MQTT.publish.mock.calls.find((c) => c[0] === 'zigbee2mqtt/bridge/devices')[1]);
237237
expect(MQTT.publish).toHaveBeenCalledWith(
238238
'zigbee2mqtt/bridge/devices',
239239
stringify([
@@ -318,6 +318,41 @@ describe('Bridge', () => {
318318
value_max: 454,
319319
value_min: 250,
320320
},
321+
{
322+
access: 7,
323+
description: 'Configure genLevelCtrl',
324+
features: [
325+
{
326+
access: 7,
327+
description:
328+
'this setting can affect the "on_level", "current_level_startup" or "brightness" setting',
329+
label: 'Execute if off',
330+
name: 'execute_if_off',
331+
property: 'execute_if_off',
332+
type: 'binary',
333+
value_off: false,
334+
value_on: true,
335+
},
336+
{
337+
access: 7,
338+
description: 'Defines the desired startup level for a device when it is supplied with power',
339+
label: 'Current level startup',
340+
name: 'current_level_startup',
341+
presets: [
342+
{description: 'Use minimum permitted value', name: 'minimum', value: 0},
343+
{description: 'Use previous value', name: 'previous', value: 255},
344+
],
345+
property: 'current_level_startup',
346+
type: 'numeric',
347+
value_max: 254,
348+
value_min: 1,
349+
},
350+
],
351+
label: 'Level config',
352+
name: 'level_config',
353+
property: 'level_config',
354+
type: 'composite',
355+
},
321356
],
322357
type: 'light',
323358
},
@@ -1878,6 +1913,41 @@ describe('Bridge', () => {
18781913
value_max: 454,
18791914
value_min: 250,
18801915
},
1916+
{
1917+
access: 7,
1918+
description: 'Configure genLevelCtrl',
1919+
features: [
1920+
{
1921+
access: 7,
1922+
description:
1923+
'this setting can affect the "on_level", "current_level_startup" or "brightness" setting',
1924+
label: 'Execute if off',
1925+
name: 'execute_if_off',
1926+
property: 'execute_if_off',
1927+
type: 'binary',
1928+
value_off: false,
1929+
value_on: true,
1930+
},
1931+
{
1932+
access: 7,
1933+
description: 'Defines the desired startup level for a device when it is supplied with power',
1934+
label: 'Current level startup',
1935+
name: 'current_level_startup',
1936+
presets: [
1937+
{description: 'Use minimum permitted value', name: 'minimum', value: 0},
1938+
{description: 'Use previous value', name: 'previous', value: 255},
1939+
],
1940+
property: 'current_level_startup',
1941+
type: 'numeric',
1942+
value_max: 254,
1943+
value_min: 1,
1944+
},
1945+
],
1946+
label: 'Level config',
1947+
name: 'level_config',
1948+
property: 'level_config',
1949+
type: 'composite',
1950+
},
18811951
],
18821952
type: 'light',
18831953
},
@@ -2186,7 +2256,7 @@ describe('Bridge', () => {
21862256
await zigbeeHerdsman.events.deviceInterview({device: zigbeeHerdsman.devices.unsupported, status: 'successful'});
21872257
await flushPromises();
21882258
expect(MQTT.publish).toHaveBeenCalledTimes(7);
2189-
// console.log(MQTT.publish.mock.calls.filter((c) => c[0] === 'zigbee2mqtt/bridge/event'))
2259+
// console.log(MQTT.publish.mock.calls.filter((c) => c[0] === 'zigbee2mqtt/bridge/event'));
21902260
expect(MQTT.publish).toHaveBeenCalledWith(
21912261
'zigbee2mqtt/bridge/event',
21922262
stringify({
@@ -2254,6 +2324,40 @@ describe('Bridge', () => {
22542324
value_max: 454,
22552325
value_min: 250,
22562326
},
2327+
{
2328+
access: 7,
2329+
description: 'Configure genLevelCtrl',
2330+
features: [
2331+
{
2332+
access: 7,
2333+
description: `this setting can affect the "on_level", "current_level_startup" or "brightness" setting`,
2334+
label: 'Execute if off',
2335+
name: 'execute_if_off',
2336+
property: 'execute_if_off',
2337+
type: 'binary',
2338+
value_off: false,
2339+
value_on: true,
2340+
},
2341+
{
2342+
access: 7,
2343+
description: 'Defines the desired startup level for a device when it is supplied with power',
2344+
label: 'Current level startup',
2345+
name: 'current_level_startup',
2346+
presets: [
2347+
{description: 'Use minimum permitted value', name: 'minimum', value: 0},
2348+
{description: 'Use previous value', name: 'previous', value: 255},
2349+
],
2350+
property: 'current_level_startup',
2351+
type: 'numeric',
2352+
value_max: 254,
2353+
value_min: 1,
2354+
},
2355+
],
2356+
label: 'Level config',
2357+
name: 'level_config',
2358+
property: 'level_config',
2359+
type: 'composite',
2360+
},
22572361
],
22582362
type: 'light',
22592363
},

‎test/networkMap.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ describe('Networkmap', () => {
201201
description: 'TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm',
202202
model: 'LED1545G12',
203203
supports:
204-
'light (state, brightness, color_temp, color_temp_startup), effect, power_on_behavior, color_options, identify, linkquality',
204+
'light (state, brightness, color_temp, color_temp_startup, level_config), effect, power_on_behavior, color_options, identify, linkquality',
205205
vendor: 'IKEA',
206206
},
207207
failed: [],
@@ -547,7 +547,7 @@ describe('Networkmap', () => {
547547
description: 'TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm',
548548
model: 'LED1545G12',
549549
supports:
550-
'light (state, brightness, color_temp, color_temp_startup), effect, power_on_behavior, color_options, identify, linkquality',
550+
'light (state, brightness, color_temp, color_temp_startup, level_config), effect, power_on_behavior, color_options, identify, linkquality',
551551
vendor: 'IKEA',
552552
},
553553
failed: [],

0 commit comments

Comments
 (0)