bt-sensors-plugin-sk 1.2.6-beta-3 → 1.2.6-beta-5

package/sensor_classes/JikongBMS.js

@@ -0,0 +1,506 @@
+const { ThemeProvider } = require("react-bootstrap");
+const BTSensor = require("../BTSensor");
+let FakeDevice,FakeGATTService,FakeGATTCharacteristic;
+
+// Dynamically import FakeBTDevice.js for node<= 20 
+import('../development/FakeBTDevice.js')    
+  .then(module => {
+        FakeDevice = module.FakeDevice; 
+        FakeGATTService= module.FakeGATTService
+        FakeGATTCharacteristic=module.FakeGATTCharacteristic
+
+    })
+    .catch(error => {
+        console.error('Error loading FakeBTDevice:', error);
+    });
+
+function sumByteArray(byteArray) {
+ let sum = 0;
+    for (let i = 0; i < byteArray.length; i++) {
+     sum += byteArray[i];
+   }
+   return sum;
+ }
+
+const countSetBits=(n)=> {return (n == 0)?0:(n & 1) + countSetBits(n >> 1)};
+class JikongBMS extends BTSensor {
+  static Domain = BTSensor.SensorDomains.electrical;
+
+  static RX_SERVICE = "0000ffe0-0000-1000-8000-00805f9b34fb";
+  static RX_CHAR_UUID = "0000ffe1-0000-1000-8000-00805f9b34fb";
+  static validResponseHeader = 0x55aaeb90;
+  static validAcknowledgeHeader = 0xaa5590eb;
+
+  static commandResponse = {
+    0x96: 0x02,
+    0x97: 0x03,
+  };
+
+  static async test(datafile) {
+    const data = require(datafile);
+    const device = new FakeDevice([
+      new FakeGATTService(this.RX_SERVICE, [
+        new FakeGATTCharacteristic(
+          this.RX_CHAR_UUID,
+          data.data["0x96"],
+          data.delay
+        ),
+      ]),
+    ]);
+    const obj = new JikongBMS(device, { offset: 16, dischargeFloor: 0.1 });
+    obj.currentProperties = { Name: "Fake JKBMS", Address: "<mac>" };
+    obj.debug = (m) => {
+      console.log(m);
+    };
+    obj.deviceConnect = () => {};
+
+    await obj.initSchema();
+    await obj.initGATTInterval();
+    for (const [tag, path] of Object.entries(
+      obj._schema.properties.paths.properties
+    )) {
+      obj.on(tag, (val) => {
+        console.log(`${tag} => ${val} `);
+      });
+    }
+  }
+  static identify(device) {
+    return null;
+  }
+  static ImageFile = "JikongBMS.jpg";
+  connections = 0;
+
+  jikongCommand(command) {
+    var result = [
+      0xaa,
+      0x55,
+      0x90,
+      0xeb,
+      command,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+      0x00,
+    ];
+    result.push(Buffer.from([sumByteArray(result)])[0]);
+    return result;
+  }
+
+  async sendReadFunctionRequest(command) {
+    this.debug(`sending ${command} for ${this.getName()}`);
+    try {
+      return await this.rxChar.writeValueWithoutResponse(
+        Buffer.from(this.jikongCommand(command))
+      );
+    } catch (e) {
+      this.debug(
+        `Error rec'd writing data: ${e.message} for ${this.getName()}`
+      );
+    }
+  }
+
+  pollFreq=20
+  async initSchema() {
+    super.initSchema();
+    this.addDefaultParam("batteryID");
+    this.addParameter("offset", {
+      description: "Data offset",
+      type: "number",
+      isRequired: true,
+      default: 16,
+    });
+
+    this.addParameter("dischargeFloor", {
+      description: "Discharge floor ratio ",
+      isRequired: true,
+      type: "number",
+      default: 0.1,
+      minimum: 0,
+      max: 0.99,
+    });
+
+    if (this.numberOfCells == undefined) {
+      try {
+        await this.initGATTConnection();
+        this.numberOfCells = await this.getNumberOfCells()
+      }
+      catch(e){
+        this.numberOfCells = 4;
+      }
+    }
+
+    this.addParameter("numberOfCells", {
+      description: "Number of cells",
+      type: "number",
+      isRequired: true,
+      default: this.numberOfCells,
+    });
+
+    for (let i = 0; i < this?.numberOfCells ?? 4; i++) {
+      this.addMetadatum(
+        `cell${i}Voltage`,
+        "V",
+        `Cell ${i + 1} voltage`,
+        (buffer) => {
+          if (i == 0) {
+            this.currentProperties._totalCellVoltage = 0;
+            this.currentProperties._maxCellVoltage = 0;
+            this.currentProperties._minCellVoltage = 0;
+          }
+          const v = buffer.readUInt16LE(6 + i * 2) / 1000;
+          this.currentProperties._totalCellVoltage += v;
+          if (v > this.currentProperties._maxCellVoltage)
+            this.currentProperties._maxCellVoltage = v;
+          if (
+            this.currentProperties._minCellVoltage == 0 ||
+            v < this.currentProperties._minCellVoltage
+          )
+            this.currentProperties._minCellVoltage = v;
+          return v;
+        }
+      ).default = `electrical.batteries.{batteryID}.cell${i}.voltage`;
+
+      this.addMetadatum(
+        `cell${i}Resistance`,
+        "ohm",
+        `Cell ${i + 1} resistance in ohms`,
+        (buffer) => {
+          return buffer.readUInt16LE(i * 2 + 64 + this.offset) / 1000;
+        }
+      ).default = `electrical.batteries.{batteryID}.cell${i}.resistance`;
+    }
+
+    this.addMetadatum(
+      "avgCellVoltage",
+      "number",
+      "Average Cell Voltage",
+      () => {
+        return this.currentProperties._totalCellVoltage / this.numberOfCells;
+      }
+    ).default = "electrical.batteries.{batteryID}.avgCellVoltage";
+
+    this.addMetadatum(
+      "deltaCellVoltage",
+      "number",
+      "Delta Cell Voltage",
+      () => {
+        return (
+          this.currentProperties._maxCellVoltage -
+          this.currentProperties._minCellVoltage
+        );
+      }
+    ).default = "electrical.batteries.{batteryID}.deltaCellVoltage";
+
+    this.addDefaultPath("voltage", "electrical.batteries.voltage").read = (
+      buffer
+    ) => {
+      return buffer.readUInt16LE(118 + this.offset * 2) / 1000;
+    };
+
+    this.addDefaultPath("power", "electrical.batteries.power", (buffer) => {
+      return buffer.readInt16LE(122 + this.offset * 2) / 1000;
+    });
+
+    this.addDefaultPath("current", "electrical.batteries.current").read = (
+      buffer
+    ) => {
+      this.currentProperties._current =
+        buffer.readInt16LE(126 + this.offset * 2) / 1000;
+      return this.currentProperties._current;
+    };
+
+    this.addDefaultPath(
+      "remainingCapacity",
+      "electrical.batteries.capacity.remaining"
+    ).read = (buffer) => {
+      this.currentProperties._capacityRemaining =
+        (buffer.readUInt32LE(142 + this.offset * 2) / 1000) * 3600;
+      return this.currentProperties._capacityRemaining;
+    };
+
+    this.addDefaultPath(
+      "capacity",
+      "electrical.batteries.capacity.actual"
+    ).read = (buffer) => {
+      this.currentProperties._capacityActual =
+        (buffer.readUInt32LE(146 + this.offset * 2) / 1000) * 3600;
+      return this.currentProperties._capacityActual;
+    };
+
+    this.addDefaultPath(
+      "timeRemaining",
+      "electrical.batteries.capacity.timeRemaining"
+    ).read = (buffer) => {
+      return Math.abs(
+        (this.currentProperties._capacityActual * this.dischargeFloor) /
+          this.currentProperties._current
+      );
+    };
+
+    this.addDefaultPath("cycles", "electrical.batteries.cycles").read = (
+      buffer
+    ) => {
+      return buffer.readUInt32LE(150 + this.offset * 2);
+    };
+
+    this.addMetadatum("cycleCapacity", "number", "Cycle capacity", (buffer) => {
+      return buffer.readUInt32LE(154 + this.offset * 2) / 1000;
+    }).default = "electrical.batteries.{batteryID}.discharging";
+
+    this.addMetadatum(
+      "balanceAction",
+      "",
+      "Balancing action (0=off 1=Charging Balance, 2=Discharging Balance",
+      (buffer) => {
+        return buffer[140 + this.offset * 2];
+      }
+    ).default = "electrical.batteries.{batteryID}.balanceAction";
+
+    this.addMetadatum("balancingCurrent", "", "Balancing current", (buffer) => {
+      return buffer.readUInt16LE(138 + this.offset * 2) / 1000;
+    }).default = "electrical.batteries.{batteryID}.balance";
+
+    this.addDefaultPath(
+      "SOC",
+      "electrical.batteries.capacity.stateOfCharge"
+    ).read = (buffer) => {
+      return buffer[141 + this.offset * 2] / 100;
+    };
+
+    this.addDefaultPath(
+      "SOH",
+      "electrical.batteries.capacity.stateOfHealth"
+    ).read = (buffer) => {
+      return buffer[158 + this.offset * 2] / 100;
+    };
+
+    this.addMetadatum("runtime", "s", "Total runtime in seconds", (buffer) => {
+      return buffer.readUInt32LE(162 + this.offset * 2);
+    }).default = "electrical.batteries.{batteryID}.runtime";
+
+    this.addMetadatum(
+      "timeEmergency",
+      "s",
+      "Time emergency in seconds",
+      (buffer) => {
+        return buffer.readUInt16LE(186 + this.offset * 2);
+      }
+    ).default = "electrical.batteries.{batteryID}.timeEmergency";
+
+    this.addMetadatum(
+      "charging",
+      "bool",
+      "MOSFET Charging enable",
+      (buffer) => {
+        return buffer[166 + this.offset * 2] == 1;
+      }
+    ).default = "electrical.batteries.{batteryID}.charging";
+
+    this.addMetadatum(
+      "discharging",
+      "bool",
+      "MOSFET Disharging enable",
+      (buffer) => {
+        return buffer[167 + this.offset * 2] == 1;
+      }
+    ).default = "electrical.batteries.{batteryID}.discharging";
+
+    this.addMetadatum("temp1", "K", "Temperature 1 in K", (buffer) => {
+      return 273.15 + buffer.readInt16LE(130 + this.offset * 2) / 10;
+    }).default = "electrical.batteries.{batteryID}.temperature1";
+
+    this.addMetadatum("temp2", "K", "Temperature 2 in K", (buffer) => {
+      return 273.15 + buffer.readInt16LE(132 + this.offset * 2) / 10;
+    }).default = "electrical.batteries.{batteryID}.temperature2";
+
+    this.addMetadatum("mosTemp", "K", "MOS Temperature in K", (buffer) => {
+      return 273.15 + buffer.readInt16LE(112 + this.offset * 2) / 10;
+    }).default = "electrical.batteries.{batteryID}.mosTemperature";
+  }
+
+  hasGATT() {
+    return true;
+  }
+  async initGATTNotifications() {
+    this.debug(`${this.getName()}::initGATTNotifications`);
+  }
+
+  async emitGATT() {
+    await this.getAndEmitBatteryInfo();
+  }
+
+  async getNumberOfCells() {
+    this.debug(`${this.getName()}::getNumberOfCells`);
+
+    const b = await this.getBuffer(0x96);
+    return countSetBits(b.readUInt32BE(70));
+  }
+
+  getBuffer(command) {
+    return new Promise(async (resolve, reject) => {
+      const r = await this.sendReadFunctionRequest(command);
+      let datasize = 300;
+      let result = Buffer.alloc(datasize);
+      let offset = 0;
+
+      const timer = setTimeout(() => {
+        this.rxChar.removeAllListeners();
+        clearTimeout(timer);
+        reject(
+          new Error(
+            `Response timed out (+30s) getting results for command ${command} from JikongBMS device ${this.getName()}.`
+          )
+        );
+      }, 30000);
+
+      const valChanged = async (buffer) => {
+        if (
+          offset == 0 && //first packet
+          (buffer.length < 5 ||
+            buffer.readUInt32BE(0) !== this.constructor.validResponseHeader)
+        ) {
+          if (
+            buffer.readUInt32BE(0) !== this.constructor.validAcknowledgeHeader
+          )
+            this.debug(
+              `Invalid buffer ${JSON.stringify(
+                buffer
+              )}from ${this.getName()}, not processing.`
+            );
+        } else {
+          buffer.copy(result, offset);
+          if (offset + buffer.length == datasize) {
+            if (result[4] == this.constructor.commandResponse[command]) {
+              this.rxChar.removeAllListeners();
+              clearTimeout(timer);
+              this.debug(
+                `Rec'd command in buffer ${JSON.stringify(
+                  result
+                )} for ${this.getName()}`
+              );
+              resolve(result);
+            } else {
+              offset = 0;
+              result = Buffer.alloc(datasize);
+            }
+          } else {
+            offset += buffer.length;
+          }
+        }
+      };
+      this.rxChar.on("valuechanged", valChanged);
+    });
+  }
+
+  usingGATT() {
+    return false;
+  }
+
+  async getAndEmitBatteryInfo() {
+    const buffer = await this.getBuffer(0x96);
+    [
+      "current",
+      "voltage",
+      "remainingCapacity",
+      "capacity",
+      "cycles",
+      "charging",
+      "discharging",
+      "balanceAction",
+      "timeRemaining",
+      "balancingCurrent",
+      "cycleCapacity",
+      "timeEmergency",
+      "SOC",
+      "SOH",
+      "runtime",
+      "temp1",
+      "temp2",
+      "mosTemp",
+    ].forEach((tag) => this.emitData(tag, buffer));
+    for (let i = 0; i < this.numberOfCells; i++) {
+      this.emitData(`cell${i}Voltage`, buffer);
+      this.emitData(`cell${i}Resistance`, buffer);
+    }
+
+    ["deltaCellVoltage", "avgCellVoltage"].forEach((tag) => this.emitData(tag));
+  }
+
+  async deactivateGATT() {
+    this.debug(`${this.getName()}::deactivateGATT`);
+    if (this.rxChar) {
+      try {
+        await this.rxChar.stopNotifications();
+      } catch (e) {
+        this.debug(
+          `(${this.getName()}) Error stopping notifications for rxChar`
+        );
+      }
+    }
+    await super.deactivateGATT();
+  }
+
+  async initGATTConnection(isReconnecting = false) {
+    this.debug(`${this.getName()}::initGATTConnection`);
+
+    await super.initGATTConnection(isReconnecting);
+    const gattServer = await this.getGATTServer();
+
+    this.rxService = await gattServer.getPrimaryService(
+      this.constructor.RX_SERVICE
+    );
+    
+    if (this.rxChar)
+      try {
+        await this.rxChar.stopNotifications()
+      }
+      catch(e){
+        this.rxChar.removeAllListeners()
+
+        this.debug(`error while stopping notifications`)
+        this.debug(e)
+      }
+
+    this.rxChar = await this.rxService.getCharacteristic(
+      this.constructor.RX_CHAR_UUID
+    );
+
+    await this.rxChar.startNotifications();
+    try {
+      await this.getBuffer(0x97)
+    } catch (e) {
+      this.setError(e.message)
+    }
+
+    //this.debug(`(${this.getName()}) Connections: ${this.connections++}`)
+  }
+
+  activate(config, plugin) {
+    super.activate(config, plugin);
+    this.initGATTConnection().then(async () => {
+      try {
+        await this.getAndEmitBatteryInfo();
+      } catch(e) {
+        this.setError(e.message)
+      }
+      this.intervalID = setInterval(async () => {
+        if (!(await this.device.isConnected())) {
+          await this.initGATTConnection(true);
+        }
+        await this.getAndEmitBatteryInfo();
+      }, this.pollFreq * 1000);
+    });
+  }
+}
+
+module.exports = JikongBMS;

