@ncd-io/node-red-enterprise-sensors 0.1.10 → 0.1.12

package/lib/WirelessGateway.js

@@ -62,7 +62,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 = [78,79,80,81,82,84,89,91,101,102,519,520,521];
+			var otf_devices = [45,48,78,79,80,81,82,84,88,89,91,101,102,519,520,521];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -214,7 +214,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [78,79,80,81,82,84,89,91,101,102,519,520,521];
+		var otf_devices = [45,48,78,79,80,81,82,84,88,89,91,101,102,519,520,521];
 		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) {
@@ -367,17 +367,17 @@ module.exports = class WirelessSensor{
 						default:
 							en_axis_data.increment = 0;
 					}
-					var fsr_mult = .000019;
+					var fsr_mult = 0.000305185;
 					var fsr_text = "";
 					switch(globalDevices[deviceAddr].fsr){
 						case 0:
-							fsr_mult = 0.000019;
+							fsr_mult = 0.000305185;
 							break;
 						case 1:
-							fsr_mult = 0.000038;
+							fsr_mult = 0.00061037;
 							break;
 						case 2:
-							fsr_mult = 0.000076;
+							fsr_mult = 0.0012207;
 							break;
 					}
 					switch(globalDevices[deviceAddr].fsr){
@@ -5010,6 +5010,24 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'95': {
+			name: '16-Bit 1-Channel 0-24VDC Receiver',
+			parse: (d) => {
+				return {
+					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
+					vdc: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
+				};
+			}
+		},
+		'96': {
+			name: '16-Bit 1-Channel 0-48VDC Receiver',
+			parse: (d) => {
+				return {
+					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
+					vdc: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
+				};
+			}
+		},
 		'101':{
 			name: 'Pro Vibration',
 			parse: (d, full)=>{
@@ -5941,6 +5959,36 @@ function sensor_types(parent){
 				}
 			}
 		},
+		'524': {
+			name: 'SDI Multi Soil Probe',
+			parse: (payload, parsed) => {
+				return {
+					moisture_1: payload.slice(0, 2).reduce(msbLsb)/100,
+					temp_1: payload.slice(2, 4).reduce(msbLsb)/100,
+					moisture_2: payload.slice(4, 6).reduce(msbLsb)/100,
+					temp_2: payload.slice(6, 8).reduce(msbLsb)/100,
+					moisture_3: payload.slice(8, 10).reduce(msbLsb)/100,
+					temp_3: payload.slice(10, 12).reduce(msbLsb)/100,
+					moisture_4: payload.slice(12, 14).reduce(msbLsb)/100,
+					temp_4: payload.slice(14, 16).reduce(msbLsb)/100,
+					moisture_5: payload.slice(16, 18).reduce(msbLsb)/100,
+					temp_5: payload.slice(18, 20).reduce(msbLsb)/100,
+					moisture_6: payload.slice(20, 22).reduce(msbLsb)/100,
+					temp_6: payload.slice(22, 24).reduce(msbLsb)/100
+				}
+			}
+		},
+		'531': {
+			name: 'Custom Noise Sensor',
+			parse: (d) => {
+				return {
+					noise_db: d[0],
+					peak_freq_1: d.slice(1, 3).reduce(msbLsb),
+					peak_freq_2: d.slice(3, 5).reduce(msbLsb),
+					peak_freq_3: d.slice(5, 7).reduce(msbLsb)
+				};
+			}
+		},
 		'10000': {
 			name: '4-Relay',
 			parse: (d) => {

package/package.json

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

package/wireless.html

@@ -423,6 +423,8 @@
 					"89": "89 - 2 Channel Ultrasound Vibration Sensor",
 					"91": "91 - Wireless Air Velocity Sensor HVAC",
 					"92": "92 - Sound Sensor",
+					"95": "95 - 16-Bit 1-Channel 0-24VDC Receiver",
+					"96": "96 - 16-Bit 1-Channel 0-48VDC Receiver",
 					"101": "101 - Pro Vibration",
 					"102": "102 - Strain Gauge",
 					"200": "200 - 4-20mA Pass Through",
@@ -436,6 +438,8 @@
 					"519": "519: Custom Vibration 1",
 					"520": "520: Custom 6 Channel Current Temperature & Humidity",
 					"521": "521 - Custom 3 Channel Light Sensor",
+					"524": "524 - SDI Multi Soil Probe",
+					"531": "531 - Custom Noise Sensor",
 					"10000": "10000 - 4-Channel Relay",
 					"10006": "10006 - 4-Channel 4-20 mA Input",
 					"10007": "10007 - 4-Channel Current Monitor",
@@ -668,6 +672,8 @@
 			<option value="89">89 - 2 Channel Ultrasound Vibration 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>
+			<option value="96">96 - 16-Bit 1-Channel 0-48VDC Receiver</option>
 			<option value="101">101 - Pro Vibration</option>
 			<option value="102">102 - Strain Gauge</option>
 			<option value="200">200 - 4-20mA Pass Through</option>
@@ -681,6 +687,8 @@
 			<option value="519">519 - Type 519: Custom Vibration 1</option>
 			<option value="520">520 - Type 520: Custom 6 Channel Current Temperature & Humidity</option>
 			<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="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>
@@ -694,7 +702,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-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-519 data-sensor-520 data-sensor-521>
+			<div class="form-row ncd-dependent" data-sensor-45 data-sensor-48 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-519 data-sensor-520 data-sensor-521>
 				<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">

package/wireless.js

@@ -775,6 +775,7 @@ module.exports = function(RED) {
 								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));
 								}
+								break;
 							case 101:
 								if(config.output_data_rate_101_m2_active){
 									promises.output_data_rate_101_m2 = node.config_gateway.config_set_output_data_rate_101(mac, parseInt(config.output_data_rate_101_m2));
@@ -1007,52 +1008,40 @@ module.exports = function(RED) {
 					var tout = setTimeout(() => {
 						_send_otn_request(sensor);
 					}, 100);
-				}else if(sensor.mode == "FLY" && config.sensor_type == 101 || sensor.mode == "FLY" &&  config.sensor_type == 102){
-					// send broadcast rtc to 101 and 102 regardless of settings
-					if(this.gateway.hasOwnProperty('fly_101_in_progress') && this.gateway.fly_101_in_progress == false || !this.gateway.hasOwnProperty('fly_101_in_progress')){
-						var broadcast_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')){
 							this.gateway.fly_101_in_progress = true;
-							node.warn('start timer 2 ' + Date.now());
+							node.warn('Starting RTC Timer' + Date.now());
+							node.warn('Sensor checked in for RTC: ' + sensor.mac + ' at ' + Date.now());
 							var broadcast_tout = setTimeout(() => {
-								node.warn('broadcast timer expired ' + Date.now());
+								node.warn('Sending RTC Broadcast ' + Date.now());
 								_broadcast_rtc(sensor);
 							}, 2000);
 						}else{
-							node.warn('Attempted to start a new rtc broadcast, but denied rightly at ' + Date.now());
+							node.warn('Sensor checked in for RTC: ' + sensor.mac + ' at ' + Date.now());
 						}
+
 						if(config.auto_config && config.on_the_fly_enable){
 							var tout = setTimeout(() => {
-								node.warn('config timer expired' + Date.now());
+								node.warn('Proceeding with normal configs' + Date.now());
 								_config(sensor, true);
 							}, 3500);
 						}
 					}else{
 						_config(sensor, true);
 					}
-				} else if(config.sensor_type == 101 && sensor.mode == "OTN" || config.sensor_type == 102 && sensor.mode == "OTN"){
+				} else if(config.sensor_type == 101 && sensor.mode == "FLY" || config.sensor_type == 102 && sensor.mode == "FLY"){
 					if(this.gateway.hasOwnProperty('fly_101_in_progress') && this.gateway.fly_101_in_progress == false || !this.gateway.hasOwnProperty('fly_101_in_progress')){
 						this.gateway.fly_101_in_progress = true;
-						node.warn('start timer 2 ' + Date.now());
+						node.warn('Starting RTC Timer' + Date.now());
+						node.warn('Sensor checked in for RTC: ' + sensor.mac + ' at ' + Date.now());
 						var broadcast_tout = setTimeout(() => {
-							node.warn('broadcast timer expired ' + Date.now());
+							node.warn('Sending RTC Broadcast ' + Date.now());
 							_broadcast_rtc(sensor);
-							var otf_timeout = setTimeout(() => {
-								node.warn('Sending OTF request ' + Date.now());
-								this.config_gateway.config_exit_otn_mode(sensor.mac);
-							}, 1000);
 						}, 2000);
 					}else{
-						node.warn('Attempted to start a new rtc broadcast, but denied rightly at ' + Date.now());
-						var otf_timeout = setTimeout(() => {
-							node.warn('Sending OTF request ' + Date.now());
-							this.config_gateway.config_exit_otn_mode(sensor.mac);
-						}, 3000);
+						node.warn('Sensor checked in for RTC: ' + sensor.mac + ' at ' + Date.now());
 					}
 				}
 			});
