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

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,76,78,79,80,81,82,84,88,89,90,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,108,519,520,521,531,535,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,76,78,79,80,81,82,84,88,89,90,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,108,519,520,521,531,535,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) {
@@ -912,6 +912,13 @@ module.exports = class WirelessSensor{
 		packet.push(...cal_val);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_sensor_forced_calibration_535(sensor_mac){
+		console.log('config_set_sensor_forced_calibration_535');
+		// convert before processing
+		var packet = [244, 32, 0, 0, 0];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_sensor_temperature_offset_44(sensor_mac, value){
 		console.log('config_set_sensor_temperature_offset_44');
 		// convert before processing
@@ -1140,6 +1147,32 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+
+	config_set_accelerometer_threshold_108(sensor_mac, value){
+		console.log('config_set_accelerometer_threshold_108');
+		var packet = [244, 32, 0, 0, 0, 1, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_debounce_time_108(sensor_mac, value){
+		console.log('config_set_debounce_time_108');
+		var packet = [244, 39, 0, 0, 0, 64, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_clear_timers_108(sensor_mac){
+		console.log('config_clear_timers_108');
+		var packet = [244, 36, 0, 0, 0, 7];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_accelerometer_state_108(sensor_mac, value){
+		console.log('config_set_accelerometer_state_108');
+		var packet = [244, 37, 0, 0, 0, 7, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+
 	config_set_sensor_boot_time_420ma(sensor_mac, value){
 		console.log('sensor_boot_time_420ma');
 		var packet = [244, 68, 0, 0, 45, value];
@@ -5329,6 +5362,29 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'108': {
+			name: 'Machine Uptime Monitoring Sensor',
+			parse: (d, payload) => {
+				if(payload[7] & 2 != 0){
+					console.log('Error found');
+					// parsed.data = {error: 'Error found, Acclerometer Probe may be unattached'};
+					let error = {error: 'Error found, Acclerometer Probe may be unattached'};
+					return error;
+				}
+				return {
+					digital_input_1_counter: d.slice(0, 4).reduce(msbLsb),
+					digital_input_1_uptime: d.slice(4, 8).reduce(msbLsb),
+					digital_input_2_counter: d.slice(8, 12).reduce(msbLsb),
+					digital_input_2_uptime: d.slice(12, 16).reduce(msbLsb),
+					digital_input_3_counter: d.slice(16, 20).reduce(msbLsb),
+					digital_input_3_uptime: d.slice(20, 24).reduce(msbLsb),
+					accelerometer_counter: d.slice(24, 28).reduce(msbLsb),
+					accelerometer_uptime: d.slice(28, 32).reduce(msbLsb),
+					magnetometer_counter: d.slice(32, 36).reduce(msbLsb),
+					magnetometer_uptime: d.slice(36, 40).reduce(msbLsb)
+				};
+			}
+		},
 		'200': {
 			name: '4-20mA Pass Through',
 			parse: (d) => {
@@ -6295,6 +6351,16 @@ function sensor_types(parent){
 				}
 			}
 		},
+		'535': {
+			name: 'Custom Wireless CO2 Gas Sensor',
+			parse: (d) => {
+				return {
+					humidity: msbLsb(d[0], d[1])/100,
+					temperature: signInt((msbLsb(d[2], d[3])), 16)/100,
+					co2: msbLsb(d[4], d[5])
+				};
+			}
+		},
 		'537': {
 			name: 'Type 537 - Custom Standalone Smart Vibration Sensor',
 			parse: (payload, parsed, mac) => {

package/package.json

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

package/wireless.html

@@ -226,6 +226,8 @@
 			force_calibration_co2_auto_config: {value: ""},
 			force_calibration_co2: {value: 400, validate: NCD_validators.number_range(400, 2000)},
 
+			force_calibration_co2_535_active: {value: ""},
+
 			temperature_offset_44_active: {value: ""},
 			temperature_offset_44: {value: 4, validate: NCD_validators.number_range(0, 25)},
 
@@ -340,6 +342,14 @@
 			pitch_angle_threshold_47:{value:0, validate: NCD_validators.number_range(0, 255)},
 			pitch_angle_threshold_47_active:{value:""},
 
+			accelerometer_state_108:{value:0},
+			accelerometer_state_108_active:{value:""},
+			clear_all_counters_108:{value:0},
+			accelerometer_threshold_108:{value:10, validate: NCD_validators.number_range(0, 255)},
+			accelerometer_threshold_108_active:{value:""},
+			debounce_time_108:{value:10, validate: NCD_validators.number_range(0, 255)},
+			debounce_time_108_active:{value:""},
+
 			counter_threshold_35:{value:50, validate: NCD_validators.number_range(0, 65534)},
 			counter_threshold_35_active:{value:""},
 
@@ -450,6 +460,7 @@
 					"101": "101 - Pro Vibration",
 					"102": "102 - Strain Gauge",
 					"107": "107 - 4 Channel 4-20mA Receiver",
+					"108": "108 - Machine Uptime Monitoring Sensor",
 					"200": "200 - 4-20mA Pass Through",
 					"202": "202 - Weather Station",
 					"502": "502 - C_50-27",
@@ -463,6 +474,7 @@
 					"521": "521 - Custom 3 Channel Light Sensor",
 					"524": "524 - SDI Multi Soil Probe",
 					"531": "531 - Custom Noise Sensor",
+					"535": "535 - Custom CO2 Sensor",
 					"537": "537 - Custom Standalone Smart Vibration Sensor",
 					"10000": "10000 - 4-Channel Relay",
 					"10006": "10006 - 4-Channel 4-20 mA Input",
@@ -702,6 +714,7 @@
 			<option value="101">101 - Pro Vibration</option>
 			<option value="102">102 - Strain Gauge</option>
 			<option value="107">107 - 4 Channel 4-20mA Receiver</option>
+			<option value="108">108 - Machine Uptime Monitoring Sensor</option>
 			<option value="200">200 - 4-20mA Pass Through</option>
 			<option value="202">202 - Weather Station</option>
 			<option value="502">502 - C_50-27</option>
@@ -715,6 +728,7 @@
 			<option value="521">521 - Custom 3 Channel Light Sensor</option>
 			<option value="524">524 - SDI Multi Soil Probe</option>
 			<option value="531">531 - Custom Noise Sensor</option>
+			<option value="535">535 - Custom CO2 Sensor</option>
 			<option value="537">537 - Custom Standalone Smart Vibration Sensor</option>
 			<option value="10000">10000 - 4-Channel Relay</option>
 			<option value="10006">10006 - 4-Channel 4-20 mA Input</option>
@@ -729,7 +743,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-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>
+			<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-108 data-sensor-519 data-sensor-520 data-sensor-521 data-sensor-531 data-sensor-535 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">
@@ -1045,30 +1059,47 @@
 			</div>
 			<div class="ncd-dependent" data-sensor-44>
 				<hr>
-				<div class="form-row">
-					<p><strong>Advanced: Set Sensor Forced Calibration</strong></p>
-					<p>This command will take 3 minutes to execute as the sensor calibrates. Do not reboot the sensor during this time. The configuration completed command through the UI is referring to the receipt and acknowledgement of the configuration packet.</p>
-				</div>
-				<div class="form-row">
-					<label for="node-input-force_calibration_co2_auto_config"><i class="icon-tag"></i>  Auto Config</label>
-					<input type="checkbox" id="node-input-force_calibration_co2_auto_config" class="ncd-config-toggle" data-target-id="node-input-force_calibration_co2" value="1">
-				</div>
-				<div class="form-row">
-					<label for="node-input-force_calibration_co2"><i class="icon-tag"></i>  Value</label>
-					<input type="text" id="node-input-force_calibration_co2" placeholder="455" value="455">
+				<div class="form-row ncd-active-check">
+					<div class="form-row">
+						<p><strong>Advanced: Set Sensor Forced Calibration</strong></p>
+						<p>This command will take 3 minutes to execute as the sensor calibrates. Do not reboot the sensor during this time. The configuration completed command through the UI is referring to the receipt and acknowledgement of the configuration packet.</p>
+					</div>
+					<div class="form-row">
+						<label for="node-input-force_calibration_co2_auto_config"><i class="icon-tag"></i>  Auto Config</label>
+						<input type="checkbox" id="node-input-force_calibration_co2_auto_config" class="ncd-config-toggle" data-target-id="node-input-force_calibration_co2" value="1">
+					</div>
+					<div class="form-row">
+						<label for="node-input-force_calibration_co2"><i class="icon-tag"></i>  Value</label>
+						<input type="text" id="node-input-force_calibration_co2" placeholder="455" value="455">
+					</div>
 				</div>
 			</div>
-			<div class="form-row ncd-active-check">
-				<div>
-					<strong>Temperature Offset</strong>
-				</div>
-				<div>
-					<label for="node-input-temperature_offset_44_active"><i class="icon-tag"></i>  Auto Config</label>
-					<input type="checkbox" id="node-input-temperature_offset_44_active" class="ncd-config-toggle" data-target-id="node-input-temperature_offset_44" value="1">
+			<div class="ncd-dependent" data-sensor-535>
+				<hr>
+				<div class="form-row ncd-active-check">
+					<div class="form-row">
+						<p><strong>Advanced: Set Sensor Forced Calibration</strong></p>
+						<p>This command will take 10 minutes to execute as the sensor calibrates. Do not reboot the sensor during this time. The configuration completed command through the UI is referring to the receipt and acknowledgement of the configuration packet.</p>
+					</div>
+					<div class="form-row">
+						<label for="node-input-force_calibration_co2_535_active"><i class="icon-tag"></i>Enable</label>
+						<input type="checkbox" id="node-input-force_calibration_co2_535_active" class="ncd-config-toggle" value="1">
+					</div>
 				</div>
-				<div>
-					<label for="node-input-temperature_offset_44"><i class="icon-tag"></i>  Value</label>
-					<input type="text" id="node-input-temperature_offset_44" placeholder="4" value="4">
+			</div>
+			<div class="ncd-dependent" data-sensor-44 data-sensor-535>
+				<div class="form-row ncd-active-check">
+					<div>
+						<strong>Temperature Offset</strong>
+					</div>
+					<div>
+						<label for="node-input-temperature_offset_44_active"><i class="icon-tag"></i>  Auto Config</label>
+						<input type="checkbox" id="node-input-temperature_offset_44_active" class="ncd-config-toggle" data-target-id="node-input-temperature_offset_44" value="1">
+					</div>
+					<div>
+						<label for="node-input-temperature_offset_44"><i class="icon-tag"></i>  Value</label>
+						<input type="text" id="node-input-temperature_offset_44" placeholder="4" value="4">
+					</div>
 				</div>
 			</div>
 			<div class="ncd-dependent" data-sensor-84 data-sensor-519 data-sensor-537>
@@ -1755,6 +1786,59 @@
 					</div>
 				</div>
 			</div>
+
+			<div class="ncd-dependent" data-sensor-108>
+				<div class="form-row ncd-active-check">
+					<strong>Enable Accelerometer Error Reporting</strong>
+					<p class="caption">
+						Enables error reporting for the accelerometer probe. If this option is enabled errors will be reported when the accelerometer probe is non-functional.
+					</p>
+					<div>
+						<label for="node-input-accelerometer_state_108_active">Active:</label>
+						<input type="checkbox" id="node-input-accelerometer_state_108_active" class="ncd-config-toggle" data-target-id="node-input-accelerometer_state_108" value="1">
+					</div>
+					<div>
+						<label for="node-input-accelerometer_state_108"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-accelerometer_state_108">
+							<option value="0" selected>Disabled</option>
+							<option value="1">Enabled</option>
+						</select>
+					</div>
+				</div>
+				<div class="form-row">
+					<label for="node-input-clear_all_counters_108"><i class="icon-tag"></i>Clear All Counters</label>
+					<input type="checkbox" id="node-input-clear_all_counters_108" value="1">
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Set Accelerometer Threshold</strong>
+					<p class="caption">
+						Sets the threshold in multiples of 32mg in which an uptime will be detected. A value of 1 = 32mg, a value of 2 = 64mg etc.
+					</p>
+					<div>
+						<label for="node-input-accelerometer_threshold_108_active">Active:</label>
+						<input type="checkbox" id="node-input-accelerometer_threshold_108_active" class="ncd-config-toggle" data-target-id="node-input-accelerometer_threshold_108" value="1">
+					</div>
+					<div>
+						<label for="node-input-accelerometer_threshold_108"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-accelerometer_threshold_108" placeholder="10" value="10">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Set Input Debounce Time</strong>
+					<p class="caption">
+						Sets the debounce time in milliseconds on inputs. State changes to the input during this debounce time will be ignored. Generally recommended for mechanically triggered state changes such as button or relay/contactor outputs.
+					</p>
+					<div>
+						<label for="node-input-debounce_time_108_active">Active:</label>
+						<input type="checkbox" id="node-input-debounce_time_108_active" class="ncd-config-toggle" data-target-id="node-input-debounce_time_108" value="1">
+					</div>
+					<div>
+						<label for="node-input-debounce_time_108"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-debounce_time_108" placeholder="10" value="10">
+					</div>
+				</div>
+			</div>
+
 			<div class="ncd-dependent" data-sensor-35 data-sensor-36>
 				<hr>
 				<div class="form-row ncd-active-check">

package/wireless.js

@@ -887,6 +887,20 @@ module.exports = function(RED) {
 									promises.high_calibration_420ma = node.config_gateway.config_set_high_calibration_420ma(mac, parseInt(config.high_calibration_420ma));
 								}
 								break;
+							case 108:
+								if(config.accelerometer_state_108_active){
+									promises.accelerometer_state_108 = node.config_gateway.config_set_accelerometer_state_108(mac, parseInt(config.accelerometer_state_108));
+								}
+								if(config.clear_all_counters_108){
+									promises.clear_all_counters_108 = node.config_gateway.config_clear_timers_108(mac);
+								}
+								if(config.accelerometer_threshold_108_active){
+									promises.accelerometer_threshold_108 = node.config_gateway.config_set_accelerometer_threshold_108(mac, parseInt(config.accelerometer_threshold_108));
+								}
+								if(config.debounce_time_108_active){
+									promises.debounce_time_108 = node.config_gateway.config_set_debounce_time_108(mac, parseInt(config.debounce_time_108));
+								}
+								break;
 							case 200:
 								if(config.low_calibration_420ma_active){
 									promises.low_calibration_420ma = node.config_gateway.config_set_low_calibration_420ma(mac, parseInt(config.low_calibration_420ma));
@@ -970,6 +984,14 @@ module.exports = function(RED) {
 									promises.set_rtc_101 = node.config_gateway.config_set_rtc_101(mac);
 								}
 								break;
+							case 535:
+								if(config.force_calibration_co2_535_active){
+									promises.force_calibration_co2_535 = node.config_gateway.config_set_sensor_forced_calibration_535(mac);
+								}
+								if(config.temperature_offset_44_active){
+									promises.temperature_offset_44 = node.config_gateway.config_set_sensor_temperature_offset_44(mac, parseInt(config.temperature_offset_44));
+								}
+								break;
 							case 537:
 								if(config.output_data_rate_101_active){
 									promises.output_data_rate_101 = node.config_gateway.config_set_output_data_rate_101(mac, parseInt(config.output_data_rate_101));