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

package/lib/WirelessGateway.js

@@ -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(){
@@ -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');

package/package.json

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

package/wireless.html

@@ -65,63 +65,63 @@
 </script>
 
 <style>
-    .ncd-active-check strong{
-        width: 100%;
-    }
-    .form-row.ncd-active-check{
-        margin: 12px 0px;
-        border: 1px solid #eee;
-        padding: 12px;
-        border-radius: 8px;
-    }
-    .form-row.ncd-active-check > div{
-        padding: 4px;
-    }
-    .form-row.ncd-active-check > div > input[type='checkbox']{
-        width: inherit;
-    }
-    .form-row .caption{
-        font-size: .95em;
+	.ncd-active-check strong{
+		width: 100%;
+	}
+	.form-row.ncd-active-check{
+		margin: 12px 0px;
+		border: 1px solid #eee;
+		padding: 12px;
+		border-radius: 8px;
+	}
+	.form-row.ncd-active-check > div{
+		padding: 4px;
+	}
+	.form-row.ncd-active-check > div > input[type='checkbox']{
+		width: inherit;
+	}
+	.form-row .caption{
+		font-size: .95em;
 		padding-left: 1em;
 		margin-top: .25em;
-    }
+	}
 </style>
 
 <script type="text/x-red" data-help-name="ncd-gateway-node">
-    <h3>Gateway Node</h3>
+	<h3>Gateway Node</h3>
 	<p>This node is primarily useful for debugging and configuring sensors. This node is equipped with a button on the flow that switches the modem between configuration and listening mode.</p>
 	<h3>Output</h3>
 	<p>Any time sensor data is received from any sensor on the network, this node will output a message containing all pertinant information as in the example below.</p>
-  <h3>Input</h3>
-  <p>The Input connection to this Gateway node allows for sending data to devices.  The input connection expects the payload to be an object containging an address and data variable.  Address is a string representation of the destination device.  Data is a byte array of data to be transmitted as payload to that device.  Example "payload":{"address":"00:13:A2:00:01:02:03:04",data:[254,108,1]}</p>
-  <pre>
-  msg = {
-    topic: "sensor_data",
-    payload: {
-      nodeId: 0,
-      firmware: 3,
-      battery: 3.2940600000000004,
-      counter: 37,
-      sensor_type: 1,
-      sensor_data: {
-        humidity: 45.51,
-        temperature: 23.91,
-      },
-      type: "sensor_data",
-      addr: "00:13:a2:00:41:07:18:81",
-      original: {
-        mac: "00:13:a2:00:41:07:18:81",
-        receive_options: {
-          ack: 0,
-          broadcast: 0,
-          type: ""
-        }
-      },
-      data: [127,0,3,3,255,37,0,1,0,17,199,9,87],
-      type: "receive_packet"
-    },
-    _msgid: "391caba.5a19454"
-  }
+	<h3>Input</h3>
+	<p>The Input connection to this Gateway node allows for sending data to devices.  The input connection expects the payload to be an object containging an address and data variable.  Address is a string representation of the destination device.  Data is a byte array of data to be transmitted as payload to that device.  Example "payload":{"address":"00:13:A2:00:01:02:03:04",data:[254,108,1]}</p>
+	<pre>
+		msg = {
+			topic: "sensor_data",
+			payload: {
+				nodeId: 0,
+				firmware: 3,
+				battery: 3.2940600000000004,
+				counter: 37,
+				sensor_type: 1,
+				sensor_data: {
+					humidity: 45.51,
+					temperature: 23.91,
+				},
+				type: "sensor_data",
+				addr: "00:13:a2:00:41:07:18:81",
+				original: {
+					mac: "00:13:a2:00:41:07:18:81",
+					receive_options: {
+						ack: 0,
+						broadcast: 0,
+						type: ""
+					}
+				},
+				data: [127,0,3,3,255,37,0,1,0,17,199,9,87],
+				type: "receive_packet"
+			},
+			_msgid: "391caba.5a19454"
+		}
 	</pre>
 </script>
 
@@ -323,6 +323,13 @@
 
 			motion_threshold_46_active:{value:""},
 			motion_threshold_46:{value: 100, validate: NCD_validators.number_range(0, 4294967295)},
+
+			low_calibration_420ma_active:{value:""},
+			low_calibration_420ma:{value: 68805, validate: NCD_validators.number_range(0, 4294967295)},
+			mid_calibration_420ma_active:{value:""},
+			mid_calibration_420ma:{value: 68724, validate: NCD_validators.number_range(0, 4294967295)},
+			high_calibration_420ma_active:{value:""},
+			high_calibration_420ma:{value: 68714, validate: NCD_validators.number_range(0, 4294967295)},
 		},
 		inputs: 0,
 		outputs: 1,
@@ -404,7 +411,7 @@
 					"81": "81 - Two Channel Vibration Plus",
 					"82": "82 - Condition Based/Predictive Maintenance Sensor",
 					"84": "84 - Standalone Smart Vibration Sensor",
-					"89": "89 - 2 Channel Ustrasound Vibration Sensor",
+					"89": "89 - 2 Channel Ultrasound Vibration Sensor",
 					"92": "92 - Sound Sensor",
 					"101": "101 - Pro Vibration",
 					"102": "102 - Strain Gauge",
