iobroker.zigbee 1.8.1 → 1.8.3

package/lib/rgb.js

@@ -4,7 +4,7 @@ With these functions you can convert the CIE color space to the RGB color space
 The developer documentation for Philips Hue provides the formulas used in the code below:
 https://developers.meethue.com/documentation/color-conversions-rgb-xy
 
-I've used the formulas and Objective-C example code and transferred it to JavaScript.
+I've used the formulas and Objective-C example code and transfered it to JavaScript.
 
 
 Examples:
@@ -60,20 +60,24 @@ function cie_to_rgb(x, y, brightness) {
     const Z = (Y / y) * z;
 
     //Convert to RGB using Wide RGB D65 conversion
-    let red   = X * 1.656492 - Y * 0.354851 - Z * 0.255038;
+    let red 	=  X * 1.656492 - Y * 0.354851 - Z * 0.255038;
     let green = -X * 0.707196 + Y * 1.655397 + Z * 0.036152;
-    let blue  = X * 0.051713 - Y * 0.121364 + Z * 1.011530;
+    let blue 	=  X * 0.051713 - Y * 0.121364 + Z * 1.011530;
 
     //If red, green or blue is larger than 1.0 set it back to the maximum of 1.0
     if (red > blue && red > green && red > 1.0) {
+
         green = green / red;
         blue = blue / red;
         red = 1.0;
-    } else if (green > blue && green > red && green > 1.0) {
+    }
+    else if (green > blue && green > red && green > 1.0) {
+
         red = red / green;
         blue = blue / green;
         green = 1.0;
-    } else if (blue > red && blue > green && blue > 1.0) {
+    }
+    else if (blue > red && blue > green && blue > 1.0) {
 
         red = red / blue;
         green = green / blue;
@@ -81,24 +85,25 @@ function cie_to_rgb(x, y, brightness) {
     }
 
     //Reverse gamma correction
-    red   = red   <= 0.0031308 ? 12.92 * red : (1.0 + 0.055) * Math.pow(red, (1.0 / 2.4)) - 0.055;
-    green = green <= 0.0031308 ? 12.92 * green : (1.0 + 0.055) * Math.pow(green, (1.0 / 2.4)) - 0.055;
-    blue  = blue  <= 0.0031308 ? 12.92 * blue : (1.0 + 0.055) * Math.pow(blue, (1.0 / 2.4)) - 0.055;
+    red 	= red   <= 0.0031308 ? 12.92 * red   : (1.0 + 0.055) * Math.pow(red,   (1.0 / 2.4)) - 0.055;
+    green 	= green <= 0.0031308 ? 12.92 * green : (1.0 + 0.055) * Math.pow(green, (1.0 / 2.4)) - 0.055;
+    blue 	= blue  <= 0.0031308 ? 12.92 * blue  : (1.0 + 0.055) * Math.pow(blue,  (1.0 / 2.4)) - 0.055;
+
 
     //Convert normalized decimal to decimal
-    red   = Math.round(red * 255);
-    green = Math.round(green * 255);
-    blue  = Math.round(blue * 255);
+    red 	= Math.round(red * 255);
+    green 	= Math.round(green * 255);
+    blue 	= Math.round(blue * 255);
 
-    if (isNaN(red) || red < 0) {
+    if (isNaN(red) || red < 0 ) {
         red = 0;
     }
 
-    if (isNaN(green) || green < 0) {
+    if (isNaN(green) || green < 0 ) {
         green = 0;
     }
 
-    if (isNaN(blue) || blue < 0) {
+    if (isNaN(blue) || blue < 0 ) {
         blue = 0;
     }
 
@@ -115,18 +120,18 @@ function cie_to_rgb(x, y, brightness) {
  */
 function rgb_to_cie(red, green, blue) {
     // Apply a gamma correction to the RGB values, which makes the color more vivid and more the like the color displayed on the screen of your device
-    red   = (red > 0.04045) ? Math.pow((red + 0.055) / (1.0 + 0.055), 2.4) : (red / 12.92);
-    green = (green > 0.04045) ? Math.pow((green + 0.055) / (1.0 + 0.055), 2.4) : (green / 12.92);
-    blue  = (blue > 0.04045) ? Math.pow((blue + 0.055) / (1.0 + 0.055), 2.4) : (blue / 12.92);
+    red 	= (red > 0.04045) ? Math.pow((red + 0.055) / (1.0 + 0.055), 2.4) : (red / 12.92);
+    green 	= (green > 0.04045) ? Math.pow((green + 0.055) / (1.0 + 0.055), 2.4) : (green / 12.92);
+    blue 	= (blue > 0.04045) ? Math.pow((blue + 0.055) / (1.0 + 0.055), 2.4) : (blue / 12.92);
 
     // RGB values to XYZ using the Wide RGB D65 conversion formula
-    const X = red * 0.664511 + green * 0.154324 + blue * 0.162028;
-    const Y = red * 0.283881 + green * 0.668433 + blue * 0.047685;
-    const Z = red * 0.000088 + green * 0.072310 + blue * 0.986039;
+    const X 		= red * 0.664511 + green * 0.154324 + blue * 0.162028;
+    const Y 		= red * 0.283881 + green * 0.668433 + blue * 0.047685;
+    const Z 		= red * 0.000088 + green * 0.072310 + blue * 0.986039;
 
     // Calculate the xy values from the XYZ values
-    let x = (X / (X + Y + Z)).toFixed(4);
-    let y = (Y / (X + Y + Z)).toFixed(4);
+    let x 		= (X / (X + Y + Z)).toFixed(4);
+    let y 		= (Y / (X + Y + Z)).toFixed(4);
 
     if (isNaN(x)) {
         x = 0;
@@ -145,13 +150,9 @@ function hsvToRGB(h, s, v) {
     s = s / 100;
     v = v / 100;
 
-    let r;
-    let g;
-    let b;
+    let r; let g; let b;
     if (arguments.length === 1) {
-        s = h.s;
-        v = h.v;
-        h = h.h;
+        s = h.s, v = h.v, h = h.h;
     }
     const i = Math.floor(h * 6);
     const f = h * 6 - i;
@@ -159,36 +160,12 @@ function hsvToRGB(h, s, v) {
     const q = v * (1 - f * s);
     const t = v * (1 - (1 - f) * s);
     switch (i % 6) {
-        case 0:
-            r = v;
-            g = t;
-            b = p;
-            break;
-        case 1:
-            r = q;
-            g = v;
-            b = p;
-            break;
-        case 2:
-            r = p;
-            g = v;
-            b = t;
-            break;
-        case 3:
-            r = p;
-            g = q;
-            b = v;
-            break;
-        case 4:
-            r = t;
-            g = p;
-            b = v;
-            break;
-        case 5:
-            r = v;
-            g = p;
-            b = q;
-            break;
+        case 0: r = v, g = t, b = p; break;
+        case 1: r = q, g = v, b = p; break;
+        case 2: r = p, g = v, b = t; break;
+        case 3: r = p, g = q, b = v; break;
+        case 4: r = t, g = p, b = v; break;
+        case 5: r = v, g = p, b = q; break;
     }
     return {
         r: Math.round(r * 255),
@@ -199,92 +176,73 @@ function hsvToRGB(h, s, v) {
 
 function rgbToHSV(r, g, b, numeric) {
     if (arguments.length === 1) {
-        g = r.g;
-        b = r.b;
-        r = r.r;
+        g = r.g, b = r.b, r = r.r;
     }
-    const max = Math.max(r, g, b);
-    const min = Math.min(r, g, b);
+    const max = Math.max(r, g, b); const min = Math.min(r, g, b);
     const d = max - min;
     let h;
     const s = (max === 0 ? 0 : d / max);
     const v = max / 255;
 
     switch (max) {
-        case min:
-            h = 0;
-            break;
-        case r:
-            h = (g - b) + d * (g < b ? 6 : 0);
-            h /= 6 * d;
-            break;
-        case g:
-            h = (b - r) + d * 2;
-            h /= 6 * d;
-            break;
-        case b:
-            h = (r - g) + d * 4;
-            h /= 6 * d;
-            break;
-    }
-    if (numeric) {
-        return {
-            h: Math.round(h * 360),
-            s: Math.round(s * 100),
-            v: Math.round(v * 100),
-        };
-    }
+        case min: h = 0; break;
+        case r: h = (g - b) + d * (g < b ? 6: 0); h /= 6 * d; break;
+        case g: h = (b - r) + d * 2; h /= 6 * d; break;
+        case b: h = (r - g) + d * 4; h /= 6 * d; break;
+    }
+    if (numeric) return {
+        h: Math.round(h*360),
+        s: Math.round(s*100),
+        v: Math.round(v*100),
+    };
     return {
         h: (h * 360).toFixed(3),
         s: (s * 100).toFixed(3),
         v: (v * 100).toFixed(3),
     };
 }
-
 function colorArrayFromString(value) {
-    if (typeof value === 'string') {
+    if (typeof(value) === 'string') {
         const rv = [];
-        value.split(',').forEach(element =>
-            rv.push(colors.ParseColor(element)));
+        value.split(',').forEach(element => {
+            rv.push(colors.ParseColor(element));
+        });
         return rv;
     }
-    return [{r: 0, g: 128, b: 255}];
+    return [{r:0,g:128,b:255}];
 }
 
-function colorStringFromRGBArray(payload) {
-    const rv = [];
-    payload.forEach(element =>
-        rv.push(rgb_to_rgbstring(element)));
+function colorStringFromRGBArray(payload)
+{
+    let rv = []
+    payload.forEach(element => {
+        rv.push(rgb_to_rgbstring(element));
+    });
     return rv.toString();
 }
 
-function hsv_to_cie(h, s, v) {
-    const rgb = hsvToRGB(h, s, v);
+function hsv_to_cie(h,s,v){
+    const rgb = hsvToRGB(h,s,v);
     return rgb_to_cie(rgb.r, rgb.g, rgb.b);
 }
 
 function rgb_to_rgbstring(element) {
     let col = '#';
-    if (element && element.hasOwnProperty('r')) {
-        col = col + element.r.toString(16).padStart(2, '0');
-    } else {
-        col = col + '00';
-    }
-    if (element && element.hasOwnProperty('g')) {
-        col = col + element.g.toString(16).padStart(2, '0');
-    } else {
-        col = col + '00';
-    }
-    if (element && element.hasOwnProperty('b')) {
-        col = col + element.b.toString(16).padStart(2, '0');
-    } else {
-        col = col + '00';
-    }
+    if (element && element.hasOwnProperty("r"))
+      col = col + element.r.toString(16).padStart(2, '0');
+    else col = col + '00';
+    if (element && element.hasOwnProperty("g"))
+      col = col + element.g.toString(16).padStart(2, '0');
+    else col = col + '00';
+    if (element && element.hasOwnProperty("b"))
+      col = col + element.b.toString(16).padStart(2, '0');
+    else col = col + '00';
     return col;
 }
 
-function hsvToRGBString(h, s, v) {
-    return rgb_to_rgbstring(hsvToRGB(h, s, v));
+
+function hsvToRGBString(h,s,v) {
+    return rgb_to_rgbstring(hsvToRGB(h,s,v))
 }
 
 exports.hsv_to_cie = hsv_to_cie;

package/lib/seriallist.js

@@ -1,13 +1,13 @@
 'use strict';
 
-let SerialPort = null;
+const serialPortUtils = require('zigbee-herdsman/dist/adapter/serialPortUtils').default;
+
 
 class SerialList {
     constructor(adapter) {
         this.adapter = adapter;
-        this.adapter.on('message', obj => this.onMessage(obj));
+        this.adapter.on('message', this.onMessage.bind(this));
     }
-
     /**
      * @param {ioBroker.Message} obj
      */
@@ -16,33 +16,28 @@ class SerialList {
             switch (obj.command) {
                 case 'listUart':
                     if (obj.callback) {
-                        SerialPort = SerialPort || require('serialport').SerialPort;
-                        if (SerialPort) {
-                            // read all found serial ports
-                            SerialPort.list()
-                                .then(ports => {
-                                    this.adapter.log.info(`List of port: ${JSON.stringify(ports)}`);
-                                    this.adapter.sendTo(obj.from, obj.command, ports.map(item => ({
-                                        label: item.friendlyName || item.pnpId || item.manufacturer,
-                                        comName: item.path
-                                    })), obj.callback);
-                                })
-                                .catch(e => {
-                                    this.adapter.sendTo(obj.from, obj.command, [], obj.callback);
-                                    this.adapter.log.error(e);
-                                });
-                        } else {
-                            this.adapter.log.warn('Module serialport is not available');
-                            this.adapter.sendTo(obj.from, obj.command, [{
-                                label: 'Not available',
-                                comName: ''
-                            }], obj.callback);
-                        }
+                        this.listSerial()
+                            .then((ports) => {
+                                this.adapter.log.debug('List of ports: ' + JSON.stringify(ports));
+                                this.adapter.sendTo(obj.from, obj.command, ports.map(item => ({                                 
+                                    label: item.friendlyName || item.pnpId || item.manufacturer,
+                                    comName: item.path
+                                })), obj.callback);
+                            }).catch((err) => {
+                                this.adapter.log.error(`List of ports error: ${err}`);
+                                this.adapter.sendTo(obj.from, obj.command, [], obj.callback);
+                            });
                     }
                     break;
             }
         }
     }
+
+    listSerial() {
+        return serialPortUtils.find([{}]).then((ports) => {
+            return ports.map((port) => {return {comName: port};});
+        });
+    }
 }
 
 module.exports = SerialList;