bt-sensors-plugin-sk 1.2.6-beta-6e → 1.3.1

package/OutOfRangeDevice.js

@@ -23,7 +23,7 @@ class OutOfRangeDevice extends EventEmitter{
         this.intervalID=setInterval(
             ()=>{
 			adapter.waitDevice(config.mac_address,(config?.discoveryTimeout??30)*1000)
-			.then(async (device)=> { 
+			.then( (device)=> { 
                 this.emit("deviceFound", device)
                 clearInterval(this.intervalID)
                 this.intervalID=undefined

package/README.md

@@ -2,32 +2,28 @@
 
 ## WHAT'S NEW  
 
-# Version 1.2.6-beta-6
- - Funny you should ask...
- 
-# Version 1.2.6-beta-5
-
-- JikongBMS fixes
 
-# Version 1.2.6-beta-4
+# Version 1.3.1
 
-- Improved reconnect logic for connected devices
-- Error display in config (preliminary effort)  
-- JikongBMS support (aka JKBMS)
+- JBD Protection status
+- SensorPush devices (untested)
 
-# Version 1.2.6-beta-3
+# Version 1.3.0
 
+- JikongBMS support (aka JKBMS)
+- EcoWorthyBW02 Batteries/BMS support (need testers)
+- Ective, Topband, Skanbatt etc LiFePo4 BMS support (ective.de BMS manufacturer)
+- FeasyCom BP108B support -- iBeacon/Eddystone protocols
+- Refactored code for connected devices 
+- Display connection/active state in config
+- DBus resource issues addressed
+- dbus-next package replaced with @jellybrick/dbus-next
+- Improved reconnect logic for connected devices
 - UI improvements for selecting Sensor Class (if available, paths appear immediately upon selection)
-- EcoWorthy Batteries/BMS (need testers)
-
-# Version 1.2.6-beta
-
-
 - Mopeka examples not defaults in config for underused paths
 - Fix so no plugin restart required after selecting sensor class for an unidentified device
-- FeasyCom BP108B support -- iBeacon/Eddystone protocols
-- Ective, Topband, Skanbatt etc LiFePo4 BMS support (ective.de)
 - Fixed Junctek chargeDirection at start (amps will not reported until chargeDirection is known)
+- auxMode detection fixes for Victron SmartBatteryMonitor devices
 
 # Version 1.2.5-1
 
@@ -122,7 +118,7 @@ It's pretty easy to write and deploy your own sensor class for any currently uns
 |[Jikong](https://jikongbms.com/)| https://jikongbms.com/product/ |
 |[Junctek](https://www.junteks.com)|[Junctek BMS](https://www.junteks.com/pages/product/index) |
 |[Remoran](https://remoran.eu)| [Remoran Wave.3](https://remoran.eu/wave.html)|
-|[AC DC Systems](https://marinedcac.com) | [Bank Manager] hybrid (Pb and Li) charger(https://marinedcac.com/pages/bankmanager)|
+|[AC DC Systems](https://marinedcac.com) | [Bank Manager](https://marinedcac.com/pages/bankmanager) hybrid (Pb and Li) charger|
 |[Ective](https://ective.de/)| Also Topband(?), Skanbatt and others |
 
 ### Environmental 
@@ -138,6 +134,7 @@ It's pretty easy to write and deploy your own sensor class for any currently uns
 |[Govee](http://www.govee.com)| Govee H50xx and H510x Temperature and humidity sensors |
 |[BTHome](https://bthome.io/)| NOTE: Framework for IOT sensor devices. |
 |[Inkbird](https://inkbird.com/)| TH-2 Temp and Humidity Sensor |
+|[SensorPush](https://www.sensorpush.com/)| Temperature, Humidity and Atmospheric Pressure sensor|
 
 
 ### Tanks 

package/index.js

@@ -550,6 +550,7 @@ module.exports =   function (app) {
 				c.debug=app.debug
 				
 				const sensor = new c(device, config?.params, config?.gattParams)
+		
 				sensor._paths=config.paths //this might be a good candidate for refactoring
 				sensor._app=app
 				sensor._adapter=adapter //HACK!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.2.6-beta-6e",
+  "version": "1.3.1",
   "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/sensor_classes/JBDBMS.js

@@ -62,7 +62,24 @@ class JBDBMS extends BTSensor {
         .read=(buffer)=>{return buffer.readUInt16BE(12)} 
 
       this.addMetadatum('protectionStatus', '', 'Protection Status',
-        (buffer)=>{return buffer.readUInt16BE(20)} )
+        (buffer)=>{
+          const bits = buffer.readUInt16BE(20).toString(2)
+          return {    
+		        singleCellOvervolt: bits[0]=='1',
+		        singleCellUndervolt: bits[1]=='1',
+		        packOvervolt: (bits[2]=='1'),
+		        packUndervolt: bits[3]=='1',
+		        chargeOvertemp:bits[4]=='1',
+		        chargeUndertemp:bits[5]=='1',
+		        dischargeOvertemp:bits[6]=='1',
+		        dischargeUndertemp:bits[7]=='1',
+		        chargeOvercurrent:bits[8]=='1',
+		        dischargeOvercurrent:bits[9]=='1',
+		        shortCircut:bits[10]=='1',
+		        frontEndDetectionICError:bits[11]=='1',
+		        softwareLockMOS:bits[12]=='1',
+          }  
+        })
         .default="electrical.batteries.{batteryID}.protectionStatus"
          
       this.addDefaultPath('SOC','electrical.batteries.capacity.stateOfCharge')

package/sensor_classes/RenogyBattery.js

@@ -6,12 +6,6 @@ const RenogySensor = require("./Renogy/RenogySensor.js");
 class RenogyBattery extends RenogySensor {
     
     static ImageFile="RenogySmartLiFePo4Battery.webp"
-  
-    async init(){
-        this.numberOfCells = await this.retrieveNumberOfCells()
-        this.deviceID = await this.retrieveDeviceID()
-        await super.init()
-    }
 
     async getAllEmitterFunctions(){
         return [this.getAndEmitBatteryInfo.bind(this), 
@@ -46,6 +40,8 @@ class RenogyBattery extends RenogySensor {
     }
     async initGATTConnection() {
         await super.initGATTConnection()
+        this.numberOfCells = await this.retrieveNumberOfCells()
+        this.deviceID = await this.retrieveDeviceID()
         this.emit('numberOfCells', this.numberOfCells)
     }
     

package/sensor_classes/SensorPush.js

@@ -0,0 +1,123 @@
+const BTSensor = require("../BTSensor");
+class SensorPush extends BTSensor{
+    static Domain = BTSensor.SensorDomains.environmental
+        
+    static async identify(device){
+        
+        const name = await this.getDeviceProp(device,"Name")
+        const regex= /^SensorPush\s(HT|HTP)\s[0-9a-fA-F]{4}$/
+        if (name && name.match(regex))
+            return this 
+        else
+            return null
+    }
+    static ImageFile="SensorPush.webp"
+    static Manufacturer="Cousins & Sears - Creative Technologists - Brooklyn, NY USA"
+    static ServiceUUID = "EF090000-11D6-42BA-93B8-9DD7EC090AB0"
+    static Characteristics = 
+        {
+            tx:   "EF090003-11D6-42BA-93B8-9DD7EC090AA9",
+            adv:  "EF090005-11D6-42BA-93B8-9DD7EC090AA9",
+            batt: "EF090007-11D6-42BA-93B8-9DD7EC090AA9",
+            LED:  "EF09000C-11D6-42BA-93B8-9DD7EC090AA9",
+            temp: "EF090080-11D6-42BA-93B8-9DD7EC090AA9",
+            hum:  "EF090081-11D6-42BA-93B8-9DD7EC090AA9",
+            bar:  "EF090082-11D6-42BA-93B8-9DD7EC090AA9"
+        }
+    pollFreq=30
+    hasGATT(){
+        return true
+    }
+    usingGATT(){
+        return true
+    }
+    
+
+    async emitGATT(){
+        this.characteristics.temp.writeValue(0x01000000).then(async ()=>{
+            this.emitData("temp", await this.characteristics.temp.readValue())
+            this.emitData("hum", await this.characteristics.temp.readValue())
+        })
+        this.characteristics.bar.writeValue(0x01000000).then(async ()=>{
+            this.emitData("bar", await this.characteristics.bar.readValue())
+        })
+    }
+
+     initSchema(){
+        super.initSchema()
+        this.getGATTParams()["useGATT"].default=true
+        
+        this.addDefaultParam("zone")
+
+        this.addParameter(
+        "tx",
+            {
+                title:'transmission rate in db',
+                type: 'number',
+                enum: [-21, -18, -15, -12, -9, -6, -3, 0, 1, 2, 3, 4, 5],
+                default: -3,
+                isRequired: true
+            }
+        )
+        this.addParameter(
+        "adv",
+            {
+                title:'advertising interval in ms',
+                type: 'number',
+                default: 1285,
+                minimum: Math.round((32*625)/1000),
+                maximum: Math.round((32767*625)/1000),
+                isRequired: true
+            }
+      )
+
+       this.addParameter(
+        "LED",
+            {
+                type: 'number',
+                title:'LED flashes per second (0=off, 1-127, 128=once every second',
+                default: 0,
+                minimum: 0,
+                maximum: 128,
+                isRequired: true
+            }
+      )
+
+        this.addDefaultPath("batt","sensors.batteryVoltage")
+        .read=(buffer)=>{ return buffer.readUInt16LE()/100}
+
+        this.addDefaultPath("temp","environment.temperature") 
+        .read=(buffer)=>{ return buffer.readInt32E()/100}
+       
+        this.addDefaultPath("humidity","environment.humidity") 
+        .read=(buffer)=>{ return buffer.readInt32E()/10000}
+
+        this.addDefaultPath("pressure","environment.pressure") 
+        .read=(buffer)=>{ return buffer.readInt32E()/100}
+
+    }
+
+    async initGATTConnection(isReconnecting){ 
+        await super.initGATTConnection(isReconnecting)
+        const gattServer = await this.getGATTServer() 
+        const service = await gattServer.getPrimaryService(this.constructor.ServiceUUID) 
+        this.characteristics={}
+        for (const c in this.constructor.Characteristics) {
+            this.characteristics[c] = await service.getCharacteristic(this.constructor.Characteristics[c])
+        }
+        if (this.tx) this.characteristics.tx.writeValueWithoutResponse(this.tx)
+        if (this.LED) this.characteristics.LED.writeValueWithoutResponse(this.LED)
+        if (this.adv) this.characteristics.tx.writeValueWithoutResponse(Math.round((this.adv/625)*1000))
+    }
+    async initGATTNotifications() { 
+
+    }
+  
+    async deactivateGATT(){
+        for (const c in this.characteristics) {
+            await this.stopGATTNotifications(this.characteristics[c])
+        }
+        await super.deactivateGATT()
+    }
+}
+module.exports=SensorPush