@@ -519,10 +526,10 @@
 			$('.ncd-config-toggle').each(function(){
 				var handleClick = function(){
 					// if($(this).prop('checked') && $(this).data('target-id')) {
-					//     $('#'+$(this).data('target-id')).prop('disabled', false);
+					//	 $('#'+$(this).data('target-id')).prop('disabled', false);
 					// }
 					// else{
-					//     $('#'+$(this).data('target-id')).prop('disabled', true);
+					//	 $('#'+$(this).data('target-id')).prop('disabled', true);
 					// }
 
 					if($(this).prop('checked')){
@@ -913,7 +920,7 @@
 					</select>
 				</div>
 			</div>
-            <div class="ncd-dependent" data-sensor-40>
+			<div class="ncd-dependent" data-sensor-40>
 				<div class="form-row">
 					<label for="node-input-filtering"><i class="icon-tag"></i> Data Filtering</label>
 					<select id="node-input-filtering">
@@ -1444,7 +1451,7 @@
 				</div>
 			</div>
 
-			<div class="ncd-dependent" data-sensor-14 data-sensor-45 data-sensor-48 data-sensor-52>
+			<div class="ncd-dependent" data-sensor-14 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-89>
 				<div class="form-row ncd-active-check">
 					<strong>Sensor Boot Time</strong>
 					<p class="caption">
@@ -1462,6 +1469,42 @@
 				</div>
 			</div>
 
+			<div class="ncd-dependent" data-sensor-3 data-sensor-14 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-89 data-sensor-200>
+				<div class="form-row ncd-active-check">
+					<strong>Low Calibration Point</strong>
+					<div>
+						<label for="node-input-low_calibration_420ma_active">Active:</label>
+						<input type="checkbox" id="node-input-low_calibration_420ma_active" class="ncd-config-toggle" data-target-id="node-input-low_calibration_420ma" value="1">
+					</div>
+					<div>
+						<label for="node-input-low_calibration_420ma"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-low_calibration_420ma" placeholder="68805" value="68805">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Mid Calibration Point</strong>
+					<div>
+						<label for="node-input-mid_calibration_420ma_active">Active:</label>
+						<input type="checkbox" id="node-input-mid_calibration_420ma_active" class="ncd-config-toggle" data-target-id="node-input-mid_calibration_420ma" value="1">
+					</div>
+					<div>
+						<label for="node-input-mid_calibration_420ma"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-mid_calibration_420ma" placeholder="68724" value="68724">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>High Calibration Point</strong>
+					<div>
+						<label for="node-input-high_calibration_420ma_active">Active:</label>
+						<input type="checkbox" id="node-input-high_calibration_420ma_active" class="ncd-config-toggle" data-target-id="node-input-high_calibration_420ma" value="1">
+					</div>
+					<div>
+						<label for="node-input-high_calibration_420ma"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-high_calibration_420ma" placeholder="68714" value="68714">
+					</div>
+				</div>
+			</div>
+
 			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-505 data-sensor-506>
 				<div class="form-row ncd-active-check">
 					<strong>Channel 1 Current Calibration Value</strong>
@@ -1606,7 +1649,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="ncd-wireless-node">
-    <h3>Wireless Node</h3>
+	<h3>Wireless Node</h3>
 	<p>This node is used to filter sensor data coming from a modem. It can filter by mac address, or sensor type, and can be used to configure wireless devices automatically when they enter configuration mode.</p>
 	<h4>Serial Devices</h4>
 	<p>The Serial Device field refers to the modem that will be recieving the packets from the device. The Serial Device for Config field refers to a modem that is always set to the config network ID (0x7BCD), this is the recommended setup as it allows you to configure nodes without missing potentially important sensor data, however, the config button on the Wireless Gateway node may be used if a single modem will be acting as both the listener, and config endpoints, making the second selection optional.</p>
@@ -1619,37 +1662,37 @@
 	<h4>Output</h4>
 	<p>This node will output detailed information about incoming sensor data, and the device identity and status including. The payload will contain an object containing sensor data, an example can be seen below:</p>
 	<pre>
-  msg = {
-    topic: "sensor_data",
-	payload: {
-      humidity: 45.51,
-      temperature: 23.91,
-	}
-    data: {
-      nodeId: 0,
-      firmware: 3,
-      battery: 3.2940600000000004,
-      counter: 37,
-      sensor_type: 1,
-      sensor_data: {
-        humidity: 45.51,
-        temperature: 23.91,
-      },
-      type: "sensor_data",
-      addr: "00:13:a2:00:41:07:18:81",
-      original: {
-        mac: "00:13:a2:00:41:07:18:81",
-        receive_options: {
-          ack: 0,
-          broadcast: 0,
-          type: ""
-        }
-      },
-      data: [127,0,3,3,255,37,0,1,0,17,199,9,87],
-      type: "receive_packet"
-    },
-    _msgid: "391caba.5a19454"
-  }
+		msg = {
+			topic: "sensor_data",
+			payload: {
+				humidity: 45.51,
+				temperature: 23.91,
+			}
+			data: {
+				nodeId: 0,
+				firmware: 3,
+				battery: 3.2940600000000004,
+				counter: 37,
+				sensor_type: 1,
+				sensor_data: {
+					humidity: 45.51,
+					temperature: 23.91,
+				},
+				type: "sensor_data",
+				addr: "00:13:a2:00:41:07:18:81",
+				original: {
+					mac: "00:13:a2:00:41:07:18:81",
+					receive_options: {
+						ack: 0,
+						broadcast: 0,
+						type: ""
+					}
+				},
+				data: [127,0,3,3,255,37,0,1,0,17,199,9,87],
+				type: "receive_packet"
+			},
+			_msgid: "391caba.5a19454"
+		}
 	</pre>
 </script>