package/sensor_classes/RemoranWave3.js

@@ -56,7 +56,7 @@ const BTSensor = require("../BTSensor");
      }
     emitInfo1Data(buffer){
         if (buffer.length < 20) {
-            app.debug(`Bad buffer size ${buffer.length}. Buffer size must be 20 bytes or more.`)
+            this.debug(`Bad buffer size ${buffer.length}. Buffer size must be 20 bytes or more.`)
             return
         }
         this.emit("versionNumber", buffer.readUInt8(0))
@@ -85,7 +85,7 @@ const BTSensor = require("../BTSensor");
     emitInfo2Data(buffer){
 
         if (buffer.size < 12) {
-            app.debug(`Bad buffer size ${buffer.length}. Buffer size must be 12 bytes or more.`)
+            this.setError(`Bad buffer size ${buffer.length}. Buffer size must be 12 bytes or more.`)
             return
          }
         this.emit("versionNumber", buffer.readUInt8(0))
@@ -96,8 +96,7 @@ const BTSensor = require("../BTSensor");
     }
     emitEventData(buffer){
         if (buffer.length < 14) {
-            this.debug(buffer)
-            app.debug(`Bad buffer size ${buffer.length}. Buffer size must be 14 bytes or more.`)
+            this.debug(`Bad buffer size ${buffer.length}. Buffer size must be 14 bytes or more.`)
             return
          }
         const eventType = buffer.readUInt16LE(8)

package/sensor_classes/RuuviTag.js

@@ -122,5 +122,6 @@ Offset	Allowed values	Description
         if (props.ManufacturerData)
             this.emitValuesFrom( this.getManufacturerData(this.constructor.manufacturerID) )
     }
+
 }
 module.exports=RuuviTag

