bt-sensors-plugin-sk 1.2.0-beta.0.0.6 → 1.2.0-beta.0.0.8

package/.vscode/launch.json

@@ -0,0 +1,7 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": []
+}

package/BTSensor.js

@@ -100,7 +100,6 @@ function preparePath(obj, str) {
  */
 
 class BTSensor extends EventEmitter {
-    //static metadata=new Map()
  
     static DEFAULTS = require('./plugin_defaults.json');
     
@@ -318,10 +317,11 @@ class BTSensor extends EventEmitter {
 
         //create the 'name' parameter
         this.addDefaultParam("name")
+            .default=this?.currentProperties?.Name
 
         //create the 'location' parameter
 
-        this.addDefaultParam("location")
+        //this.addDefaultParam("location")
 
         //create the 'RSSI' parameter 
         this.addDefaultPath("RSSI","sensors.RSSI")

package/README.md

@@ -1,8 +1,27 @@
 # Bluetooth Sensors for [Signal K](http://www.signalk.org)
 
-## Beta 1.0.0
+## What's New
 
-Dynamic configuration added (no more screen refreshing necessary).
+## 1.2.0-beta-0.0.8
+
+Improved handling of changed state on config page.
+
+Several small fixes to various sensor classes.
+
+## 1.2.0-beta-0.0.7
+
+Added zone config param for environmental sensors. Removed location parameter. 
+
+## 1.2.0-beta-0.0.6
+Default values for paths for most sensor classes. 
+
+## 1.2.0-beta-0.0.5
+
+Added workaround to support multiple simultaneous GATT connections. Owing to problematic behavior in Bluez where making a GATT connection halted the scanner which made additional updates and connections impossible, added a scanner restart after making each GATT connection. 
+
+## 1.2.0-beta-0.0.1
+
+Dynamic configuration added. List updates when new devices are found by scanner. (No more screen refreshing necessary).
 
 ## WHAT IT IS
 
@@ -33,13 +52,13 @@ Signalk users with a Linux boat-puter (Windows and MacOS are NOT currently suppo
 NOTE: If you're running the 1.0.3 release, you will have to reconfigure your devices.<br>
 
 ### Signalk Appstore
-The plugin is currently available in the Signalk Appstore. <br>
+The beta plugin is not currently available in the Signalk Appstore. <br>
 
 ### NPM
 
 Go to you signalk home (usually ~/.signalk) and run:
 
-npm i bt-sensors-plugin-sk@1.1.0-beta.2.1
+npm i bt-sensors-plugin-sk@1.2.0-beta.0.0.7
 
 ### Linux
 
@@ -48,7 +67,7 @@ If you want to install directly from source (this is mostly of interest to custo
 <pre>  cd ~/[some_dir]
   git clone https://github.com/naugehyde/bt-sensors-plugin-sk
   cd bt-sensors-plugin-sk
-  git switch '1.1.0'
+  git switch '1.2.0-beta'
   git pull
   npm i
   [sudo] npm link
@@ -68,16 +87,11 @@ After installing and restarting Signalk you should see a "BT Sensors Plugin" opt
 
 On initial configuration, wait for your Bluetooth adapter to scan devices. The plugin will scan for new devices at whatever you set the "scan for new devices interval" value to. <br><br>
 
-> TIP: Close and re-open the config screen to refresh the screen. The config screen isn't as <i>reactive</i> as it oughtta be.<br><br>
-
-Then press the + button to add a sensor. Your screen should look something like this:<br><br>
-<img width="1122" alt="Screenshot 2024-10-13 at 6 52 52 PM" src="https://github.com/user-attachments/assets/0487b8d0-4bc0-4358-85c6-a507bc3c97d2">
-
 <br><br>
 
-Select the sensor you want Signalk to listen to from the drop down.<br>
+Select the sensor you want Signalk to listen to from the list.<br>
 
-If you don't see your device and you know that it's on and nearby to the server, it may not be currently supported. But fear not, you can add custom sensor classes yourself. (Check out [the development section](#development).). <br><br>
+If you don't see your device and you know that it's on and nearby to the server, it may not be currently supported (It could also be out of range.) But fear not, you can add custom sensor classes yourself. (Check out [the development section](#development).). <br><br>
 
 Now it's a simple matter of associating the data emitted by the sensor with the Signalk path you want it to update. (Also, you can name your sensor so when it appears in logs its easy to recognize.) <br><br>
 

package/index.js

@@ -21,15 +21,13 @@ class MissingSensor  {
 		this.addPath=BTSensor.prototype.addPath.bind(this)
 		this.addParameter=BTSensor.prototype.addParameter.bind(this)
 		this.addDefaultPath=BTSensor.prototype.addDefaultPath.bind(this)
-		this.addDefaultParam=BTSensor.prototype.addDefaultPath.bind(this)
-		this.addDefaultParam=BTSensor.prototype.addDefaultPath.bind(this)
+		this.addDefaultParam=BTSensor.prototype.addDefaultParam.bind(this)
 		this.getPath=BTSensor.prototype.getPath.bind(this)
 
 		this.getJSONSchema = BTSensor.prototype.getJSONSchema.bind(this)
 		this.initSchema = BTSensor.prototype.initSchema.bind(this)
 
 		this.initSchema()
-
 		var keys = Object.keys(config?.paths??{})
 
 		keys.forEach((key)=>{
@@ -390,7 +388,6 @@ module.exports =   function (app) {
 			adapter.waitDevice(config.mac_address,(config?.discoveryTimeout??30)*1000)
 			.then(async (device)=> { 
 				if (startNumber != starts ) {
-					debugger
 					return
 				}
 				//app.debug(`Found ${config.mac_address}`)
@@ -400,8 +397,13 @@ module.exports =   function (app) {
 					reject ( `Device is blacklisted (${s.reasonForBlacklisting()}).`)
 				else{
 					addSensorToList(s)
+					let _lastRSSI=-1*Infinity
 					s.on("RSSI",(()=>{
-						updateSensor(s)
+						if (Date.now()-_lastRSSI > 5000) { //only update RSSI on client every five seconds 
+							_lastRSSI=Date.now()
+							updateSensor(s)
+						}	
+
 					}))
 					resolve(s)
 				}
@@ -443,7 +445,7 @@ module.exports =   function (app) {
 				app.setPluginError(msg)
 			}
 			//if we're here ain't got no class for the device
-			var sensor
+			var sensor 
 			if (config.params?.sensorClass){
 				var c = classMap.get(config.params.sensorClass)
 			} else{

package/package.json

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

package/plugin_defaults.json

@@ -22,6 +22,7 @@
     "environment":{
         "temperature": 
             {
+                "title":"Current zone's temperature",
                 "unit":"K",
                 "default": "environment.{zone}.temperature"
             },
@@ -32,15 +33,15 @@
             },
         "relativeHumidity":
             {
-                "title":"Current relative humidity",
+                "title":"Current zone's relative humidity",
                 "unit":"ratio",
-                "default":"environment.{zone}.humidity"
+                "default":"environment.{zone}.relativeHumidity"
             },
         "pressure":
             {
-                "title": "Current outside air ambient pressure",
+                "title": "Current zone's ambient air pressure",
                 "unit":"Pa",
-                "default":"environment.{zone}.humidity"
+                "default":"environment.{zone}.pressure"
             }
     },
     "electrical":{

package/public/893.js

@@ -1 +1 @@
-"use strict";(self.webpackChunkbt_sensors_plugin_sk=self.webpackChunkbt_sensors_plugin_sk||[]).push([[893],{2995:(e,t,n)=>{n.r(t),n.d(t,{default:()=>v});var a=n(3490),s=n(4810),o=n(4147),r=n.n(o),l=n(7606),c=n(4952),i=n(3768),u=n(1431),d=n(9676),m=n(7041),f=n(3657),g=n(5027),p=n(7265),h=n(6890),E=n(8207);const w=e=>console.log.bind(console,e);var S;const v=e=>{const[t,n]=(0,o.useState)({}),[v,b]=(0,o.useState)({}),[y,A]=(0,o.useState)({}),[$,k]=(0,o.useState)({"ui:submitButtonOptions":{props:{disabled:!1,className:"btn btn-info"},norender:!0,submitText:"Submit"}}),[x,D]=(0,o.useState)([]),[C,T]=(0,o.useState)(),[j,_]=(0,o.useState)(new Map),[O,N]=(0,o.useState)({progress:0,maxTimeout:100,deviceCount:0,totalDevices:0}),[M,J]=(0,o.useState)("unknown"),[L,U]=(0,o.useState)();function B(e,t){console.log(`sending ${e}`),console.log(t);const n=new Headers;return n.append("Content-Type","application/json"),fetch(`/plugins/bt-sensors-plugin-sk/${e}`,{credentials:"include",method:"POST",body:JSON.stringify(t),headers:n})}async function H(e){return console.log(`fetching ${e}`),fetch(`/plugins/bt-sensors-plugin-sk/${e}`,{credentials:"include"})}async function I(){const e=await H("progress");if(200!=e.status)throw new Error(`Unable get progres: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}function P(){console.log("refreshing sensor map"),async function(){const e=await H("sensors");if(200!=e.status)throw new Error(`Unable get sensor data: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}().then((e=>{_(new Map(e.map((e=>[e.info.mac,e]))))})).catch((e=>{U(e)}))}return(0,o.useEffect)((()=>{H("sendPluginState").then((async e=>{const t=await e.json();J(t.state),console.log("Setting up eventsource");const n=new EventSource("/plugins/bt-sensors-plugin-sk/sse");return n.addEventListener("newsensor",(e=>{let t=JSON.parse(e.data);S.has(t.info.mac)||(console.log(`New sensor: ${t.info.mac}`),_(new Map(S.set(t.info.mac,t))))})),n.addEventListener("sensorchanged",(e=>{let t=JSON.parse(e.data);if(S.has(t.mac)){let e=S.get(t.mac);Object.assign(e.info,t),_(new Map(S))}})),n.addEventListener("progress",(e=>{const t=JSON.parse(e.data);N(t),console.log(t)})),n.addEventListener("pluginstate",(e=>{const t=JSON.parse(e.data);J(t.state)})),()=>n.close()})).catch((e=>{U(e)}))}),[]),(0,o.useEffect)((()=>{"started"==M?(P(),async function(){const e=await H("base");if(200!=e.status)throw new Error(`Unable get base data: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}().then((e=>{n(e.schema),b(e.data)})).catch((e=>{U(e)})),I().then((e=>{N(e)})).catch((e=>{U(e)}))):(_(new Map),n({}),b({}))}),[M]),(0,o.useEffect)((()=>{console.log(L)}),[L]),(0,o.useEffect)((()=>{S=j,D(Array.from(j.entries()).map((e=>{const t=j.get(e[0]),n=t.config,a=Object.keys(n).length>0;return r().createElement(h.A,{action:!0,onClick:()=>{t&&(n.mac_address=e[0],A(t.schema),T(n))}},r().createElement("div",{class:"d-flex justify-content-between align-items-center",style:a?{fontWeight:"normal"}:{fontStyle:"italic"}},`${t.info.name} MAC: ${t.info.mac} RSSI: ${s=t.info.RSSI,null==s?NaN:s}`,r().createElement("div",{class:"d-flex justify-content-between "},function(e){return null==e.info.lastContactDelta||e.info.lastContactDelta>e.config.discoveryTimeout?r().createElement(i.A,null):e.info.signalStrength>80?r().createElement(u.A,null):e.info.signalStrength>60?r().createElement(d.A,null):e.info.signalStrength>40?r().createElement(m.A,null):e.info.signalStrength>20?r().createElement(f.A,null):r().createElement(g.A,null)}(t))));var s})))}),[j]),"stopped"==M?r().createElement("h1",null,"Enable plugin to see configuration"):r().createElement("div",null,L?r().createElement("h2",{style:"color: red;"},L.message):"",r().createElement(a.Ay,{schema:t,validator:s.Ay,onChange:e=>b(e.formData),onSubmit:({formData:e},t)=>{T(null),B("sendBaseData",e).then((e=>{200!=e.status?U(new Error(`Unable to update base data: ${e.statusText} (${e.status})`)):(I().then((e=>{N(e)})).catch((e=>{U(e)})),P())}))},onError:w("errors"),formData:v}),r().createElement("p",null),r().createElement("p",null),O.deviceCount<O.totalDevices?r().createElement(E.A,{max:O.maxTimeout,now:O.progress}):"",r().createElement("h2",null,j.size>0?" Bluetooth Devices click to configure":""),r().createElement("p",null),r().createElement("div",{style:{paddingBottom:20},class:"d-flex flex-wrap justify-content-start align-items-start"},r().createElement(p.A,{style:{maxHeight:"300px",overflowY:"auto"}},x),r().createElement("div",{style:{paddingLeft:10,paddingTop:10,display:0==Object.keys(y).length?"none":""}},r().createElement(a.Ay,{schema:y,validator:s.Ay,uiSchema:$,onChange:e=>T(e.formData),onSubmit:({formData:e},t)=>{var n;console.log(e),B("sendSensorData",n=e).then((e=>{if(200!=e.status)throw new Error(e.statusText);j.get(n.mac_address).config=n})),A({}),alert("Changes saved")},onError:w("errors"),formData:C},r().createElement("div",null,r().createElement(l.A,{direction:"row",style:{spacing:5}},r().createElement(c.A,{type:"submit",color:"primary",variant:"contained"},"Save"),r().createElement(c.A,{variant:"contained",onClick:()=>{var e;e=C.mac_address,T(j.get(e).config)}},"Undo"),r().createElement(c.A,{variant:"contained",color:"secondary",onClick:e=>{return t=C.mac_address,void(window.confirm(`Delete configuration for ${t}?`)&&function(e){try{B("removeSensorData",{mac_address:e}).then((e=>{if(200!=e.status)throw new Error(e.statusText)})),S.delete(e),_(new Map(S)),A({})}catch{}}(t));var t}},"Delete")))))))}}}]);
+"use strict";(self.webpackChunkbt_sensors_plugin_sk=self.webpackChunkbt_sensors_plugin_sk||[]).push([[893],{2995:(e,t,n)=>{n.r(t),n.d(t,{default:()=>S});var a=n(3490),s=n(4810),o=n(4147),r=n.n(o),c=n(7606),l=n(4952),i=n(3768),u=n(1431),d=n(9676),m=n(7041),g=n(3657),f=n(5027),h=n(7265),p=n(6890),E=n(8207);const w=e=>console.log.bind(console,e);var v;const S=e=>{const[t,n]=(0,o.useState)({}),[S,b]=(0,o.useState)({}),[y,A]=(0,o.useState)({}),[$,D]=(0,o.useState)({"ui:submitButtonOptions":{props:{disabled:!1,className:"btn btn-info"},norender:!0,submitText:"Submit"}}),[_,k]=(0,o.useState)([]),[x,C]=(0,o.useState)(),[T,j]=(0,o.useState)(new Map),[M,O]=(0,o.useState)({progress:0,maxTimeout:100,deviceCount:0,totalDevices:0}),[N,J]=(0,o.useState)("unknown"),[L,U]=(0,o.useState)();function B(e,t){console.log(`sending ${e}`),console.log(t);const n=new Headers;return n.append("Content-Type","application/json"),fetch(`/plugins/bt-sensors-plugin-sk/${e}`,{credentials:"include",method:"POST",body:JSON.stringify(t),headers:n})}async function z(e){return console.log(`fetching ${e}`),fetch(`/plugins/bt-sensors-plugin-sk/${e}`,{credentials:"include"})}async function H(){const e=await z("progress");if(200!=e.status)throw new Error(`Unable get progres: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}function I(){console.log("refreshing sensor map"),async function(){const e=await z("sensors");if(200!=e.status)throw new Error(`Unable get sensor data: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}().then((e=>{j(new Map(e.map((e=>[e.info.mac,e]))))})).catch((e=>{U(e)}))}return(0,o.useEffect)((()=>{z("sendPluginState").then((async e=>{const t=await e.json();J(t.state),console.log("Setting up eventsource");const n=new EventSource("/plugins/bt-sensors-plugin-sk/sse");return n.addEventListener("newsensor",(e=>{let t=JSON.parse(e.data);v.has(t.info.mac)||(console.log(`New sensor: ${t.info.mac}`),j(new Map(v.set(t.info.mac,t))))})),n.addEventListener("sensorchanged",(e=>{let t=JSON.parse(e.data);if(v.has(t.mac)){let e=v.get(t.mac);Object.assign(e.info,t),j(new Map(v))}})),n.addEventListener("progress",(e=>{const t=JSON.parse(e.data);O(t),console.log(t)})),n.addEventListener("pluginstate",(e=>{const t=JSON.parse(e.data);J(t.state)})),()=>n.close()})).catch((e=>{U(e)}))}),[]),(0,o.useEffect)((()=>{"started"==N?(I(),async function(){const e=await z("base");if(200!=e.status)throw new Error(`Unable get base data: ${e.statusText} (${e.status}) `);const t=await e.json();return console.log(t),t}().then((e=>{n(e.schema),b(e.data)})).catch((e=>{U(e)})),H().then((e=>{O(e)})).catch((e=>{U(e)}))):(j(new Map),n({}),b({}))}),[N]),(0,o.useEffect)((()=>{console.log(L)}),[L]),(0,o.useEffect)((()=>{v=T,k(Array.from(T.entries()).map((e=>{const t=T.get(e[0]),n=t.config,a=Object.keys(n).length>0;return r().createElement(p.A,{action:!0,onClick:()=>{t&&(n.mac_address=e[0],A(t.schema),C(n))}},r().createElement("div",{class:"d-flex justify-content-between align-items-center",style:a?{fontWeight:"normal"}:{fontStyle:"italic"}},`${t._changesMade?"*":""}${t.info.name} MAC: ${t.info.mac} RSSI: ${s=t.info.RSSI,null==s?NaN:s}`,r().createElement("div",{class:"d-flex justify-content-between "},function(e){return null==e.info.lastContactDelta||e.info.lastContactDelta>e.config.discoveryTimeout?r().createElement(i.A,null):e.info.signalStrength>80?r().createElement(u.A,null):e.info.signalStrength>60?r().createElement(d.A,null):e.info.signalStrength>40?r().createElement(m.A,null):e.info.signalStrength>20?r().createElement(g.A,null):r().createElement(f.A,null)}(t))));var s})))}),[T]),"stopped"==N?r().createElement("h1",null,"Enable plugin to see configuration"):r().createElement("div",null,L?r().createElement("h2",{style:"color: red;"},L.message):"",r().createElement(a.Ay,{schema:t,validator:s.Ay,onChange:e=>b(e.formData),onSubmit:({formData:e},t)=>{C(null),B("sendBaseData",e).then((e=>{200!=e.status?U(new Error(`Unable to update base data: ${e.statusText} (${e.status})`)):(H().then((e=>{O(e)})).catch((e=>{U(e)})),I())}))},onError:w("errors"),formData:S}),r().createElement("p",null),r().createElement("p",null),M.deviceCount<M.totalDevices?r().createElement(E.A,{max:M.maxTimeout,now:M.progress}):"",r().createElement("h2",null,T.size>0?"Bluetooth Devices click to configure":""),r().createElement("h2",null,T.size>0?"(* means sensor has unsaved changes)":""),r().createElement("p",null),r().createElement("div",{style:{paddingBottom:20},class:"d-flex flex-wrap justify-content-start align-items-start"},r().createElement(h.A,{style:{maxHeight:"300px",overflowY:"auto"}},_),r().createElement("div",{style:{paddingLeft:10,paddingTop:10,display:0==Object.keys(y).length?"none":""}},r().createElement(a.Ay,{schema:y,validator:s.Ay,uiSchema:$,onChange:e=>{T.get(e.formData.mac_address)._changesMade=!0,C(e.formData)},onSubmit:({formData:e},t)=>{var n;console.log(e),B("sendSensorData",n=e).then((e=>{if(200!=e.status)throw new Error(e.statusText);T.get(n.mac_address)._changesMade=!1,T.get(n.mac_address).config=n})),A({}),alert("Changes saved")},onError:w("errors"),formData:x},r().createElement("div",null,r().createElement(c.A,{direction:"row",style:{spacing:5}},r().createElement(l.A,{type:"submit",color:"primary",variant:"contained"},"Save"),r().createElement(l.A,{variant:"contained",onClick:()=>{var e;e=x.mac_address,T.get(e)._changesMade=!1,C(T.get(e).config)}},"Undo"),r().createElement(l.A,{variant:"contained",color:"secondary",onClick:e=>{return t=x.mac_address,void(window.confirm(`Delete configuration for ${t}?`)&&function(e){try{B("removeSensorData",{mac_address:e}).then((e=>{if(200!=e.status)throw new Error(e.statusText)})),v.delete(e),j(new Map(v)),A({})}catch{}}(t));var t}},"Delete")))))))}}}]);

package/sensor_classes/ATC.js

@@ -33,6 +33,8 @@ class ATC extends BTSensor{
     }
     initSchema(){
         super.initSchema()
+        this.addDefaultParam("zone")
+
         this.addDefaultPath('batteryStrength','sensors.batteryStrength')
         .read=(buff)=>{return ((buff.readUInt8(12))/100)}
 

package/sensor_classes/Aranet4.js

@@ -31,7 +31,7 @@ class Aranet4 extends AranetSensor{
         this.addDefaultPath("pressure","environment.pressure") 
         .read=(buff)=>{return ((buff.readUInt16LE(12)))/10}
       
-        this.addDefaultPath('relativeHumidity','environment.relative')
+        this.addDefaultPath('relativeHumidity','environment.relativeHumidity')
         .read=(buff)=>{return ((buff.readUInt8(14))/100)}
         
         this.addMetadatum('color', '',  'Warning color (G Y R)',

package/sensor_classes/GoveeH50xx.js

@@ -19,6 +19,8 @@ class GoveeH50xx extends  BTSensor {
 
     initSchema(){
         super.initSchema()
+        this.addDefaultParam("zone")
+
         this.addDefaultPath("temp","environment.temperature")
             .read= (buffer)=>{return 273.15+(buffer.readUInt16LE(1)/100) }
         

package/sensor_classes/GoveeH510x.js

@@ -36,6 +36,8 @@ class GoveeH510x extends BTSensor{
 
     initSchema(){
         super.initSchema()
+        this.addDefaultParam("zone")
+
         this.addDefaultPath("temp","environment.temperature")
         this.addDefaultPath("humidity", "environment.humidity")
         this.addDefaultPath("battery","sensors.batteryStrength")        

package/sensor_classes/Inkbird.js

@@ -15,6 +15,8 @@ class Inkbird extends BTSensor{
 
     initSchema() {
         super.initSchema()
+        this.addDefaultParam("zone")
+
         this.addDefaultPath('temp','environment.temperature')
         this.addDefaultPath('battery', 'sensors.batteryStrength')
         if (this.getName() == 'sps'){

package/sensor_classes/RuuviTag.js

@@ -10,13 +10,14 @@ class RuuviTag extends BTSensor{
         
     initSchema(){
         super.initSchema()
+        this.addDefaultParam("zone")
+
         const md = this.valueIfVariant(this.getManufacturerData(this.constructor.manufacturerID))
         this.mode = md[0]
         if (this['_initModeV'+this.mode])
             this['_initModeV'+this.mode]()
         else    
             throw new Error("Unrecognized Ruuvitag data mode "+md[0])
-        this.addDefaultParam("zone")
 
     } 
 

package/sensor_classes/ShellySBHT003C.js

@@ -80,6 +80,8 @@ class ShellySBHT003C extends AbstractBTHomeSensor {
 
 	initSchema() {
 		super.initSchema()
+		this.addDefaultParam("zone")
+
 		this.addDefaultPath(
 			"battery",
 			"sensors.batteryStrength")

package/sensor_classes/SwitchBotMeterPlus.js

@@ -37,6 +37,8 @@ class SwitchBotMeterPlus extends BTSensor{
 // Refer https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/meter.md#(new)-broadcast-message 
  
         super.initSchema()
+        this.addDefaultParam("zone")
+
         this.addDefaultPath('temp', 'environment.temperature')
         .read= (buffer)=>{return (( ( ( (buffer[4] & 0x7f) + ((buffer[3] & 0x0f)/10) ) * ( (buffer[4] & 0x80)>0 ? 1 : -1 ) ) - ( (buffer[5] & 0x80)>0 ? 32 : 0) ) / ( (buffer[5] & 0x80)>0 ? 1.8 : 1) ) + 273.15 }
         this.addDefaultPath('humidity', 'environment.humidity')

package/sensor_classes/SwitchBotTH.js

@@ -39,6 +39,8 @@ class SwitchBotTH extends  BTSensor {
 
     initSchema(){
         super.initSchema()
+        this.addDefaultParam("zone")
+
         this.addDefaultPath('temp', 'environment.temperature') 
         .read=(buffer)=>{
                 return (27315+(((buffer[8] & 0x0F)/10 + (buffer[9] & 0x7F)) * (((buffer[9] & 0x80)>0)?100:-100)))/100

package/sensor_classes/VictronSmartBatteryProtect.js

@@ -26,6 +26,7 @@ class VictronSmartBatteryProtect extends VictronSensor{
 
     initSchema(){
         super.initSchema()
+        this.addDefaultParam("id")
         this.addMetadatum('deviceState','', 'device state', 
             (buff)=>{return VC.OperationMode.get(buff.readUInt8(1))})
         this.addMetadatum('outputStatus','', 'output status', //TODO

package/sensor_classes/XiaomiMiBeacon.js

@@ -207,6 +207,8 @@ class XiaomiMiBeacon extends BTSensor{
     }   
     initSchema(){
         super.initSchema()
+        this.addDefaultParam("zone")
+
         this.addParameter(
             "encryptionKey",
             {

package/src/components/PluginConfigurationPanel.js

@@ -5,8 +5,7 @@ import {useEffect, useState} from 'react'
 
 import {Button, Grid} from '@material-ui/core';
 
-
-import {  SignalCellular0Bar, SignalCellular1Bar, SignalCellular2Bar, SignalCellular3Bar, SignalCellular4Bar, SignalCellularConnectedNoInternet0Bar    } from '@material-ui/icons';
+import { SignalCellular0Bar, SignalCellular1Bar, SignalCellular2Bar, SignalCellular3Bar, SignalCellular4Bar, SignalCellularConnectedNoInternet0Bar    } from '@material-ui/icons';
 
 const log = (type) => console.log.bind(console, type);
 
@@ -111,13 +110,14 @@ export default (props) => {
       if (response.status != 200) {
         throw new Error(response.statusText)
       }
-      debugger
+      sensorMap.get(data.mac_address)._changesMade=false
       sensorMap.get(data.mac_address).config = data
       
     })
   }
 
   function undoChanges(mac) {
+    sensorMap.get(mac)._changesMade = false
     setSensorData( sensorMap.get(mac).config )
   }
 
@@ -289,7 +289,7 @@ useEffect(()=>{
         }
         }> 
         <div  class="d-flex justify-content-between align-items-center" style={hasConfig?{fontWeight:"normal"}:{fontStyle:"italic"}}>
-        {`${sensor.info.name} MAC: ${sensor.info.mac} RSSI: ${ifNullNaN(sensor.info.RSSI)}`  }
+        {`${sensor._changesMade?"*":""}${sensor.info.name} MAC: ${sensor.info.mac} RSSI: ${ifNullNaN(sensor.info.RSSI)}`  }
         <div class="d-flex justify-content-between ">
           {
             signalStrengthIcon(sensor)
@@ -329,7 +329,8 @@ useEffect(()=>{
                      now={progress.progress} 
         />:""
       }
-      <h2>{`${sensorMap.size>0?" Bluetooth Devices click to configure":""}`}</h2>
+      <h2>{`${sensorMap.size>0?"Bluetooth Devices click to configure" :""}`}</h2>
+      <h2>{`${sensorMap.size>0?"(* means sensor has unsaved changes)" :""}`}</h2>
       <p></p>
       <div style={{paddingBottom: 20}} class="d-flex flex-wrap justify-content-start align-items-start">
       <ListGroup style={{  maxHeight: '300px', overflowY: 'auto' }}>
@@ -340,7 +341,14 @@ useEffect(()=>{
         schema={schema}
         validator={validator}
         uiSchema={uiSchema}
-        onChange={(e) => setSensorData(e.formData)}
+        onChange={(e) => {
+            const s = sensorMap.get(e.formData.mac_address)
+            s._changesMade=true
+            //s.config = e.formData; 
+
+            setSensorData(e.formData)
+          }
+        }
         onSubmit={({ formData }, e) => {
           console.log(formData) 
           updateSensorData(formData)