bt-sensors-plugin-sk 1.1.0-beta.2.2.3 → 1.1.0-beta.2.2.4

package/README.md

@@ -1,5 +1,9 @@
 # Bluetooth Sensors for [Signal K](http://www.signalk.org)
 
+## BETA 2.2.4
+### What's New
+Fix to 2.2.3 scan and connect issues. Added Transport option to Config page. Default is Bluetooth LE (was Auto in 2.2.3). 
+
 ## BETA 2.2.3
 ### What's New
 Support for [JBD/Jiabaida/Xiaoxiang Battery management systems](https://jiabaida-bms.com/), IBeacon and clone devices courtesy of [Arjen R](https://github.com/ArjenR). 

package/index.js

@@ -4,6 +4,7 @@ const path = require('path')
 const packageInfo = require("./package.json")
 
 const {createBluetooth} = require('node-ble')
+const { Variant } = require('dbus-next')
 const {bluetooth, destroy} = createBluetooth()
 
 const BTSensor = require('./BTSensor.js')
@@ -193,12 +194,15 @@ module.exports =   function (app) {
 		properties: {
 			adapter: {title: "Bluetooth adapter",
 				type: "string", default: "hci0"},
+			transport: {title: "Transport ",
+					type: "string", enum: ["auto","le","bredr"], default: "le", enumNames:["Auto", "LE-Bluetooth Low Energy", "BR/EDR Bluetooth basic rate/enhanced data rate"]},
 
 			discoveryTimeout: {title: "Default device discovery timeout (in seconds)", 
 				type: "integer", default: 30,
 				minimum: 10,
 				maximum: 3600 
 			},
+			
 			discoveryInterval: {title: "Scan for new devices interval (in seconds-- 0 for no new device scanning)", 
 				type: "integer", 
 				default: 10,
@@ -348,13 +352,23 @@ module.exports =   function (app) {
 		})})
 	}
 	
-	async function startScanner() {
+	async function startScanner(transport) {
 		
 		app.debug("Starting scan...");
 		//Use adapter.helper directly to get around Adapter::startDiscovery()
 		//filter options which can cause issues with Device::Connect() 
 		//turning off Discovery
-		try{ await adapter.helper.callMethod('StartDiscovery') } catch (error){	
+		//try {await adapter.startDiscovery()}
+		try{ 
+			if (transport) {
+				app.debug(`Setting Bluetooth transport option to ${transport}`)
+				await adapter.helper.callMethod('SetDiscoveryFilter', {
+					Transport: new Variant('s', transport)
+				  })
+				}
+			await adapter.helper.callMethod('StartDiscovery') 
+		} 
+		catch (error){	
 			app.debug(error)
 		}
 		
@@ -511,7 +525,7 @@ module.exports =   function (app) {
 		plugin.uiSchema.adapter={'ui:disabled': (activeAdapters.length==1)}
 
 		
-		await startScanner()
+		await startScanner(options.transport)
 		if (starts>0){
 			app.debug(`Plugin ${packageInfo.version} restarting...`);
 			if (plugin.schema.properties.peripherals.items.dependencies)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-sensors-plugin-sk",
-  "version": "1.1.0-beta.2.2.3",
+  "version": "1.1.0-beta.2.2.4",
   "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": {