@@ -1125,24 +1114,18 @@ module.exports = function(RED) {
 						var tout = setTimeout(() => {
 							_send_otn_request(sensor);
 						}, 100);
-					}else if(sensor.mode == "FLY" && config.sensor_type == 101 || sensor.mode == "FLY" &&  config.sensor_type == 102){
-						// send broadcast rtc to 101 and 102 regardless of settings
-						if(this.gateway.hasOwnProperty('fly_101_in_progress') && this.gateway.fly_101_in_progress == false || !this.gateway.hasOwnProperty('fly_101_in_progress')){
-							var broadcast_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')){
 								this.gateway.fly_101_in_progress = true;
-								node.warn('start timer 2 ' + Date.now());
+								node.warn('Starting RTC Timer' + Date.now());
+								node.warn('Sensor checked in for RTC: ' + sensor.mac + ' at ' + Date.now());
 								var broadcast_tout = setTimeout(() => {
-									node.warn('broadcast timer expired ' + Date.now());
+									node.warn('Sending RTC Broadcast ' + Date.now());
 									_broadcast_rtc(sensor);
 								}, 2000);
 							}else{
-								node.warn('Attempted to start a new rtc broadcast, but denied rightly at ' + Date.now());
+								node.warn('Sensor checked in for RTC: ' + sensor.mac + ' at ' + Date.now());
 							}
 							if(config.auto_config && config.on_the_fly_enable){
 								var tout = setTimeout(() => {
@@ -1154,24 +1137,17 @@ module.exports = function(RED) {
 							_config(sensor, true);
 						}
 
-					}else if(config.sensor_type == 101 && sensor.mode == "OTN" || config.sensor_type == 102 && sensor.mode == "OTN"){
+					}else if(sensor.mode == "FLY" && config.sensor_type == 101 || sensor.mode == "FLY" &&  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')){
 							this.gateway.fly_101_in_progress = true;
-							node.warn('start timer 2 ' + Date.now());
+							node.warn('Starting RTC Timer' + Date.now());
+							node.warn('Sensor checked in for RTC: ' + sensor.mac + ' at ' + Date.now());
 							var broadcast_tout = setTimeout(() => {
-								node.warn('broadcast timer expired ' + Date.now());
+								node.warn('Sending RTC Broadcast ' + Date.now());
 								_broadcast_rtc(sensor);
-								var otf_timeout = setTimeout(() => {
-									node.warn('Sending OTF request ' + Date.now());
-									this.config_gateway.config_exit_otn_mode(sensor.mac);
-								}, 1000);
 							}, 2000);
 						}else{
-							node.warn('Attempted to start a new rtc broadcast, but denied rightly at ' + Date.now());
-							var otf_timeout = setTimeout(() => {
-								node.warn('Sending OTF request ' + Date.now());
-								this.config_gateway.config_exit_otn_mode(sensor.mac);
-							}, 3000);
+							node.warn('Sensor checked in for RTC: ' + sensor.mac + ' at ' + Date.now());
 						}
 					}
 				}