package/sensor_classes/ShellySBMO003Z.js

@@ -61,6 +61,7 @@ class ShellySBMO003Z extends AbstractBTHomeSensor {
 		)
 		.default="sensors.{macAndName}.button"
 
+
 /*
 		this.addMetadatum(
 			"packetID",
@@ -72,6 +73,10 @@ class ShellySBMO003Z extends AbstractBTHomeSensor {
 */
 
 	}
+	getState() {
+	
+	return super.getState()
+	}
 }
 
 module.exports = ShellySBMO003Z;

package/sensor_classes/TestData/Jikong.json

@@ -0,0 +1,36 @@
+{
+"delay":100,
+"data":
+    {
+    "0x96": [
+        "55 aa eb 90 01 de 58 02 00 00 f0 0a 00 00 54 0b 00 00 10 0e 00 00 de 0d 00 00 05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 f6 09 00 00 f0 49 02 00 1e 00 00 00 3c 00 00 00 40 0d 03 00 1e 00 00 00 3c 00 00 00 3c 00 00 00 d0 07 00 00 f4 01 00 00 c2 01 00 00 f4 01 00 00 c2 01 00 00 00 00 00 00 1e 00 00 00 84 03 00 00 20 03 00 00 04 00 00 00 01 00 00 00 01 00 00 00 01 00",
+        "00 00 e0 93 04 00 dc 05 00 00 48 0d 00 00 00 00 00 00 00 00 00 00",
+        "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00",
+        "b0 71 0b 00 08 00 00 00 00 7c f8 ff ff 1f 0d 00 00 00 00 00 00 2a",
+        "55 aa eb 90 02 de 02 0d 02 0d 02 0d 02 0d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0f 00 00 00 02 0d 00 00 00 00 2e 00 31 00 34 00 28 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
+        "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 cb 00 00 00 00 00",
+        "06 34 00 00 e9 1d 00 00 c1 fd ff ff ac 00 ac 00 00 00 00 00 00 00 00 2a 5b f4 01 00 e0 93 04 00 40 00 00 00 bd 30 29 01 64 00 00 00 19 95 c1 03 01 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 00 01 00 00 00 bf 03 01 00 03 00 12 5b 3f 40 00 00 00 00 33 05 39 1b 00 01 00 01 00 05 00 00  c0 2c df 00 00 00 00 00 cb 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
+        "00 00 00 00 00 00 00 00 00 fe ff 7f dc 0f 01 00 00 00 00 00 00 f1",
+        "55 aa eb 90 02 de 02 0d 02 0d 02 0d 02 0d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0f 00 00 00 02 0d 00 00 00 00 2e 00 31 00 34 00 28 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
+        "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 cb 00 00 00 00 00",
+        "06 34 00 00 e9 1d 00 00 c1 fd ff ff ac 00 ac 00 00 00 00 00 00 00 00 2a 5b f4 01 00 e0 93 04 00 40 00 00 00 bd 30 29 01 64 00 00 00 19 95 c1 03 01 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 00 01 00 00 00 bf 03 01 00 03 00 12 5b 3f 40 00 00 00 00 33 05 39 1b 00 01 00 01 00 05 00 00  c0 2c df 00 00 00 00 00 cb 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
+        "00 00 00 00 00 00 00 00 00 fe ff 7f dc 0f 01 00 00 00 00 00 00 f1",
+        "55 aa eb 90 01 de 58 02 00 00 f0 0a 00 00 54 0b 00 00 10 0e 00 00 de 0d 00 00 05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 f6 09 00 00 f0 49 02 00 1e 00 00 00 3c 00 00 00 40 0d 03 00 1e 00 00 00 3c 00 00 00 3c 00 00 00 d0 07 00 00 f4 01 00 00 c2 01 00 00 f4 01 00 00 c2 01 00 00 00 00 00 00 1e 00 00 00 84 03 00 00 20 03 00 00 04 00 00 00 01 00 00 00 01 00 00 00 01 00",
+        "00 00 e0 93 04 00 dc 05 00 00 48 0d 00 00 00 00 00 00 00 00 00 00",
+        "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00",
+        "b0 71 0b 00 08 00 00 00 00 7c f8 ff ff 1f 0d 00 00 00 00 00 00 2a",
+        "aa bb cc dd ee ff",
+        "aa bb cc",
+        "55 aa eb 90 02 de 02 0d 02 0d 02 0d 02 0d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0f 00 00 00 02 0d 00 00 00 00 2e 00 31 00 34 00 28 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
+        "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 cb 00 00 00 00 00",
+        "06 34 00 00 e9 1d 00 00 c1 fd ff ff ac 00 ac 00 00 00 00 00 00 00 00 2a 5b f4 01 00 e0 93 04 00 40 00 00 00 bd 30 29 01 64 00 00 00 19 95 c1 03 01 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff 00 01 00 00 00 bf 03 01 00 03 00 12 5b 3f 40 00 00 00 00 33 05 39 1b 00 01 00 01 00 05 00 00  c0 2c df 00 00 00 00 00 cb 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
+        "00 00 00 00 00 00 00 00 00 fe ff 7f dc 0f 01 00 00 00 00 00 00 f1" 
+    ],
+    "0x97":[
+        "55 aa eb 90 03 c4 4a 4b 5f 42 32 41 38 53 32 30 50 00 00 00 00 00 31 31 2e 58 57 00 00 00 31 31 2e 32 36 31 00 00 68 96 c1 03 18 00 00 00 48 42 31 5f 42 34 00 00 00 00 00 00 00 00 00 00 31 32 33 34 00 00 00 00 00 00 00 00 00 00 00 00 32 33 30 38 31 34 00 00 33 30 32 32 38 34 34 32 36 37 00 30 30 30 30 00 49 6e 70 75 74 20 55 73 65 72 64 61 74 61 00 00 31 32 33 33 32 31 00 00 00 00",
+        "00 00 00 00 00 00 49 6e 70 75 74 20 55 73 65 72 64 61 74 61 00 00",
+        "7c f8 ff ff 1f 0d 00 00 00 00 00 00 90 0f 00 00 00 00 c0 d8 03 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00",
+        "00 00 00 00 00 00 00 00 00 fe 2f 00 00 00 00 00 00 00 00 00 00 bf"
+    ]
+    }
+}

