@ncd-io/node-red-enterprise-sensors 0.1.4 → 0.1.6

package/lib/WirelessGateway.js

@@ -62,7 +62,7 @@ module.exports = class WirelessSensor{
 			var new_mode = is_new;
 			var mode = (type == 'power_up') ? data.mode : ((type == 'sensor_data') ? 'RUN' : ((type == 'config_ack') ? 'ACK' : 'PGM'));
 			// #OTF
-			var otf_devices = [80,81,82,84,101,102,519,520];
+			var otf_devices = [80,81,82,84,89,101,102,519,520];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -79,6 +79,9 @@ module.exports = class WirelessSensor{
 				}else{
 					data.sensor_type = msbLsb(frame.data[3], frame.data[4]);
 				}
+				if(data.sensor_type == 0){
+					data.sensor_type = msbLsb(frame.data[3], frame.data[4]);
+				}
 				if(frame.data[7] == 79 && frame.data[8] == 84 && frame.data[9] == 78){
 					mode = "OTN";
 				}
@@ -123,8 +126,18 @@ module.exports = class WirelessSensor{
 			}
 			// mode === 'ACK' check added to allow multiple configs through front end gateway input
 			if(new_mode || mode === 'ACK'){
-				that._emitter.emit('sensor_mode', that.sensor_pool[frame.mac]);
-				that._emitter.emit('sensor_mode-'+frame.mac, that.sensor_pool[frame.mac]);
+				// If RSSI is not enabled send stored values, if it is, request the RSSI and temporarily append it.
+				if(typeof frame.rssi == 'undefined'){
+					that._emitter.emit('sensor_mode', that.sensor_pool[frame.mac]);
+					that._emitter.emit('sensor_mode-'+frame.mac, that.sensor_pool[frame.mac]);
+				}else{
+					frame.rssi.then((v) => {
+						let sensor_pool_rssi = that.sensor_pool[frame.mac];
+						sensor_pool_rssi.rssi = v.data[0];
+						that._emitter.emit('sensor_mode', sensor_pool_rssi);
+						that._emitter.emit('sensor_mode-'+frame.mac, sensor_pool_rssi);
+					}).catch(console.log);
+				}
 			}
 			if(mode != 'FLY'){
 				var send_events = function(){
@@ -201,7 +214,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [80,81,82,84,101,102,519,520];
+		var otf_devices = [80,81,82,84,89,101,102,519,520];
 		if(otf_devices.includes(parsed.sensor_type)){
 			// If the message says FLY and there is not FLY timer in progress.
 			if(payload[8] == 70 && payload[9] == 76 && payload[10] == 89) {
@@ -995,6 +1008,31 @@ module.exports = class WirelessSensor{
 		return this.config_send(sensor_mac, packet);
 	}
 
+	config_set_low_calibration_420ma(sensor_mac, value){
+		console.log('config_set_low_calibration_420ma');
+		let packet = [244, 66, 0, 0, 45, 1];
+		let calibration = int2Bytes((value), 4);
+		packet.push(...calibration);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_mid_calibration_420ma(sensor_mac, value){
+		console.log('config_set_mid_calibration_420ma');
+		let packet = [244, 66, 0, 0, 45, 2];
+		let calibration = int2Bytes((value), 4);
+		packet.push(...calibration);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_high_calibration_420ma(sensor_mac, value){
+		console.log('config_set_high_calibration_420ma');
+		let packet = [244, 66, 0, 0, 45, 3];
+		let calibration = int2Bytes((value), 4);
+		packet.push(...calibration);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+
 	config_get_delay(sensor_mac){
 		return new Promise((fulfill, reject) => {
 			this.config_send(sensor_mac, [247, 21, 0, 0, 0]).then((res) => {
@@ -4058,7 +4096,7 @@ function sensor_types(parent){
 		},
 
 		'84': {
-			name: 'Type 84 - Vibration on a stick',
+			name: 'Type 84 - Standalone Smart Vibration Sensor',
 			parse: (payload, parsed, mac) => {
 				if(payload[7] >> 1 != 0){
 					console.log('Error found');
@@ -4613,7 +4651,27 @@ function sensor_types(parent){
 				}
 			}
 		},
-
+		'89': {
+			name: '2 Channel Ultrasound Vibration Sensor',
+			parse: (d) => {
+				return {
+					c1_raw_adc: d.slice(0, 2).reduce(msbLsb),
+					c1_ma: d.slice(2, 4).reduce(msbLsb) / 100,
+					c1_db: d.slice(4, 6).reduce(msbLsb) / 100,
+					c2_raw_adc: d.slice(6, 8).reduce(msbLsb),
+					c2_ma: d.slice(8, 10).reduce(msbLsb) / 100,
+					c2_db: d.slice(10, 12).reduce(msbLsb) / 100
+				};
+			}
+		},
+		'92': {
+			name: 'Sound Sensor',
+			parse: (d) => {
+				return {
+					sound: signInt(d[3], 8)/100
+				};
+			}
+		},
 		'101':{
 			name: 'Pro Vibration',
 			parse: (d, full)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ncd-io/node-red-enterprise-sensors",
-    "version": "0.1.4",
+    "version": "0.1.6",
     "description": "",
     "main": "index.js",
     "scripts": {