zigbee-herdsman-converters 14.0.482 → 14.0.483

package/devices/ikea.js

@@ -378,7 +378,7 @@ module.exports = [
     },
     {
         zigbeeModel: ['TRADFRI bulb E27 CWS opal 600lm', 'TRADFRI bulb E26 CWS opal 600lm', 'TRADFRI bulb E14 CWS opal 600lm',
-            'TRADFRI bulb E12 CWS opal 600lm'],
+            'TRADFRI bulb E12 CWS opal 600lm', 'TRADFRI bulb E27 C/WS opal 600'],
         model: 'LED1624G9',
         vendor: 'IKEA',
         description: 'TRADFRI LED bulb E14/E26/E27 600 lumen, dimmable, color, opal white',

package/devices/lixee.js

@@ -196,7 +196,8 @@ const fzLocal = {
 // we are doing it with exclusion and not inclusion because the list is dynamic (based on zlinky mode),
 // and change based on that. Just some few attributes are useless, so we exclude them
 const tarifsDef = {
-    histo_BASE: {fname: 'Historique - BASE',
+    histo_BASE: {
+        fname: 'Historique - BASE',
         currentTarf: 'BASE', excluded: [
             'HCHC',
             'HCHP',
@@ -212,7 +213,8 @@ const tarifsDef = {
             'DEMAIN',
             'PEJP',
         ]},
-    histo_HCHP: {fname: 'Historique - HCHP',
+    histo_HCHP: {
+        fname: 'Historique - HCHP',
         currentTarf: 'HC..', excluded: [
             'BASE',
             'EJPHN',
@@ -226,7 +228,8 @@ const tarifsDef = {
             'DEMAIN',
             'PEJP',
         ]},
-    histo_EJP: {fname: 'Historique - EJP',
+    histo_EJP: {
+        fname: 'Historique - EJP',
         currentTarf: 'EJP.', excluded: [
             'BASE',
             'HCHC',
@@ -239,7 +242,8 @@ const tarifsDef = {
             'BBRHPJR',
             'DEMAIN',
         ]},
-    histo_BBR: {fname: 'Historique - BBR',
+    histo_BBR: {
+        fname: 'Historique - BBR',
         currentTarf: 'BBR', excluded: [
             'BASE',
             'HCHC',
@@ -248,7 +252,8 @@ const tarifsDef = {
             'EJPHPM',
             'PEJP',
         ]},
-    stand_SEM_WE_MERCR: {fname: 'Standard - Sem WE Mercredi',
+    stand_SEM_WE_MERCR: {
+        fname: 'Standard - Sem WE Mercredi',
         currentTarf: 'SEM WE MERCREDI', excluded: [
             'EASF04',
             'EASF05',
@@ -271,8 +276,10 @@ const tarifsDef = {
             'PJOURF+1',
             'PPOINTE1',
         ]},
-    stand_HPHC: {fname: 'Standard - Heure Pleine Heure Creuse',
-        currentTarf: 'H PLEINE/CREUSE', excluded: [
+    stand_BASE: {
+        fname: 'Standard - BASE',
+        currentTarf: 'BASE',
+        excluded: [
             'EASF03',
             'EASF04',
             'EASF05',
@@ -295,8 +302,33 @@ const tarifsDef = {
             'PJOURF+1',
             'PPOINTE1',
         ]},
+    stand_HPHC: {
+        fname: 'Standard - Heure Pleine Heure Creuse',
+        currentTarf: 'H PLEINE/CREUSE', excluded: [
+            'EASF03',
+            'EASF04',
+            'EASF05',
+            'EASF06',
+            'EASF07',
+            'EASF08',
+            'EASF09',
+            'EASF10',
+            'EASD03',
+            'EASD04',
+            'DPM1',
+            'DPM2',
+            'DPM3',
+            'FPM1',
+            'FPM2',
+            'FPM3',
+            'NJOURF',
+            'NJOURF+1',
+            'PJOURF+1',
+            'PPOINTE1',
+        ]},
 };
 
+
 const linkyModeDef = {
     standard: 'standard',
     legacy: 'historique',
@@ -505,6 +537,9 @@ function getCurrentConfig(device, options, logger=console) {
     case linkyMode == linkyModeDef.standard && tarifsDef.stand_HPHC.currentTarf:
         myExpose = myExpose.filter((a) => !tarifsDef.stand_HPHC.excluded.includes(a.exposes.name));
         break;
+    case linkyMode == linkyModeDef.standard && tarifsDef.stand_BASE.currentTarf:
+        myExpose = myExpose.filter((a) => !tarifsDef.stand_BASE.excluded.includes(a.exposes.name));
+        break;
     default:
         break;
     }

package/devices/micromatic.js

@@ -20,6 +20,7 @@ module.exports = [
             await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl', 'haElectricalMeasurement', 'seMetering']);
             await reporting.brightness(endpoint);
             await reporting.readEletricalMeasurementMultiplierDivisors(endpoint);
+            await reporting.readMeteringMultiplierDivisor(endpoint);
             await reporting.rmsVoltage(endpoint, {min: 10, change: 20}); // Voltage - Min change of 2V
             await reporting.rmsCurrent(endpoint, {min: 10, change: 10}); // A - z2m displays only the first decimals, change of 10 / 0,01A
             await reporting.activePower(endpoint, {min: 10, change: 15}); // W - Min change of 1,5W
@@ -28,4 +29,3 @@ module.exports = [
         exposes: [e.light_brightness(), e.power(), e.current(), e.voltage().withAccess(ea.STATE), e.energy()],
     },
 ];
-

package/devices/vbled.js

@@ -0,0 +1,18 @@
+const reporting = require('../lib/reporting');
+const extend = require('../lib/extend');
+
+module.exports = [
+    {
+        zigbeeModel: ['43023'],
+        model: '43023',
+        vendor: 'VBLED',
+        description: 'ZigBee AC phase-cut dimmer',
+        extend: extend.light_onoff_brightness({noConfigure: true}),
+        configure: async (device, coordinatorEndpoint, logger) => {
+            await extend.light_onoff_brightness().configure(device, coordinatorEndpoint, logger);
+            const endpoint = device.getEndpoint(1);
+            await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff', 'genLevelCtrl']);
+            await reporting.onOff(endpoint);
+        },
+    },
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.482",
+  "version": "14.0.483",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [
@@ -38,7 +38,7 @@
     "buffer-crc32": "^0.2.13",
     "https-proxy-agent": "^5.0.0",
     "tar-stream": "^2.2.0",
-    "zigbee-herdsman": "^0.14.22"
+    "zigbee-herdsman": "^0.14.24"
   },
   "devDependencies": {
     "eslint": "*",