package/sensor_classes/XiaomiMiBeacon.js

@@ -113,11 +113,9 @@ class XiaomiMiBeacon extends BTSensor{
     initGATTConnection(){
         return new Promise((resolve,reject )=>{
             this.deviceConnect().then(async ()=>{
-                if (!this.gattServer) {
-                    this.gattServer = await this.device.gatt()
-                    this.gattService = await this.gattServer.getPrimaryService("ebe0ccb0-7a0a-4b0c-8a1a-6ff2997da3a6")
-                    this.gattCharacteristic = await this.gattService.getCharacteristic("ebe0ccc1-7a0a-4b0c-8a1a-6ff2997da3a6")
-                }
+                const gatt = await this.getGATTServer()
+                this.gattService = await gatt.getPrimaryService("ebe0ccb0-7a0a-4b0c-8a1a-6ff2997da3a6")
+                this.gattCharacteristic = await this.gattService.getCharacteristic("ebe0ccc1-7a0a-4b0c-8a1a-6ff2997da3a6")                
                 resolve(this)
             })
             .catch((e)=>{
@@ -128,7 +126,9 @@ class XiaomiMiBeacon extends BTSensor{
 
     emitGATT(){
         this.gattCharacteristic.readValue()
-            .then((buffer)=>this.emitValues(buffer))
+            .then(
+                (buffer)=>this.emitValues(buffer)
+        )
     }
 
     async initGATTNotifications() { 
@@ -247,19 +247,17 @@ class XiaomiMiBeacon extends BTSensor{
 
     }
 
+    async deactivateGATT(){
+        await this.disconnectGATTCharacteristic()
+        await super.deactivateGATT()
+    }
+
     async disconnectGATTCharacteristic(){
         if (this.gattCharacteristic  && await this.gattCharacteristic.isNotifying()) {
+            this.gattCharacteristic.removeAllListeners()
             await this.gattCharacteristic.stopNotifications()
             this.gattCharacteristic=null
         }
     }
-    async stopListening(){
-        super.stopListening()
-        await this.disconnectGATTCharacteristic()
-       
-        if (await this.device.isConnected()){
-               await this.device.disconnect()
-        }
-    }
 }
 module.exports=XiaomiMiBeacon

package/src/components/PluginConfigurationPanel.js

@@ -228,7 +228,7 @@ async function fetchJSONData(path, data = {}) {
       function sensorChangedEvent(event){
         console.log("sensorchanged")
         const json = JSON.parse(event.data)      
-        
+        console.log(json)
         setSensorMap( (_sm) => {
           const sensor = _sm.get(json.mac)
           if (sensor) 
@@ -385,12 +385,17 @@ function createListGroupItem(sensor){
         }> 
         <div  class="d-flex justify-content-between align-items-center" style={config?{fontWeight:"normal"}:{fontStyle:"italic"}}>
         {`${sensor._changesMade?"*":""}${sensor.info.name} MAC: ${sensor.info.mac} RSSI: ${ifNullNaN(sensor.info.RSSI)}`  }
+        <div class="d-flex justify-content-between ">
+          {
+            sensor.info.state
+          }
         <div class="d-flex justify-content-between ">
           {
             signalStrengthIcon(sensor)
           }
         </div>
         </div>
+        </div>
         </ListGroupItem>
 }