bt-sensors-plugin-sk 1.3.2 → 1.3.3

package/BTSensor.js

@@ -3,7 +3,7 @@ const { log } = require('node:console');
 const EventEmitter = require('node:events');
 const AutoQueue =  require("./Queue.js")
 const DistanceManager = require("./DistanceManager")
-
+const OutOfRangeDevice = require("./OutOfRangeDevice.js")
 /** 
  * @author Andrew Gerngross <oh.that.andy@gmail.com>
 */
@@ -278,7 +278,7 @@ class BTSensor extends EventEmitter {
 
     unsetError(){
         this._error=false
-        this.emit("error", false)
+        this.emit("errorDetected", false)
     }
 
     setError(message){
@@ -292,7 +292,7 @@ class BTSensor extends EventEmitter {
 
         this._errorLog.push({timestamp:Date.now(), message:message})
         this._error=true
-        this.emit("error", true)
+        this.emit("errorDetected", true)
     }
 
     //Instance Initialization functions
@@ -365,7 +365,10 @@ class BTSensor extends EventEmitter {
         await this.initSchema()
 
         this.initListen()
-        this.setState("DORMANT")
+        if ( this.device instanceof OutOfRangeDevice)
+            this.setState("OUT OF RANGE")
+        else
+            this.setState("DORMANT")
 
     }
 
@@ -1059,11 +1062,11 @@ class BTSensor extends EventEmitter {
 			if (!(path === undefined)) {
                 let preparedPath =  this.preparePath(path)
                 this.on(tag, (val)=>{
-					if (pathMeta.notify){
+/*					if (pathMeta.notify){
 						this._app.notify(tag, val, id )
-					} else {
+					} else {*/
 						this.updatePath(preparedPath,val, id, source)
-					}
+					//}
                 })
 			}
 		})

package/README.md

@@ -1,6 +1,18 @@
 # Bluetooth Sensors for [Signal K](http://www.signalk.org) 
 
 ## WHAT'S NEW  
+
+# Version 1.3.3 
+
+- Support for additional Xiaomi environmental sensors
+- Out Of Range device automatic retry
+- Pairing guide
+
+# Version 1.3.2-1
+
+- VictronSmartBatteryProtect fix
+- RenogyRoverClient deviceID clarity
+
 # Version 1.3.2
 
 - Victron Alarm Reason improvements

package/index.js

@@ -445,7 +445,7 @@ module.exports =   function (app) {
 			sensor.on("connected", (state)=>{
 				updateSensor(sensor)			
 			})
-			sensor.on("error",(error)=>{
+			sensor.on("errorDetected",(error)=>{
 				updateSensor(sensor)		
 			})
 			sensor.on("debug", ()=>{
@@ -492,19 +492,17 @@ module.exports =   function (app) {
 					s.stopListening()
 				else{
 					const device = new OutOfRangeDevice(adapter, config)
-					const c = await getClassFor(device,config)
-					if (c.domain==BTSensor.SensorDomains.beacons || c.IsRoaming){
-						s = await instantiateSensor(device,config)
-						device.once("deviceFound",async (device)=>{
-								s.device=device
-								s.listen()
-								await s.activate(config, plugin)
-								removeSensorFromList(s)
-								addSensorToList(s)
-						})
+					s = await instantiateSensor(device,config)
+					device.once("deviceFound",async (device)=>{
+						s.device=device
+						s.listen()
+						if (config.active)
+							await s.activate(config, plugin)
+						removeSensorFromList(s)
 						addSensorToList(s)
-						resolve(s)
-					}
+					})
+					addSensorToList(s)
+					resolve(s)
 				}
 				if (startNumber == starts ) {
 					const errorTxt = `Unable to communicate with device ${deviceNameAndAddress(config)} Reason: ${e?.message??e}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Bluetooth Sensors for Signalk - see https://www.npmjs.com/package/bt-sensors-plugin-sk#supported-sensors for a list of supported sensors",
   "main": "index.js",
   "dependencies": {

package/pairing.md

@@ -0,0 +1,147 @@
+# Bluetooth Device Pairing using bluetoothctl
+
+This guide provides a step-by-step procedure for pairing, trusting, and connecting a new Bluetooth device using the bluetoothctl command-line utility, which is the official Bluetooth client for BlueZ (the Linux Bluetooth stack).
+
+## Prerequisites
+
+- A running Linux system (e.g., Debian, Ubuntu, Fedora, Arch).
+- The bluez package installed (which includes bluetoothctl).
+- The Bluetooth service (bluetooth.service) is running. 
+- Your local Bluetooth adapter is enabled and powered on.
+
+## The Pairing Process
+
+Follow these steps within your terminal:
+
+### Step 1: Launch bluetoothctl
+
+Open your terminal and run the command to enter the interactive bluetoothctl prompt.
+
+```
+
+bluetoothctl
+
+```
+
+(The prompt should change to [bluetooth]#)
+
+### Step 2: Check Controller Status (Optional but recommended)Ensure your adapter is powered on and set to discoverable/pairable mode.
+
+```
+
+[bluetooth]# show
+
+```
+
+If the Powered field is listed as no, power the adapter on:
+
+```
+
+[bluetooth]# power on
+
+```
+
+### Step 3: Start Scanning for Devices
+
+Put your target Bluetooth device into pairing mode (see device instructions). Then, start the scanning process:
+
+```
+
+[bluetooth]# scan on
+
+```
+
+
+You will see a list of discovered devices scrolling by with their MAC addresses and names.
+
+```
+Discovery started
+[CHG] Device 12:34:56:78:90:AB Name: My Bluetooth Headphones
+[NEW] Device AB:CD:EF:12:34:56 Name: Wireless Mouse
+...
+```
+
+
+### Step 4: Identify and Stop Scanning
+
+Once you see the name of your device, copy its MAC Address (e.g., AB:CD:EF:12:34:56) and stop the scan to save battery and reduce clutter:
+
+```
+
+[bluetooth]# scan off
+
+```
+
+
+Step 5: Trust the Device
+
+Trusting the device is crucial. It allows the device to reconnect automatically after a reboot or disconnection without needing to re-pair. Replace [MAC_ADDRESS] with your device's MAC address.
+
+```
+
+[bluetooth]# trust [MAC_ADDRESS]
+
+Attempting to trust AB:CD:EF:12:34:56
+[CHG] Device AB:CD:EF:12:34:56 Trusted: yes
+...
+
+```
+
+### Step 6: Connect the Device 
+
+This step attempts to establish the active connection. 
+
+```
+
+[bluetooth]# connect [MAC_ADDRESS]
+
+Attempting to connect to AB:CD:EF:12:34:56
+[CHG] Device AB:CD:EF:12:34:56 Connected: yes
+Connection successful
+...
+```
+
+### Step 7: Pair the Device
+
+If the connection attempt in Step 6 did not automatically handle the key exchange, or if you prefer to explicitly perform the key exchange first, use the pair command. This initiates the actual pairing sequence. If your device requires a PIN or Passkey, bluetoothctl will prompt you to enter it (or confirm it). NOTE: Check your device's manual for setting the device's pairing mode.
+
+```
+
+[bluetooth]# pair [MAC_ADDRESS]
+Attempting to pair with AB:CD:EF:12:34:56
+[CHG] Device AB:CD:EF:12:34:56 Paired: yes
+Pairing successful
+...
+
+```
+
+(If prompted, enter or confirm the Passkey. If this command succeeds, you may need to run connect (Step 6) again to establish the active link.)
+
+### Step 8: Exit
+
+Once the connection is established, you can exit the interactive utility.
+
+```
+
+[bluetooth]# exit
+
+```
+
+## Summary of Essential Commands
+
+| **Command** | **Purpose** | 
+| :--- | :--- |
+| `bluetoothctl` | Enter the interactive prompt. | 
+| `power on` | Power on the local Bluetooth adapter. | 
+| `scan on` | Start discovering nearby devices. | 
+| `scan off` | Stop device discovery. | 
+| `trust [MAC]` | Mark the device as trusted for auto-reconnection. **(Crucial)** | 
+| `connect [MAC]` | Establish a connection to the device (may implicitly trigger pairing). | 
+| `pair [MAC]` | Explicitly initiate the pairing process (key exchange). | 
+| `exit` | Exit the `bluetoothctl` utility. | 
+
+### Troubleshooting Tips
+
+* **Adapter Issues:** If `show` or `list` commands don't show an adapter, ensure your Bluetooth hardware is properly recognized by the system (check kernel logs or `rfkill list`).
+
+* **Device Out of Range:** Ensure the device is close to the computer and is fully charged.

package/sensor_classes/JBDBMS.js

@@ -197,6 +197,7 @@ class JBDBMS extends BTSensor {
 } 
 
 async initGATTConnection() {
+  this.setConnected(await this.device.isConnected())
   return this  
 }
 

package/sensor_classes/JikongBMS.js

@@ -257,7 +257,7 @@ class JikongBMS extends BTSensor {
 
     this.addMetadatum("cycleCapacity", "number", "Cycle capacity", (buffer) => {
       return buffer.readUInt32LE(154 + this.offset * 2) / 1000;
-    }).default = "electrical.batteries.{batteryID}.discharging";
+    }).default = "electrical.batteries.{batteryID}.cycleCapacity";
 
     this.addMetadatum(
       "balanceAction",

package/sensor_classes/Renogy/RenogySensor.js

@@ -3,7 +3,7 @@ ported from https://github.com/cyrils/renogy-bt
 */
 const BTSensor = require("../../BTSensor.js");
 const VC = require('./RenogyConstants.js');
-const crc16Modbus = require('./CRC.js')
+const crc16Modbus = require('./CRC.js');
 class RenogySensor extends BTSensor{
     static Domain=BTSensor.SensorDomains.electrical
     static ALIAS_PREFIX = 'BT-TH'
@@ -34,20 +34,27 @@ class RenogySensor extends BTSensor{
         b.writeUInt16BE(words,4) 
         b.writeUInt16BE(crc16Modbus(b.subarray(0,6)),6)          
         
-        await writeCharacteristic.writeValueWithResponse(b,  0)
+        await writeCharacteristic.writeValueWithoutResponse(b,  0)
     
     }
     static identify(device){
         return null
     }
-
+    pollFreq=30
     async initSchema(){
         await super.initSchema()
-       
+        this.getGATTParams().pollFreq.default=this.pollFreq
         this.addParameter(
             "deviceID",
             {
-                title: 'ID of device'
+                title: 'ID of device',
+                description: 'only modify if device is in hub mode or daisy chained',
+                default:255,
+                type: 'number',
+                minimum: 0, 
+                maximum: 255,
+                multipleOf:1,
+                isRequired: true                
             }
         ) 
     }
@@ -73,15 +80,17 @@ class RenogySensor extends BTSensor{
     }
 
     async sendReadFunctionRequest(writeReq, words){
-        this.constructor.sendReadFunctionRequest(
+        await this.constructor.sendReadFunctionRequest(
             this.writeChar, this.getDeviceID(), writeReq, words) 
     }
 
     initGATTInterval(){
+        this.emitGATT()
         this.intervalID = setInterval(()=>{
             this.emitGATT()
         }, 1000*(this?.pollFreq??60) )
     }
+
     emitGATT(){
          this.getAllEmitterFunctions().forEach(async (emitter)=>
             await emitter()

package/sensor_classes/RenogyBattery.js

@@ -12,9 +12,21 @@ class RenogyBattery extends RenogySensor {
                 this.getAndEmitCellTemperatures.bind(this), 
                 this.getAndEmitCellVoltages.bind(this)]
     }
+    numberOfCells=4
     initSchema(){
-
-        this.addMetadatum('numberOfCells','', 'number of cells')
+        this.addDefaultParam("batteryID").default="house"
+        this.addParameter(
+            "numberOfCells",
+            {
+                title:"Number of cells",
+                type: "number",
+                isRequired: true,
+                default: this.numberOfCells,
+                minimum: 1,
+                maximum: 16,
+                multipleOf:1
+            }
+        )
         this.addDefaultPath('current','electrical.batteries.current')
             .read=(buffer)=>{return buffer.readInt16BE(3)/100}
              
@@ -41,31 +53,33 @@ class RenogyBattery extends RenogySensor {
     async initGATTConnection() {
         await super.initGATTConnection()
         this.numberOfCells = await this.retrieveNumberOfCells()
-        this.deviceID = await this.retrieveDeviceID()
-        this.emit('numberOfCells', this.numberOfCells)
     }
     
-    retrieveNumberOfCells(){
-
+    retrieveModelID(){
         return new Promise( async ( resolve, reject )=>{
-            await this.sendReadFunctionRequest(0x1388,0x11)
 
-            const valChanged = async (buffer) => {
-                resolve(buffer.readUInt16(3))
-            }
-            this.readChar.once('valuechanged', valChanged )
+        await this.sendReadFunctionRequest(0x1402,0x08)
+          
+        this.readChar.once('valuechanged', async (buffer) => {
+            if (buffer[2]!=0x10) 
+                reject("Unknown error retrieving model ID") //???
+            const model = buffer.subarray(3,17).toString().trim()
+            resolve(model)           
         })
+    })
     }
-    retrieveDeviceID(){
+    retrieveNumberOfCells(){
+
         return new Promise( async ( resolve, reject )=>{
-            this.sendFunctionRequest(0x14, 0x67)
+            await this.sendReadFunctionRequest(0x1388,0x11)
 
             const valChanged = async (buffer) => {
-                resolve((buffer.readUInt8(4)))
+                resolve(buffer.readUInt16(3))
             }
             this.readChar.once('valuechanged', valChanged )
         })
     }
+   
 
     getAndEmitBatteryInfo(){
         return new Promise( async ( resolve, reject )=>{

package/sensor_classes/RenogyInverter.js

@@ -54,10 +54,24 @@ class RenogyInverter extends RenogySensor {
         })
     }
 
+    retrieveModelID(){
+        return new Promise( async ( resolve, reject )=>{
+
+        await this.sendReadFunctionRequest(0x10d7,0x08)
+          
+        this.readChar.once('valuechanged', async (buffer) => {
+            if (buffer[2]!=0x10) 
+                reject("Unknown error retrieving model ID") //???
+            const model = buffer.subarray(3,17).toString().trim()
+            resolve(model)           
+        })
+    })
+    }
+
     getAndEmitInverterStats(){
         return new Promise( async ( resolve, reject )=>{
 
-            await this.sendReadFunctionRequest(0xfa0, 0x8)
+            await this.sendReadFunctionRequest(0xfa0, 0xA)
         
             this.readChar.once('valuechanged', (buffer) => {
                 ["ueiVoltage","ueiCurrent", "voltage", "loadCurrent", "frequency","temperature"].forEach((tag)=>
@@ -71,7 +85,7 @@ class RenogyInverter extends RenogySensor {
     getAndEmitSolarCharging(){
         return new Promise( async ( resolve, reject )=>{
 
-            await this.sendReadFunctionRequest(0x10e9, 0x5)
+            await this.sendReadFunctionRequest(0x10e9, 0x7)
         
             this.readChar.once('valuechanged', (buffer) => {
                 ["solarVoltage","solarCurrent", "solarPower", "solarChargingStatus", "solarChargingPower"].forEach((tag)=>
@@ -85,7 +99,7 @@ class RenogyInverter extends RenogySensor {
     getAndEmitInverterLoad(){
         return new Promise( async ( resolve, reject )=>{
             
-            await this.sendReadFunctionRequest(0x113a, 0x2)
+            await this.sendReadFunctionRequest(0x113a, 0x6)
         
             this.readChar.once('valuechanged', (buffer) => {
                 ["loadPower", "chargingCurrent"].forEach((tag)=>

package/sensor_classes/RenogyRoverClient.js

@@ -34,6 +34,10 @@ class RenogyRoverClient extends RenogySensor {
     initSchema(){
         //Buffer(73) [1, 3, 68, 32, 32, 82, 78, 71, 45, 67, 84, 82, 76, 45, 87, 78, 68, 51, 48, 7, 140, 0, 132, 0, 126, 0, 120, 0, 111, 0, 106, 100, 50, 0, 5, 0, 120, 0, 120, 0, 28, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 5, 0, 5, 2, 148, 0, 5, 206, 143, 34, 228, buffer: ArrayBuffer(8192), byteLength: 73, byteOffset: 6144, length: 73, Symbol(Symbol.toStringTag): 'Uint8Array']
         super.initSchema()
+
+        this.addDefaultParam("id")
+            .default="solar"
+
         this.addMetadatum('batteryType', '', "battery type")
             .default="electrical.chargers.{id}.battery.type"
         this.addMetadatum('batteryPercentage', 'ratio', "battery percentage",
@@ -118,22 +122,12 @@ class RenogyRoverClient extends RenogySensor {
 
     }
     
-    retrieveDeviceID(){
-        return new Promise( async ( resolve, reject )=>{
-            this.sendReadFunctionRequest(0x1A, 0x1)
-
-            const valChanged = async (buffer) => {
-                resolve((buffer.readUInt8(4)))
-            }
-            this.readChar.once('valuechanged', valChanged )
-        })
-    }
-
+   
     retrieveBatteryType(){
         return new Promise( async ( resolve, reject )=>{
         //Buffer(7) [255, 3, 2, 0, 1, 80, 80, buffer: ArrayBuffer(8192), byteLength: 7, byteOffset: 864, length: 7, Symbol(Symbol.toStringTag): 'Uint8Array']
 
-            this.sendReadFunctionRequest(0xe004, 0x01)
+            await this.sendReadFunctionRequest(0xe004, 0x01)
 
             const valChanged = async (buffer) => {
                 resolve(RC.BATTERY_TYPE[(buffer.readUInt8(4))])
@@ -157,13 +151,10 @@ class RenogyRoverClient extends RenogySensor {
     }
     async initGATTConnection() {
         await super.initGATTConnection()
-        if (!this.deviceID)
-            this.deviceID = await this.retrieveDeviceID()
-        this.modelID=await this.retrieveModelID()
 
+        this.modelID=await this.retrieveModelID()
         this.batteryType = await this.retrieveBatteryType()
-        this.emit('batteryType', this.batteryType)
-
+        this.emit('batteryType', this.batteryType)   
         
     }
 
@@ -175,7 +166,7 @@ class RenogyRoverClient extends RenogySensor {
     async getAndEmitChargeInfo(){
         return new Promise( async ( resolve, reject )=>{
             try {
-                this.sendReadFunctionRequest(0x100, 0x22)
+                await this.sendReadFunctionRequest(0x100, 0x22)
 
                 this.readChar.once('valuechanged', buffer => {
                     this.emitValuesFrom(buffer)

package/sensor_classes/ShenzhenLiOnBMS.js

@@ -71,11 +71,12 @@ class ShenzhenLiONBMS extends BTSensor{
          "numberOfCells",
             {
                 title:"Number of cells",
-                type: "integer",
+                type: "number",
                 isRequired: true,
                 default: 4,
                 minimum: 1,
-                maximum: 16
+                maximum: 16,
+                multipleOf:1
             }
        )
 

package/sensor_classes/VictronBatteryMonitor.js

@@ -26,7 +26,7 @@ class VictronBatteryMonitor extends VictronSensor{
         d.debug.bind(d)
         d.initSchema()
         Object.keys(d.getPaths()).forEach((tag)=>{
-                d.on(tag,(v)=>console.log(`${tag}=${v}`))
+                d.on(tag,(v)=>console.log(`${tag}=${JSON.stringify(v)}`))
         })
         if (key)
             b = d.decrypt(b)
@@ -62,7 +62,6 @@ class VictronBatteryMonitor extends VictronSensor{
         const alarmMD = this.addMetadatum('alarm','',  'alarm', 
                 (buff,offset=0)=>{return buff.readInt16LE(offset)})
                 alarmMD.default='electrical.batteries.{batteryID}.alarm'                
-                alarmMD.notify=true
 
         this.addMetadatum( 'consumed','Ah', 'amp-hours consumed', 
                 (buff,offset=0)=>{return buff.readInt32LE(offset)/10},
@@ -78,8 +77,6 @@ class VictronBatteryMonitor extends VictronSensor{
             .read=(buff,offset=0)=>{return this.NaNif(buff.readUInt16LE(offset),0xFFFF)*60}
         this.getPath("ttg").gatt='65970ffe-4bda-4c1e-af4b-551c4cf74769';
 
-        this.auxMode=VC.AuxMode.STARTER_VOLTAGE
-
         if (this.auxMode==undefined){
             const md=await this.constructor.getDataPacket(this.device, this.getManufacturerData(this.constructor.ManufacturerID))
             try {

package/sensor_classes/VictronDCEnergyMeter.js

@@ -55,7 +55,6 @@ class VictronDCEnergyMeter extends VictronSensor{
         this.addMetadatum('alarm','', 'alarm', 
             (buff)=>{return buff.readUInt16LE(4)})
            .default="electrical.meters.{id}.alarm"
-        this.getPath("alarm").notify=true
         this.addMetadatum('current','A', 'current')
         .default="electrical.meters.{id}.current"       
  

package/sensor_classes/VictronInverter.js

@@ -17,7 +17,6 @@ class VictronInverter extends VictronSensor{
         const md = this.addMetadatum('alarmReason','', 'reason for alarm',
             (buff)=>{return buff.readIntU16LE(1)})
         .default="electrical.inverters.{id}.alarm"
-        md.notify=true
 
         this.addDefaultPath('dcVoltage','electrical.inverters.dc.voltage') 
             .read=(buff)=>{return this.NaNif(buff.readInt16LE(3),0x7FFF)/100}

package/sensor_classes/VictronInverterRS.js

@@ -18,7 +18,6 @@ class VictronInverterRS extends VictronSensor{
         const md = this.addMetadatum('chargerError','', 'charger error',
             (buff)=>{return VC.ChargerError(buff.readIntU8(1))})
             md.default='electrical.inverters.{id}.error'
-            md.notify=true
 
         this.addMetadatum('batteryVoltage','V', 'battery voltage', 
             (buff)=>{return this.NaNif(buff.readInt16LE(2),0x7FFF)/100})

package/sensor_classes/VictronSmartBatteryProtect.js

@@ -33,7 +33,6 @@ class VictronSmartBatteryProtect extends VictronSensor{
             (buff)=>{return VC.ChargerError.get(buff.readUInt8(3))})
         this.addMetadatum('alarmReason','', 'alarm reason', 
             (buff)=>{return buff.readUInt16LE(4)})
-        this.getPath("alarmReason").notify=true
         this.addMetadatum('warningReason','', 'warning reason', //TODO
             (buff)=>{return (buff.readUInt16LE(5))})
         this.addMetadatum('channel1Voltage','V', 'channel one voltage', 
@@ -45,9 +44,9 @@ class VictronSmartBatteryProtect extends VictronSensor{
         }
           emitValuesFrom(decData){
             super.emitValuesFrom(decData)
-            const alarm = this.getPath("alarm").read(decData)
+            const alarm = this.getPath("alarmReason").read(decData)
             if (alarm>0)
-                this.emitAlarm("alarm",alarm)
+                this.emitAlarm("alarmReason",alarm)
           }
 
 }

package/sensor_classes/XiaomiMiBeacon.js

@@ -100,7 +100,7 @@ class XiaomiMiBeacon extends BTSensor{
     }
 
     getDescription(){
-        return `<div><p><img src="../bt-sensors-plugin-sk/images/LYWSD03MMC-Device.jpg" alt=LYWSD03MMC image" style="float: left; margin-right: 10px;" /> The LYWSD03MMC temperature and humidity sensor is an inexpensive environmental sensor from Xiaomi Inc. <p> WARNING: If you use the GATT connection, you won't need an encrypytion//bind key to get your data but the energy cost of maintaining a GATT connection is high and will drain your battery in about 2 weeks of persistent use. Instead follow the instructions <a href=https://github.com/PiotrMachowski/Xiaomi-cloud-tokens-extractor/?tab=readme-ov-file#linux--home-assistant-in-ssh--web-terminal target="_blank">here</a> to get your device's encryption key.<div>`
+        return `<div><p><img src="../bt-sensors-plugin-sk/images/LYWSD03MMC-Device.jpg" alt=LYWSD03MMC image" style="float: left; margin-right: 10px;" /> The LYWSD03MMC temperature and humidity sensor is an inexpensive environmental sensor from Xiaomi Inc. <p> Follow the instructions <a href=https://github.com/PiotrMachowski/Xiaomi-cloud-tokens-extractor/?tab=readme-ov-file#linux--home-assistant-in-ssh--web-terminal target="_blank">here</a> to get your device's encryption key.<div>`
     }
     
     getManufacturer(){
@@ -131,19 +131,18 @@ class XiaomiMiBeacon extends BTSensor{
         })
     }
 
-    decryptV2and3(data){
+    decryptV2and3(data, index=11){
         const encryptedPayload = data.subarray(-4);
-        const xiaomi_mac = data.subarray(5,11)
-        const nonce = Buffer.concat([data.subarray(0, 5), data.subarray(-4,-1), xiaomi_mac.subarray(-1)]);
+        const nonce = Buffer.concat([data.subarray(0, 5), data.subarray(-4,-1), (this._mac_reversed)]);
         const cipher = crypto.createDecipheriv('aes-128-ccm', Buffer.from(this.encryptionKey,"hex"), nonce, { authTagLength: 4});
         cipher.setAAD(Buffer.from('11', 'hex'), { plaintextLength: encryptedPayload.length });
         
         return cipher.update(encryptedPayload)
     }
-    decryptV4and5(data){
-        const encryptedPayload = data.subarray(11,-7);
-        const xiaomi_mac = data.subarray(5,11)
-        const nonce = Buffer.concat([xiaomi_mac, data.subarray(2, 5), data.subarray(-7,-4)]);
+    decryptV4and5(data, index=11){
+        
+        const encryptedPayload = data.subarray(index,-7);
+        const nonce = Buffer.concat([(this._mac_reversed), data.subarray(2, 5), data.subarray(-7,-4)]);
         const cipher = crypto.createDecipheriv('aes-128-ccm', Buffer.from(this.encryptionKey,"hex"), nonce, { authTagLength: 4});
         cipher.setAAD(Buffer.from('11', 'hex'), { plaintextLength: encryptedPayload.length });
         cipher.setAuthTag(data.subarray(-4))    
@@ -151,7 +150,7 @@ class XiaomiMiBeacon extends BTSensor{
     }
 
     hasGATT(){
-        return true
+        return false
     }
 
     propertiesChanged(props){
@@ -160,35 +159,64 @@ class XiaomiMiBeacon extends BTSensor{
         if (!props.hasOwnProperty("ServiceData")) return
         
         const data = this.getServiceData(this.constructor.SERVICE_MIBEACON)
-        var dec
+        if (data.length<12) return
+        
+        let dec=[]
+        let dataIndex=5
+
+        const frameControl = data.readUInt16LE(0)
+        const isEncrypted = (frameControl >> 3) & 1
+        const encryptionVersion = frameControl >> 12 
+        const mesh = (frameControl >> 7) & 1;           // mesh device
+        const authMode = (frameControl >> 10) & 3;
+        const solicited = (frameControl >> 9) & 1;
+        const registered = (frameControl >> 8) & 1;
+        const objectInclude = (frameControl >> 6) & 1;     // object/payload data present
+        const capabilityInclude = (frameControl >> 5) & 1; // capability byte present
+        const macInclude = (frameControl >> 4) & 1;        // MAC address included in payload
+        const requestTiming = frameControl & 1;     
+    
         if (!this.encryptionKey){
             throw new Error(`${this.getNameAndAddress()} requires an encryption key.`)
         }
-        if (this.encryptionVersion >= 4) {
-            dec = this.decryptV4and5(data)
+        if (encryptionVersion >= 4) {
+            dec = this.decryptV4and5(data, macInclude?11:5)
         } else {
-            if(this.encryptionVersion>=2){
-                dec=this.decryptV2and3(data)
+            if(encryptionVersion>=2){
+                dec=this.decryptV2and3(data, macInclude?11:5)
             }
         }
         if (dec.length==0)
             throw new Error(`${this.getNameAndAddress()} received empty decrypted packet. Check that the bind/encryption key in config is correct.`)
 
-        switch(dec[0]){
-        case 0x0D:
+        const objCode = dec.readUInt16LE(0)
+
+        switch(objCode){
+        case 0x100D:
             this.emitData("temp",dec,3)  
             this.emitData("humidity",dec,5)      
             break    
 
-        case 0x0A:
+        case 0x100A:
             this.emitData("batteryStrength",dec,3)
             break
-        case 0x04:    
+        case 0x1004:    
             this.emitData("temp",dec,3)  
             break        
-        case 0x06:
+        case 0x1006:
             this.emitData("humidity",dec,3)          
             break
+        case 0x4C01:
+            this.emit("temp",dec.readFloatLE(3)+273.15)          
+            break
+                   
+        case 0x4C02:
+            this.emit("humidity",dec[3]/100)          
+            break
+        case 0x4C03:
+            this.emit("batteryStrength",dec[3]/100)          
+            break
+        
         default:
             throw new Error(`${this.getNameAndAddress()} unable to parse decrypted service data (${util.inspect(dec)})`)
             
@@ -198,13 +226,13 @@ class XiaomiMiBeacon extends BTSensor{
     async init(){
 
         await super.init()
+        this._mac_reversed = (Buffer.from(this.getMacAddress().replaceAll(":",""), "hex")).reverse()
         const data = this.getServiceData(this.constructor.SERVICE_MIBEACON)
         if (!data || data.length<4)
-            throw new Error(`Service Data ${this.constructor.SERVICE_MIBEACON} not available for ${this.getName()}`)
-        const frameControl = data[0] + (data[1] << 8)
-        this.deviceID = data[2] + (data[3] << 8)
-        this.isEncrypted = (frameControl >> 3) & 1
-        this.encryptionVersion = frameControl >> 12 
+            this.setError(`Service Data ${this.constructor.SERVICE_MIBEACON} not available for ${this.getName()}`)
+        else
+            this.deviceID = data[2] + (data[3] << 8)
+
     }   
     initSchema(){
         super.initSchema()