@mschaeffler/node-red-bthome 1.6.1 → 1.7.0

package/README.md

@@ -102,7 +102,7 @@ There are two output ports:
 With this JSON string the installed [BT-Home](https://bthome.io) devices are configured:
 ```
 {
-    "<mac address of the device>": { "topic": "<name of the device>", "key": "<encryption key, if device is encrypted>" }
+    "<mac address of the device in lower case>": { "topic": "<name of the device>", "key": "<encryption key, if device is encrypted>" }
 }
 ```
 

package/bthome.html

@@ -195,7 +195,7 @@
     <h4>Device-Configuration</h4>
     <p>With this JSON string the installed <a href="https://bthome.io">BT-Home</a> devices are configured:</p>
     <pre><code>{
-    "<mac address of the device>": { "topic": "<name of the device>", "key": "<encryption key, if device is encrypted>" }
+    "<mac address of the device in lower case>": { "topic": "<name of the device>", "key": "<encryption key, if device is encrypted>" }
 }</code></pre>
 
     <p>An example for such a config from the unit tests:</p>

package/bthome.js

@@ -4,10 +4,42 @@ const Rawdata = require( "./rawdata.js" );
 const BtEvent = require( "./btevent.js" );
 
 class TypeIds {
+    static bluButton = 1;
     static bluDW     = 2;
     static bluRemote = 9;
 }
+class DeviceNames {
+    static 0x01 = "SBBT-002C";
+    static 0x02 = "SBDW-002C";
+    static 0x03 = "SBHT-003C";
+    static 0x05 = "SBHT-003C";
+    static 0x06 = "SBBT-004CEU";
+    static 0x07 = "SBBT-004CUS";
+    static 0x08 = "SBTR-001AEU";
+    static 0x09 = "SBRC-005B";
+    static 0x0A = "SBDI-003E";
+    static 0x0B = "SBWS-90CM";
+    static 0x0C = "SBHT-103C";
+    static 0x11 = "SBHT-203C";
+    static 0x14 = "SBDW-103C";
+    static 0x15 = "SBBT-104CEU"
+    static 0x16 = "SBBT-104CUS";
+    static 0x17 = "SBBT-102C";
+    static 0x201A = "SBCB-01PXNEUB6";
+    static 0x201B = "SBCB-01PXNEUB10";
+    static 0x201C = "SBCB-01PXNEUB13";
+    static 0x201D = "SBCB-01PXNEUB16";
+    static 0x201E = "SBCB-01PXNEUB20";
+    static 0x201F = "SBCB-01PXNEUB25";
+    static 0x203A = "SBCB-01PXNEUC6";
+    static 0x203B = "SBCB-01PXNEUC10";
+    static 0x203C = "SBCB-01PXNEUC13";
+    static 0x203D = "SBCB-01PXNEUC16";
+    static 0x203E = "SBCB-01PXNEUC20";
+    static 0x203F = "SBCB-01PXNEUC25";
+}
 Object.freeze( TypeIds );
+Object.freeze( DeviceNames );
 
 module.exports = function(RED) {
 
@@ -56,6 +88,11 @@ module.exports = function(RED) {
                 node.log( mac + e.message );
                 device.key = null;
             }
+            if( mac !== mac.toLowerCase() )
+            {
+                console.log( `BT addresses must be lower case: ${mac}` );
+                node.error( `BT addresses must be lower case: ${mac}` );
+            }
         }
 
         node.on('input', function(msg,send,done) {
@@ -78,6 +115,10 @@ module.exports = function(RED) {
                 done( "msg.payload.data must be an Array!" );
                 return;
             }
+            if( msg.payload.addr )
+            {
+                msg.payload.addr = msg.payload.addr.toLowerCase();
+            }
 
             function checkMsg()
             {
@@ -256,6 +297,12 @@ module.exports = function(RED) {
                         case 0x46:
                             setData( "uv", rawdata.getUInt8() / 10 );
                             break;
+                        case 0x53:
+                            setData( "text", rawdata.getBuffer().toString() );
+                            break;
+                        case 0x54:
+                            setData( "raw", rawdata.getBuffer() );
+                            break;
                         case 0x59:
                             setData( "count", rawdata.getInt8() );
                             break;
@@ -269,7 +316,8 @@ module.exports = function(RED) {
                             setData( "channel", rawdata.getUInt8() + 1 );
                             break;
                         case 0xF0:
-                            item.typeId = rawdata.getUInt16() & 0xFF;
+                            item.typeId = rawdata.getUInt16() & 0xF0FF;
+                            item.model  = DeviceNames[item.typeId] ?? null;
                             break;
                         case 0xF1:
                             item.version = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mschaeffler/node-red-bthome",
-    "version": "1.6.1",
+    "version": "1.7.0",
     "description": "A Node Red node to decrypt and decode BT-Home frames",
     "author": {
         "name": "Mathias Schäffler",

package/rawdata.js

@@ -61,6 +61,16 @@ class Rawdata {
     {
         return values[this.getUInt8()] ?? "";
     }
+    getBuffer()
+    {
+        const size = this.getUInt8();
+        let   buf  = Buffer.alloc( size );
+        for( let i = 0; i < size; i++ )
+        {
+            buf[i] = this.getUInt8();
+        }
+        return buf;
+    }
 }
 
 module.exports = Rawdata;