@ncd-io/node-red-enterprise-sensors 1.0.6 → 1.0.8

package/lib/WirelessGateway.js

@@ -142,13 +142,13 @@ module.exports = class WirelessSensor{
 				}
 			}
 			// #OTF
-			var otf_devices = [23,26,39,45,48,52,58,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 otf_devices = [23,26,32,33,39,44,45,48,52,53,58,74,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,202,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];
 
 			if(mode == "RUN"){
 				if(frame.data[9] == 70 && frame.data[10] == 76 && frame.data[11] == 89) {
-					var broadcast_otf_devices = [101,102];
+					var broadcast_otf_devices = [101,102,202];
 					mode = "FLY";
 				}
 			}
@@ -294,7 +294,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [23,26,39,45,48,52,58,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 otf_devices = [23,26,32,33,39,44,45,48,52,53,58,74,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,202,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) {
@@ -712,7 +712,7 @@ module.exports = class WirelessSensor{
 					data: payload.slice(8)
 				};
 				// #OTF
-			}else if(parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538){
+			}else if(parsed.sensor_type == 33 || parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 110 || parsed.sensor_type == 111 || parsed.sensor_type == 112 || parsed.sensor_type == 114 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538){
 				parsed.sensor_data = this.sensor_types[parsed.sensor_type].parse(payload, parsed, frame.mac);
 				if(!parsed.sensor_data){
 					return;
@@ -795,11 +795,26 @@ module.exports = class WirelessSensor{
 		return this.config_send(sensor_mac, packet);
 	}
 	config_set_change_detection(sensor_mac, enabled, perc, interval){
+		console.log('config_set_change_detection_ch1');
 		if(!perc) perc = 0;
 		if(!interval) interval = 0;
 		var packet = [247, 7, 0, 0, 0, enabled, perc, interval >> 16, (interval >> 8) & 255, interval & 255];
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_change_detection_ch2(sensor_mac, enabled, perc, interval){
+		console.log('config_set_change_detection_ch2');
+		if(!perc) perc = 0;
+		if(!interval) interval = 0;
+		var packet = [247, 8, 0, 0, 0, enabled, perc, interval >> 16, (interval >> 8) & 255, interval & 255];
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_change_detection_ch3(sensor_mac, enabled, perc, interval){
+		console.log('config_set_change_detection_ch3');
+		if(!perc) perc = 0;
+		if(!interval) interval = 0;
+		var packet = [247, 9, 0, 0, 0, enabled, perc, interval >> 16, (interval >> 8) & 255, interval & 255];
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_bp_altitude(sensor_mac, alt){
 		var packet = [244, 1, 0, 0, 0, alt >> 8, alt & 255];
 		return this.config_send(sensor_mac, packet);
@@ -1016,6 +1031,12 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_sampling_interval_202(sensor_mac, sampling_interval){
+		console.log('config_set_sampling_interval_202');
+		var packet = [244, 0, 0, 0, 0, sampling_interval];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_get_sampling_interval_101(sensor_mac, sampling_interval){
 		console.log('config_get_sampling_interval_101');
 		var packet = [244, 79, 0, 0, 101, 7];
@@ -1157,6 +1178,15 @@ module.exports = class WirelessSensor{
 		delete this.fly_101_in_progress;
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_rtc_202(sensor_mac){
+		console.log('config_set_rtc_202');
+		console.log(sensor_mac);
+		var date = new Date();
+		var packet = [244, 8, 0, 0, 0, date.getHours(), date.getMinutes(), date.getSeconds()];
+		console.log(packet);
+		delete this.fly_101_in_progress;
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_roll_threshold_47(sensor_mac, threshold){
 		console.log('config_set_roll_threshold_47');
 		var packet = [244, 1, 0, 0, 47, 0, threshold];
@@ -1219,6 +1249,12 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_push_notification_108(sensor_mac, value){
+		console.log('config_set_push_notification_108');
+		var packet = [244, 45, 0, 0, 0, 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];
@@ -1419,7 +1455,6 @@ module.exports = class WirelessSensor{
 	}
 	config_set_current_calibration_13(sensor_mac, calib){
 		console.log('config_set_current_calibration_13');
-		calib = calib * 100;
 		var packet = [244, 1, 0, 0, 0];
 		var cal_val = int2Bytes(calib, 4);
 		packet.push(...cal_val);
@@ -1428,7 +1463,6 @@ module.exports = class WirelessSensor{
 	}
 	config_set_current_calibration_ch2_19(sensor_mac, calib){
 		console.log('config_set_current_calibration_ch2_19');
-		calib = calib * 100;
 		var packet = [244, 3, 0, 0, 0];
 		var cal_val = int2Bytes(calib, 4);
 		packet.push(...cal_val);
@@ -1437,13 +1471,36 @@ module.exports = class WirelessSensor{
 	}
 	config_set_current_calibration_ch3_28(sensor_mac, calib){
 		console.log('cconfig_set_current_calibration_ch3_28');
-		calib = calib * 100;
 		var packet = [244, 5, 0, 0, 0];
 		var cal_val = int2Bytes(calib, 4);
 		packet.push(...cal_val);
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_current_calibration_13_dep(sensor_mac, calib){
+		console.log('config_set_current_calibration_13_dep');
+		var packet = [244, 1, 0, 0, 0];
+		var cal_val = int2Bytes(calib, 2);
+		packet.push(...cal_val);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_current_calibration_ch2_19_dep(sensor_mac, calib){
+		console.log('config_set_current_calibration_ch2_19_dep');
+		var packet = [244, 3, 0, 0, 0];
+		var cal_val = int2Bytes(calib, 2);
+		packet.push(...cal_val);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_current_calibration_ch3_28_dep(sensor_mac, calib){
+		console.log('cconfig_set_current_calibration_ch3_28_dep');
+		var packet = [244, 5, 0, 0, 0];
+		var cal_val = int2Bytes(calib, 2);
+		packet.push(...cal_val);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_rx485_timeout_1011(sensor_mac, value){
 		console.log('config_set_Rx485_timeout_1011');
 		var packet = [244, 48, 0, 0, 23, value];
@@ -1464,6 +1521,24 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_stop_bit_1011(sensor_mac, value){
+		console.log('config_set_stop_bit_1011');
+		var packet = [244, 34, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_parity_1011(sensor_mac, value){
+		console.log('config_set_parity_1011');
+		var packet = [244, 33, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_reboot_1011(sensor_mac){
+		console.log('config_set_reboot_1011');
+		var packet = [247, 64, 0, 0, 0, 5, 22, 23];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_operation_mode_531(sensor_mac, mode){
 		console.log('config_set_operation_mode_531');
 		console.log(mode);
@@ -1471,6 +1546,58 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_calibration_58(sensor_mac){
+		console.log('config_set_calibration_58');
+		var packet = [244, 32, 0, 0, 23];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_factory_reset_tank_probe_58(sensor_mac){
+		console.log('config_set_factory_reset_tank_probe_58');
+		var packet = [244, 33, 0, 0, 23];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_max_range_58(sensor_mac, value){
+		console.log('config_set_max_range_58');
+		var packet = [244, 34, 0, 0, 23, 39, 16];
+		var max = int2Bytes(value, 2);
+		packet.push(...max);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_clear_counter_33(sensor_mac){
+		console.log('config_clear_counter_33');
+		var packet = [244, 36, 0, 0, 0, 31];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_push_notification_33(sensor_mac, value){
+		console.log('config_set_push_notification_33');
+		var packet = [244, 45, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_fly_interval_110(sensor_mac, value){
+		console.log('config_set_fly_interval');
+		var packet = [244, 79, 0, 0, 101, 81];
+		let value_ = int2Bytes((value), 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_scd_skip_samples_44(sensor_mac, value){
+		console.log('config_set_scd_skip_samples');
+		var packet = [244, 34, 0, 0, 53, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_sps_skip_samples_32(sensor_mac, value){
+		console.log('config_set_scd_skip_samples');
+		var packet = [244, 32, 0, 0, 53, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_get_delay(sensor_mac){
 		return new Promise((fulfill, reject) => {
 			this.config_send(sensor_mac, [247, 21, 0, 0, 0]).then((res) => {
@@ -2350,9 +2477,18 @@ function sensor_types(parent){
 		},
 		'33': {
 			name: 'AC Current Detect Sensor',
-			parse: (d) => {
-				return {
-					input_1: d[0]
+			parse: (payload, parsed, mac) => {
+				if(parsed.firmware > 3){
+					return {
+						input_1: payload[8],
+						current_detect: payload[9],
+						total_uptime: payload.slice(10, 14).reduce(msbLsb),
+						total_cycle_count: payload.slice(14, 18).reduce(msbLsb)
+					};
+				}else{
+					return {
+						input_1: payload[8]
+					};
 				};
 			}
 		},
@@ -2571,12 +2707,8 @@ function sensor_types(parent){
 				return {
 					adc1: adc1,
 					adc2: adc2,
-					mA1: adc1 * 0.0006863,
-					mA2: adc2 * 0.0006863,
-					byteOne: d[0],
-					byteTwo: d[1],
-					byteThree: d[2],
-					byteFour: d[3]
+					mA1: parseFloat((adc1 * 0.0006863).toFixed(2)),
+					mA2: parseFloat((adc2 * 0.0006863).toFixed(2))
 				};
 			},
 			'parse_fly': (frame) => {
@@ -2657,12 +2789,8 @@ function sensor_types(parent){
 				return {
 					adc1: adc1,
 					adc2: adc2,
-					VDC1: adc1 * 0.00034122,
-					VDC2: adc2 * 0.00034122,
-					byteOne: d[0],
-					byteTwo: d[1],
-					byteThree: d[2],
-					byteFour: d[3]
+					VDC1: parseFloat((adc1 * 0.00034122).toFixed(2)),
+					VDC2: parseFloat((adc2 * 0.00034122).toFixed(2))
 				};
 			}
 		},
@@ -2673,12 +2801,13 @@ function sensor_types(parent){
 					filtered_range: d.slice(0, 2).reduce(msbLsb),
 					long_range_algorithm: d.slice(2, 4).reduce(msbLsb),
 					second_chance:  d.slice(4, 6).reduce(msbLsb),
-					copare_reading:  d.slice(6, 8).reduce(msbLsb),
-					short_range_algorithm: d.slice(8, 10).reduce(msbLsb),
-					trusted_reading:  d.slice(10, 12).reduce(msbLsb),
-					final_filter:  d.slice(12, 14).reduce(msbLsb),
-					raw_final:  d.slice(14, 16).reduce(msbLsb),
-					final_index:  d.slice(16, 18).reduce(msbLsb),
+					second_reading: d.slice(6, 8).reduce(msbLsb),
+					compare_reading:  d.slice(8, 10).reduce(msbLsb),
+					short_range_algorithm: d.slice(10, 12).reduce(msbLsb),
+					trusted_reading:  d.slice(12, 14).reduce(msbLsb),
+					final_filter:  d.slice(14, 16).reduce(msbLsb),
+					raw_final:  d.slice(16, 18).reduce(msbLsb),
+					final_index:  d.slice(18, 20).reduce(msbLsb),
 				};
 			}
 		},
@@ -2813,6 +2942,22 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'74': {
+			name: 'Wireless Temp Humidity Pressure Air quality Sensor',
+			parse: (d) => {
+				return {
+					temperature: signInt(d.slice(0, 2).reduce(msbLsb), 16) *100,
+					pressure: d.slice(2, 6).reduce(msbLsb) * 100,
+					humidity: d.slice(6, 10).reduce(msbLsb) * 1000,
+					resistance: d.slice(10, 14).reduce(msbLsb),
+					iaq: d.slice(14, 16).reduce(msbLsb),
+					co2_eqv: d.slice(16, 18).reduce(msbLsb),
+					breath_voc: d.slice(18, 22).reduce(msbLsb)* 100,
+					static_iaq: d.slice(22, 26).reduce(msbLsb)* 100,
+					iaq_accuracy: d[27]
+				};
+			}
+		},
 		'75': {
 			name: 'Siemens Air Velocity Probe',
 			parse: (d) => {
@@ -4294,6 +4439,7 @@ function sensor_types(parent){
 					'destination_address': toMac(frame.slice(12, 16)),
 					'mode': frame_data.mode,
 					'odr_1': frame_data.odr_1+'Hz',
+					'odr_2': frame_data.odr_2+'Hz',
 					'sampling_duration_1': frame_data.sampling_duration_1,
 					'sampling_duration_2': frame_data.sampling_duration_2,
 					'filter_status': frame_data.filter_status,
@@ -4314,6 +4460,7 @@ function sensor_types(parent){
 					'destination_address': toMac(frame.slice(12, 16), false),
 					'mode': frame[16],
 					'odr_1': frame[17],
+					'odr_2': frame[18],
 					'sampling_duration_1': frame[19],
 					'sampling_duration_2': frame[20],
 					'filter_status': frame[21],
@@ -5704,7 +5851,8 @@ function sensor_types(parent){
 					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)
+					magnetometer_uptime: d.slice(36, 40).reduce(msbLsb),
+					io_states: d[40]
 				};
 			}
 		},
@@ -8382,15 +8530,9 @@ function sensor_types(parent){
 					adc1: adc1,
 					adc2: adc2,
 					dac1: dac1,
-					mA1: adc1/100.00,
+					mA1: parseFloat((adc1/100.00).toFixed(2)),
 					raw_adc: adc2,
-					raw_dac: dac1,
-					byteOne: d[0],
-					byteTwo: d[1],
-					byteThree: d[2],
-					byteFour: d[3],
-					byteFive: d[4],
-					byteSix: d[5]
+					raw_dac: dac1
 				};
 			}
 		},

package/package.json

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