Skip to content

Commit

Permalink
fix(ignore): update zigbee-herdsman-converters to 20.21.0 (#24172)
Browse files Browse the repository at this point in the history 
* fix(ignore): update zigbee-herdsman-converters to 20.21.0

* fix
  • Loading branch information
@Koenkk
Koenkk authored Oct 1, 2024
1 parent 13e4937 commit c82f932
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 10 deletions.
10 changes: 5 additions & 5 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"winston-transport": "^4.8.0",
"ws": "^8.18.0",
"zigbee-herdsman": "2.1.3",
"zigbee-herdsman-converters": "20.20.0",
"zigbee-herdsman-converters": "20.21.0",
"zigbee2mqtt-frontend": "0.7.4"
},
"devDependencies": {
Expand Down
108 changes: 106 additions & 2 deletions test/bridge.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ describe('Bridge', () => {

it('Should publish devices on startup', async () => {
await resetExtension();
// console.log(MQTT.publish.mock.calls.find((c) => c[0] === 'zigbee2mqtt/bridge/devices')[1])
// console.log(MQTT.publish.mock.calls.find((c) => c[0] === 'zigbee2mqtt/bridge/devices')[1]);
expect(MQTT.publish).toHaveBeenCalledWith(
'zigbee2mqtt/bridge/devices',
stringify([
Expand Down Expand Up @@ -318,6 +318,41 @@ describe('Bridge', () => {
value_max: 454,
value_min: 250,
},
{
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,
},
{
access: 7,
description: 'Defines the desired startup level for a device when it is supplied with power',
label: 'Current level startup',
name: 'current_level_startup',
presets: [
{description: 'Use minimum permitted value', name: 'minimum', value: 0},
{description: 'Use previous value', name: 'previous', value: 255},
],
property: 'current_level_startup',
type: 'numeric',
value_max: 254,
value_min: 1,
},
],
label: 'Level config',
name: 'level_config',
property: 'level_config',
type: 'composite',
},
],
type: 'light',
},
Expand Down Expand Up @@ -1878,6 +1913,41 @@ describe('Bridge', () => {
value_max: 454,
value_min: 250,
},
{
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,
},
{
access: 7,
description: 'Defines the desired startup level for a device when it is supplied with power',
label: 'Current level startup',
name: 'current_level_startup',
presets: [
{description: 'Use minimum permitted value', name: 'minimum', value: 0},
{description: 'Use previous value', name: 'previous', value: 255},
],
property: 'current_level_startup',
type: 'numeric',
value_max: 254,
value_min: 1,
},
],
label: 'Level config',
name: 'level_config',
property: 'level_config',
type: 'composite',
},
],
type: 'light',
},
Expand Down Expand Up @@ -2186,7 +2256,7 @@ describe('Bridge', () => {
await zigbeeHerdsman.events.deviceInterview({device: zigbeeHerdsman.devices.unsupported, status: 'successful'});
await flushPromises();
expect(MQTT.publish).toHaveBeenCalledTimes(7);
// console.log(MQTT.publish.mock.calls.filter((c) => c[0] === 'zigbee2mqtt/bridge/event'))
// console.log(MQTT.publish.mock.calls.filter((c) => c[0] === 'zigbee2mqtt/bridge/event'));
expect(MQTT.publish).toHaveBeenCalledWith(
'zigbee2mqtt/bridge/event',
stringify({
Expand Down Expand Up @@ -2254,6 +2324,40 @@ describe('Bridge', () => {
value_max: 454,
value_min: 250,
},
{
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,
},
{
access: 7,
description: 'Defines the desired startup level for a device when it is supplied with power',
label: 'Current level startup',
name: 'current_level_startup',
presets: [
{description: 'Use minimum permitted value', name: 'minimum', value: 0},
{description: 'Use previous value', name: 'previous', value: 255},
],
property: 'current_level_startup',
type: 'numeric',
value_max: 254,
value_min: 1,
},
],
label: 'Level config',
name: 'level_config',
property: 'level_config',
type: 'composite',
},
],
type: 'light',
},
Expand Down
4 changes: 2 additions & 2 deletions test/networkMap.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ describe('Networkmap', () => {
description: 'TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm',
model: 'LED1545G12',
supports:
'light (state, brightness, color_temp, color_temp_startup), effect, power_on_behavior, color_options, identify, linkquality',
'light (state, brightness, color_temp, color_temp_startup, level_config), effect, power_on_behavior, color_options, identify, linkquality',
vendor: 'IKEA',
},
failed: [],
Expand Down Expand Up @@ -547,7 +547,7 @@ describe('Networkmap', () => {
description: 'TRADFRI bulb E26/E27, white spectrum, globe, opal, 980 lm',
model: 'LED1545G12',
supports:
'light (state, brightness, color_temp, color_temp_startup), effect, power_on_behavior, color_options, identify, linkquality',
'light (state, brightness, color_temp, color_temp_startup, level_config), effect, power_on_behavior, color_options, identify, linkquality',
vendor: 'IKEA',
},
failed: [],
Expand Down

0 comments on commit c82f932

Please sign in to comment.