@ncd-io/node-red-enterprise-sensors 1.0.3 → 1.0.4

package/lib/WirelessGateway.js

@@ -142,7 +142,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,105,106,107,108,110,111,112,114,180,181,519,520,521,531,535,537,538,539,540];
+			var otf_devices = [23,26,39,45,48,52,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,519,520,521,531,535,537,538,539,540,1010,1011];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -294,7 +294,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,105,106,107,108,110,111,112,114,180,181,519,520,521,531,535,537,538,539,540];
+		var otf_devices = [23,26,39,45,48,52,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,519,520,521,531,535,537,538,539,540,1010,1011];
 		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) {

package/package.json

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

package/wireless.html

@@ -196,6 +196,7 @@
 			pan_id_active: {value: ""},
 			pan_id: {value: '7FFF', validate: NCD_validators.number_range(0, 0x7FFF, 16)},//(0 - 0x7FFF)
 
+			change_detection_t3_active: {value: ""},
 			change_enabled: {value: ""},
 			change_pr: {value: "0", validate: NCD_validators.number_range(0, 255)},
 			change_interval: {value: "0", validate: NCD_validators.number_range(0, 16712198)},
@@ -562,6 +563,8 @@
 					"538": "538 - Custom One Channel Vibration Plus",
 					"539": "539 - RS-485 Modbus Wireless Converter",
 					"540": "540 - Wireless Ultrasonic Flow Meter FD-Q32C",
+					"1010": "1010 - RS-232 Wireless Converter 1010",
+					"1011": "1011 - RS-485 Wireless Converter 1011",
 					"10000": "10000 - 4-Channel Relay",
 					"10006": "10006 - 4-Channel 4-20 mA Input",
 					"10007": "10007 - 4-Channel Current Monitor",
@@ -850,6 +853,8 @@
 			<option value="538">538 - Custom One Channel Vibration Plus</option>
 			<option value="539">539 - RS-485 Modbus Wireless Converter</option>
 			<option value="540">540 - Wireless Ultrasonic Flow Meter FD-Q32C</option>
+			<option value="1010">1010 - RS-232 Wireless Converter 1010</option>
+			<option value="1011">1011 - RS-485 Wireless Converter 1011</option>
 			<option value="10000">10000 - 4-Channel Relay</option>
 			<option value="10006">10006 - 4-Channel 4-20 mA Input</option>
 			<option value="10007">10007 - 4-Channel Current Monitor</option>
@@ -863,7 +868,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-105 data-sensor-106 data-sensor-107 data-sensor-108 data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114 data-sensor-180 data-sensor-181 data-sensor-519 data-sensor-520 data-sensor-521 data-sensor-531 data-sensor-535 data-sensor-537 data-sensor-538 data-sensor-540>
+			<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-105 data-sensor-106 data-sensor-107 data-sensor-108 data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114 data-sensor-180 data-sensor-181 data-sensor-519 data-sensor-520 data-sensor-521 data-sensor-531 data-sensor-535 data-sensor-537 data-sensor-538 data-sensor-539 data-sensor-540 data-sensor-1010 data-sensor-1011>
 				<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">
@@ -957,18 +962,25 @@
 					<input type="text" id="node-input-retries">
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-13 data-sensor-10 data-sensor-3>
-				<div class="form-row">
-					<label for="node-input-change_enabled"><i class="icon-tag"></i> Enable Percentage Change Detection</label>
-					<input type="checkbox" id="node-input-change_enabled" value="1">
-				</div>
-				<div class="form-row">
-					<label for="node-input-change_pr"><i class="icon-tag"></i> Percentage Change Threshold (0-255)</label>
-					<input type="text" id="node-input-change_pr">
-				</div>
-				<div class="form-row">
-					<label for="node-input-change_interval"><i class="icon-tag"></i> Percentage Change Interval (seconds)</label>
-					<input type="text" id="node-input-change_interval">
+			<div class="ncd-dependent" data-sensor-3 data-sensor-10 data-sensor-13>
+				<div class="form-row ncd-active-check">
+					<strong>Percentage Change Detection</strong>
+					<div>
+						<label for="node-input-change_detection_t3_active">Active:</label>
+						<input type="checkbox" id="node-input-change_detection_t3_active" class="ncd-config-toggle" data-target-class="change_detection_t3" value="1">
+					</div>
+					<div class="form-row">
+						<label for="node-input-change_enabled"><i class="icon-tag"></i>Enable:</label>
+						<input type="checkbox" id="node-input-change_enabled" class="change_detection_t3" value="1">
+					</div>
+					<div class="form-row">
+						<label for="node-input-change_pr"><i class="icon-tag"></i>Percentage Change Threshold (0-255)</label>
+						<input type="text" id="node-input-change_pr" class="change_detection_t3">
+					</div>
+					<div class="form-row">
+						<label for="node-input-change_interval"><i class="icon-tag"></i>Percentage Change Interval (seconds)</label>
+						<input type="text" id="node-input-change_interval" class="change_detection_t3">
+					</div>
 				</div>
 			</div>
 			<!-- Current Monitor Options -->
@@ -2167,7 +2179,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-539>
+			<div class="ncd-dependent" data-sensor-539 data-sensor-1010 data-sensor-1011>
 				<div class="form-row ncd-active-check">
 					<strong>Set Stay On Mode</strong>
 					<div>
@@ -2210,6 +2222,8 @@
 						<input type="text" id="node-input-rx_timeout_539" placeholder="10" value="10">
 					</div>
 				</div>
+			</div>	
+			<div class="ncd-dependent" data-sensor-539>	
 				<div class="form-row ncd-active-check">
 					<strong>Set Bootup Time</strong>
 					<div>
@@ -2334,45 +2348,6 @@
 				</div>
 			</div>
 
-			<div class="ncd-dependent" data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114>
-				<div class="form-row ncd-active-check">
-					<strong>Set Auto Raw Interval</strong>
-					<div>
-						<label for="node-input-auto_raw_interval_110_active">Active:</label>
-						<input type="checkbox" id="node-input-auto_raw_interval_110_active" class="ncd-config-toggle" data-target-id="node-input-auto_raw_interval_110" value="1">
-					</div>
-					<div>
-						<label for="node-input-auto_raw_interval_110"><i class="icon-tag"></i>Address:</label>
-						<input type="text" id="node-input-auto_raw_interval_110" value="0">
-					</div>
-				</div>
-				<div class="form-row ncd-active-check">
-					<strong>Set Auto Raw Destination Address</strong>
-					<div>
-						<label for="node-input-auto_raw_destination_110_active">Active:</label>
-						<input type="checkbox" id="node-input-auto_raw_destination_110_active" class="ncd-config-toggle" data-target-id="node-input-auto_raw_destination_110" value="1">
-					</div>
-					<div>
-						<label for="node-input-auto_raw_destination_110"><i class="icon-tag"></i>Address:</label>
-						<input type="text" id="node-input-auto_raw_destination_110" value="0000FFFF">
-					</div>
-					<p class="caption">
-						Default value: 0000FFFF for Broadcast Mode<br>
-						Example of targeted address: 41D5EC37
-					</p>
-				</div>
-				<div class="form-row ncd-active-check">
-					<strong>Set Smart Mode Threshold</strong>
-					<div>
-						<label for="node-input-smart_threshold_110_active">Active:</label>
-						<input type="checkbox" id="node-input-smart_threshold_110_active" class="ncd-config-toggle" data-target-id="node-input-smart_threshold_110" value="1">
-					</div>
-					<div>
-						<label for="node-input-smart_threshold_110"><i class="icon-tag"></i>Value:</label>
-						<input type="text" id="node-input-smart_threshold_110" value="1">
-					</div>
-				</div>
-			</div>
 			<div class="ncd-dependent" data-sensor-114>
 				<div class="form-row ncd-active-check">
 					<strong>Clear Probe Uptimers</strong>

package/wireless.js

@@ -806,10 +806,7 @@ module.exports = function(RED) {
 						if(config.retries_active){
 							promises.retries = node.config_gateway.config_set_retries(mac, parseInt(config.retries));
 						}
-						var change_detection = [13, 10, 3];
-						if(change_detection.indexOf(sensor.type) > -1){
-							promises.change_detection = node.config_gateway.config_set_change_detection(mac, config.change_enabled ? 1 : 0, parseInt(config.change_pr), parseInt(config.change_interval));
-						}
+
 						switch(sensor.type){
 							case 2:
 								if(config.debounce_time_2_active){
@@ -826,6 +823,9 @@ module.exports = function(RED) {
 								if(config.high_calibration_420ma_active){
 									promises.high_calibration_420ma = node.config_gateway.config_set_high_calibration_420ma(mac, parseInt(config.high_calibration_420ma));
 								}
+								if(config.change_detection_t3_active){
+									promises.change_detection = node.config_gateway.config_set_change_detection(mac, config.change_enabled ? 1 : 0, parseInt(config.change_pr), parseInt(config.change_interval));
+								}
 								break;
 							case 5:
 								promises.acceleration_range = node.config_gateway.config_set_amgt_accel(mac, parseInt(config.amgt_accel));
@@ -856,6 +856,11 @@ module.exports = function(RED) {
 								// promises.impact_threshold = node.config_gateway.config_set_impact_threshold(mac, parseInt(config.impact_threshold));
 								// promises.impact_duration = node.config_gateway.config_set_impact_duration(mac, parseInt(config.impact_duration));
 								break;
+							case 10:
+								if(config.change_detection_t3_active){
+									promises.change_detection = node.config_gateway.config_set_change_detection(mac, config.change_enabled ? 1 : 0, parseInt(config.change_pr), parseInt(config.change_interval));
+								}
+								break;
 							case 13:
 								if(config.current_calibration_13_active){
 									var cali = parseInt(config.current_calibration_13);
@@ -863,6 +868,9 @@ module.exports = function(RED) {
 										promises.current_calibration_13 = node.config_gateway.config_set_current_calibration_13(mac, cali);
 									}
 								}
+								if(config.change_detection_t3_active){
+									promises.change_detection = node.config_gateway.config_set_change_detection(mac, config.change_enabled ? 1 : 0, parseInt(config.change_pr), parseInt(config.change_interval));
+								}
 								break;
 							case 14:
 								if(config.sensor_boot_time_420ma_active){
@@ -2035,6 +2043,28 @@ module.exports = function(RED) {
 									promises.high_calibration_420ma = node.config_gateway.config_set_high_calibration_420ma(mac, parseInt(config.high_calibration_420ma));
 								}
 								break;
+							case 1010:
+								if(config.stay_on_mode_539_active){
+									promises.stay_on_mode_539 = node.config_gateway.config_set_stay_on_mode_539(mac, parseInt(config.stay_on_mode_539));
+								}
+								if(config.baudrate_539_active){
+									promises.baudrate_539 = node.config_gateway.config_set_baudrate_539(mac, parseInt(config.baudrate_539));
+								}
+								if(config.rx_timeout_539_active){
+									promises.rx_timeout_539 = node.config_gateway.config_set_rx_timeout_539(mac, parseInt(config.rx_timeout_539));
+								}
+								break;
+							case 1011:
+								if(config.stay_on_mode_539_active){
+									promises.stay_on_mode_539 = node.config_gateway.config_set_stay_on_mode_539(mac, parseInt(config.stay_on_mode_539));
+								}
+								if(config.baudrate_539_active){
+									promises.baudrate_539 = node.config_gateway.config_set_baudrate_539(mac, parseInt(config.baudrate_539));
+								}
+								if(config.rx_timeout_539_active){
+									promises.rx_timeout_539 = node.config_gateway.config_set_rx_timeout_539(mac, parseInt(config.rx_timeout_539));
+								}
+								break;
 						}
 					}
 					// These sensors listed in original_otf_devices use a different OTF code.
@@ -2252,9 +2282,14 @@ module.exports = function(RED) {
 						// _send_otn_request(sensor);
 						// Sensors having issues seeing OTN request sent too quickly
 						// Added timeout to fix issue
-						var tout = setTimeout(() => {
-							_send_otn_request(sensor);
-						}, 100);
+						if(config.sensor_type == 1010 || config.sensor_type == 1011){
+							_config(sensor, true);
+						}else{
+							var tout = setTimeout(() => {
+								_send_otn_request(sensor);
+							}, 100);
+						}
+
 					}else if(config.auto_config && config.on_the_fly_enable && sensor.mode == "OTN"){
 						if(config.sensor_type == 101 || config.sensor_type == 102){
 							if(this.gateway.hasOwnProperty('fly_101_in_progress') && this.gateway.fly_101_in_progress == false || !this.gateway.hasOwnProperty('fly_101_in_progress')){