@ncd-io/node-red-enterprise-sensors 0.1.21 → 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,108,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,108,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
@@ -1159,6 +1166,12 @@ module.exports = class WirelessSensor{
 		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');
@@ -5351,7 +5364,13 @@ function sensor_types(parent){
 		},
 		'108': {
 			name: 'Machine Uptime Monitoring Sensor',
-			parse: (d) => {
+			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),
@@ -6332,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.21",
+    "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,8 @@
 			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:""},
@@ -470,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",
@@ -723,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>
@@ -737,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-108 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">
@@ -1053,18 +1059,35 @@
 			</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 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 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 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>
+			<div class="ncd-dependent" data-sensor-44 data-sensor-535>
 				<div class="form-row ncd-active-check">
 					<div>
 						<strong>Temperature Offset</strong>
@@ -1765,6 +1788,23 @@
 			</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">

package/wireless.js

@@ -888,6 +888,9 @@ module.exports = function(RED) {
 								}
 								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);
 								}
@@ -981,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));