bt-sensors-plugin-sk 1.3.6-3 → 1.3.6-beta5

package/diff.txt

@@ -1,2860 +0,0 @@
-diff --git a/BTSensor.js b/BTSensor.js
-index bcf4df6..16fcaa4 100644
---- a/BTSensor.js
-+++ b/BTSensor.js
-@@ -74,7 +74,7 @@ function preparePath(obj, str) {
-             evalResult= evalResult.call(obj)
-         }
- 
--        resultString += evalResult !== undefined ? evalResult : `${keyToAccess}_value_undefined`;
-+        resultString += evalResult !== undefined ? evalResult.replace(/\s+/g,'_') : `${keyToAccess}_value_undefined`;
-       } catch (error) {
-         console.error(`Error accessing key '${keyToAccess}':`, error);
-         resultString += fullMatch; // Keep the original curly braces on error
-@@ -107,6 +107,7 @@ class BTSensor extends EventEmitter {
-         unknown: { name: "unknown", description: "Unknown sensor domain "},
-         environmental: { name: "environmental", description: "Sensors that measure environmental conditions - air temperature, humidity etc."},
-         electrical: { name: "electrical", description: "Electrical sensor - chargers, batteries, inverters etc."},
-+        propulsion: { name: "propulsion", description: "Sensors that measure engine state"},
-         tanks: { name: "tanks", description: "Sensors that measure level in tanks (gas, propane, water etc.) "}
-     }
-     static Domain = this.SensorDomains.unknown   
-@@ -404,6 +405,12 @@ class BTSensor extends EventEmitter {
-         if (!param.type)
-             param.type="string"
- 
-+        if (param.isRequired) {
-+            if (!Object.hasOwn(this._schema.properties.params, "required"))
-+                this._schema.properties.params.required=[tag]
-+            else
-+                this._schema.properties.params.required.push(tag)
-+        }
-         this._schema.properties.params.properties[tag]=param
-         return this._schema.properties.params.properties[tag]
-     }
-@@ -412,6 +419,13 @@ class BTSensor extends EventEmitter {
-         if (!path.type)
-             path.type="string"
- 
-+        if (path.isRequired) {
-+            if (!Object.hasOwn(this._schema.properties.paths, "required"))
-+                this._schema.properties.paths.required=[tag]
-+            else
-+                this._schema.properties.paths.required.push(tag)
-+        }
-+
-         if (!path.pattern)
-             path.pattern=//"^(?:[^{}\\s]*\\{[a-zA-Z0-9]+\\}[^{}\\s]*|[^{}\\s]*)$"
-                 "^((\\{[a-zA-Z0-9]+\\}|[a-zA-Z0-9]+))(\\.(\\{[a-zA-Z0-9]+\\}|[a-zA-Z0-9]+))*$"
-@@ -423,7 +437,13 @@ class BTSensor extends EventEmitter {
- 
-         if (!param.type)
-             param.type="string"
--        
-+
-+        if (param.isRequired) {
-+            if (!Object.hasOwn(this._schema.properties.gattParams, "required"))
-+                this._schema.properties.gattParams.required=[tag]
-+            else
-+                this._schema.properties.gattParams.required.push(tag)
-+        }
-         return this._schema.properties.gattParams.properties[tag]=param
-     }
- 
-@@ -432,8 +452,10 @@ class BTSensor extends EventEmitter {
-         return this.addPath(tag,Object.assign({}, path))
-     }
- 
--    addDefaultParam(tag){        
--        return this.addParameter(tag,Object.assign({}, BTSensor.DEFAULTS.params[tag]))
-+    addDefaultParam(tag,required=false){        
-+        const param = Object.assign({}, BTSensor.DEFAULTS.params[tag])
-+        param.isRequired=required
-+        return this.addParameter(tag,param)
-     }
- 
-     getJSONSchema(){
-@@ -465,13 +487,41 @@ class BTSensor extends EventEmitter {
-         throw new Error("::initGATTNotifications() should be implemented by the BTSensor subclass")
-     }
- 
--    deviceConnect() {
-+    deviceConnect(reconnect=false) {
- 
-      
-         return connectQueue.enqueue( async ()=>{
-             this.debug(`Connecting... ${this.getName()}`)
--            await this.device.connect()
-+            await this.device.helper.callMethod('Connect')
-+
-             this.debug(`Connected to ${this.getName()}`)
-+            if (!reconnect) {
-+                this.device.helper.on('PropertiesChanged',  (propertiesChanged) => {
-+                    if ('Connected' in propertiesChanged) {
-+                        const { value } = propertiesChanged.Connected
-+                        if (value) {
-+                            this.device.emit('connect', { connected: true })
-+                        } else {
-+                            this.device.emit('disconnect', { connected: false })
-+                        }
-+                    }
-+                })
-+                this.device.on("disconnect", ()=>{
-+                        if (this.isActive()) {
-+                        this.debug(`Device disconnected. Attempting to reconnect to ${this.getName()}`)  
-+                            try {        
-+                            this.deviceConnect(true).then(()=>{
-+                                this.debug(`Device reconnected -- ${this.getName()}`)  
-+                            })
-+                            }
-+                            catch (e) {
-+                                this.setPluginError( `Error while reconnecting to ${this.getName()}: ${e.message}`)
-+                                this.debug( `Error while reconnecting to ${this.getName()}: ${e.message}`)
-+                                this.debug(e)
-+                            }
-+                        }
-+                    })     
-+                }
- 
-             try {
- 
-@@ -787,8 +837,6 @@ class BTSensor extends EventEmitter {
-   /**
-    *  Listen to sensor.
-    *  ::listen() sets up listeners for property changes thru ::propertiesChanged(props)
--   *  If GATT connections are available and active, function inits the GATT connection and 
--   *  optional GATT connection interval
-    */
- 
- 
-@@ -839,13 +887,14 @@ class BTSensor extends EventEmitter {
- 		Object.keys(this.getPaths()).forEach((tag)=>{
-             const pathMeta=this.getPath(tag)
-             const path = config.paths[tag]
--            if (!(path===undefined))
-+            if (!(path===undefined)) {
-+                const preparedPath  =
-                 this.app.handleMessage(id, 
-                 {
--//                $source: source,
-                 updates: 
--                    [{ meta: [{path: preparePath(this, path), value: { units: pathMeta?.unit }}]}]
-+                    [{ meta: [{path:  preparePath(this, path), value: { units: pathMeta?.unit }}]}]
-                 })
-+            }
-         })
- 	}
- 
-@@ -855,11 +904,12 @@ class BTSensor extends EventEmitter {
-             const pathMeta=this.getPath(tag)
- 			const path = deviceConfig.paths[tag];
- 			if (!(path === undefined)) {
-+                let preparedPath =  preparePath(this, path)
-                 this.on(tag, (val)=>{
- 					if (pathMeta.notify){
- 						this.app.notify(tag, val, id )
- 					} else {
--						this.updatePath(preparePath(this,path),val, id, source)
-+						this.updatePath(preparedPath,val, id, source)
- 					}
-                 })
- 			}
-@@ -872,6 +922,9 @@ class BTSensor extends EventEmitter {
-         return (Date.now()-this?._lastContact??Date.now())/1000
-     }
- 
-+    prepareConfig(config){
-+        config.params.sensorClass=this.constructor.name
-+    }
- 
- }
- 
-diff --git a/README.md b/README.md
-index 5ed25cc..9f82afa 100644
---- a/README.md
-+++ b/README.md
-@@ -1,7 +1,54 @@
- # Bluetooth Sensors for [Signal K](http://www.signalk.org) 
--# Version 1.2.0 
- 
--## WHAT'S NEW SINCE VERSION 1.1.x
-+## WHAT'S NEW  
-+
-+# Version 1.2.5
-+
-+- On initial startup, plugin saves default configuration. Fixing the "missing" configured devices after restart.
-+- Mopeka Tank Sensor configuration fix
-+- Added number of found devices in a domain in the configuration screen's domain tab
-+
-+## IMPORTANT NOTE TO NEW USERS OF VERSIONS OLDER THAN 1.2.5
-+
-+There's a known issue with saving the configuration after initial installation owing to current ServerAPI limitations.
-+
-+Your device config after you've saved it will appear to be "missing" after restarting. It's in fact saved in the plugin config directory. All you have to do is Submit the main configuration then enable and optionally disable Debug. This, believe it or not, ensures that the config is marked as enabled. You should see your data now and upon restart. 
-+
-+# Version 1.2.4-4
-+
-+Junctek support (tested)
-+
-+# Version 1.2.4-3
-+
-+- Mercury Smartcraft fixes (working now!)
-+- Govee 510x regression errors fixed
-+
-+# Version 1.2.4-2
-+
-+- RenogyRoverClient fix to Battery SOC calculation
-+- VictronBatteryMonitor set default aux mode to secondary voltage 
-+- SwitchBotTH and Meter Plus ::identify errors fixed
-+- MercurySmartcraft::identify method fix
-+
-+# Version 1.2.4-1
-+
-+- **NEW SENSOR** [Bank Manager](https://marinedcac.com/pages/bankmanager) (tested) 
-+- **NEW SENSOR** [Mercury Smartcraft](https://www.mercurymarine.com/us/en/gauges-and-controls/displays/smartcraft-connect) (untested)
-+- Fixed Govee 5075 parsing
-+- Added defaults for Renogy Rover Client
-+- Automatic reconnect for GATT connected devices
-+
-+### Version 1.2.3
-+
-+Bug fixes Remoran Wave.3, JunctekBMS, and ShenzhenLiOn
-+
-+### Version 1.2.2
-+
-+- Junctek BMS and Remoran Wave 3 support (Note: both are not currently field tested)
-+
-+- Fixes to ShenzhenLiOn BMS, Victron Orion XS, Victron DC DC Converter, Victron Smart Lithium Classes
-+
-+### Version 1.2.1
- 
- - Dynamic configuration screen. The Device list automatically updates when new devices are found by the BT scanner. (No more annoying screen refresh necessary!). 
- 
-@@ -13,6 +60,7 @@
- 
- - Support for multiple simultaneous GATT connections. 
- 
-+
- ## WHAT IT IS
- 
- BT Sensors Plugin for Signalk is a lightweight BLE (Bluetooth Low Energy) framework for listening and connecting to Bluetooth sensors on your boat. After discovery and configuration the plugin sends deltas to Signalk paths with values your sensor reports. <br>
-@@ -44,7 +92,9 @@ It's pretty easy to write and deploy your own sensor class for any currently uns
- |Redodo| Rebranded LiTime |
- |Kilovault| [Kilovault HLX+ smart batteries ](https://sunwatts.com/content/manual/KiloVault_HLX_PLUS_Datasheet_06252021%20%281%29.pdf?srsltid=AfmBOooY-cGnC_Qm6V1T9Vg5oZzBCJurS0AOGoWqWeyy-dwz2vA-l1Jb) (Note: Kilovault appears to be out of business as of March 2024) |
- |[Lancol](www.Lancol.com)| [Micro 10C 12V Car Battery Monitor](https://www.lancol.com/product/12v-bluetooth-4-0-battery-tester-micro-10-c/)|
--
-+|[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)|
- 
- ### Environmental 
- | Manufacturer |  Devices | 
-@@ -67,6 +117,13 @@ It's pretty easy to write and deploy your own sensor class for any currently uns
- | [Gobius](https://gobiusc.com/) | Gobius-C Tank level sensor|
- | [Mopeka](https://www.mopeka.com) | [Mopeka Pro Chek](https://mopeka.com/product-category/recreational-sensors-rv-bbq-etc/) ultrasonic tank level sensor  |
- 
-+### Propulsion
-+| Manufacturer |  Devices | 
-+|--------------|----------|
-+| [Mercury](https://www.mercurymarine.com)| [Mercury Smartcraft](https://www.mercurymarine.com/us/en/gauges-and-controls/displays/smartcraft-connect) connect engine sensor|
-+
-+
-+
- 
- ## WHO IT'S FOR
- 
-@@ -121,6 +178,35 @@ Finally, restart SK. Plugin should appear in your server plugins list.<br>
- > NOTE: "~/.signalk" is the default signalk home on Linux. If you're 
- > getting permissions errors executing npm link, try executing "npm link" under sudo.
- 
-+## KNOWN ISSUES
-+
-+### Connected Devices on Raspberry Pi platform (4/4b/5/CM400/CM500)
-+
-+Onboard Raspberry Pi WiFi can cause interference with the onboard Bluetooth resulting in lost connections to GATT connected devices (Renogy, JBD, etc. )
-+
-+One simple solution is to install a USB BT adapter like the [Tp-link UB500-Plus](https://www.tp-link.com/us/home-networking/usb-adapter/ub500-plus/) 
-+
-+### USB 3.0 and HDMI interference
-+
-+Poorly shielded USB 3.0 and HDMI (5ghz) can interfere with BT transmission (2.4ghz).
-+
-+### Configuration Panel
-+
-+- Safari 18.1 on OsX produces errors on load that kill the configuration screen. No known cause. Upgrade to most recent Safari or use Chrome.
-+- Unsaved sensor configuration changes are lost after selecting a different sensor. Be sure to Save changes for now.
-+- Victron GX, Victron Smart Battery Protect, and Victron VE Bus sensor classes have no default paths currently. Users will need to manually input.
-+
-+### Runtime
-+
-+- IMPORTANT Set `Scan for new devices interval` to `0` after configuration is complete. The plugin will run but in Bluetooth-rich environments, or if you have a long range BT 5.3 device, the system Bluetooth stack may fail after 4 hours or so.
-+- There's no way that I know of to remove a SK Path without restarting the server. So if any active paths are changed by the plugin, you'll still see them hanging around in the data browser growing stale until you restart the server.
-+- RPi 3/4/5/CM400s when running an Access Point on the on board Wifi can cause a problem connecting to devices through the onboard BT. The only known fix is to disable the onboard Bluetooth and use a USB BT adapter. Alternatively, you can use a USB WiFi adapter. NOTE: This only applies to _connected_ devices like Renogy devices, LiTime batteries etc. 
-+
-+### Problems saving the configuration after installing plugin for first time (fixed as of Version 1.2.5)  
-+
-+Device config after being saved will appear to be "missing" after restarting. The config is in fact saved in the plugin config directory. All you have to do is Submit the main configuration then enable and optionally disable Debug. This, believe it or not, ensures that the config is marked as enabled. You should see your data now and upon restart. 
-+
-+
- ## CONFIGURATION
- 
- After installing and restarting Signalk you should see a "BT Sensors Plugin" option in the Signalk->Server->Plugin Config page.<br><br>
-@@ -266,6 +352,7 @@ Many thanks to all those who contributed to the project either with code or test
- - Arjen
- - SDLee
- - Jordan
-+- Jan of SKipper App fame
- 
- It takes a village. Or more appropriately, an armada. Okay, regatta. But you get the idea.
-   
-diff --git a/index.js b/index.js
-index 90dbf06..85c912c 100644
---- a/index.js
-+++ b/index.js
-@@ -1,5 +1,6 @@
- const packageInfo = require("./package.json")
- 
-+
- const {createBluetooth} = require('node-ble')
- const {Variant} = require('dbus-next')
- const {bluetooth, destroy} = createBluetooth()
-@@ -138,10 +139,27 @@ module.exports =   function (app) {
- 		var adapterID=options.adapter
- 		var foundConfiguredDevices=0
- 
-+		if (Object.keys(options).length==0){ //empty config means initial startup. save defaults and enabled=true. 
-+			let json = {configuration:{adapter:"hci0", transport:"le", discoveryTimeout:30, discoveryInterval:10}, enabled:true, enableDebug:false}
-+			let appDataDirPath = app.getDataDirPath()
-+			let jsonFile = appDataDirPath+'.json'
-+			const fs = require("node:fs")
-+			try {
-+				fs.writeFileSync(jsonFile, JSON.stringify(json, null,2))
-+				options=json
-+			} catch(err){
-+				console.log(`Error writing initial config: ${err.message} `)
-+				console.log(err)
-+			}
-+		
-+		}
-+
- 		plugin.registerWithRouter = function(router) {
- 
- 			router.post('/updateSensorData', async (req, res) => {
- 				app.debug(req.body)
-+				const sensor = sensorMap.get(req.body.mac_address)
-+				sensor.prepareConfig(req.body)
- 				const i = deviceConfigs.findIndex((p)=>p.mac_address==req.body.mac_address) 
- 				if (i<0){
- 					if (!options.peripherals){
-@@ -154,28 +172,36 @@ module.exports =   function (app) {
- 				} else {
- 					options.peripherals[i] = req.body
- 				}
-+				deviceConfigs=options.peripherals
- 				app.savePluginOptions(
- 					options, async () => {
- 						app.debug('Plugin options saved')
- 						res.status(200).json({message: "Sensor updated"})
--						const sensor = sensorMap.get(req.body.mac_address)
- 						if (sensor) {
- 							removeSensorFromList(sensor)
- 							if (sensor.isActive()) 
- 								await sensor.stopListening()
--							initConfiguredDevice(req.body)
- 						} 
--						
-+						initConfiguredDevice(req.body)
- 					}
- 				)
- 				
- 			});
- 			router.post('/removeSensorData', async (req, res) => {
- 				app.debug(req.body)
-+				const sensor = sensorMap.get(req.body.mac_address)
-+				if (!sensor) {
-+					res.status(404).json({message: "Sensor not found"})
-+					return
-+				}
- 				const i = deviceConfigs.findIndex((p)=>p.mac_address==req.body.mac_address) 
- 				if (i>=0){
- 					deviceConfigs.splice(i,1)
- 				}
-+
-+				if (sensor.isActive()) 
-+					await sensor.stopListening()
-+				
- 				if (sensorMap.has(req.body.mac_address))
- 					sensorMap.delete(req.body.mac_address)
- 				app.savePluginOptions(
-@@ -201,12 +227,6 @@ module.exports =   function (app) {
- 					}
- 				)
- 			});
--			router.get('/getDomains', (req, res) => {
--				
--				res.status(200).json(
--					BTSensor.SensorDomains
--				);
--			})
- 		
- 			router.get('/getBaseData', (req, res) => {
- 				
-@@ -231,9 +251,10 @@ module.exports =   function (app) {
- 
- 			router.get('/getProgress', (req, res) => {
- 				app.debug("Sending progress")
--				const json = {"progress":foundConfiguredDevices/deviceConfigs.length, "maxTimeout": 1, 
-+				let deviceCount = deviceConfigs.filter((dc)=>dc.active).length
-+				const json = {"progress":foundConfiguredDevices/deviceCount, "maxTimeout": 1, 
- 							  "deviceCount":foundConfiguredDevices, 
--							  "totalDevices": deviceConfigs.length}
-+							  "totalDevices": deviceCount}
- 				res.status(200).json(json)
- 				
- 			  });
-@@ -278,10 +299,12 @@ module.exports =   function (app) {
- 			const config = getDeviceConfig(sensor.getMacAddress())
- 			const schema = sensor.getJSONSchema()
- 			schema.htmlDescription = sensor.getDescription()
-+			
- 			return {
- 					info: getSensorInfo(sensor),
- 					schema: schema,
--					config: config?config:{}
-+					config: config?config:{},
-+					configCopy: JSON.parse(JSON.stringify(config?config:{}))
- 				}
- 		}
- 
-@@ -400,8 +423,10 @@ module.exports =   function (app) {
- 			try{
- 				const c = await getClassFor(device,config)
- 				c.debug=app.debug
-+				
- 				const sensor = new c(device, config?.params, config?.gattParams)
- 				sensor.debug=app.debug
-+				sensor.setPluginError=app.setPluginError
- 				sensor.app=app
- 				sensor._adapter=adapter //HACK!
- 				await sensor.init()				
-@@ -411,7 +436,8 @@ module.exports =   function (app) {
- 				const msg = `Unable to instantiate ${await BTSensor.getDeviceProp(device,"Address")}: ${error.message} `
- 				app.debug(msg)
- 				app.debug(error)
--				app.setPluginError(msg)
-+				if (config.active) 
-+					app.setPluginError(msg)
- 				return null
- 			}
- 
-@@ -564,12 +590,13 @@ module.exports =   function (app) {
- 		}
- 		if (!(deviceConfigs===undefined)){
- 			const maxTimeout=Math.max(...deviceConfigs.map((dc)=>dc?.discoveryTimeout??options.discoveryTimeout))
-+			const totalDevices = deviceConfigs.filter((dc)=>dc.active).length
-+
- 			var progress = 0
- 			if (progressID==null) 
- 			progressID  = setInterval(()=>{
--				channel.broadcast({"progress":++progress, "maxTimeout": maxTimeout, "deviceCount":foundConfiguredDevices, "totalDevices": deviceConfigs.length},"progress")
--				if ( foundConfiguredDevices==deviceConfigs.length){
--					app.debug("progress complete") 
-+				channel.broadcast({"progress":++progress, "maxTimeout": maxTimeout, "deviceCount":foundConfiguredDevices, "totalDevices": totalDevices},"progress")
-+				if ( foundConfiguredDevices==totalDevices){
- 					progressID,progressTimeoutID = null
- 					clearTimeout(progressTimeoutID)
- 					clearInterval(progressID)
-@@ -578,12 +605,11 @@ module.exports =   function (app) {
- 			},1000); 
- 			if (progressTimeoutID==null)
- 			progressTimeoutID = setTimeout(()=> {
--				app.debug("progress timed out ")
- 				if (progressID) {
- 
- 					clearInterval(progressID);
- 					progressID=null
--					channel.broadcast({"progress":maxTimeout, "maxTimeout": maxTimeout, "deviceCount":foundConfiguredDevices, "totalDevices": deviceConfigs.length},"progress")
-+					channel.broadcast({"progress":maxTimeout, "maxTimeout": maxTimeout, "deviceCount":foundConfiguredDevices, "totalDevices": totalDevices},"progress")
- 				} 
- 			}, (maxTimeout+1)*1000);
- 
-diff --git a/package.json b/package.json
-index 8203e83..8eb2e4d 100644
---- a/package.json
-+++ b/package.json
-@@ -1,9 +1,9 @@
- {
-   "name": "bt-sensors-plugin-sk",
--  "version": "1.2.0",
--  "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",
-+  "version": "1.2.5",
-+  "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": {
-+  "dependencies": { 
-     "@rjsf/bootstrap-4": "^5.24.11",
-     "@rjsf/core": "^5.24.11",
-     "@rjsf/utils": "^5.24.11",
-@@ -54,7 +54,7 @@
-     "prepublishOnly": "npm run clean && npm run build",
-     "dev": "webpack --watch --mode development",
-     "build": "webpack --mode=production",
--    "clean": "rimraf ./public",
-+    "clean": "rimraf ./public/*.js; rimraf ./public/*.txt",
-     "bundle-analyzer": "webpack-bundle-analyzer --port 4200 public/stats.json"
-   },
-   "repository": {
-diff --git a/plugin_defaults.json b/plugin_defaults.json
-index 1430fd1..a2f7b37 100644
---- a/plugin_defaults.json
-+++ b/plugin_defaults.json
-@@ -96,6 +96,17 @@
-                 "default": "electrical.batteries.{batteryID}.voltage"
-             },
-             
-+            "power":
-+            { 
-+                "unit": "W",
-+                "default": "electrical.batteries.{batteryID}.power"
-+            },
-+                        
-+            "impedance":
-+            { 
-+                "unit": "Ohm",
-+                "default": "electrical.batteries.{batteryID}.impedance"
-+            },
-             "temperature":{
-                 "unit": "K",
-                 "default": "electrical.batteries.{batteryID}.temperature"
-@@ -107,13 +118,21 @@
- 
-             "capacity":{
-                 "remaining":{
--                    "unit":"Ah",
-+                    "unit":"C",
-                     "default": "electrical.batteries.{batteryID}.capacity.remaining"
-                 },
-                 "actual":{
--                    "unit":"Ah",
-+                    "unit":"C",
-                     "default": "electrical.batteries.{batteryID}.capacity.actual"
-                 },
-+                "discharge":{
-+                    "unit":"KWh",
-+                    "default": "electrical.batteries.{batteryID}.capacity.dischargeSinceFull"
-+                },
-+                "charge":{
-+                    "unit":"KWh",
-+                    "default": "electrical.batteries.{batteryID}.capacity.totalCharge"
-+                },
-                 "stateOfCharge":{
-                     "unit":"ratio",
-                     "default": "electrical.batteries.{batteryID}.capacity.stateOfCharge" 
-diff --git a/public/images/Bank Manager All-in-onewc.webp b/public/images/Bank Manager All-in-onewc.webp
-new file mode 100644
-index 0000000..540ac19
-Binary files /dev/null and b/public/images/Bank Manager All-in-onewc.webp differ
-diff --git a/public/images/SmartShunt_500_nw.png b/public/images/SmartShunt_500_nw.png
-new file mode 100644
-index 0000000..5f60330
-Binary files /dev/null and b/public/images/SmartShunt_500_nw.png differ
-diff --git a/public/images/smartcraft.webp b/public/images/smartcraft.webp
-new file mode 100644
-index 0000000..f740827
-Binary files /dev/null and b/public/images/smartcraft.webp differ
-diff --git a/sensor_classes/BTHome/AbstractBTHomeSensor.js b/sensor_classes/BTHome/AbstractBTHomeSensor.js
-index 729fb18..d7db48b 100644
---- a/sensor_classes/BTHome/AbstractBTHomeSensor.js
-+++ b/sensor_classes/BTHome/AbstractBTHomeSensor.js
-@@ -235,7 +235,7 @@ class AbstractBTHomeSensor extends BTSensor {
- 	 * Extracts motion detection from the given BTHome data.
- 	 *
- 	 * @param btHomeData {BTHomeServiceData.BthomeServiceData} The BTHome data provided by the device.
--	 * @returns {Boolean|null} The device's button press state.
-+   * @returns {Boolean|null} Wether the device has detected motion.
- 	 */
- 	parseMotion(btHomeData) {
- 		const motion = this.getSensorDataByObjectId(
-@@ -304,6 +304,31 @@ class AbstractBTHomeSensor extends BTSensor {
- 		return null;
- 	}
- 
-+  /**
-+   * Parses the opening (window/door) state from BTHome service data.
-+   * @param {BTHomeServiceData.BthomeServiceData} btHomeData - The parsed BTHome data object.
-+   * @returns {string|null} "open", "closed", or null if not present.
-+   */
-+  parseWindowState(btHomeData) {
-+    const state = this.getSensorDataByObjectId(btHomeData, BTHomeServiceData.BthomeObjectId.BINARY_WINDOW)?.window;
-+    if (state.intValue === 1) return "open";
-+    if (state.intValue === 0) return "closed";
-+    return null;
-+  }
-+
-+  /**
-+   * Parses the rotation from BTHome service data.
-+   * @param {BTHomeServiceData.BthomeServiceData} btHomeData - The parsed BTHome data object.
-+   * @returns {number|null} rotation in degrees from the closed position, or null if not present.
-+   */
-+  parseRotation(btHomeData) {
-+    // Use the correct object ID for window event (0x2D, which is 45 in decimal, which is already specified in BthomeObjectId).
-+    const sensorRotation = this.getSensorDataByObjectId(btHomeData, BTHomeServiceData.BthomeObjectId.SENSOR_ROTATION_0_1)?.rotation;
-+    if (sensorRotation) {
-+      return Number.parseFloat(sensorRotation.toFixed(2));
-+    }
-+    return null;
-+  }
- 
- 	propertiesChanged(props) {
- 		super.propertiesChanged(props);
-diff --git a/sensor_classes/BankManager.js b/sensor_classes/BankManager.js
-new file mode 100644
-index 0000000..d0303fc
---- /dev/null
-+++ b/sensor_classes/BankManager.js
-@@ -0,0 +1,96 @@
-+const BTSensor = require("../BTSensor");
-+
-+class BankManager extends BTSensor{
-+
-+    static Domain = BTSensor.SensorDomains.electrical
-+    static async  identify(device){
-+
-+        const name = await this.getDeviceProp(device,"Name")
-+        const regex = /^BankManager*[0-9]{2}/
-+ 
-+        if (name && name.match(regex))  
-+            return this
-+        else
-+            return null
-+        
-+    }
-+    initSchema(){
-+        super.initSchema()
-+
-+        this.addDefaultParam("id")
-+            .default="bankManager"
-+
-+        this.addMetadatum('liVoltage','V','Lithium Voltage')
-+            .default="electrical.batteries.{id}.voltage.lithium"
-+        this.addMetadatum('pbVoltage','V','Lead Voltage')
-+            .default="electrical.batteries.{id}.voltage.lead"
-+        this.addMetadatum('current','A','total current')
-+            .default="electrical.batteries.{id}.current"
-+        this.addMetadatum('soc','ratio','state of charge')
-+            .default="electrical.batteries.{id}.soc"
-+        this.addMetadatum('connectionStatus','','Connection Status')
-+            .default="electrical.batteries.{id}.connectionStatus"
-+
-+    }
-+
-+    getManufacturer(){
-+        return "Bank Manager"
-+    }
-+    hasGATT(){
-+        return false
-+    }
-+    usingGATT(){
-+        return true
-+    }
-+    emitDataFrom(buffer){
-+        let data=buffer.toString().split(",")
-+        this.emit("liVoltage", parseFloat(data[1]))
-+        this.emit("pbVoltage", parseFloat(data[2]))
-+        this.emit("current", parseFloat(data[3])) 
-+        this.emit("soc", parseFloat(data[4])/100) 
-+        this.emit("connectionStatus", parseInt(data[5])) 
-+
-+    }
-+    emitGATT(){
-+    
-+    }
-+
-+
-+    initGATTConnection(){ 
-+        return new Promise((resolve,reject )=>{ this.deviceConnect().then(async ()=>{ 
-+            if (!this.gattServer) { 
-+                this.gattServer = await this.device.gatt() 
-+                this.service = await this.gattServer.getPrimaryService("0000ffe0-0000-1000-8000-00805f9b34fb") 
-+                this.characteristic = await this.service.getCharacteristic("0000ffe1-0000-1000-8000-00805f9b34fb")
-+             } 
-+            resolve(this)
-+             }) .catch((e)=>{ reject(e.message) }) }) 
-+    }
-+
-+    initGATTNotifications() { 
-+        Promise.resolve(this.characteristic.startNotifications().then(()=>{   
-+            let data = null 
-+            this.characteristic.on('valuechanged', buffer => {
-+                if (buffer.length>0 && buffer[0]==0x23) {
-+                    data = Buffer.from(buffer)
-+                } else if (data && buffer.indexOf(0x0d0a)!==-1) {
-+                    data=Buffer.concat([data,buffer.subarray(0,buffer.indexOf(0x0d0a)-1)], data.length+buffer.indexOf(0x0d0a)-1)
-+                    this.emitDataFrom(data)
-+                    data=null
-+                }
-+            })
-+        }))
-+       
-+    }
-+  
-+    async stopListening(){
-+        super.stopListening()
-+        if (this.characteristic  && await this.characteristic.isNotifying()) {
-+            await this.characteristic.stopNotifications()
-+        }
-+        if (await this.device.isConnected()){
-+            await this.device.disconnect()
-+        }
-+    }                  
-+}
-+module.exports=BankManager
-
-diff --git a/sensor_classes/GobiusCTankMeter.js b/sensor_classes/GobiusCTankMeter.js
-index 6480535..318e621 100644
---- a/sensor_classes/GobiusCTankMeter.js
-+++ b/sensor_classes/GobiusCTankMeter.js
-@@ -338,19 +338,7 @@ class GobiusCTankMeter extends BTSensor{
-                 this.service = await this.gattServer.getPrimaryService("0000ffe0-0000-1000-8000-00805f9b34fb") 
-                 this.characteristic = await this.service.getCharacteristic("0000ffe9-0000-1000-8000-00805f9b34fb")
-             }
--                this.device.on("disconnect", ()=>{
--                        if (this.isActive()) {
--                        this.debug(`Device disconnected. Attempting to reconnect to ${this.getName()}`)  
--                                try {        
--                                this.deviceConnect().then(()=>{
--                                        this.debug(`Device reconnected -- ${this.getName()}`)  
--                                })
--                                }
--                                catch (e) {
--                                        this.debug(`Error while reconnecting to ${this.getName()}`)
--                                }
--                        }
--                })     
-+        
-   
-             resolve(this)
-             }).catch((e)=>{ reject(e.message) }) }) 
-diff --git a/sensor_classes/Govee/GoveeSensor.js b/sensor_classes/Govee/GoveeSensor.js
-new file mode 100644
-index 0000000..386ab98
---- /dev/null
-+++ b/sensor_classes/Govee/GoveeSensor.js
-@@ -0,0 +1,48 @@
-+const BTSensor = require("../../BTSensor");
-+
-+class GoveeSensor extends  BTSensor {
-+    static Domain = this.SensorDomains.environmental
-+    static ManufacturerUUID = '0000ec88-0000-1000-8000-00805f9b34fb'
-+    static async  identify(device){
-+        
-+        const regex = /^Govee_H5075_[a-f,A-F,0-9]{4}$/
-+        const name = await this.getDeviceProp(device,"Name")
-+        const uuids = await this.getDeviceProp(device,'UUIDs')
-+ 
-+        if (name && name.match(this.getIDRegex()) && 
-+            uuids && uuids.length > 0 && 
-+            uuids[0] == this.ManufacturerUUID)
-+            return this
-+        else
-+            return null
-+        
-+    }
-+
-+    static DATA_ID=0xec88
-+    getManufacturer(){
-+        return "Govee"
-+    }
-+    getPackedTempAndHumidity(buffer, beg )
-+    {
-+        const negative=buffer[beg]&0x80
-+        return {
-+            packedValue: ((buffer.readIntBE(beg,3))&0xFFFFFF) ^ (negative?0x800000:0x000000),
-+            tempIsNegative: negative
-+        }
-+    }
-+    emitTemperatureAndHumidity(packedValue, tempIsNegative ){
-+        this.emit("temp", 273.15+((((Math.trunc(packedValue/1000))/10))*(tempIsNegative?-1:1)))
-+        this.emit("humidity", (packedValue % 1000) / 1000)
-+
-+    }
-+    async propertiesChanged(props){
-+        super.propertiesChanged(props)    
-+        if (!props.hasOwnProperty("ManufacturerData")) return
-+
-+        const buffer = this.getManufacturerData(this.constructor.DATA_ID)
-+        if (buffer) {
-+            this.emitValuesFrom(buffer)
-+        }      
-+   }                         
-+}
-+module.exports=GoveeSensor
-diff --git a/sensor_classes/GoveeH5074.js b/sensor_classes/GoveeH5074.js
-new file mode 100644
-index 0000000..307c235
---- /dev/null
-+++ b/sensor_classes/GoveeH5074.js
-@@ -0,0 +1,23 @@
-+const GoveeSensor = require("./Govee/GoveeSensor");
-+
-+class GoveeH5074 extends  GoveeSensor {
-+    static getIDRegex() {
-+        return /^Govee_H5074_[a-f,A-F,0-9]{4}$/
-+    }
-+    initSchema(){
-+        super.initSchema()
-+        this.addDefaultParam("zone")
-+
-+        this.addDefaultPath("temp","environment.temperature")
-+            .read= (buffer)=>{return 273.15+(buffer.readUInt16LE(1)/100) }
-+        
-+        this.addDefaultPath("humidity", "environment.humidity")
-+            .read = (buffer)=>{return buffer.readUInt16LE(3)/10000}   
-+
-+        this.addDefaultPath("battery","sensors.batteryStrength")   
-+            .read = (buffer)=>{return buffer.readUInt8(5)/100}
-+    }
-+
-+        
-+}
-+module.exports=GoveeH5074
-diff --git a/sensor_classes/GoveeH5075.js b/sensor_classes/GoveeH5075.js
-new file mode 100644
-index 0000000..6098893
---- /dev/null
-+++ b/sensor_classes/GoveeH5075.js
-@@ -0,0 +1,37 @@
-+const GoveeSensor = require("./Govee/GoveeSensor");
-+
-+class GoveeH5075 extends  GoveeSensor {
-+    static getIDRegex(){
-+        return /^Govee_H5075_[a-f,A-F,0-9]{4}$/
-+    }
-+    static test(){
-+        const sensor = new GoveeH5075()
-+        sensor.getName=()=>{return "Govee H5075 fake"}
-+        sensor.initSchema()
-+        sensor.on("temp", (t)=>{console.log(`temp => ${t}`)})
-+        sensor.on("humidity", (t)=>{console.log(`humidity => ${t}`)})
-+        sensor.on("battery", (t)=>{console.log(`battery => ${t}`)})
-+        sensor.emitValuesFrom(Buffer.from([0x00, 0x81, 0xc2 ,0x89 ,0x64 ,0x00]))
-+        sensor.emitValuesFrom(Buffer.from([0x00,0x03,0xbb,0x94,0x64,0x00]))
-+
-+    }
-+    initSchema(){
-+        super.initSchema()
-+        this.addDefaultParam("zone")
-+
-+        this.addDefaultPath("temp","environment.temperature")
-+        this.addDefaultPath("humidity", "environment.humidity")
-+        this.addDefaultPath("battery","sensors.batteryStrength")   
-+    }
-+
-+    emitValuesFrom(buffer){
-+        if (buffer.length<6) {
-+            this.debug(`Invalid buffer received. Cannot parse buffer ${buffer} for ${this.getMacAndName()}`)
-+            return
-+        }
-+        const val = this.getPackedTempAndHumidity(buffer,1)
-+        this.emitTemperatureAndHumidity(val.packedValue, val.tempIsNegative)
-+        this.emit("battery", buffer[4]/100)
-+    }                         
-+}
-+module.exports=GoveeH5075
-diff --git a/sensor_classes/GoveeH50xx.js b/sensor_classes/GoveeH50xx.js
-deleted file mode 100644
-index 1b49299..0000000
---- a/sensor_classes/GoveeH50xx.js
-+++ /dev/null
-@@ -1,47 +0,0 @@
--const BTSensor = require("../BTSensor");
--
--class GoveeH50xx extends  BTSensor {
--    static Domain = this.SensorDomains.environmental
--    static async  identify(device){
--        const regex = /^Govee_H50[0-9]{2}_[a-f,A-F,0-9]{4}$/
--        //this.getManufacturer()
--        const name = await this.getDeviceProp(device,"Name")
--        const uuids = await this.getDeviceProp(device,'UUIDs')
-- 
--        if (name && name.match(regex) && 
--            uuids && uuids.length > 0 && 
--            uuids[0] == '0000ec88-0000-1000-8000-00805f9b34fb')
--            return this
--        else
--            return null
--        t
--    }
--
--    initSchema(){
--        super.initSchema()
--        this.addDefaultParam("zone")
--
--        this.addDefaultPath("temp","environment.temperature")
--            .read= (buffer)=>{return 273.15+(buffer.readUInt16LE(1)/100) }
--        
--        this.addDefaultPath("humidity", "environment.humidity")
--            .read = (buffer)=>{return buffer.readUInt16LE(3)/10000}   
--
--        this.addDefaultPath("battery","sensors.batteryStrength")   
--            .read = (buffer)=>{return buffer.readUInt8(5)/100}
--    }
--
--    getManufacturer(){
--        return "Govee"
--    }
--    async propertiesChanged(props){
--        super.propertiesChanged(props)    
--        if (!props.hasOwnProperty("ManufacturerData")) return
--
--        const buffer = this.getManufacturerData(0xec88)
--        if (buffer) {
--            this.emitValuesFrom(buffer)
--        }      
--   }                         
--}
--module.exports=GoveeH50xx
-diff --git a/sensor_classes/GoveeH510x.js b/sensor_classes/GoveeH510x.js
-index aaf3ed6..1627c63 100644
---- a/sensor_classes/GoveeH510x.js
-+++ b/sensor_classes/GoveeH510x.js
-@@ -1,39 +1,22 @@
--const BTSensor = require("../BTSensor");
--function decodeTempHumid(tempHumidBytes) {
--    // Convert the bytes to a 24-bit integer
--    const baseNum = (tempHumidBytes[0] << 16) + (tempHumidBytes[1] << 8) + tempHumidBytes[2];
--  
--    // Check if the temperature is negative
--    const isNegative = (baseNum & 0x800000) !== 0;
--  
--    // Extract the temperature and humidity values
--    const tempAsInt = baseNum & 0x7FFFFF;
--    const tempAsFloat = (tempAsInt / 1000) / 10.0;
--    const humid = (tempAsInt % 1000) / 10.0;
--  
--    // Apply the negative sign if necessary
--    if (isNegative) {
--      return {t:-tempAsFloat, h: humid};
--    } else {
--      return {t: tempAsFloat, h: humid};
--    }
--  }
--class GoveeH510x extends BTSensor{
--    static Domain = this.SensorDomains.environmental
--    static async  identify(device){
--        const regex = /^GVH510[0-9]_[a-f,A-F,0-9]{4}$/
--        const name = await this.getDeviceProp(device,"Name")
--        const uuids = await this.getDeviceProp(device,'UUIDs')
-+const GoveeSensor = require("./Govee/GoveeSensor");
- 
--        if (name && name.match(regex) && 
--            uuids && uuids.length > 0 && 
--            uuids[0] == '0000ec88-0000-1000-8000-00805f9b34fb')
--            return this
--        else
--            return null
--        
-+class GoveeH510x extends GoveeSensor{
-+    
-+    static getIDRegex(){
-+        return /^GVH510[0-9]_[a-f,A-F,0-9]{4}$/
-     }
- 
-+     static test(){
-+        const sensor = new GoveeH510x()
-+        sensor.getName=()=>{return "Govee H510x fake"}
-+        sensor.initSchema()
-+        sensor.on("temp", (t)=>{console.log(`temp => ${t}`)})
-+        sensor.on("humidity", (t)=>{console.log(`humidity => ${t}`)})
-+        sensor.on("battery", (t)=>{console.log(`battery => ${t}`)})
-+        sensor.emitValuesFrom(Buffer.from([0x01,0x01,0x03,0x6d,0xcc,0x5c]))
-+
-+    }
-+    static DATA_ID = 0x0001
-     initSchema(){
-         super.initSchema()
-         this.addDefaultParam("zone")
-@@ -44,23 +27,16 @@ class GoveeH510x extends BTSensor{
-     }
- 
-     emitValuesFrom(buffer){
--        const th = decodeTempHumid(buffer.subarray(2,5))
--        this.emit("temp", parseFloat((273.15+th.t).toFixed(2))) ;
--        this.emit("humidity", th.h/100 )
--        this.emit('battery', buffer[5]/100)
--    }
-+        if (buffer.length<6) {
-+            this.debug(`Invalid buffer received. Cannot parse buffer ${buffer} for ${this.getMacAndName()}`)
-+            return
-+        }
-+        const val = this.getPackedTempAndHumidity(buffer,2)
-+        this.emitTemperatureAndHumidity(val.packedValue, val.tempIsNegative)
-+        this.emit("battery", buffer[5]/100)
- 
--    getManufacturer(){
--        return "Govee"
-     }
--    async propertiesChanged(props){
--        super.propertiesChanged(props)    
--        if (!props.hasOwnProperty("ManufacturerData")) return
- 
--        const buffer = this.getManufacturerData(0x0001)
--        if (buffer) {
--            this.emitValuesFrom(buffer)
--        }      
--   }                         
-+                     
- }
- module.exports=GoveeH510x
-diff --git a/sensor_classes/JBDBMS.js b/sensor_classes/JBDBMS.js
-index d25061a..0374a0c 100644
---- a/sensor_classes/JBDBMS.js
-+++ b/sensor_classes/JBDBMS.js
-@@ -52,10 +52,10 @@ class JBDBMS extends BTSensor {
-         (buffer)=>{return buffer.readInt16BE(6) / 100} 
-       
-       this.addDefaultPath('remainingCapacity','electrical.batteries.capacity.remaining')
--        .read=(buffer)=>{return buffer.readUInt16BE(8) / 100} 
-+        .read=(buffer)=>{return (buffer.readUInt16BE(8) / 100)*3600} 
-       
-       this.addDefaultPath('capacity','electrical.batteries.capacity.actual')
--        .read=(buffer)=>{return buffer.readUInt16BE(10) / 100} 
-+        .read=(buffer)=>{return (buffer.readUInt16BE(10) / 100)*3600} 
-      
-       this.addDefaultPath('cycles','electrical.batteries.cycles' )
-         .read=(buffer)=>{return buffer.readUInt16BE(12)} 
-@@ -139,7 +139,7 @@ class JBDBMS extends BTSensor {
-         let datasize = -1
-         const timer = setTimeout(() => {
-           clearTimeout(timer)
--          reject(new Error(`Response timed out from JBDBMS device ${this.getName()}. `));
-+          reject(new Error(`Response timed out (+30s) from JBDBMS device ${this.getName()}. `));
-         }, 30000);
- 
-         const valChanged = async (buffer) => {
-@@ -147,13 +147,12 @@ class JBDBMS extends BTSensor {
-             if (buffer[0]!==0xDD || buffer.length < 5 || buffer[1] !== command)
-                 reject(`Invalid buffer from ${this.getName()}, not processing.`)
-             else 
--                datasize=buffer[2]
-+                datasize=buffer[3]
-           }
-           buffer.copy(result,offset)
--          if (buffer[buffer.length-1]==0x77 && offset+buffer.length-6==datasize){
-+          if (buffer[buffer.length-1]==0x77 && offset+buffer.length-7==datasize){
-             
-             result = Uint8Array.prototype.slice.call(result, 0, offset+buffer.length)
--            this.debug(result)
-             this.rxChar.removeAllListeners()
-             clearTimeout(timer)
-             if (!checkSum(result)) 
-@@ -196,6 +195,8 @@ async getAndEmitCellVoltages(){
- }
- 
- initGATTInterval(){
-+   
-+  this.emitGATT()
-   this.initGATTNotifications()
- }
- 
-diff --git a/sensor_classes/Junctek.js b/sensor_classes/Junctek.js
-new file mode 100644
-index 0000000..473e8f1
---- /dev/null
-+++ b/sensor_classes/Junctek.js
-@@ -0,0 +1,177 @@
-+
-+
-+const BTSensor = require("../BTSensor");
-+
-+function bytesToBase10String(bytes){
-+        let s = ""
-+        for (let byte of bytes){
-+            s+=byte.toString(16).padStart(2,'0')
-+        }
-+        return s
-+    }
-+
-+class JunctekBMS extends BTSensor{
-+    static Domain = BTSensor.SensorDomains.electrical
-+    
-+    constructor(device, config, gattConfig) {
-+        super(device, config, gattConfig)
-+    }
-+
-+    static async identify(device){
-+
-+        return null
-+    }
-+
-+    chargeDirection = 1 
-+
-+    hasGATT(){
-+        return true
-+    }
-+
-+
-+
-+    async initSchema(){
-+        super.initSchema()
-+        this.addDefaultParam("batteryID")
-+
-+        this.addDefaultPath("voltage","electrical.batteries.voltage")
-+            
-+        this.addDefaultPath("current","electrical.batteries.current")
-+        
-+        this.addDefaultPath("power","electrical.batteries.power")
-+        
-+        this.addDefaultPath("cycles",'electrical.batteries.cycles')
-+
-+        this.addDefaultPath("soc",'electrical.batteries.capacity.stateOfCharge')
-+        this.addDefaultPath("remaining",'electrical.batteries.capacity.remaining')
-+        this.addDefaultPath("timeRemaining",'electrical.batteries.capacity.timeRemaining')
-+        this.addDefaultPath("discharge",'electrical.batteries.capacity.dischargeSinceFull')
-+        this.addDefaultPath("charge",'electrical.batteries.capacity.charge')
-+        this.addDefaultPath("temperature",'electrical.batteries.temperature')
-+        this.addDefaultPath("actualCapacity",'electrical.batteries.capacity.actual')
-+        this.addMetadatum('timeToCharged','s', 'time in seconds to battery is fully charged')
-+            .default='electrical.batteries.{batteryID}.timeToCharged'
-+        this.addMetadatum('impedance','mOhm', 'measured resistance')
-+            .default='electrical.batteries.{batteryID}.impedance'
-+    }
-+
-+    emitFrom(buffer){
-+        let value=[], emitObject={}
-+        this.debug(buffer)
-+        for (let byte of buffer){
-+            if (byte==0xBB) {
-+                value=[]
-+                continue
-+            }
-+            if (byte==0xEE){
-+                continue
-+            }
-+            
-+            if (isNaN(parseInt(byte.toString(16)))){ //not a base-10 number. seriously. that's how Junctek does this.
-+                const v = parseInt(bytesToBase10String(value))
-+                //if (byte!==0xd5)
-+                //    this.debug(`0x${(byte).toString(16)}: ${(value).map((v)=>'0x'+v.toString(16))} (${v})`)
-+                value=[]
-+                switch (byte){
-+                case 0xC0:
-+                    emitObject["voltage"]=v/100
-+                    break
-+                
-+                case 0xC1:
-+                    emitObject["current"]=()=>{return (v/100)*this.chargeDirection}
-+                    break
-+
-+                case 0xD1:
-+                    this.debug(v)
-+                    if (v==0)
-+                        this.chargeDirection=-1
-+                    else 
-+                        this.chargeDirection= 1
-+                    this.debug(this.chargeDirection)
-+                    break
-+
-+                case 0xD2:
-+
-+                    emitObject["remaining"]=v*3.6
-+                    break
-+
-+                case 0xD3:
-+                    emitObject["discharge"]= v/100000
-+                    break
-+                case 0xD4:
-+                    emitObject["charge"]=v/100000
-+                    break
-+                case 0xD6:
-+                    if (chargeDirection==-1){
-+                        emitObject["timeToCharged"] = NaN
-+                        emitObject["timeRemaining"] = v*60
-+                    }
-+                    else {
-+                        emitObject["timeRemaining"] = NaN
-+                        emitObject["timeToCharged"] = v*60
-+                    }
-+                    break
-+                case 0xD7:
-+                    emitObject["impedance"]=v/100
-+                    break
-+                case 0xD8:
-+                    emitObject["power"]=()=>{
-+                        this.debug(this.chargeDirection)
-+                        return (v/100)*this.chargeDirection
-+                    }
-+                    break
-+                case 0xD9:
-+                    emitObject["temperature"]=v + 173.15 //assume C not F -- raw value is c - 100
-+                    break
-+                case 0xB1:
-+                    emitObject["capacityActual"]=v /10
-+                    break
-+            }
-+            }
-+            else{
-+                value.push(byte)
-+            }
-+        }
-+        for (const [key, value] of Object.entries(emitObject)) {
-+                this.emit(key,value instanceof Function?value():value)
-+        }
-+        emitObject = {}
-+    }
-+    emitGATT(){
-+        /*this.battCharacteristic.readValue()
-+        .then((buffer)=>{
-+            this.emitFrom(buffer)
-+        })*/
-+    }
-+    initGATTConnection(){ 
-+        return new Promise((resolve,reject )=>{ this.).then(async ()=>{ 
-+            if (!this.gattServer) { 
-+                this.gattServer = await this.device.gatt() 
-+                this.battService = await this.gattServer.getPrimaryService("0000fff0-0000-1000-8000-00805f9b34fb") 
-+                this.battCharacteristic = await this.battService.getCharacteristic("0000fff1-0000-1000-8000-00805f9b34fb")
-+
-+            }
-+                resolve(this)
-+             }) .catch((e)=>{ reject(e.message) }) }) 
-+    }
-+
-+    initGATTNotifications() { 
-+        Promise.resolve(this.battCharacteristic.startNotifications().then(()=>{    
-+            this.battCharacteristic.on('valuechanged', buffer => {
-+                this.emitFrom(buffer)
-+            })
-+        }))
-+    }
-+  
-+    async stopListening(){
-+        super.stopListening()
-+        if (this.battCharacteristic  && await this.battCharacteristic.isNotifying()) {
-+            await this.battCharacteristic.stopNotifications()
-+            this.battCharacteristic=null
-+        }
-+        if (await this.device.isConnected()){
-+            await this.device.disconnect()
-+        }
-+    }
-+}
-+module.exports=JunctekBMS
-diff --git a/sensor_classes/KilovaultHLXPlus.js b/sensor_classes/KilovaultHLXPlus.js
-index 882feb9..e3a2723 100644
---- a/sensor_classes/KilovaultHLXPlus.js
-+++ b/sensor_classes/KilovaultHLXPlus.js
-@@ -78,7 +78,7 @@ class KilovaultHLXPlus extends BTSensor{
-         this.addDefaultPath("cycles",'electrical.batteries.cycles')
-             .read=(buffer)=>{return buffer.readInt16LE(12)}
- 
--        this.addDefaultPath("soc",'electrical.batteries.capacity,stateOfCharge')
-+        this.addDefaultPath("soc",'electrical.batteries.capacity.stateOfCharge')
-             .read=(buffer)=>{return buffer.readInt16LE(14)}
-         
-         this.addDefaultPath("temperature",'electrical.batteries.temperature')
-diff --git a/sensor_classes/MercurySmartcraft.js b/sensor_classes/MercurySmartcraft.js
-new file mode 100644
-index 0000000..577a483
---- /dev/null
-+++ b/sensor_classes/MercurySmartcraft.js
-@@ -0,0 +1,126 @@
-+/*
-+Service UUID	Characteristic UUID	Type	Param	Convertion	Unit	SignalK Path	Comment
-+00000000-0000-1000-8000-ec55f9f5b963 (Unknown)	00000001-0000-1000-8000-ec55f9f5b963	write / indicate	SDP	-	-	-	Enable or disable data stream. To enable write 0x0D 0x01; To disable write 0x0D 0x00.
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000101-0000-1000-8000-ec55f9f5b963	read	?	-	-	?	Returns: Value: 1.1.0 (raw: 312e312e30)
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000102-0000-1000-8000-ec55f9f5b963	write / notify	ENGINE_RPM_UUID	value / 60	Hz	propulsion.p0.revolutions	
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000103-0000-1000-8000-ec55f9f5b963	write / notify	COOLANT_TEMPERATURE_UUID	value + 273.15	Kelvin	propulsion.p0.temperature	
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000104-0000-1000-8000-ec55f9f5b963	write / notify	BATTERY_VOLTAGE_UUID	value / 1000	Volts	propulsion.p0.alternatorVoltage	
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000105-0000-1000-8000-ec55f9f5b963	write / notify	UNK_105_UUID	?	?	?	Need longer data to figure out what is it. Value around 17384.
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000106-0000-1000-8000-ec55f9f5b963	write / notify	ENGINE_RUNTIME_UUID	value * 60	Seconds	propulsion.p0.runTime	
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000107-0000-1000-8000-ec55f9f5b963	write / notify	CURRENT_FUEL_FLOW_UUID	value / 100000	m3 / hour	propulsion.p0.fuel.rate	
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000108-0000-1000-8000-ec55f9f5b963	write / notify	FUEL_TANK_PCT_UUID	value / 100	%	propulsion.p0.fuel.tank	Maybe there is a more appropriate name for the Signalk path
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	00000109-0000-1000-8000-ec55f9f5b963	write / notify	UNK_109_UUID	?	?	?	Need longer data to figure out what is it. Raw data varied from 102701 to 102700.
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	0000010a-0000-1000-8000-ec55f9f5b963	write / notify	OIL_PRESSURE_UUID	value / 100	kPascal	propulsion.p0.oilPressure	
-+00000100-0000-1000-8000-ec55f9f5b963 (L2CAP)	0000010b-0000-1000-8000-ec55f9f5b963	write / notify	UNK_10B_UUID	?	?	?	Always zero. To investigate with more data.
-+*/
-+const BTSensor = require("../BTSensor");
-+class MercurySmartcraft extends BTSensor{
-+    static Domain = BTSensor.SensorDomains.propulsion
-+	
-+    static async identify(device){
-+        
-+        const name = await this.getDeviceProp(device,"Name")
-+        const address = await this.getDeviceProp(device,"Address")
-+        if (name && address && name == `VVM_${address.replace(":","")}`)
-+            return this 
-+        else
-+            return null
-+    }
-+
-+    
-+
-+    hasGATT(){
-+        return false
-+    }
-+    usingGATT(){
-+        return true
-+    }
-+    emitGATT(){
-+    }
-+    initSchema(){
-+        const bo = 2
-+
-+        super.initSchema()
-+        this.addParameter(
-+            "id",
-+            {
-+                "title": "Engine ID",
-+                "examples": ["port","starboard","p0","p1"],
-+                "isRequired": true
-+            }
-+        )
-+
-+        this.addMetadatum("rpm","Hz","engine revolutions per sec", 
-+            (buffer)=>{return buffer.readUInt16LE(bo)/60}
-+        ).default='propulsion.{id}.revolutions'
-+
-+        this.addMetadatum("coolant","K","temperature of engine coolant in K", 
-+            (buffer)=>{return buffer.readUInt16LE(bo)+273.15}
-+        ).default='propulsion.{id}.coolantTemperature'
-+
-+        this.addMetadatum("alternatorVoltage","V","voltage of alternator", 
-+            (buffer)=>{return buffer.readUInt16LE(bo)/1000}
-+        ).default='propulsion.{id}.alternatorVoltage'
-+
-+        this.addMetadatum("runtime","s","Total running time for engine (Engine Hours in seconds)", 
-+            (buffer)=>{return buffer.readUInt16LE(bo)*60}
-+        ).default='propulsion.{id}.runTime'
-+
-+        this.addMetadatum("rate","m3/s","Fuel rate  of consumption (cubic meters per second)", 
-+            (buffer)=>{return buffer.readUInt16LE(bo)/100000/3600}
-+        ).default='propulsion.{id}.fuel.rate'
-+            
-+        this.addMetadatum("pressure","Pa","Fuel pressure", 
-+            (buffer)=>{return buffer.readUInt16LE(bo)*10}
-+        ).default='propulsion.{id}.pressure'
-+
-+        this.addMetadatum("level","ratio","Level of fluid in tank 0-100%", 
-+            (buffer)=>{return buffer.readUInt16LE(bo)/10000}
-+        ).default='tanks.petrol.currentLevel'
-+    }
-+
-+    initGATTConnection(){ 
-+        return new Promise((resolve,reject )=>{ this.deviceConnect().then(async ()=>{ 
-+            if (!this.gattServer) { 
-+                this.gattServer = await this.device.gatt() 
-+                this.sdpService = await this.gattServer.getPrimaryService("00000000-0000-1000-8000-ec55f9f5b963") 
-+                this.sdpCharacteristic = await this.sdpService.getCharacteristic("00000001-0000-1000-8000-ec55f9f5b963") 
-+                this.dataService = await this.gattServer.getPrimaryService("00000100-0000-1000-8000-ec55f9f5b963") 
-+                this.dataCharacteristics = {
-+                    rpm: await this.dataService.getCharacteristic("00000102-0000-1000-8000-ec55f9f5b963"),
-+                    coolant: await this.dataService.getCharacteristic("00000103-0000-1000-8000-ec55f9f5b963"),
-+                    alternatorVoltage: await this.dataService.getCharacteristic("00000104-0000-1000-8000-ec55f9f5b963"),
-+                    runtime: await this.dataService.getCharacteristic("00000106-0000-1000-8000-ec55f9f5b963"),
-+                    rate: await this.dataService.getCharacteristic("00000107-0000-1000-8000-ec55f9f5b963"),
-+                    level: await this.dataService.getCharacteristic("00000108-0000-1000-8000-ec55f9f5b963"),
-+                    pressure: await this.dataService.getCharacteristic("0000010a-0000-1000-8000-ec55f9f5b963")
-+                }
-+            } 
-+                resolve(this)
-+             }) .catch((e)=>{ reject(e.message) }) }) 
-+    }
-+    async initGATTNotifications() { 
-+        await this.sdpCharacteristic.writeValue(Buffer.from([0x0D,0x01]))
-+        for (const c in this.dataCharacteristics){
-+            Promise.resolve(this.dataCharacteristics[c].startNotifications().then(()=>{    
-+                this.dataCharacteristics[c].on('valuechanged', buffer => {
-+                    this.emitData(c,buffer)
-+                })
-+            }))
-+        }
-+    }
-+  
-+    async stopListening(){
-+        super.stopListening()
-+        for (const c in this.dataCharacteristics){
-+            if (this.dataCharacteristics[c] && await this.dataCharacteristics[c].isNotifying()) {
-+                await this.dataCharacteristics[c].stopNotifications()
-+            }
-+        }
-+
-+        if (await this.device.isConnected()){
-+            await this.device.disconnect()
-+        }
-+    }
-+}
-+module.exports=MercurySmartcraft
-
-diff --git a/sensor_classes/MopekaTankSensor.js b/sensor_classes/MopekaTankSensor.js
-index 67ed0f6..9d41e7b 100644
---- a/sensor_classes/MopekaTankSensor.js
-+++ b/sensor_classes/MopekaTankSensor.js
-@@ -259,8 +259,8 @@ class MopekaTankSensor extends BTSensor{
-         
-     async init(){
-         await super.init()
--        const md = this.valueIfVariant(this.getManufacturerData(this.constructor.manufacturerID))
--        this.modelID = md[0]
-+        const md = this.getManufacturerData(this.constructor.manufacturerID)
-+        this.modelID = md?md[0]:0
-     } 
- 
-     getMedium(){
-@@ -280,17 +280,19 @@ class MopekaTankSensor extends BTSensor{
-         this.addParameter("medium",
-             {
-                 title:"type of liquid in tank",
--                enum: Object.keys(Media)
-+                enum: Object.keys(Media),
-+                isRequired: true
-             }
-         )
-         this.addParameter("tankHeight",
-             {
-                 title:"height of tank (in mm)",
--                type:"number",
--                unit:"mm"
-+                type:"integer",
-+                unit:"mm",
-+                isRequired: true
-             }
-         )
--        this.addDefaultParam("id")
-+        this.addDefaultParam("id", true)
- 
-         this.addDefaultPath("battVolt","sensors.batteryVoltage") 
-             .read=((buffer)=>{ 
-diff --git a/sensor_classes/RemoranWave3.js b/sensor_classes/RemoranWave3.js
-new file mode 100644
-index 0000000..e8448db
---- /dev/null
-+++ b/sensor_classes/RemoranWave3.js
-@@ -0,0 +1,225 @@
-+
-+function arduinoDateDecode (elapsedSeconds) {
-+    const date = new Date("2000-01-01")
-+    date.setTime(date.getTime() + 1000 * elapsedSeconds)
-+    return date
-+}
-+const errors=  {
-+                0: "Undefined",
-+                1: "Invalid Battery",
-+                2: "Overheat",
-+                3: "Overheat Shutdown",
-+                4: "Generator lead 1 disconnected",
-+                5: "Generator lead 2 disconnected",
-+                6: "Generator lead 3 disconnected",
-+                7: "Short Circuit"
-+        }
-+
-+const eventTypes = {
-+            0: "Reboot",
-+            1: "Invalid Battery",
-+            2: "Overheat",
-+            3: "Overheat Shutdown",
-+            4: "Generator lead 1 disconnected",
-+            5: "Generator lead 2 disconnected",
-+            6: "Generator lead 3 disconnected",
-+            7: "Short Circuit",
-+            255: "Debug"
-+        }
-+
-+const states= ["Charging Needed", "Charging", "Floating", "Idle"]
-+
-+
-+const BTSensor = require("../BTSensor");
-+ class RemoranWave3 extends BTSensor{
-+    static Domain = BTSensor.SensorDomains.electrical
-+    serviceUUID = "81d08df0-c0f8-422a-9d9d-e4379bb1ea3b"
-+    info1CharUUID = "62c91222-fafe-4f6e-95f0-afc02bd19f2e"
-+    info2CharUUID = "f5d12d34-4390-486c-b906-24ea8906af71"
-+    eventUUID =  "f12a8e25-59f7-42f2-b7ae-ba96fb25c13c"
-+
-+     static async identify(device){
-+         
-+         const name = await this.getDeviceProp(device,"Name")
-+         if (name == 'Remoran Wave.3')
-+             return this 
-+         else
-+             return null
-+     }
-+     hasGATT(){
-+         return true
-+     }
-+     usingGATT(){
-+         return true
-+     }
-+    emitInfo1Data(buffer){
-+        if (buffer.length < 20) {
-+            app.debug(`Bad buffer size ${buffer.length}. Buffer size must be 20 bytes or more.`)
-+            return
-+        }
-+        this.emit("versionNumber", buffer.readUInt8(0))
-+        const errors = buffer.readUInt8(2)
-+        const errorState = []
-+        for (var i = 0; i < 8; ++i) {
-+            var c = 1 << i;
-+            errors & c && errorState.push(errors[i])
-+        }
-+        this.emit("errors", errorState)
-+        this.emit("state",  states[buffer.readUInt8(3)])
-+        this.emit("rpm", buffer.readUInt32LE(4))
-+        this.emit( "voltage" , buffer.readFloatLE(8))
-+        this.emit("current",  buffer.readFloatLE(12))
-+        this.emit( "power", buffer.readFloatLE(16))
-+                
-+        if (buffer.length > 23) {
-+            this.emit( "temp", ((buffer.readFloatLE(20))+273.15))
-+            this.emit( "uptime", buffer.readUInt32LE(24))
-+            if (versionNumber>1 && buffer.size > 31) {
-+                this.emit("energy", buffer.readFloatLE(32))
-+            }
-+        }
-+    
-+    }
-+    emitInfo2Data(buffer){
-+
-+        if (buffer.size < 12) {
-+            app.debug(`Bad buffer size ${buffer.length}. Buffer size must be 12 bytes or more.`)
-+            return
-+         }
-+        this.emit("versionNumber", buffer.readUInt8(0))
-+        this.emit("temp",  ((buffer.readFloatLE(4))+273.15))
-+        this.emit("uptime", buffer.readUInt32LE(8))
-+        this.emit("lastBootTime", arduinoDateDecode(buffer.readUInt32LE(12)))
-+        this.emit("energy",   buffer.readFloatLE(16))
-+    }
-+    emitEventData(buffer){
-+        if (buffer.length < 14) {
-+            this.debug(buffer)
-+            app.debug(`Bad buffer size ${buffer.length}. Buffer size must be 14 bytes or more.`)
-+            return
-+         }
-+        const eventType = buffer.readUInt16LE(8)
-+        var eventDesc = eventType.toString()
-+        if (Object.hasOwn(eventTypes,eventType))
-+            eventDesc = eventTypes[eventType]
-+
-+
-+        this.emit("event", 
-+            {
-+                firstDate: arduinoDateDecode(buffer.readUInt32LE(0)),
-+                lastDate: arduinoDateDecode(buffer.readUInt32LE(4)),
-+                eventType: eventType,
-+                count: buffer.readUInt16LE(10),
-+                index: buffer.readUInt16LE(12),
-+                eventDesc: eventDesc
-+            }
-+        )
-+    }
-+    emitGATT(){
-+        this.info1Characteristic.readValue()
-+        .then((buffer)=>
-+            this.emitInfo1Data( buffer)
-+        )
-+        this.info2Characteristic.readValue()
-+        .then((buffer)=>
-+            this.emitInfo2Data(buffer)  
-+        )
-+        this.eventCharacteristic.readValue()
-+        .then((buffer)=>
-+            this.emitEventData(buffer)   
-+        )
-+
-+    }
-+     initSchema(){
-+        super.initSchema()
-+        this.addDefaultParam("id")
-+            .default="RemoranWave3"         
-+    
-+        this.getGATTParams()["useGATT"].default=true
-+
-+        this.addMetadatum('errorCodes','', 'charger error codes (array)')
-+            .default= "electrical.chargers.{id}.errorCodes"
-+
-+        this.addMetadatum('state','', 'charger state')
-+            .default= "electrical.chargers.{id}.state"
-+
-+        this.addMetadatum('voltage','V', 'battery voltage')
-+        .default= "electrical.chargers.{id}.battery.voltage"
-+
-+        this.addMetadatum('current','A', 'battery current')
-+        .default= "electrical.chargers.{id}.battery.current"
-+
-+        this.addMetadatum('power','W', 'battery power')
-+        .default= "electrical.chargers.{id}.battery.power"
-+
-+        this.addMetadatum('temp', 'K', 'charger temperature')
-+        .default= "electrical.chargers.{id}.temperature"
-+
-+        this.addMetadatum('energy', 'wh', 'energy created today in Wh')
-+        .default= "electrical.chargers.{id}.energy"
-+
-+        this.addMetadatum('event', '', 'charger event')
-+        .default= "electrical.chargers.{id}.event"
-+
-+        this.addMetadatum('lastBootTime', 's', 'last boot time')
-+        .default= "electrical.chargers.{id}.lastBootTime"
-+
-+        this.addMetadatum('rpm', '', 'revolutions per minute')
-+        .default= "sensors.{macAndName}.rpm"
-+
-+        this.addMetadatum('uptime', 's', 'charger/sensor uptime')
-+        .default= "sensors.{macAndName}.uptime"
-+
-+        this.addMetadatum('versionNumber', '', 'charger/sensor version number')
-+        .default= "sensors.{macAndName}.version"
-+
-+    }
-+
-+ 
-+     initGATTConnection(){ 
-+         return new Promise((resolve,reject )=>{ this.deviceConnect().then(async ()=>{ 
-+             if (!this.gattServer) { 
-+                 this.gattServer = await this.device.gatt() 
-+                 this.service = await this.gattServer.getPrimaryService(this.serviceUUID) 
-+                 this.info1Characteristic = await this.service.getCharacteristic(this.info1CharUUID)
-+                 this.info2Characteristic = await this.service.getCharacteristic(this.info2CharUUID) 
-+                 this.eventCharacteristic = await this.service.getCharacteristic(this.eventUUID)
-+                 resolve(this)
-+            }}) .catch((e)=>{ this.debug(e); reject(e.message) }) }) 
-+     }
-+     
-+     initGATTNotifications() { 
-+         Promise.resolve(this.info1Characteristic.startNotifications().then(()=>{    
-+             this.info1Characteristic.on('valuechanged', buffer => {
-+                 this.emitInfo1Data(buffer)
-+             })
-+         }))
-+         Promise.resolve(this.info2Characteristic.startNotifications().then(()=>{    
-+             this.info2Characteristic.on('valuechanged', buffer => {
-+                 this.emitInfo2Data(buffer)
-+             })
-+         }))
-+         Promise.resolve(this.eventCharacteristic.startNotifications().then(()=>{    
-+             this.eventCharacteristic.on('valuechanged', buffer => {
-+                 this.emitEventData(buffer)
-+             })
-+         }))
-+     }
-+    
-+    async stopNotifications(characteristic){
-+        if (characteristic  && await characteristic.isNotifying()) {
-+                await characteristic.stopNotifications()
-+        }
-+    }
-+     async stopListening(){
-+        super.stopListening()
-+        await this.stopNotifications(this?.info1Characteristic)
-+        await this.stopNotifications(this?.info2Characteristic)
-+        await this.stopNotifications(this?.eventCharacteristic)
-+        if (await this.device.isConnected()){
-+            await this.device.disconnect()
-+        }
-+     }
-+ }
-+ module.exports=RemoranWave3
-+ 
-
-diff --git a/sensor_classes/Renogy/RenogyConstants.js b/sensor_classes/Renogy/RenogyConstants.js
-index 53bbf37..c35d8c8 100644
---- a/sensor_classes/Renogy/RenogyConstants.js
-+++ b/sensor_classes/Renogy/RenogyConstants.js
-@@ -13,7 +13,8 @@ CHARGING_STATE:
-     3: 'Equalizing',
-     4: 'Boost',
-     5: 'Floating',
--    6: 'Current limiting'
-+    6: 'Current limiting',
-+    8: 'Not charging'
- },
- 
- LOAD_STATE: {
-diff --git a/sensor_classes/Renogy/RenogySensor.js b/sensor_classes/Renogy/RenogySensor.js
-index 6094b2d..c4719ae 100644
---- a/sensor_classes/Renogy/RenogySensor.js
-+++ b/sensor_classes/Renogy/RenogySensor.js
-@@ -42,13 +42,7 @@ class RenogySensor extends BTSensor{
- 
-     async initSchema(){
-         await super.initSchema()
--        this.addParameter(
--            "refreshInterval",
--            {
--                title: 'refresh interval',
--                type: 'number'
--            }
--        )
-+       
-         this.addParameter(
-             "deviceID",
-             {
-@@ -57,9 +51,6 @@ class RenogySensor extends BTSensor{
-         ) 
-     }
- 
--    emitGATT(){
--    }
--
-     getModelName(){
-         return this?.modelID??`${this.constructor.name} Unknown model` 
-     }
-@@ -86,7 +77,6 @@ class RenogySensor extends BTSensor{
-     }
- 
-     initGATTInterval(){
--           this.emitGATT()
-         this.intervalID = setInterval(()=>{
-             this.emitGATT()
-         }, 1000*(this?.pollFreq??60) )
-@@ -121,7 +111,8 @@ class RenogySensor extends BTSensor{
-     async stopListening(){
-         super.stopListening()
-     
--        await this.readChar.stopNotifications()
-+        if (this.readChar)
-+            await this.readChar.stopNotifications()
-         
-         if (await this.device.isConnected()){
-             await this.device.disconnect()
-diff --git a/sensor_classes/RenogyRoverClient.js b/sensor_classes/RenogyRoverClient.js
-index 61d1787..36bcbff 100644
---- a/sensor_classes/RenogyRoverClient.js
-+++ b/sensor_classes/RenogyRoverClient.js
-@@ -6,53 +6,113 @@ const RenogySensor = require("./Renogy/RenogySensor.js");
- const RC=require("./Renogy/RenogyConstants.js")
- 
- class RenogyRoverClient extends RenogySensor {
--
-+/*
-+          "batteryType": "electrical.charger.battery.type",
-+          "batteryPercentage": "electrical.charger.battery.charge",
-+          "batteryVoltage": "electrical.charger.battery.voltage",
-+          "batteryCurrent": "electrical.charger.battery.current",
-+          "controllerTemperature": "electrical.charger.temperature",
-+          "batteryTemperature": "electrical.charger.battery.temperature",
-+          "loadVoltage": "electrical.charger.load.voltage",
-+          "loadCurrent": "electrical.charger.load.current",
-+          "loadPower": "electrical.charger.load.power",
-+          "pvVoltage": "electrical.charger.solar.voltage",
-+          "pvCurrent": "electrical.charger.solar.current",
-+          "pvPower": "electrical.charger.solar.power",
-+          "maxChargingPowerToday": "electrical.charger.today.max",
-+          "maxDischargingPowerToday": "electrical.charger.discharging.maximum",
-+          "chargingAmpHoursToday": "electrical.charger.charged.today",
-+          "powerGenerationToday": "electrical.charger.power.today",
-+          "powerGenerationTotal": "electrical.charger.power.total",
-+          "loadStatus": "electrical.charger.load.status",
-+          "chargingStatus": "electrical.charger.status"
-+*/
- 
-     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.addMetadatum('batteryType', '', "battery type")
-+            .default="electrical.chargers.{id}.battery.type"
-         this.addMetadatum('batteryPercentage', 'ratio', "battery percentage",
--             (buffer)=>{return buffer.readUInt16BE(3) })
-+             (buffer)=>{return buffer.readUInt16BE(3)/100 })
-+            .default="electrical.chargers.{id}.battery.soc"
-+
-         this.addMetadatum('batteryVoltage', 'V', "battery voltage",
-             (buffer)=>{return buffer.readUInt16BE((5))/10})
-+        .default="electrical.chargers.{id}.battery.voltage"
-+
-         this.addMetadatum('batteryCurrent', 'A', 'battery current',
-             (buffer)=>{return buffer.readUInt16BE((7))/100})
-+        .default="electrical.chargers.{id}.battery.current"
-+
-         this.addMetadatum('controllerTemperature', 'K', 'controller temperature',
-             (buffer)=>{return buffer.readInt8((9))+273.15})
-+        .default="electrical.chargers.{id}.controller.temperature"
-+
-         this.addMetadatum('batteryTemperature', 'K', 'battery temperature',
-             (buffer)=>{return buffer.readInt8((10))+273.15})
-+        .default="electrical.chargers.{id}.battery.temperature"
-+
-         this.addMetadatum('loadVoltage', 'V', 'load voltage',
-             (buffer)=>{return buffer.readUInt16BE((11))/10})
-+        .default="electrical.chargers.{id}.load.voltage"
-+
-         this.addMetadatum('loadCurrent',  'A', 'load current',
-             (buffer)=>{return buffer.readUInt16BE((13))/100})
-+        .default="electrical.chargers.{id}.load.current"
-         this.addMetadatum('loadPower', 'W', 'load power',
-             (buffer)=>{return buffer.readUInt16BE((15))})
-+        .default="electrical.chargers.{id}.load.power"
-         this.addMetadatum('pvVoltage', 'V', 'pv voltage',
-             (buffer)=>{return buffer.readUInt16BE((17))/10})
-+        .default="electrical.chargers.{id}.solar.voltage"
-         this.addMetadatum('pvCurrent', 'A', 'pv current',
-             (buffer)=>{return buffer.readUInt16BE((19))/100})
-+        .default="electrical.chargers.{id}.solar.current"
-         this.addMetadatum('pvPower', 'W', 'pv power',
-             (buffer)=>{return buffer.readUInt16BE(21)})
-+        .default="electrical.chargers.{id}.solar.power"
-         this.addMetadatum('maxChargingPowerToday', 'W', 'max charging power today',
-             (buffer)=>{return buffer.readUInt16BE(33)})
-+        .default="electrical.chargers.{id}.charge.max.today"
-         this.addMetadatum('maxDischargingPowerToday', 'W', 'max discharging power today',
-             (buffer)=>{return buffer.readUInt16BE(35)})
-+        .default="electrical.chargers.{id}.discharge.max.today"
-         this.addMetadatum('chargingAmpHoursToday', 'Ah', 'charging amp hours today',
-             (buffer)=>{return buffer.readUInt16BE(37)})
-+        .default="electrical.chargers.{id}.charge.ampHours.today"
-+
-         this.addMetadatum('dischargingAmpHoursToday', 'Ah', 'discharging amp hours today',
-             (buffer)=>{return buffer.readUInt16BE(39)})
-+        .default="electrical.chargers.{id}.discharge.ampHours.today"
-+
-         this.addMetadatum('powerGenerationToday', 'W', 'power generation today',
-             (buffer)=>{return buffer.readUInt16BE(41)})
-+        .default="electrical.chargers.{id}.power.generated.today"
-+
-         this.addMetadatum('powerConsumptionToday', 'W', 'power consumption today',
-             (buffer)=>{return buffer.readUInt16BE(43)})
-+        .default="electrical.chargers.{id}.power.consumed.today"
-+
-         this.addMetadatum('powerGenerationTotal', 'W', 'power generation total',
-             (buffer)=>{return buffer.readUInt32BE(59)})
-+         .default="electrical.chargers.{id}.power.generated.total"
-+
-         this.addMetadatum('loadStatus', '',  'load status',
-             (buffer)=>{return RC.LOAD_STATE[buffer.readUInt8(67)>>7]})
-+         .default="electrical.chargers.{id}.load.status"
- 
-         this.addMetadatum('chargingStatus', '', 'charging status',
--            (buffer)=>{return RC.CHARGING_STATE[buffer.readUInt8(68)]})
-+            (buffer)=>{
-+                const cs = buffer.readUInt8(68)
-+                if (Object.hasOwn(RC.CHARGING_STATE,cs))
-+                    return RC.CHARGING_STATE[cs]
-+                else
-+                    return null
-+            })
-+
-+         .default="electrical.chargers.{id}.charge.status"
-+
-     }
-     
-     retrieveDeviceID(){
-diff --git a/sensor_classes/RuuviTag.js b/sensor_classes/RuuviTag.js
-index 3648b98..555b3fc 100644
---- a/sensor_classes/RuuviTag.js
-+++ b/sensor_classes/RuuviTag.js
-@@ -50,15 +50,15 @@ class RuuviTag extends BTSensor{
-         
-         this.addMetadatum("accX","Mg","acceleration on X-axis", 
-             (buffer)=>{ return buffer.readInt16BE(7)}
--        ).default="sensors.{macAndName}.accX"
-+        ).examples=["sensors.{macAndName}.accX"]
-         
-         this.addMetadatum("accY","Mg","acceleration on Y-axis", 
-             (buffer)=>{ return buffer.readInt16BE(9)}
--        )        .default="sensors.{macAndName}.accY"
-+        )        .examples=["sensors.{macAndName}.accY"]
-         
-         this.addMetadatum("accZ","Mg","acceleration on Z-axis", 
-             (buffer)=>{ return buffer.readInt16BE(11)}
--        ) .default="sensors.{macAndName}.accZ"
-+        ) .examples=["sensors.{macAndName}.accZ"]
-         
-         this.addDefaultPath("battV","sensors.batteryVoltage")
-         .read=(buffer)=>{ return parseFloat((1.6+(buffer.readUInt16BE(13)>>5)/1000).toFixed(2))}
-@@ -66,12 +66,12 @@ class RuuviTag extends BTSensor{
-         this.addMetadatum("mc","","movement counter", 
-             (buffer)=>{ return buffer.readUInt16BE(13) && 0x1F}
-         )
--        .default="sensors.{macAndName}.movementCounter"
-+        .examples=["sensors.{macAndName}.movementCounter"]
- 
-         this.addMetadatum("msc","","measurement sequence counter", 
-             (buffer)=>{ return buffer.readUInt16BE(15)}
-         )
--        .default="sensors.{macAndName}.measurementSequenceCounter"
-+        .examples=["sensors.{macAndName}.measurementSequenceCounter"]
-         
-     }
- 
-diff --git a/sensor_classes/ShellySBDW002C.js b/sensor_classes/ShellySBDW002C.js
-new file mode 100644
-index 0000000..f9fe7a1
---- /dev/null
-+++ b/sensor_classes/ShellySBDW002C.js
-@@ -0,0 +1,51 @@
-+const BTHomeServiceData = require("./BTHome/BTHomeServiceData");
-+const AbstractBTHomeSensor = require("./BTHome/AbstractBTHomeSensor");
-+
-+/**
-+ * Sensor class representing the Shelly BLU Door/Window.
-+ * Specification on @see https://shelly-api-docs.shelly.cloud/docs-ble/Devices/dw
-+ * This sensor is publishing data utilising the BTHome format and inherits from {@link AbstractBTHomeSensor}.
-+ */
-+class ShellySBDW002C extends AbstractBTHomeSensor {
-+  static Domain = this.SensorDomains.environmental;
-+
-+  /**
-+   * The shortened local name as advertised by the Shelly BLU H&T.
-+   * @type {string}
-+   */
-+  static SHORTENED_LOCAL_NAME = "SBDW-002C";
-+  static LOCAL_NAME = "Shelly BLU Door/Window";
-+
-+  getDescription() {
-+    return `For more information about the sensor go here: <a href=https://us.shelly.com/products/shelly-blu-door-window-white target="_blank">Shelly Blu Door/Window</a>.`;
-+  }
-+
-+  initSchema() {
-+    super.initSchema();
-+    this.addDefaultParam("zone", true).default = "cabin";
-+
-+    this.addParameter("opening", {
-+      title: "Name of opening",
-+      examples: ["companionWay", "porthole", "hatch"],
-+      isRequired: true,
-+      default: "companionWay",
-+    });
-+
-+    this.addMetadatum("opening", "", "state of opening (door/window) as 'open' or 'closed'; null if not present. ", this.parseWindowState.bind(this)).default =
-+      "environment.{zone}.{opening}.state";
-+
-+    // The second parameter is not the signalk path, but a JSON object in plugin_defaults.json; that provides the default signalk path
-+    this.addDefaultPath("battery", "sensors.batteryStrength").read = this.parseBatteryLevel.bind(this);
-+
-+    this.addMetadatum("illuminance", "lx", "illuminance measured in lux, scaled 0.01", this.parseIlluminance.bind(this)).default =
-+      "sensors.{macAndName}.illuminance";
-+
-+    this.addMetadatum("rotation", "deg", "rotation in degrees from the closed position; null if not present", this.parseRotation.bind(this)).default =
-+      "sensors.{macAndName}.rotation";
-+
-+    this.addMetadatum("button", "", "button 'press' or 'hold_press'; null if not present", this.parseShellyButton.bind(this)).default =
-+      "sensors.{macAndName}.button";
-+  }
-+}
-+
-+module.exports = ShellySBDW002C;
-diff --git a/sensor_classes/ShellySBMO003Z.js b/sensor_classes/ShellySBMO003Z.js
-index f1f16fb..7609db5 100644
---- a/sensor_classes/ShellySBMO003Z.js
-+++ b/sensor_classes/ShellySBMO003Z.js
-@@ -27,8 +27,7 @@ class ShellySBMO003Z extends AbstractBTHomeSensor {
- 
- 	initSchema() {
- 		super.initSchema()
--		this.addDefaultParam("zone")
--
-+		this.addDefaultParam("zone", true)
- 
- 		this.addMetadatum(
- 			"motion",
-diff --git a/sensor_classes/ShenzhenLiOnBMS.js b/sensor_classes/ShenzhenLiOnBMS.js
-index bb6de7a..792aff0 100644
---- a/sensor_classes/ShenzhenLiOnBMS.js
-+++ b/sensor_classes/ShenzhenLiOnBMS.js
-@@ -1,6 +1,6 @@
- /**
-  * Class to support Batteries with embedded Shenzhen Li-ion Battery Bodyguard Technology BMS 
-- * Brands include Redodo, Litime PowerQueen and possibly others
-+ * Brands include Redodo, Litime, PowerQueen and possibly others
-  */
- 
- 
-@@ -34,19 +34,21 @@ class ShenzhenLiONBMS extends BTSensor{
-     static async identify(device){
-         return null
-     }
-+    async sendCommand(cmd){
-+        await this.txCharacteristic.writeValueWithResponse( Buffer.from(cmd))
-+    }
-+
-+    async queryBatteryCommand(){
-+        await this.sendCommand(this.constructor.Commands.query_battery_status)
-+    }
-+
-     hasGATT(){
-         return true
-     }
-     usingGATT(){
-         return true
-     }
--    emitGATT(){
--        this.characteristic.readValue()
--        .then((buffer)=>
--            this.emitValuesFrom( buffer)
--        )
- 
--    }
-      initSchema(){
-         super.initSchema()
-         this.getGATTParams()["useGATT"].default=true
-@@ -58,6 +60,7 @@ class ShenzhenLiONBMS extends BTSensor{
-             {
-                 title:"Number of cells",
-                 type: "integer",
-+                isRequired: true,
-                 default: 4,
-                 minimum: 1,
-                 maximum: 16
-@@ -82,7 +85,7 @@ class ShenzhenLiONBMS extends BTSensor{
- 
-         for(let cellNum=0; cellNum < this?.numberOfCells??4; cellNum++) {
-             this.addMetadatum(`cell${cellNum+1}Voltage`,'V', `cell #${cellNum+1} voltage`,
--                (buff)=>{return buff.readInt16LE(16+(cellNum*2)) })
-+                (buff)=>{return buff.readInt16LE(16+(cellNum*2)) /1000})
-             .default=`electrical.batteries.{batteryID}.cells.${cellNum+1}.voltage`
-         }
- 
-@@ -97,11 +100,11 @@ class ShenzhenLiONBMS extends BTSensor{
-                 (buff)=>{return buff.readInt16LE(54) + 273.15})
-             .default="electrical.batteries.{batteryID}.bms.temperature"
- 
--        this.addDefaultPath('remainingAh','electrical.batteries.capacity.remaining')
--            .read=(buff)=>{return this.buff.readUInt16LE(62)/100}
-+        this.addDefaultPath('remaining','electrical.batteries.capacity.remaining')
-+            .read=(buff)=>{return (buff.readUInt16LE(62)/100)*3600}
- 
--        this.addDefaultPath('actualAh','electrical.batteries.capacity.actual')
--            .read=(buff)=>{return this.buff.readUInt16LE(64)/100}
-+        this.addDefaultPath('actual','electrical.batteries.capacity.actual')
-+            .read=(buff)=>{return (buff.readUInt16LE(64)/100)*3600}
- 
-         this.addMetadatum('heat','', 'discharge disabled due to app button = 00000080, heater_error = 00000002',
-                 (buff)=>{return buff.slice(68,72).reverse().join("")})
-@@ -138,7 +141,6 @@ class ShenzhenLiONBMS extends BTSensor{
-         this.addDefaultPath( 'soc',"electrical.batteries.capacity.stateOfCharge") 
-             .read=(buff)=>{return buff.readUInt16LE(90)/100}
-         
--       
-         this.getJSONSchema().properties.params.required=["batteryID", "numberOfCells" ]
-     }
- 
-@@ -155,16 +157,27 @@ class ShenzhenLiONBMS extends BTSensor{
-             resolve(this)
-         })})
-     }
-+
-+    async initGATTInterval(){
-+        await this.initGATTNotifications() 
-+    }
-+    emitGATT(){
-+        
-+    }
-     async initGATTNotifications() { 
--        await this.txCharacteristic.writeValue( Buffer.from(this.constructor.Commands.query_battery_status))
-         await this.rxCharacteristic.startNotifications()    
-         this.rxCharacteristic.on('valuechanged', buffer => {
-                 this.emitValuesFrom(buffer)
-         })
-+        this.intervalID=setInterval(
-+            async ()=>{
-+                await this.queryBatteryCommand()
-+            }, (this?.pollFreq??10)*1000
-+        )    
-     }
-   
-     async stopListening(){
--        super.stopListening()
-+        super.stopListening() //clears IntervalID as it happens
-         if (this.rxCharacteristic  && await this.rxCharacteristic.isNotifying()) {
-             await this.rxCharacteristic.stopNotifications()
-             this.rxCharacteristic=null
-@@ -174,4 +187,4 @@ class ShenzhenLiONBMS extends BTSensor{
-         }
-     }
- }
--module.exports=ShenzhenLiONBMS
-
-+module.exports=ShenzhenLiONBMS
-diff --git a/sensor_classes/SwitchBotMeterPlus.js b/sensor_classes/SwitchBotMeterPlus.js
-index f611940..36eb9f3 100644
---- a/sensor_classes/SwitchBotMeterPlus.js
-+++ b/sensor_classes/SwitchBotMeterPlus.js
-@@ -24,7 +24,7 @@ class SwitchBotMeterPlus extends BTSensor{
-         const keys = Object.keys(md)
-         if ( (keys && keys.length>0) && (sdKeys && sdKeys.length >0) ){
-             const id = keys[keys.length-1]
--            if (parseInt(id)==this.ID && md[id][0]==modelID && sdKeys[0] == this.serviceDataKey)
-+            if (parseInt(id)==this.ID && md[id][0]==this.modelID && sdKeys[0] == this.serviceDataKey)
-                return this
-         }
-         return null
-@@ -63,7 +63,7 @@ class SwitchBotMeterPlus extends BTSensor{
-     }
- 
-     getName() {
--        return "SwitchBotMeterPlus"
-+        return `SwitchBot Meter Plus (${this?.name??"Unnamed"})` 
-     }
- 
- }
-diff --git a/sensor_classes/SwitchBotTH.js b/sensor_classes/SwitchBotTH.js
-index 3444ab2..8dabba5 100644
---- a/sensor_classes/SwitchBotTH.js
-+++ b/sensor_classes/SwitchBotTH.js
-@@ -32,7 +32,7 @@ class SwitchBotTH extends  BTSensor {
-         const keys = Object.keys(md)
-         if (keys && keys.length>0){
-             const id = keys[keys.length-1]
--            if (parseInt(id)==this.ID && md[id].length==12 && md[id][0]==modelID)
-+            if (parseInt(id)==this.ID && md[id].length==12 && md[id][0]==this.modelID)
-                 return this
-         } 
-         return null
-@@ -59,7 +59,7 @@ class SwitchBotTH extends  BTSensor {
-         return "Wonder Labs"
-     }
-     getName() {
--        "SwitchBotTH"
-+        return `SwitchBotTH (${this?.name??"Unnamed"})` 
-     }
-     async propertiesChanged(props){
-         super.propertiesChanged(props)    
-diff --git a/sensor_classes/Victron/VictronImages.js b/sensor_classes/Victron/VictronImages.js
-index bc624e4..8831cf5 100644
---- a/sensor_classes/Victron/VictronImages.js
-+++ b/sensor_classes/Victron/VictronImages.js
-@@ -1,6 +1,6 @@
-    Images= {
-     generic: "victron-min-1.jpg ",
--    shunt: "Victron-SmartShunt.jpg",
-+    shunt: "SmartShunt_500_nw.png",
-     bmv: "BMV-712-Smart-Front.webp",
-     smartSolar: "smartsolarMPPT7515.png"
-   }
-diff --git a/sensor_classes/Victron/VictronSensor.js b/sensor_classes/Victron/VictronSensor.js
-index ae6612f..c112b14 100644
---- a/sensor_classes/Victron/VictronSensor.js
-+++ b/sensor_classes/Victron/VictronSensor.js
-@@ -15,9 +15,15 @@ function sleep(x) {
- 
-     constructor(device,config,gattConfig){
-         super(device,config,gattConfig)
--        this.encryptionKey = config?.encryptionKey
-+        
-+        if(device.modelID)
-+            this.modelID=device.modelID
-+        
-     }
-     
-+    static getModelID(md) {
-+        return md[0x2e1]?.value.readUInt16LE(2)??-1
-+    }
-     static async identifyMode(device, mode){
-             
-         var md = await this.getDeviceProp(device,'ManufacturerData')
-@@ -26,8 +32,10 @@ function sleep(x) {
-         else {
-             
-             if (md[0x2e1].value[0]==0x10) {
--                if (md[0x2e1].value[4]==mode)
-+                if (md[0x2e1].value[4]==mode) {
-+                    device.modelID=this.getModelID(md)
-                     return this
-+                }
-                 else 
-                     return null
-             }
-@@ -45,8 +53,10 @@ function sleep(x) {
-                 await sleep(500)
-             }
-             device.helper.removeListeners()
--            if (md[0x2e1].value[4]==mode)
-+            if (md[0x2e1].value[4]==mode) {
-+                device.modelID=this.getModelID(md)
-                 return this
-+            }
-             else
-                 return null
-         } 
-@@ -60,14 +70,13 @@ function sleep(x) {
-                 title:"Encryption Key"
-             }
-         )
--        this.model_id=this.getManufacturerData(0x2e1)?.readUInt16LE(2)??"Unknown"
--        this._schema.title = this.getName()
-     }
-     alarmReason(alarmValue){
-         return this.constructor.AlarmReason[alarmValue]
-     }
-     getModelName(){
--        const m = VC.MODEL_ID_MAP[this.model_id]
-+        const mID = this.getModelID()
-+        const m = VC.MODEL_ID_MAP[mID]
-         if(m) {
-             if(typeof m == 'string' || m instanceof String ) {
-                 return m
-@@ -75,7 +84,7 @@ function sleep(x) {
-                 return m.name
-             }
-         }
--        return this.constructor.name+" (Model ID:"+this.model_id+")"
-+        return this.constructor.name+` (Model ID: ${mID==-1?"Unknown":mID})`
-     }
- 
-     decrypt(data){
-@@ -98,6 +107,13 @@ function sleep(x) {
-         return Buffer.from(decData)
-         
-     }
-+    getModelID(){
-+        if (!this.modelID ||this.modelID==-1)
-+            this.modelID=this.getManufacturerData(0x2e1)?.readUInt16LE(2)??-1
-+
-+        return this.modelID
-+    }
-+
-     getName(){
-         return `Victron ${this.getModelName()}`
-     }
-@@ -122,7 +138,7 @@ function sleep(x) {
-     }
- 
-    getImage(){
--        const m = VC.MODEL_ID_MAP[this.model_id]
-+        const m = VC.MODEL_ID_MAP[this.getModelID()]
-         if (m && m.image)
-             return m.image
-         else
-@@ -130,11 +146,18 @@ function sleep(x) {
-    }
- 
-    getDescription(){
--    //return `<img src="https://www.victronenergy.com/_next/image?url=https%3A%2F%2Fwww.victronenergy.com%2Fupload%2Fproducts%2FSmartShunt%2520500_nw.png&w=1080&q=70"" height="150" object-fit="cover" ></img>`
-+    //return `<img src="https://www.victronenergy.com/_next/image?url=https%3A%2F%2Fwww.victronenergy.com%2Fupload%2Fproducts%2FSmartShunt%2520500_nw.png&w=1080&q=70"" height="150" align=”top” ></img>`
- 
- 
--    return `<img src="../bt-sensors-plugin-sk/images/${this.getImage()}" height="300" object-fit="cover" ></img>`
-+    return `<img src="../bt-sensors-plugin-sk/images/${this.getImage()}" width="200" style="float: left; 
-+  margin: 20px;" ></img> 
-+    To get the encryption key for your device, follow the instructions <a href=https://communityarchive.victronenergy.com/questions/187303/victron-bluetooth-advertising-protocol.html target="_victron_encrypt">here</a>`
-    }
- 
-+   prepareConfig(config){
-+        super.prepareConfig(config)
-+        config.params.modelID=this.getModelID()
-+    }
-+
- }
- module.exports=VictronSensor
-
-diff --git a/sensor_classes/VictronBatteryMonitor.js b/sensor_classes/VictronBatteryMonitor.js
-index a16323e..038203e 100644
---- a/sensor_classes/VictronBatteryMonitor.js
-+++ b/sensor_classes/VictronBatteryMonitor.js
-@@ -22,7 +22,9 @@ class VictronBatteryMonitor extends VictronSensor{
-         d.currentProperties = {}
-         d.currentProperties.ManufacturerData={}
-         d.currentProperties.ManufacturerData[0x02e1]=b
--        d.initMetadata() 
-+        d.debug = (m)=>{console.log(m)}
-+        d.debug.bind(d)
-+        d.initSchema()
-         Object.keys(d.getPaths()).forEach((tag)=>{
-                 d.on(tag,(v)=>console.log(`${tag}=${v}`))
-         })
-@@ -56,7 +58,7 @@ class VictronBatteryMonitor extends VictronSensor{
-         
-         const alarmMD = this.addMetadatum('alarm','',  'alarm', 
-                 (buff,offset=0)=>{return buff.readInt16LE(offset)})
--                alarmMD.default='"electrical.batteries.{batteryID}.alarm'                
-+                alarmMD.default='electrical.batteries.{batteryID}.alarm'                
-                 alarmMD.notify=true
- 
-         this.addMetadatum( 'consumed','Ah', 'amp-hours consumed', 
-@@ -72,7 +74,7 @@ class VictronBatteryMonitor extends VictronSensor{
-         this.addDefaultPath( 'ttg',"electrical.batteries.capacity.timeRemaining") 
-             .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
-         try {
-         if (this.encryptionKey){
-             const decData = this.decrypt(this.getManufacturerData(0x02e1))
-@@ -196,7 +198,7 @@ class VictronBatteryMonitor extends VictronSensor{
-     }
- 
-     getDescription(){
--        return super.getDescription()
-+        return `${super.getDescription()}.<p><p>After setting the encryption key, Save and reselect to configure the value of the Aux field (Secondary Battery, Midpoint or Battery Temperature)`
-     }
- 
-     async stopListening(){
-diff --git a/sensor_classes/VictronDCDCConverter.js b/sensor_classes/VictronDCDCConverter.js
-index 6bc634c..d90a1ea 100644
---- a/sensor_classes/VictronDCDCConverter.js
-+++ b/sensor_classes/VictronDCDCConverter.js
-@@ -10,7 +10,7 @@ class VictronDCDCConverter extends VictronSensor{
-    
-     initSchema(){
-         super.initSchema()
--        this.addDefaultPath("id")
-+        this.addDefaultParam("id")
- 
-         this.addMetadatum('deviceState','', 'device state', 
-                 (buff)=>{return VC.OperationMode.get(buff.readUInt8(0))})
-diff --git a/sensor_classes/VictronLynxSmartBMS.js b/sensor_classes/VictronLynxSmartBMS.js
-index 41711de..80a79a5 100644
---- a/sensor_classes/VictronLynxSmartBMS.js
-+++ b/sensor_classes/VictronLynxSmartBMS.js
-@@ -24,9 +24,11 @@ class VictronLynxSmartBMS extends VictronSensor{
- 
-     initSchema(){
-         super.initSchema()
-+        this.addDefaultParam("batteryID")
-         this.addMetadatum('error','', 'error code', 
-             (buff)=>{return buff.readUInt8(0)})
-- 
-+        .default="electrical.batteries.{batteryID}.errorCode"
-+
-         this.addDefaultPath('ttg','electrical.batteries.capacity.timeRemaining')
-             .read=(buff)=>{return this.NaNif(buff.readUInt16LE(1),0xFFFF)*60}
-         this.addDefaultPath('voltage','electrical.batteries.voltage')
-@@ -36,10 +38,12 @@ class VictronLynxSmartBMS extends VictronSensor{
-         
-         this.addMetadatum('ioStatus','','IO Status', //TODO
-             (buff)=>{return buff.readUInt16LE(7)})
-+        .default="electrical.batteries.{batteryID}.IOStatus"
- 
-         this.addMetadatum('warningsAndAlarms','','warnings and alarms')
- 
-         this.addDefaultPath('soc','electrical.batteries.capacity.stateOfCharge')
-+        
-         this.addMetadatum('consumedAh','Ah','amp-hours consumed')
-         .default="electrical.batteries.{batteryID}.capacity.ampHoursConsumed"
-         
-diff --git a/sensor_classes/VictronOrionXS.js b/sensor_classes/VictronOrionXS.js
-index 3839180..4526b5e 100644
---- a/sensor_classes/VictronOrionXS.js
-+++ b/sensor_classes/VictronOrionXS.js
-@@ -34,7 +34,7 @@ class VictronOrionXS extends VictronSensor{
-             (buff)=>{return this.NaNif(buff.readUInt16LE(8),0xFFFF)/10})
-             .default="electrical.chargers.{id}.input.current"
-         this.addMetadatum('deviceOffReason','', 'device off reason', 
--            (buff)=>{return VC.OffReasons(buff.readUInt32BE(10))})
-+            (buff)=>{return VC.OffReasons.get(buff.readUInt32BE(10))})
-             .default="electrical.chargers.{id}.offReason"    
-         }
- 
-diff --git a/sensor_classes/VictronSmartLithium.js b/sensor_classes/VictronSmartLithium.js
-index 0ed70ad..2988374 100644
---- a/sensor_classes/VictronSmartLithium.js
-+++ b/sensor_classes/VictronSmartLithium.js
-@@ -50,7 +50,7 @@ class VictronSmartLithium extends VictronSensor{
-             (buff)=>{return buff.readUInt16LE(4)})
-             .default="electrical.batteries.{batteryID}.errors"
- 
--        for (let i=0;i++;i<8){
-+        for (let i=0;i<8; i++){
-             this.addMetadatum(`cell${i+1}Voltage`,'V', `cell ${i+1} voltage`)
-             .default=`electrical.batteries.{batteryID}.cell${i+1}.voltage`
-         }
-diff --git a/sensor_classes/XiaomiMiBeacon.js b/sensor_classes/XiaomiMiBeacon.js
-index 5517ab4..c7faac5 100644
---- a/sensor_classes/XiaomiMiBeacon.js
-+++ b/sensor_classes/XiaomiMiBeacon.js
-@@ -218,7 +218,8 @@ class XiaomiMiBeacon extends BTSensor{
-         this.addParameter(
-             "encryptionKey",
-             {
--                title: "encryptionKey (AKA bindKey) for decryption"
-+                title: "encryptionKey (AKA bindKey) for decryption",
-+
-             }
-         )
-         this.addDefaultPath('temp','environment.temperature')
-diff --git a/src/components/PluginConfigurationPanel.js b/src/components/PluginConfigurationPanel.js
-index 081d729..280e2b4 100644
---- a/src/components/PluginConfigurationPanel.js
-+++ b/src/components/PluginConfigurationPanel.js
-@@ -1,8 +1,7 @@
- import Form from '@rjsf/core' ;
- import validator from '@rjsf/validator-ajv8';
--import React from "react";
- import ReactHtmlParser from 'react-html-parser';
--
-+import React from 'react'
- import {useEffect, useState} from 'react'
- 
- import {Button, Grid } from '@material-ui/core';
-@@ -20,9 +19,7 @@ import { ListGroupItem } from 'react-bootstrap';
- 
- import ProgressBar from 'react-bootstrap/ProgressBar';
- 
--var _sensorMap, _sensorDomains={}, _sensorList={}
--
--export default function BTConfig (props)  {
-+export function BTConfig (props)  {
- 
-    const _uiSchema= {
-     "ui:options": {label: false},
-@@ -71,10 +68,9 @@ const useStyles = makeStyles((theme) => ({
- 
-   const [schema, setSchema] = useState({}) 
-   const [ uiSchema, setUISchema] = useState(_uiSchema )
--  const [sensorList, setSensorList] = useState([])
- 
-   const [sensorData, setSensorData] = useState()
--  const [sensorMap, setSensorMap ] = useState(new Map() )
-+  const [sensorMap, setSensorMap ] = useState(new Map())
-  
-   const [progress, setProgress ] = useState({
-     "progress":0, "maxTimeout": 100, 
-@@ -89,8 +85,6 @@ const useStyles = makeStyles((theme) => ({
-  
-   function sendJSONData(cmd, data){
- 
--    console.log(`sending ${cmd}`) 
--    console.log(data)
-     const headers = new Headers();
-     headers.append("Content-Type", "application/json");
-     return fetch(`/plugins/bt-sensors-plugin-sk/${cmd}`, {
-@@ -102,7 +96,6 @@ const useStyles = makeStyles((theme) => ({
-   }
- 
-   async function fetchJSONData(path){
--    console.log(`fetching ${path}`)
-     var result
-     try {
-       result = fetch(`/plugins/bt-sensors-plugin-sk/${path}`, {
-@@ -119,72 +112,53 @@ const useStyles = makeStyles((theme) => ({
-   }
- 
-   async function getSensors(){
--    console.log("getSensors")
-     const response = await fetchJSONData("getSensors")
-     if (response.status!=200){
-       throw new Error(`Unable get sensor data: ${response.statusText} (${response.status}) `)
-     }
-     const json = await response.json()
--    console.log(json)
--    //for (let i=0;i<json.length;i++){
--    //  json[i].schema.htmlDescription=<div>{ReactHtmlParser(json[i].schema.htmlDescription)}<p></p></div>
--    //}
--    return json
- 
--  }
--  async function getDomains(){
--    console.log("getDomains")
--    const response = await fetchJSONData("getDomains")
--    if (response.status!=200){
--      throw new Error(`Unable get domain data: ${response.statusText} (${response.status}) `)
--    }
--    const json = await response.json()
--    console.log(json)
-     return json
- 
-   }
-+
-   async function getBaseData(){
--    console.log("getBaseData")
-     const response = await fetchJSONData("getBaseData")
-     if (response.status!=200){
-       throw new Error(`Unable to get base data: ${response.statusText} (${response.status}) `)
-     }
-     const json = await response.json()
--    console.log(json)
-     json.schema.htmlDescription=<div>{ReactHtmlParser(json.schema.htmlDescription)}<p></p></div>
-     return json
-   }
-+
-   async function getProgress(){
--    console.log("getProgress")
-     const response = await fetchJSONData("getProgress")
-     if (response.status!=200){
-       throw new Error(`Unable to get progress: ${response.statusText} (${response.status}) `)
-     }
-     const json = await response.json()
--    console.log(json)
-     return json
-   }
- 
-   function updateSensorData(data){
--    console.log("updateSensorData")
-     sendJSONData("updateSensorData", data).then((response)=>{ 
-       if (response.status != 200) {
-         throw new Error(response.statusText)
-       }
--      sensorMap.get(data.mac_address)._changesMade=false
--      sensorMap.get(data.mac_address).config = data
--      
-+      setSensorMap((sm)=>{sm.delete(data.mac_address); return new Map(sm) })
-+      setSchema( {} )
-+
-     })
-   } 
- 
-   function undoChanges(mac) {
--    console.log("undoChanges")
-     sensorMap.get(mac)._changesMade = false
-+    sensorMap.get(mac).config = JSON.parse(JSON.stringify(sensorMap.get(mac).configCopy))
-     setSensorData( sensorMap.get(mac).config )
-   }
- 
-   function removeSensorData(mac){
--    console.log("removeSensorData")
- 
-     try{ 
-     
-@@ -193,10 +167,7 @@ const useStyles = makeStyles((theme) => ({
-             throw new Error(response.statusText)
-         }
-         })
--
--        _sensorMap.delete(mac)
--        
--        setSensorMap(new Map(_sensorMap))
-+        setSensorMap((sm)=>{sm.delete(mac); return new Map(sm) })
-         setSchema( {} )
-     } catch {(e)=>
-       setError( new Error(`Couldn't remove ${mac}: ${e}`))
-@@ -206,88 +177,80 @@ const useStyles = makeStyles((theme) => ({
- 
- 
-   function updateBaseData(data){
--    console.log("updateBaseData")
--
-+    setSensorMap(new Map())
-+    //setSensorList({})
-     sendJSONData("updateBaseData", data).then( (response )=>{
-       if (response.status != 200) {
-         setError(new Error(`Unable to update base data: ${response.statusText} (${response.status})`))
--      } /*else {
--        getProgress().then((json)=>{
--          setProgress(json)
--        }).catch((e)=>{
--          setError(e)
--        })
--      }*/
-+      } 
-       })
--  }
--    
--
--  function refreshSensors(){
--    console.log('refreshing sensor map')
- 
--    getSensors().then((sensors)=>{
--      setSensorMap (new Map(sensors.map((sensor)=>[sensor.info.mac,sensor])));    
--    })
--    .catch((e)=>{
--      setError(e)
--    })
-   }
-+  
-+  
- 
- 
-   useEffect(()=>{
--    console.log("useEffect([])")
-     let eventSource=null
--
-     fetchJSONData("getPluginState").then( async (response)=> {
-+    
-+      function newSensorEvent(event){
-+        let json = JSON.parse(event.data)
-+        console.log(`New sensor: ${json.info.mac}`)
-+        setSensorMap( (_sm)=> {
-+          //if (!_sm.has(json.info.mac))
-+          _sm.set(json.info.mac, json)
-+        
-+          return new Map(_sm)
-+        }
-+        )
-+      }
-+      function sensorChangedEvent(event){
-+        console.log("sensorchanged")
-+        const json = JSON.parse(event.data)      
-+        
-+        setSensorMap( (_sm) => {
-+          const sensor = _sm.get(json.mac)
-+          if (sensor) 
-+            Object.assign(sensor.info, json )
-+          return new Map(_sm)
-+        })
-+      }
-+      
-+
-       if (response.status==404) {
-         setPluginState("unknown")
-         throw new Error("unable to get plugin state")
-       }
-       const json = await response.json()
--      console.log("Setting up eventsource")
-       eventSource = new EventSource("/plugins/bt-sensors-plugin-sk/sse", { withCredentials: true })
- 
--      setPluginState(json.state)
--      
--      _sensorDomains = await getDomains()
--
-       eventSource.addEventListener("newsensor", (event) => {
--        console.log("newsensor")
--        let json = JSON.parse(event.data)
--        
--        if (!_sensorMap.has(json.info.mac)) {
--          console.log(`New sensor: ${json.info.mac}`)
--          setSensorMap(new Map(_sensorMap.set(json.info.mac, json)))
--        }
-+        newSensorEvent(event)
-       });
- 
-       eventSource.addEventListener("sensorchanged", (event) => {
--        let json = JSON.parse(event.data)      
--        console.log("sensorchanged")
--        console.log(json)
--        
--        if (_sensorMap.has(json.mac)) {      
--          let sensor = _sensorMap.get(json.mac)
--
--          Object.assign(sensor.info, json )
--          setSensorMap(new Map ( _sensorMap ))
--        }
-+        sensorChangedEvent(event)
-       });
-+
-       eventSource.addEventListener("progress", (event) => {
--        console.log("progress")
-         const json = JSON.parse(event.data)  
-         setProgress(json)
--        console.log(json)
-       });
- 
-       eventSource.addEventListener("pluginstate", (event) => {
--        console.log("pluginstate")
-         const json = JSON.parse(event.data)  
-         setPluginState(json.state)
-       });
--     
--    })
-+      
-+    setPluginState(json.state);
- 
-+    (async ()=>{
-+      const sensors = await getSensors()
-+      setSensorMap ( new Map(sensors.map((sensor)=>[sensor.info.mac,sensor])) )
-+    })()
-+
-+    })
-     .catch( (e) => { 
-         setError(e)
-       }
-@@ -296,13 +259,11 @@ const useStyles = makeStyles((theme) => ({
-       console.log("Closing connection to SSE")
-       eventSource.close()
-     };
-+    
-  },[])
- 
- useEffect(()=>{
--  console.log("useEffect([pluginState])")
--  if (pluginState=="started"){
--    refreshSensors()
--    
-+  if (pluginState=="started") {
-     getBaseData().then((json) => {
-       setBaseSchema(json.schema);    
-       setBaseData(json.data);
-@@ -317,7 +278,6 @@ useEffect(()=>{
-     })
- 
-   } else{
--    setSensorMap(new Map())
-     setBaseSchema({})
-     setBaseData({})
-   }
-@@ -325,9 +285,10 @@ useEffect(()=>{
- },[pluginState])
- 
- 
--
- function confirmDelete(mac){
--  const result = window.confirm(`Delete configuration for ${mac}?`)
-+  
-+  const sensor = sensorMap.get(mac)
-+  const result = !hasConfig(sensor) || window.confirm(`Delete configuration for ${sensor.info.name}?`)
-   if (result)
-     removeSensorData(mac)
- }
-@@ -352,7 +313,7 @@ function signalStrengthIcon(sensor){
- 
- }
- function hasConfig(sensor){
--  return Object.keys(sensor.config).length>0;
-+  return Object.keys(sensor.configCopy).length>0;
- }
- 
- function createListGroupItem(sensor){
-@@ -376,60 +337,43 @@ function createListGroupItem(sensor){
-         </ListGroupItem>
- }
- 
--function configuredDevices(){
--  return Array.from(sensorMap.entries()).filter((entry)=>hasConfig(entry[1]))
--}
- 
- function devicesInDomain(domain){
-+
-   return Array.from(sensorMap.entries()).filter((entry)=>entry[1].info.domain===domain)
- }
- 
--
--useEffect(()=>{
--  console.log("useEffect([sensorMap])")
--
--    _sensorMap = sensorMap
--    
--    const _sensorDomains = new Set(sensorMap.entries().map((entry)=>{ return entry[1].info.domain}))
--    const sl = {
--      _configured: configuredDevices().map((entry) =>  {
--         return createListGroupItem(sensorMap.get(entry[0]))
--      })
--      } 
--
--      _sensorDomains.forEach((d)=>{
--        sl[d]=devicesInDomain(d).map((entry) =>  {
--        return createListGroupItem(sensorMap.get(entry[0]))
--       })
--    })
--    _sensorList=sl 
--    
--    
--  },[sensorMap]
--  )
--
-   function ifNullNaN(value){
-     return value==null? NaN : value
-   }
- 
--  function getSensorList(domain){
--    return _sensorList[domain]
--  }
--
-   function getTabs(){
-+    const sensorDomains = [... (new Set(sensorMap.entries().map((entry)=>{ return entry[1].info.domain})))].sort()
-+    const cd = Array.from(sensorMap.entries()).filter((entry)=>hasConfig(entry[1]))
-+    let sensorList={}
-+    sensorList["_configured"]=
-+      cd.length==0?
-+        "Select a device from its domain tab (Electrical etc.) and configure it.":
-+        cd.map((entry) =>  {
-+         return createListGroupItem(sensorMap.get(entry[0]))
-+      })
-+      
-+      sensorDomains.forEach((d)=>{
-+        sensorList[d]=devicesInDomain(d).map((entry) =>  {
-+        return createListGroupItem(sensorMap.get(entry[0]))
-+       })
-+      })
-     
--    return Object.keys(_sensorList).map((domain)=> {return getTab(domain)})
-+    return Object.keys(sensorList).map((domain)=> {return getTab(domain, sensorList[domain])})
-   }
--    // <div style={{paddingBottom: 20}} class="d-flex flex-wrap justify-content-start align-items-start">
--    //    <div class="d-flex flex-column" >
- 
--  function getTab(key){
--    var title = key.slice(key.charAt(0)==="_"?1:0)
-+  function getTab(key, sensorList){
-+    let  title = key.slice(key.charAt(0)==="_"?1:0)
-     
--    return <Tab eventKey={key} title={title.charAt(0).toUpperCase()+title.slice(1)    }>
-+    return <Tab eventKey={key} title={`${title.charAt(0).toUpperCase()}${title.slice(1)}${typeof sensorList=='string'?'':' ('+sensorList.length+')'}` }  >
-         
-     <ListGroup style={{  maxHeight: '300px', overflowY: 'auto' }}>
--      {getSensorList(key)}
-+      {sensorList}
-     </ListGroup>
-     
- 
-@@ -441,22 +385,6 @@ useEffect(()=>{
-     window.open(url, "_blank", "noreferrer");
-   }
- 
--  function CustomFieldTemplate(props) {
--  const { id, classNames, style, label, help, required, description, errors, children } = props;
--  return (
--    <div className={classNames} style={style}>
--      <Grid container xs={12} direction="row" spacing="1">
--        <Grid item xs={1} sm container direction="column">
--        <Grid item ><label htmlFor={id}>{label}{required ? '*' : null}</label></Grid>
--        <Grid item> {description}</Grid>
--        </Grid>
--        <Grid item>{children}</Grid>
--      </Grid>
--      {errors}
--      {help}
--    </div>
--  );
--}
- 
-   if (pluginState=="stopped" || pluginState=="unknown")
-     return (<h3>Enable plugin to see configuration</h3>)
-@@ -498,7 +426,7 @@ useEffect(()=>{
-       defaultActiveKey="_configured"
-       id="domain-tabs"
-       className="mb-3"
--      onClick={()=>{setSchema({})}}
-+  
-       >
-       {getTabs()}
-       </Tabs>
-@@ -514,13 +442,15 @@ useEffect(()=>{
-       uiSchema={uiSchema}
-       onChange={(e) => {
-           const s = sensorMap.get(e.formData.mac_address)
--          s._changesMade=true
--          setSensorData(e.formData)
-+          if(s) {
-+            s._changesMade=true
-+            s.config = e.formData
-+            setSensorData(e.formData)
-+          }
-         }
-       }
-       onSubmit={({ formData }, e) => {
-         updateSensorData(formData)
--        setSchema({})
-         alert("Changes saved")
-       }}
-       onError={log('errors')}
-@@ -538,4 +468,5 @@ useEffect(()=>{
-   )
-     
- 
--  }
-
-+  }
-+  export default BTConfig
-
-diff --git a/src/images/Aranet2_HOME_F_900x900_90OVA5J.original.webp b/src/images/Aranet2_HOME_F_900x900_90OVA5J.original.webp
-new file mode 100644
-index 0000000..db039cc
-Binary files /dev/null and b/src/images/Aranet2_HOME_F_900x900_90OVA5J.original.webp differ
-diff --git a/src/images/BMV-712-Smart-Front.webp b/src/images/BMV-712-Smart-Front.webp
-new file mode 100644
-index 0000000..9e8fd57
-Binary files /dev/null and b/src/images/BMV-712-Smart-Front.webp differ
-diff --git a/src/images/Gobius_C.png b/src/images/Gobius_C.png
-new file mode 100644
-index 0000000..e86a0dd
-Binary files /dev/null and b/src/images/Gobius_C.png differ
-diff --git a/src/images/LYWSD03MMC-Device.jpg b/src/images/LYWSD03MMC-Device.jpg
-new file mode 100644
-index 0000000..8670cbc
-Binary files /dev/null and b/src/images/LYWSD03MMC-Device.jpg differ
-diff --git a/src/images/Victron-SmartShunt.jpg b/src/images/Victron-SmartShunt.jpg
-new file mode 100644
-index 0000000..f7cea72
-Binary files /dev/null and b/src/images/Victron-SmartShunt.jpg differ
-diff --git a/src/images/bluetooth-logo.png b/src/images/bluetooth-logo.png
-new file mode 100644
-index 0000000..37fddd4
-Binary files /dev/null and b/src/images/bluetooth-logo.png differ
-diff --git a/src/images/smartsolarMPPT7515.png b/src/images/smartsolarMPPT7515.png
-new file mode 100644
-index 0000000..1bd55e4
-Binary files /dev/null and b/src/images/smartsolarMPPT7515.png differ
-diff --git a/src/images/victron-min-1.jpg b/src/images/victron-min-1.jpg
-new file mode 100644
-index 0000000..c59afba
-Binary files /dev/null and b/src/images/victron-min-1.jpg differ