bt-sensors-plugin-sk 1.2.0-beta.0.1.5 → 1.2.0-beta.0.1.6

package/BTSensor.js

@@ -284,7 +284,7 @@ class BTSensor extends EventEmitter {
      *  
      */
 
-    initSchema(){
+    async initSchema(){
         this._schema = {
             properties:{
                 active: {title: "Active", type: "boolean", default: true },
@@ -338,13 +338,13 @@ class BTSensor extends EventEmitter {
     }
     async init(){
         this.currentProperties = await this.constructor.getDeviceProps(this.device)
-        this.initSchema()
+        await this.initSchema()
 
         this.initListen()
     }
 
     initListen(){
-        Promise.resolve(this.listen())
+        this.listen()
     }
     activate(config, plugin){
         if (config.paths){
@@ -369,9 +369,8 @@ class BTSensor extends EventEmitter {
     activateGATT(){
         this.initGATTConnection().then(async ()=>{
             this.emitGATT()
-            if (this.pollFreq){
+            if (this.pollFreq)
                 this.initGATTInterval()
-            }
             else 
                 await this.initGATTNotifications()
         }).catch((e)=>{
@@ -469,8 +468,10 @@ class BTSensor extends EventEmitter {
 
      
         return connectQueue.enqueue( async ()=>{
-            this.debug(`Connecting to ${this.getName()}`)
+            this.debug(`Connecting... ${this.getName()}`)
             await this.device.connect()
+            this.debug(`Connected to ${this.getName()}`)
+
             try {
 
                /* CAUTION: HACK AHEAD 

package/README.md

@@ -2,7 +2,7 @@
 
 ## What's New
 
-## 1.2.0-beta-0.1.4
+## 1.2.0-beta-0.1.5/6
 
 Renogy and JBDBMS fixes
 

package/index.js

@@ -276,6 +276,7 @@ module.exports =   function (app) {
 
 		function getSensorInfo(sensor){
 	
+
 			return { mac: sensor.getMacAddress(),
 				     name: sensor.getName(),
 					 domain: sensor.getDomain().name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.0-beta.0.1.5",
+  "version": "1.2.0-beta.0.1.6",
   "description": "Bluetooth Sensors for Signalk -- support for Victron devices, RuuviTag, Xiaomi, ATC and Inkbird, Ultrasonic wind meters, Mopeka tank readers, Renogy Battery and Solar Controllers, Aranet4 environment sensors, SwitchBot temp and humidity sensors, KilovaultHLXPlus smart batteries, and Govee GVH51xx temp sensors",
   "main": "index.js",
   "dependencies": {

package/sensor_classes/JBDBMS.js

@@ -62,11 +62,15 @@ class JBDBMS extends BTSensor {
           (buffer)=>{return buffer.readUInt8(24)} )
           .default="electrical.batteries.{batteryID}.FETControl"
   
-      await this.deviceConnect()
-      await this.initCharacteristics()
-      const cellsAndTemps = await this.getNumberOfCellsAndTemps()
-      this.numberOfCells=cellsAndTemps.cells
-      this.numberOfTemps=cellsAndTemps.temps
+      await this.deviceConnect() 
+        const gattServer = await this.device.gatt()
+        const txRxService= await gattServer.getPrimaryService(this.constructor.TX_RX_SERVICE)
+        this.rxChar = await txRxService.getCharacteristic(this.constructor.NOTIFY_CHAR_UUID)
+        this.txChar = await txRxService.getCharacteristic(this.constructor.WRITE_CHAR_UUID)
+        await this.rxChar.startNotifications()
+        const cellsAndTemps = await this.getNumberOfCellsAndTemps()
+        this.numberOfCells=cellsAndTemps.cells
+        this.numberOfTemps=cellsAndTemps.temps
 
       for (let i=0; i<this.numberOfTemps; i++){
         this.addMetadatum(`temp${i}`, 'K', `Temperature${i+1} reading`,
@@ -88,14 +92,6 @@ class JBDBMS extends BTSensor {
   hasGATT(){
     return true
   }
-  async initCharacteristics(){ 
-      const gattServer = await this.device.gatt()
-      const txRxService= await gattServer.getPrimaryService(this.constructor.TX_RX_SERVICE)
-      this.rxChar = await txRxService.getCharacteristic(this.constructor.NOTIFY_CHAR_UUID)
-      this.txChar = await txRxService.getCharacteristic(this.constructor.WRITE_CHAR_UUID)
-      await this.rxChar.startNotifications()
-      return this
-  }
 
   async initGATTNotifications(){
     this.intervalID = setInterval(()=>{