@ncd-io/node-red-enterprise-sensors 0.1.18 → 0.1.20

package/lib/WirelessGateway.js

@@ -137,7 +137,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 = [23,26,39,45,48,52,78,79,80,81,82,84,88,89,91,101,102,107,519,520,521,531,537];
+			var otf_devices = [23,26,39,45,48,52,76,78,79,80,81,82,84,88,89,90,91,101,102,107,519,520,521,531,537];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -289,7 +289,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [23,26,39,45,48,52,78,79,80,81,82,84,88,89,91,101,102,107,519,520,521,531,537];
+		var otf_devices = [23,26,39,45,48,52,76,78,79,80,81,82,84,88,89,90,91,101,102,107,519,520,521,531,537];
 		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) {
@@ -836,6 +836,35 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_periodic_check_rate_76(sensor_mac, value){
+		console.log('config_set_periodic_check_rate');
+		let rate = int2Bytes((value), 2);
+		var packet = [244, 32, 0, 0, 0];
+		packet.push(...rate);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_ppm_threshold_76(sensor_mac, value){
+		console.log('config_set_ppm_threshold_76');
+		let rate = int2Bytes((value), 2);
+		var packet = [244, 36, 0, 0, 0];
+		// packet.push(...rate);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_alert_duration_76(sensor_mac, value){
+		console.log('config_set_alert_duration_76');
+		var packet = [244, 38, 0, 0, value];
+		// packet.push(...rate);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_sensor_boot_time_76(sensor_mac, value){
+		console.log('config_set_sensor_boot_time_76');
+		var packet = [244, 36, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_data_rate_24(sensor_mac, value){
 		console.log('config_set_data_rate_24');
 		var packet = [244, 2, 0, 0, 0, value];
@@ -2478,11 +2507,12 @@ function sensor_types(parent){
 			name: 'Wireless CO Sensor',
 			parse: (d) => {
 				return {
-					CO_ppm: signInt(d.slice(0, 2).reduce(msbLsb), 16) / 100
+					humidity: msbLsb(d[0], d[1])/100,
+					temperature: signInt((msbLsb(d[2], d[3])), 16)/100,
+					co_ppm: msbLsb(d[4], d[5])
 				};
 			}
 		},
-
 		'77': {
 			name: '3 Channel SDI-12 Wireelss',
 			parse: (d) => {
@@ -5225,6 +5255,15 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'90': {
+			name: 'DC Current Sensor',
+			parse: (d) => {
+				return {
+					raw_adc: d.slice(0, 2).reduce(msbLsb),
+					amps: d.slice(2, 6).reduce(msbLsb) / 10,
+				};
+			}
+		},
 		'91': {
 			name: 'Wireless Air Velocity Sensor HVAC',
 			parse: (d) => {

package/package.json

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

package/wireless.html

@@ -237,6 +237,21 @@
 			mode_80_active: {value: ""},
 			mode_80: {value: 0},
 
+			periodic_check_rate_76_active: {value: ""},
+			periodic_check_rate_76: {value: 60, validate: NCD_validators.number_range(60, 255)},
+
+			ppm_threshold_76_active: {value: ""},
+			ppm_threshold_76: {value: 100, validate: NCD_validators.number_range(0, 1000)},
+
+			alert_duration_76_active: {value: ""},
+			alert_duration_76: {value: 0, validate: NCD_validators.number_range(0, 255)},
+
+			ppm_threshold_76_active: {value: ""},
+			ppm_threshold_76: {value: 100, validate: NCD_validators.number_range(0, 1000)},
+
+			sensor_boot_time_76_active: {value: ""},
+			sensor_boot_time_76: {value: 30, validate: NCD_validators.number_range(0, 255)},
+
 			measurement_mode_80_active: {value: ""},
 			measurement_mode_80: {value: 0},
 
@@ -427,6 +442,7 @@
 					"84": "84 - Standalone Smart Vibration Sensor",
 					"88": "88 - 1 Channel Ultrasound Vibration Sensor",
 					"89": "89 - 2 Channel Ultrasound Vibration Sensor",
+					"90": "90 - DC Current Sensor",
 					"91": "91 - Wireless Air Velocity Sensor HVAC",
 					"92": "92 - Sound Sensor",
 					"95": "95 - 16-Bit 1-Channel 0-24VDC Receiver",
@@ -678,6 +694,7 @@
 			<option value="84">84 - Standalone Smart Vibration Sensor</option>
 			<option value="88">88 - 1 Channel Ultrasound Vibration Sensor</option>
 			<option value="89">89 - 2 Channel Ultrasound Vibration Sensor</option>
+			<option value="90">90 - DC Current Sensor</option>
 			<option value="91">91 - Wireless Air Velocity Sensor HVAC</option>
 			<option value="92">92 - Sound Sensor</option>
 			<option value="95">95 - 16-Bit 1-Channel 0-24VDC Receiver</option>
@@ -712,7 +729,7 @@
 				<label for="node-input-auto_config"><i class="icon-tag"></i> Auto Config</label>
 				<input class="section-control" type="checkbox" id="node-input-auto_config" value="1">
 			</div>
-			<div class="form-row ncd-dependent" data-sensor-23 data-sensor-26 data-sensor-39 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-78 data-sensor-79 data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-88 data-sensor-89 data-sensor-91 data-sensor-101 data-sensor-102 data-sensor-107 data-sensor-519 data-sensor-520 data-sensor-521 data-sensor-531 data-sensor-537>
+			<div class="form-row ncd-dependent" data-sensor-23 data-sensor-26 data-sensor-39 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-76 data-sensor-78 data-sensor-79 data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-88 data-sensor-89 data-sensor-90 data-sensor-91 data-sensor-101 data-sensor-102 data-sensor-107 data-sensor-519 data-sensor-520 data-sensor-521 data-sensor-531 data-sensor-537>
 				<hr>
 				<label for="node-input-on_the_fly_enable"><i class="icon-tag"></i> OTF Config*</label>
 				<input type="checkbox" id="node-input-on_the_fly_enable" value="1">
@@ -1120,6 +1137,7 @@
 				<hr>
 				<div class="form-row ncd-active-check">
 					<strong>Mode</strong>
+					<p>WARNING: If Mode is set to Raw it is recommended to also set the Destination Address configuration to the address of your Receiver/Gateway.</p>
 					<div>
 						<label for="node-input-mode_80_active"><i class="icon-tag"></i>Active:</label>
 						<input type="checkbox" id="node-input-mode_80_active" class="ncd-config-toggle" data-target-id="node-input-mode_80" value="1">
@@ -1327,6 +1345,52 @@
 					</div>
 				</div>
 			</div>
+			<div class="ncd-dependent" data-sensor-76>
+				<div class="form-row ncd-active-check">
+					<strong>Periodic Check Rate</strong>
+					<div>
+						<label for="node-input-periodic_check_rate_76_active"><i class="icon-tag"></i>Active:</label>
+						<input type="checkbox" id="node-input-periodic_check_rate_76_active" class="ncd-config-toggle" data-target-id="node-input-periodic_check_rate_76" value="1">
+					</div>
+					<div>
+						<label for="node-input-periodic_check_rate_76"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-periodic_check_rate_76" value="60">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>PPM Threshold</strong>
+					<div>
+						<label for="node-input-ppm_threshold_76_active"><i class="icon-tag"></i>Active:</label>
+						<input type="checkbox" id="node-input-ppm_threshold_76_active" class="ncd-config-toggle" data-target-id="node-input-ppm_threshold_76" value="1">
+					</div>
+					<div>
+						<label for="node-input-ppm_threshold_76"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-ppm_threshold_76" placeholder="100">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Set Alert Duration</strong>
+					<div>
+						<label for="node-input-alert_duration_76_active"><i class="icon-tag"></i>Active:</label>
+						<input type="checkbox" id="node-input-alert_duration_76_active" class="ncd-config-toggle" data-target-id="node-input-alert_duration_76" value="1">
+					</div>
+					<div>
+						<label for="node-input-alert_duration_76"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-alert_duration_76" placeholder="0">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Sensor Boot Time</strong>
+					<div>
+						<label for="node-input-sensor_boot_time_76_active"><i class="icon-tag"></i>Active:</label>
+						<input type="checkbox" id="node-input-sensor_boot_time_76_active" class="ncd-config-toggle" data-target-id="node-input-sensor_boot_time_76" value="1">
+					</div>
+					<div>
+						<label for="node-input-sensor_boot_time_76"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-sensor_boot_time_76" value="30">
+					</div>
+				</div>
+			</div>
 			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-519 data-sensor-537>
 				<div class="form-row ncd-active-check">
 					<strong>Set Filtering</strong>

package/wireless.js

@@ -572,6 +572,19 @@ module.exports = function(RED) {
 									promises.high_calibration_420ma = node.config_gateway.config_set_high_calibration_420ma(mac, parseInt(config.high_calibration_420ma));
 								}
 								break;
+							case 76:
+								if(config.periodic_check_rate_76_active){
+									promises.periodic_check_rate_76 = node.config_gateway.config_set_periodic_check_rate_76(mac, parseInt(config.periodic_check_rate_76));
+								}
+								if(config.sensor_boot_time_76_active){
+									promises.sensor_boot_time_76 = node.config_gateway.config_set_sensor_boot_time_76(mac, parseInt(config.sensor_boot_time_76));
+								}
+								if(config.ppm_threshold_76_active){
+									promises.ppm_threshold_76 = node.config_gateway.config_set_ppm_threshold_76(mac, parseInt(config.ppm_threshold_76));
+								}
+								if(config.alert_duration_76_active){
+									promises.alert_duration_76 = node.config_gateway.config_set_alert_duration_76(mac, parseInt(config.alert_duration_76));
+								}
 							case 78:
 								if(config.sensor_boot_time_78_active){
 									promises.sensor_boot_time_78 = node.config_gateway.config_set_sensor_boot_time_78(mac, parseInt(config.sensor_boot_time_78));