dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-10-14 18:27:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update converters.

Browse Source
This commit is contained in:
Koen Kanters
2020-05-04 15:11:17 +02:00
parent ff61695355
commit 772f6c0bde
4 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/extension/homeassistant.js
+11
View File
@@ -417,6 +417,7 @@ const cfg = {
white_value: true,
schema: 'json',
command_topic: true,
brightness_scale: 254,
},
},
'light_brightness_colortemp_colorxy_white': {
@@ -429,6 +430,7 @@ const cfg = {
schema: 'json',
command_topic: true,
color_temp: true,
brightness_scale: 254,
},
},
'light_brightness_colortemp_colorxy': {
@@ -440,6 +442,7 @@ const cfg = {
xy: true,
schema: 'json',
command_topic: true,
brightness_scale: 254,
},
},
'light_brightness_colorxy': {
@@ -450,6 +453,7 @@ const cfg = {
xy: true,
schema: 'json',
command_topic: true,
brightness_scale: 254,
},
},
'light_brightness_colortemp_colorhs': {
@@ -461,6 +465,7 @@ const cfg = {
hs: true,
schema: 'json',
command_topic: true,
brightness_scale: 254,
},
},
'light_brightness_colortemp': {
@@ -471,6 +476,7 @@ const cfg = {
color_temp: true,
schema: 'json',
command_topic: true,
brightness_scale: 254,
},
},
'light_brightness': {
@@ -480,6 +486,7 @@ const cfg = {
brightness: true,
schema: 'json',
command_topic: true,
brightness_scale: 254,
},
},
@@ -1600,6 +1607,10 @@ const mapping = {
'ZL1000700-22-EU-V1A02': [cfg.light_brightness],
'SLB2': [],
'8840100H': [cfg.binary_sensor_water_leak, cfg.sensor_temperature, cfg.sensor_battery],
'404037': [cfg.light_brightness_colortemp],
'9290022408': [cfg.switch],
'HGZB-14A': [cfg.binary_sensor_water_leak, cfg.sensor_battery],
'TERNCY-DC01': [cfg.sensor_temperature, cfg.binary_sensor_contact],
};
/**
npm-shrinkwrap.json
Generated
+23 -13
View File
@@ -2178,9 +2178,9 @@
"dev": true
},
"eslint-plugin-jest": {
"version": "23.8.2",
"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz",
"integrity": "sha512-xwbnvOsotSV27MtAe7s8uGWOori0nUsrXh2f1EnpmXua8sDfY6VZhHAhHg2sqK7HBNycRQExF074XSZ7DvfoFg==",
"version": "23.9.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.9.0.tgz",
"integrity": "sha512-8mt5xJQIFh33W5nE7vCikkDTE4saTo08V91KjU6yI5sLQ9e8Jkp1OXkWJoIHLheFqY5OXIZdAjZmNYHSJ3IpzQ==",
"dev": true,
"requires": {
"@typescript-eslint/experimental-utils": "^2.5.0"
@@ -3132,6 +3132,13 @@
}
}
},
"is-docker": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
"integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
"dev": true,
"optional": true
},
"is-extendable": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -3216,11 +3223,14 @@
"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
},
"is-wsl": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
"integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==",
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
"dev": true,
"optional": true
"optional": true,
"requires": {
"is-docker": "^2.0.0"
}
},
"isarray": {
"version": "1.0.0",
@@ -4933,9 +4943,9 @@
}
},
"moment": {
"version": "2.25.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.25.1.tgz",
"integrity": "sha512-nRKMf9wDS4Fkyd0C9LXh2FFXinD+iwbJ5p/lh3CHitW9kZbRbJ8hCruiadiIXZVbeAqKZzqcTvHnK3mRhFjb6w=="
"version": "2.25.2",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.25.2.tgz",
"integrity": "sha512-2BZ14aoZMfyeTmjPi2LHdPKLvb6v4uz8QruMFzHTWd1Rl98p3TWLK6GsRFqQoJOKDZmVetzYO1iU6u1QgGJelQ=="
},
"mqtt": {
"version": "4.0.0",
@@ -15167,9 +15177,9 @@
}
},
"zigbee-herdsman-converters": {
"version": "12.0.82",
"resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.82.tgz",
"integrity": "sha512-8Nyjt6R1RyQXx2Rqby1J7vxDXj8qXiDOkdIIgiUMmwhqCF43PVgx/YpsJHtM4igu9FrTUNbguUpr61ZkNWRXXA==",
"version": "12.0.83",
"resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.83.tgz",
"integrity": "sha512-cJx1RcoQMCMcHl3T5Xgj00J76rSG5KG27Z+36FMNl7GdbNlPbJeoTAjsr6OfHAzB98fwarjzlMs3URJSndTBdw==",
"requires": {
"axios": "*",
"tar-stream": "*"
package.json
+1 -1
View File
@@ -46,7 +46,7 @@
"semver": "*",
"winston": "*",
"zigbee-herdsman": "0.12.84",
"zigbee-herdsman-converters": "12.0.82"
"zigbee-herdsman-converters": "12.0.83"
},
"devDependencies": {
"eslint": "*",
test/publish.test.js
+2 -2
View File
@@ -719,7 +719,7 @@ describe('Publish', () => {
await MQTT.events.message('zigbee2mqtt/bulb_color/set', JSON.stringify(payload));
await flushPromises();
expect(endpoint.command).toHaveBeenCalledTimes(1);
expect(endpoint.command.mock.calls[0]).toEqual(["genLevelCtrl", "moveToLevelWithOnOff", {level: 255, transtime: 30}, {}]);
expect(endpoint.command.mock.calls[0]).toEqual(["genLevelCtrl", "moveToLevelWithOnOff", {level: 254, transtime: 30}, {}]);
});
it('Should turn device on with on/off with transition when transition 0 is provided', async () => {
@@ -729,7 +729,7 @@ describe('Publish', () => {
await MQTT.events.message('zigbee2mqtt/bulb_color/set', JSON.stringify(payload));
await flushPromises();
expect(endpoint.command).toHaveBeenCalledTimes(1);
expect(endpoint.command.mock.calls[0]).toEqual(["genLevelCtrl", "moveToLevelWithOnOff", {level: 255, transtime: 0}, {}]);
expect(endpoint.command.mock.calls[0]).toEqual(["genLevelCtrl", "moveToLevelWithOnOff", {level: 254, transtime: 0}, {}]);
});
it('Should turn device off with onOff on off with transition', async () => {