@ncd-io/node-red-enterprise-sensors 1.1.1 → 1.1.3

package/lib/WirelessGateway.js

@@ -202,7 +202,10 @@ module.exports = class WirelessSensor{
 				frame.data.splice(2,0,frame.data[5],0);
 				this.sensor_pool[frame.mac].reported_config = this.sensor_types[data.sensor_type].parse_fly(frame.data);
 			}else if(mode === 'ACK'){
-				this.sensor_pool[frame.mac].result = data.result;
+				this.sensor_pool[frame.mac].status = data.result;
+				if(data.data.length){
+					this.sensor_pool[frame.mac].data = data.data;
+				};
 			}
 			var that = this;
 
@@ -1161,9 +1164,15 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_acceleration_interrupt_threshold_84(sensor_mac, value){
-		console.log('config_set_acceleration_interrupt_threshold_84');
-		var packet = [244, 79, 0, 0, 0, 60, value];
+	config_set_acceleration_interrupt_threshold_p1_84(sensor_mac, value){
+		console.log('config_set_acceleration_interrupt_threshold_p1_84');
+		var packet = [244, 79, 0, 0, 0, 60, 1, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_acceleration_interrupt_threshold_p2_84(sensor_mac, value){
+		console.log('config_set_acceleration_interrupt_threshold_p2_84');
+		var packet = [244, 79, 0, 0, 0, 60, 2, value];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
@@ -1805,6 +1814,12 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_mode_97(sensor_mac, value){
+		console.log('config_set_mode_97');
+		var packet = [244, 83, 0, 0, 0, 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) => {
@@ -3245,23 +3260,46 @@ function sensor_types(parent){
 				}
 			},
 			'parse_fly': (frame) => {
-				return {
-					'firmware': frame[2],
-					'calibration_days': frame[12],
-					'sensor_update_rate':frame.slice(13, 15).reduce(msbLsb),
-					'hardware_id_1': frame[15],
-					'hardware_id_2': frame[16],
-					'hardware_id_3': frame[17],
-					'report_rate': frame.slice(18, 22).reduce(msbLsb),
-					'tx_counter': frame.slice(22, 26).reduce(msbLsb),
-					'machine_values': {
+				if(frame[2] > 2){
+					return {
+						'firmware': frame[2],
+						'calibration_days': frame[12] + ' days',
+						'sensor_update_rate':frame.slice(13, 15).reduce(msbLsb) + ' sec',
+						'heater_duration': frame.slice(15, 17).reduce(msbLsb) + ' msec',
+						'heater_temperature': frame.slice(17, 19).reduce(msbLsb) + ' °C',
+						'hardware_id': frame.slice(19, 22),
+						'report_rate': frame.slice(22, 26).reduce(msbLsb) + ' sec',
+						'tx_counter': frame.slice(26, 30).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'calibration_days': frame[12],
+							'sensor_update_rate':frame.slice(13, 15),
+							'heater_duration': frame.slice(15, 17),
+							'heater_temperature': frame.slice(17, 19),
+							'hardware_id': frame.slice(19, 22),
+							'report_rate': frame.slice(22, 26).reduce(msbLsb),
+							'tx_counter': frame.slice(26, 30).reduce(msbLsb),
+
+						}
+					};
+				}
+				else{
+					return {
 						'firmware': frame[2],
-						'calibration_days': frame[12],
-						'sensor_update_rate':frame.slice(13, 15),
+						'calibration_days': frame[12] + ' days',
+						'sensor_update_rate':frame.slice(13, 15).reduce(msbLsb) + ' sec',
 						'hardware_id': frame.slice(15, 18),
-						'report_rate': frame.slice(18, 22),
-						'tx_counter': frame.slice(22, 26),
-					}
+						'report_rate': frame.slice(18, 22).reduce(msbLsb) + ' sec',
+						'tx_counter': frame.slice(22, 26).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'calibration_days': frame[12],
+							'sensor_update_rate':frame.slice(13, 15),
+							'hardware_id': frame.slice(15, 18),
+							'report_rate': frame.slice(18, 22),
+							'tx_counter': frame.slice(22, 26),
+						}
+					};
 				}
 			}
 		},
@@ -6295,39 +6333,56 @@ function sensor_types(parent){
 				else if(payload[8] === 0){ // processed mode
 					return {
 						mode: payload[8],
-						rms_mv: payload.slice(9, 13).reduce(msbLsb) / 1000,
-						freq_1: payload.slice(13, 15).reduce(msbLsb),
-						freq_2: payload.slice(15, 17).reduce(msbLsb),
-						freq_3: payload.slice(17, 19).reduce(msbLsb),
+						sampling_frequency: payload.slice(9, 13).reduce(msbLsb),
+						rms_mv: payload.slice(13, 17).reduce(msbLsb) / 1000,
+						freq_1: payload.slice(17, 19).reduce(msbLsb),
+						freq_2: payload.slice(19, 21).reduce(msbLsb),
+						freq_3: payload.slice(21, 23).reduce(msbLsb),
 					};
 				}
 
 			},
 			'parse_fly': (frame) => {
+				let frame_data = {};
+				frame_data.mode = frame[12] ? 'Raw':'Processed';
+				switch(frame[13]){
+					case 0:
+						frame_data.raw_lenght = 55;
+					break;
+					case 1:
+						frame_data.raw_lenght = 100;
+					break;
+					case 2:
+						frame_data.raw_lenght = 150;
+					break;
+					case 3:
+						frame_data.raw_lenght = 180;
+					break;
+				}
 				return {
 					'firmware': frame[2],
-					'raw_length': frame[12],
-					'raw_on_request_timeout': frame[13] + " Sec",
-					'fly_rate': frame.slice(14, 16).reduce(msbLsb) + " min",
-					'sensor_gain_db': frame[16] + " dB",
-					'sensor_boot_time': frame[17] + " Sec",
-					'hardware_id_1': frame[18],
-					'hardware_id_2': frame[19],
-					'hardware_id_3': frame[20],
-					'rate': frame.slice(21, 25).reduce(msbLsb),
-					'tx_life_count': frame.slice(25, 29).reduce(msbLsb),
+					'mode': frame_data.mode,
+					'raw_length': frame_data.raw_lenght + " Bytes",
+					'raw_on_request_timeout': frame[14] + " sec",
+					'fly_rate': frame.slice(15, 17).reduce(msbLsb) + " min",
+					'sensor_gain_db': frame[17] + " dB",
+					'sensor_boot_time': frame[18] + " sec",
+					'sampling_frequency': (frame.slice(19, 23).reverse()).reduce(msbLsb) + " Hz",
+					'hardware_id': frame.slice(23, 26),
+					'report_rate': frame.slice(26, 30).reduce(msbLsb),
+					'tx_life_count': frame.slice(30, 34).reduce(msbLsb),
 					'machine_values': {
 						'firmware': frame[2],
-						'raw_lenght': frame[12],
-						'raw_on_request_timeout': frame[13],
-						'fly_rate': frame.slice(14, 16),
-						'sensor_gain_db': frame[16],
-						'sensor_boot_time': frame[17],
-						'hardware_id_1': frame[18],
-						'hardware_id_2': frame[19],
-						'hardware_id_3': frame[20],
-						'rate': frame.slice(21, 25),
-						'tx_life_count': frame.slice(25, 29)
+						'mode':frame[12],
+						'raw_lenght': frame[13],
+						'raw_on_request_timeout': frame[14],
+						'fly_rate': frame.slice(15, 17),
+						'sensor_gain_db': frame[17],
+						'sensor_boot_time': frame[18],
+						'sampling_frequency': frame.slice(19, 23),
+						'hardware_id': frame.slice(23, 26),
+						'report_rate': frame.slice(26, 30),
+						'tx_life_count': frame.slice(30, 34)
 					}
 				}
 			}
@@ -6455,46 +6510,63 @@ function sensor_types(parent){
 				else if(payload[8] === 0){ // processed mode
 					return {
 						mode: payload[8],
-						c1_rms_mv: payload.slice(9, 13).reduce(msbLsb) / 1000,
-						c1_freq_1: payload.slice(13, 15).reduce(msbLsb),
-						c1_freq_2: payload.slice(15, 17).reduce(msbLsb),
-						c1_freq_3: payload.slice(17, 19).reduce(msbLsb),
-						c2_rms_mv: payload.slice(19, 23).reduce(msbLsb) / 1000,
-						c2_freq_1: payload.slice(23, 25).reduce(msbLsb),
-						c2_freq_2: payload.slice(25, 27).reduce(msbLsb),
-						c2_freq_3: payload.slice(27, 30).reduce(msbLsb)
+						sampling_frequency: payload.slice(9, 13).reduce(msbLsb),
+						c1_rms_mv: payload.slice(13, 15).reduce(msbLsb) / 1000,
+						c1_freq_1: payload.slice(15, 17).reduce(msbLsb),
+						c1_freq_2: payload.slice(17, 19).reduce(msbLsb),
+						c1_freq_3: payload.slice(19, 23).reduce(msbLsb),
+						c2_rms_mv: payload.slice(23, 25).reduce(msbLsb) / 1000,
+						c2_freq_1: payload.slice(25, 27).reduce(msbLsb),
+						c2_freq_2: payload.slice(27, 30).reduce(msbLsb),
+						c2_freq_3: payload.slice(30, 34).reduce(msbLsb)
 					};
 				}
 			},
 			'parse_fly': (frame) => {
+				let frame_data = {};
+				frame_data.mode = frame[12] ? 'Raw':'Processed';
+				switch(frame[13]){
+					case 0:
+						frame_data.raw_lenght = 55;
+					break;
+					case 1:
+						frame_data.raw_lenght = 100;
+					break;
+					case 2:
+						frame_data.raw_lenght = 150;
+					break;
+					case 3:
+						frame_data.raw_lenght = 180;
+					break;
+				}
 				return {
 					'firmware': frame[2],
-					'raw_length': frame[12],
-					'raw_on_request_timeout': frame[13] + " Sec",
-					'fly_rate': frame.slice(14, 16).reduce(msbLsb) + " min",
-					'c1_sensor_gain_db': frame[16] + " dB",
-					'c1_sensor_boot_time': frame[17] + " Sec",
-					'c2_sensor_gain_db': frame[18] + " dB",
-					'c2_sensor_boot_time': frame[19] + " Sec",
-					'hardware_id_1': frame[20],
-					'hardware_id_2': frame[21],
-					'hardware_id_3': frame[22],
-					'rate': frame.slice(23, 27).reduce(msbLsb),
-					'tx_life_count': frame.slice(27, 31).reduce(msbLsb),
+					'mode': frame_data.mode,
+					'raw_length': frame_data.raw_lenght + " Bytes",
+					'raw_on_request_timeout': frame[14] + " sec",
+					'fly_rate': frame.slice(15, 17).reduce(msbLsb) + " min",
+					'c1_sensor_gain_db': frame[17] + " dB",
+					'c1_sensor_boot_time': frame[18] + " sec",
+					'c2_sensor_gain_db': frame[19] + " dB",
+					'c2_sensor_boot_time': frame[20] + " sec",
+					'sampling_frequency': (frame.slice(21, 25).reverse()).reduce(msbLsb) + " Hz",
+					'hardware_id': frame.slice(25, 28),
+					'report_rate': frame.slice(28, 32).reduce(msbLsb),
+					'tx_life_count': frame.slice(32, 36).reduce(msbLsb),
 					'machine_values': {
 						'firmware': frame[2],
-						'raw_lenght': frame[12],
-						'raw_on_request_timeout': frame[13],
-						'fly_rate': frame.slice(14, 16),
-						'c1_sensor_gain_db': frame[16],
-						'c1_sensor_boot_time': frame[17],
-						'c2_sensor_gain_db': frame[18],
-						'c2_sensor_boot_time': frame[19],
-						'hardware_id_1': frame[20],
-						'hardware_id_2': frame[21],
-						'hardware_id_3': frame[22],
-						'rate': frame.slice(23, 27),
-						'tx_life_count': frame.slice(27, 31)
+						'mode': frame[12],
+						'raw_lenght': frame[13],
+						'raw_on_request_timeout': frame[14],
+						'fly_rate': frame.slice(15, 17),
+						'c1_sensor_gain_db': frame[17],
+						'c1_sensor_boot_time': frame[18],
+						'c2_sensor_gain_db': frame[19],
+						'c2_sensor_boot_time': frame[20],
+						'sampling_frequency': frame.slice(21, 25),
+						'hardware_id': frame.slice(25, 28),
+						'report_rate': frame.slice(28, 32),
+						'tx_life_count': frame.slice(32, 36)
 					}
 				}
 			}
@@ -6643,11 +6715,11 @@ function sensor_types(parent){
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
-					var hour = payload[11];
-					var minute = payload[12];
-					var expected_packets = payload[15];
-					var current_packet = payload[16];
-					var sdata_start = 17;
+					var hour = payload[12];
+					var minute = payload[13];
+					var expected_packets = payload[16];
+					var current_packet = payload[17];
+					var sdata_start = 18;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -6677,46 +6749,10 @@ function sensor_types(parent){
 								} else{
 
 									var mode = payload[8];
-									var odr = payload[9];
-									var en_axis = payload[10] & 7;
-									var fsr = payload[10] >> 5;
-									var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-									switch(odr){
-										case 6:
-											odr = 50;
-											break;
-										case 7:
-											odr = 100;
-											break;
-										case 8:
-											odr = 200;
-											break;
-										case 9:
-											odr = 400;
-											break;
-										case 10:
-											odr = 800;
-											break;
-										case 11:
-											odr = 1600;
-											break;
-										case 12:
-											odr = 3200;
-											break;
-										case 13:
-											odr = 6400;
-											break;
-										case 14:
-											odr = 12800;
-											break;
-										case 15:
-											odr = 25600;
-											break;
-										default:
-											odr = 0;
-									}
+									var odr = msbLsb(payload[9], payload[10])
+									var en_axis = payload[11] & 7;
+									var fsr = payload[11] >> 5;
+									var device_temp = msbLsb(payload[14], payload[15])/100;
 
 									globalDevices[deviceAddr] = {
 										// stream_size: expected_packets,
@@ -6739,46 +6775,10 @@ function sensor_types(parent){
 						}
 						else{
 							var mode = payload[8];
-							var odr = payload[9];
-							var en_axis = payload[10] & 7;
-							var fsr = payload[10] >> 5;
-							var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-							switch(odr){
-								case 6:
-									odr = 50;
-									break;
-								case 7:
-									odr = 100;
-									break;
-								case 8:
-									odr = 200;
-									break;
-								case 9:
-									odr = 400;
-									break;
-								case 10:
-									odr = 800;
-									break;
-								case 11:
-									odr = 1600;
-									break;
-								case 12:
-									odr = 3200;
-									break;
-								case 13:
-									odr = 6400;
-									break;
-								case 14:
-									odr = 12800;
-									break;
-								case 15:
-									odr = 25600;
-									break;
-								default:
-									odr = 0;
-							}
+							var odr = msbLsb(payload[9], payload[10])
+							var en_axis = payload[11] & 7;
+							var fsr = payload[11] >> 5;
+							var device_temp = msbLsb(payload[14], payload[15])/100;
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
@@ -6913,46 +6913,10 @@ function sensor_types(parent){
 					}else{
 
 						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
+						var odr = msbLsb(payload[9], payload[10])
+						var en_axis = payload[11] & 7;
+						var fsr = payload[11] >> 5;
+						var device_temp = msbLsb(payload[14], payload[15])/100;
 
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
@@ -7034,7 +6998,7 @@ function sensor_types(parent){
 						z_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
 						z_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
 						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
-						rpm: payload.slice(54, 56).reduce(msbLsb) / 10
+						rpm: payload.slice(54, 56).reduce(msbLsb)
 					};
 				}
 				// else{
@@ -7258,11 +7222,11 @@ function sensor_types(parent){
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
-					var hour = payload[11];
-					var minute = payload[12];
-					var expected_packets = payload[15];
-					var current_packet = payload[16];
-					var sdata_start = 17;
+					var hour = payload[12];
+					var minute = payload[13];
+					var expected_packets = payload[16];
+					var current_packet = payload[17];
+					var sdata_start = 18;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -7291,45 +7255,10 @@ function sensor_types(parent){
 									return;
 								} else{
 									var mode = payload[8];
-									var odr = payload[9];
-									var en_axis = payload[10] & 7;
-									var fsr = payload[10] >> 5;
-									var device_temp = msbLsb(payload[13], payload[14])/100;
-
-									switch(odr){
-										case 6:
-											odr = 50;
-											break;
-										case 7:
-											odr = 100;
-											break;
-										case 8:
-											odr = 200;
-											break;
-										case 9:
-											odr = 400;
-											break;
-										case 10:
-											odr = 800;
-											break;
-										case 11:
-											odr = 1600;
-											break;
-										case 12:
-											odr = 3200;
-											break;
-										case 13:
-											odr = 6400;
-											break;
-										case 14:
-											odr = 12800;
-											break;
-										case 15:
-											odr = 25600;
-											break;
-										default:
-											odr = 0;
-									}
+									var odr = msbLsb(payload[9], payload[10])
+									var en_axis = payload[11] & 7;
+									var fsr = payload[11] >> 5;
+									var device_temp = msbLsb(payload[14], payload[15])/100;
 
 									globalDevices[deviceAddr] = {
 										// stream_size: expected_packets,
@@ -7352,76 +7281,40 @@ function sensor_types(parent){
 						}
 						else{
 							var mode = payload[8];
-							var odr = payload[9];
-							var en_axis = payload[10] & 7;
-							var fsr = payload[10] >> 5;
-							var device_temp = msbLsb(payload[13], payload[14])/100;
+							var odr = msbLsb(payload[9], payload[10])
+							var en_axis = payload[11] & 7;
+							var fsr = payload[11] >> 5;
+							var device_temp = msbLsb(payload[14], payload[15])/100;
+
+							globalDevices[deviceAddr] = {
+								// stream_size: expected_packets,
+								data: {},
+								odr: odr,
+								mo: mode,
+								en_axis: en_axis,
+								fsr: fsr,
+								hour: hour,
+								minute: minute,
+								device_temp: device_temp,
+							}
+							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						}
+						if(Object.keys(globalDevices[deviceAddr].data).length == expected_packets){
+							var raw_data = new Array();
+
+							for(const packet in globalDevices[deviceAddr].data){
+								raw_data = raw_data.concat(globalDevices[deviceAddr].data[packet]);
+							}
+							var label = 0;
 
+							var fft = new Array();
+							var fft_concat = {};
 
-							switch(odr){
-								case 6:
-									odr = 50;
-									break;
-								case 7:
-									odr = 100;
-									break;
-								case 8:
-									odr = 200;
-									break;
-								case 9:
-									odr = 400;
-									break;
-								case 10:
-									odr = 800;
-									break;
-								case 11:
-									odr = 1600;
-									break;
-								case 12:
-									odr = 3200;
-									break;
-								case 13:
-									odr = 6400;
-									break;
-								case 14:
-									odr = 12800;
-									break;
-								case 15:
-									odr = 25600;
-									break;
-								default:
-									odr = 0;
-							}
-
-							globalDevices[deviceAddr] = {
-								// stream_size: expected_packets,
-								data: {},
-								odr: odr,
-								mo: mode,
-								en_axis: en_axis,
-								fsr: fsr,
-								hour: hour,
-								minute: minute,
-								device_temp: device_temp,
-							}
-							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-						}
-						if(Object.keys(globalDevices[deviceAddr].data).length == expected_packets){
-							var raw_data = new Array();
-
-							for(const packet in globalDevices[deviceAddr].data){
-								raw_data = raw_data.concat(globalDevices[deviceAddr].data[packet]);
-							}
-							var label = 0;
-
-							var fft = new Array();
-							var fft_concat = {};
-
-							var en_axis_data = {};
-							switch (globalDevices[deviceAddr].en_axis){
-								case 1:
-									en_axis_data.x_offset = 0;
-									en_axis_data.increment = 2;
+							var en_axis_data = {};
+							switch (globalDevices[deviceAddr].en_axis){
+								case 1:
+									en_axis_data.x_offset = 0;
+									en_axis_data.increment = 2;
 									break;
 								case 2:
 									en_axis_data.y_offset = 0;
@@ -7537,46 +7430,10 @@ function sensor_types(parent){
 						}
 					}else{
 						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
+						var odr = msbLsb(payload[9], payload[10])
+						var en_axis = payload[11] & 7;
+						var fsr = payload[11] >> 5;
+						var device_temp = msbLsb(payload[14], payload[15])/100;
 
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
@@ -7701,7 +7558,7 @@ function sensor_types(parent){
 						z1_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
 						z1_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
 						z1_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
-						rpm_1: payload.slice(54, 56).reduce(msbLsb) / 10,
+						rpm_1: payload.slice(54, 56).reduce(msbLsb),
 
 						s2_odr: odr2,
 						s2_temperature: signInt(payload.slice(55, 57).reduce(msbLsb), 16) / 100,
@@ -7729,7 +7586,7 @@ function sensor_types(parent){
 						z2_peak_one_Hz: payload.slice(93, 95).reduce(msbLsb),
 						z2_peak_two_Hz: payload.slice(95, 97).reduce(msbLsb),
 						z2_peak_three_Hz: payload.slice(97, 99).reduce(msbLsb),
-						rpm_2: payload.slice(99, 101).reduce(msbLsb) / 10
+						rpm_2: payload.slice(99, 101).reduce(msbLsb)
 					};
 				}
 				// else{
@@ -8058,11 +7915,11 @@ function sensor_types(parent){
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
-					var hour = payload[11];
-					var minute = payload[12];
-					var expected_packets = payload[15];
-					var current_packet = payload[16];
-					var sdata_start = 17;
+					var hour = payload[12];
+					var minute = payload[13];
+					var expected_packets = payload[16];
+					var current_packet = payload[17];
+					var sdata_start = 18;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -8092,46 +7949,10 @@ function sensor_types(parent){
 								} else{
 
 									var mode = payload[8];
-									var odr = payload[9];
-									var en_axis = payload[10] & 7;
-									var fsr = payload[10] >> 5;
-									var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-									switch(odr){
-										case 6:
-											odr = 50;
-											break;
-										case 7:
-											odr = 100;
-											break;
-										case 8:
-											odr = 200;
-											break;
-										case 9:
-											odr = 400;
-											break;
-										case 10:
-											odr = 800;
-											break;
-										case 11:
-											odr = 1600;
-											break;
-										case 12:
-											odr = 3200;
-											break;
-										case 13:
-											odr = 6400;
-											break;
-										case 14:
-											odr = 12800;
-											break;
-										case 15:
-											odr = 25600;
-											break;
-										default:
-											odr = 0;
-									}
+									var odr = msbLsb(payload[9], payload[10])
+									var en_axis = payload[11] & 7;
+									var fsr = payload[11] >> 5;
+									var device_temp = msbLsb(payload[14], payload[15])/100;
 
 									globalDevices[deviceAddr] = {
 										// stream_size: expected_packets,
@@ -8154,46 +7975,10 @@ function sensor_types(parent){
 						}
 						else{
 							var mode = payload[8];
-							var odr = payload[9];
-							var en_axis = payload[10] & 7;
-							var fsr = payload[10] >> 5;
-							var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-							switch(odr){
-								case 6:
-									odr = 50;
-									break;
-								case 7:
-									odr = 100;
-									break;
-								case 8:
-									odr = 200;
-									break;
-								case 9:
-									odr = 400;
-									break;
-								case 10:
-									odr = 800;
-									break;
-								case 11:
-									odr = 1600;
-									break;
-								case 12:
-									odr = 3200;
-									break;
-								case 13:
-									odr = 6400;
-									break;
-								case 14:
-									odr = 12800;
-									break;
-								case 15:
-									odr = 25600;
-									break;
-								default:
-									odr = 0;
-							}
+							var odr = msbLsb(payload[9], payload[10])
+							var en_axis = payload[11] & 7;
+							var fsr = payload[11] >> 5;
+							var device_temp = msbLsb(payload[14], payload[15])/100;
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
@@ -8331,46 +8116,10 @@ function sensor_types(parent){
 					}else{
 
 						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
+						var odr = msbLsb(payload[9], payload[10])
+						var en_axis = payload[11] & 7;
+						var fsr = payload[11] >> 5;
+						var device_temp = msbLsb(payload[14], payload[15])/100;
 
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
@@ -8453,7 +8202,7 @@ function sensor_types(parent){
 						z_peak_one_Hz: payload.slice(56, 58).reduce(msbLsb),
 						z_peak_two_Hz: payload.slice(58, 60).reduce(msbLsb),
 						z_peak_three_Hz: payload.slice(60, 62).reduce(msbLsb),
-						rpm: payload.slice(62, 64).reduce(msbLsb) / 10
+						rpm: payload.slice(62, 64).reduce(msbLsb)
 					};
 				}
 				// else{
@@ -8672,11 +8421,11 @@ function sensor_types(parent){
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
-					var hour = payload[11];
-					var minute = payload[12];
-					var expected_packets = payload[15];
-					var current_packet = payload[16];
-					var sdata_start = 17;
+					var hour = payload[12];
+					var minute = payload[13];
+					var expected_packets = payload[16];
+					var current_packet = payload[17];
+					var sdata_start = 18;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -8706,46 +8455,10 @@ function sensor_types(parent){
 								} else{
 
 									var mode = payload[8];
-									var odr = payload[9];
-									var en_axis = payload[10] & 7;
-									var fsr = payload[10] >> 5;
-									var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-									switch(odr){
-										case 6:
-											odr = 50;
-											break;
-										case 7:
-											odr = 100;
-											break;
-										case 8:
-											odr = 200;
-											break;
-										case 9:
-											odr = 400;
-											break;
-										case 10:
-											odr = 800;
-											break;
-										case 11:
-											odr = 1600;
-											break;
-										case 12:
-											odr = 3200;
-											break;
-										case 13:
-											odr = 6400;
-											break;
-										case 14:
-											odr = 12800;
-											break;
-										case 15:
-											odr = 25600;
-											break;
-										default:
-											odr = 0;
-									}
+									var odr = msbLsb(payload[9], payload[10])
+									var en_axis = payload[11] & 7;
+									var fsr = payload[11] >> 5;
+									var device_temp = msbLsb(payload[14], payload[15])/100;
 
 									globalDevices[deviceAddr] = {
 										// stream_size: expected_packets,
@@ -8768,46 +8481,10 @@ function sensor_types(parent){
 						}
 						else{
 							var mode = payload[8];
-							var odr = payload[9];
-							var en_axis = payload[10] & 7;
-							var fsr = payload[10] >> 5;
-							var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-							switch(odr){
-								case 6:
-									odr = 50;
-									break;
-								case 7:
-									odr = 100;
-									break;
-								case 8:
-									odr = 200;
-									break;
-								case 9:
-									odr = 400;
-									break;
-								case 10:
-									odr = 800;
-									break;
-								case 11:
-									odr = 1600;
-									break;
-								case 12:
-									odr = 3200;
-									break;
-								case 13:
-									odr = 6400;
-									break;
-								case 14:
-									odr = 12800;
-									break;
-								case 15:
-									odr = 25600;
-									break;
-								default:
-									odr = 0;
-							}
+							var odr = msbLsb(payload[9], payload[10])
+							var en_axis = payload[11] & 7;
+							var fsr = payload[11] >> 5;
+							var device_temp = msbLsb(payload[14], payload[15])/100;
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
@@ -8941,46 +8618,10 @@ function sensor_types(parent){
 					}else{
 
 						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
+						var odr = msbLsb(payload[9], payload[10])
+						var en_axis = payload[11] & 7;
+						var fsr = payload[11] >> 5;
+						var device_temp = msbLsb(payload[14], payload[15])/100;
 
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
@@ -9273,9 +8914,9 @@ function sensor_types(parent){
 			name: 'Dual Pressure and Temperature Sensor',
 			parse: (d) => {
 				return{
-					pressure_s1: signInt(d.slice(0, 4).reduce(msbLsb)),
+					pressure_s1: signInt(d.slice(0, 4).reduce(msbLsb)) / 100,
 					temperature_s1: signInt(d.slice(4, 6).reduce(msbLsb))/100,
-					pressure_s2: signInt(d.slice(6, 10).reduce(msbLsb)),
+					pressure_s2: signInt(d.slice(6, 10).reduce(msbLsb)) / 100,
 					temperature_s2: signInt(d.slice(10, 12).reduce(msbLsb))/100
 				};
 			},
@@ -9335,9 +8976,7 @@ function sensor_types(parent){
 					'auto_check_interval': frame.slice(14, 16).reduce(msbLsb) + " Sec.",
 					'press_auto_check_percent': frame[17] + " %",
 					'temp_auto_check_percent': frame[17] + " %",
-					'hardware_id_1': frame[18],
-					'hardware_id_2': frame[19],
-					'hardware_id_3': frame[20],
+					'hardware_id': frame.slice(18, 21),
 					'sample_rate': frame.slice(21, 25).reduce(msbLsb) + " Sec.",
 					'tx_life_counter': frame.slice(25, 29).reduce(msbLsb),
 					'machine_values': {
@@ -9347,9 +8986,7 @@ function sensor_types(parent){
 						'auto_check_interval': frame.slice(14, 16),
 						'press_auto_check_percent': frame[16],
 						'temp_auto_check_percent': frame[17],
-						'hardware_id_1': frame[18],
-						'hardware_id_2': frame[19],
-						'hardware_id_3': frame[20],
+						'hardware_id': frame.slice(18, 21),
 						'sample_rate': frame.slice(21, 25),
 						'tx_life_counter': frame.slice(25, 29),
 					}

package/package.json

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

package/wireless.html

@@ -324,8 +324,10 @@
 			led_velocity_threshold_84_active: {value: ""},
 			led_velocity_threshold_84: {},
 
-			acceleration_interrupt_threshold_84_active: {value: ""},
-			acceleration_interrupt_threshold_84: {},
+			acceleration_interrupt_threshold_p1_84_active: {value: ""},
+			acceleration_interrupt_threshold_p1_84: {},
+			acceleration_interrupt_threshold_p2_84_active: {value: ""},
+			acceleration_interrupt_threshold_p2_84: {},
 
 			set_rtc_101:{value:0},
 			set_rtc_202:{value:0},
@@ -616,7 +618,10 @@
 			number_of_samples_thermocouple_active:{value: ""},
 			number_of_samples_thermocouple:{value:0},
 			measurement_type_thermocouple_active:{value: ""},
-			measurement_type_thermocouple:{value:0}
+			measurement_type_thermocouple:{value:0},
+			
+			mode_97_active: {value: ""},
+			mode_97: {value: 0}
 		},
 		inputs: 0,
 		outputs: 1,
@@ -1556,7 +1561,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-84 data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114 data-sensor-519 data-sensor-537>
+			<div class="ncd-dependent" data-sensor-84 data-sensor-114 data-sensor-519 data-sensor-537>
 				<hr>
 				<div class="form-row ncd-active-check">
 					<strong>LED Alert Mode</strong>
@@ -1601,6 +1606,9 @@
 						<input type="text" id="node-input-led_velocity_threshold_84" placeholder="10" value="10">
 					</div>
 				</div>
+			</div>
+			<div class="ncd-dependent" data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114>
+				<hr>
 				<div class="form-row ncd-active-check">
 					<div>
 						<strong>Set Acceleration Wake/Interrupt Threshold</strong>
@@ -1608,16 +1616,32 @@
 						<p>This will be an integer value that increments the interrupt threshold by 50mg. A value of 1 means turn the wake the sensor if acceleration is above 50mg, 2 means 100mg, etc.</p>
 					</div>
 					<div>
-						<label for="node-input-acceleration_interrupt_threshold_84_active"><i class="icon-tag"></i>  Auto Config</label>
-						<input type="checkbox" id="node-input-acceleration_interrupt_threshold_84_active" class="ncd-config-toggle" data-target-id="node-input-acceleration_interrupt_threshold_84" value="1">
+						<label for="node-input-acceleration_interrupt_threshold_p1_84_active"><i class="icon-tag"></i>  Auto Config</label>
+						<input type="checkbox" id="node-input-acceleration_interrupt_threshold_p1_84_active" class="ncd-config-toggle" data-target-id="node-input-acceleration_interrupt_threshold_p1_84" value="1">
 					</div>
 					<div>
-						<label for="node-input-acceleration_interrupt_threshold_84"><i class="icon-tag"></i>  Value</label>
-						<input type="text" id="node-input-acceleration_interrupt_threshold_84" placeholder="10" value="10">
+						<label for="node-input-acceleration_interrupt_threshold_p1_84"><i class="icon-tag"></i>  Value</label>
+						<input type="text" id="node-input-acceleration_interrupt_threshold_p1_84" placeholder="10" value="10">
+					</div>
+				</div>
+			</div>
+			<div class="ncd-dependent" data-sensor-111>
+				<div class="form-row ncd-active-check">
+					<div>
+						<strong>Set Acceleration Wake/Interrupt Threshold Probe 2</strong>
+						<p>Set a breakpoint for sensor to wake up and broadcast readings. This is an interrupt based configuration ideal for devices with minimal workload/uptime.</p>
+						<p>This will be an integer value that increments the interrupt threshold by 50mg. A value of 1 means turn the wake the sensor if acceleration is above 50mg, 2 means 100mg, etc.</p>
+					</div>
+					<div>
+						<label for="node-input-acceleration_interrupt_threshold_p2_84_active"><i class="icon-tag"></i>  Auto Config</label>
+						<input type="checkbox" id="node-input-acceleration_interrupt_threshold_p2_84_active" class="ncd-config-toggle" data-target-id="node-input-acceleration_interrupt_threshold_p2_84" value="1">
+					</div>
+					<div>
+						<label for="node-input-acceleration_interrupt_threshold_p2_84"><i class="icon-tag"></i>  Value</label>
+						<input type="text" id="node-input-acceleration_interrupt_threshold_p2_84" placeholder="10" value="10">
 					</div>
 				</div>
 			</div>
-
 			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-180 data-sensor-181 data-sensor-519 data-sensor-537 data-sensor-538>
 				<hr>
 				<div class="form-row ncd-active-check">
@@ -3672,6 +3696,23 @@
 				</div>
 			</div>
 			<div class="ncd-dependent" data-sensor-97 data-sensor-98>
+				<hr>
+				<div class="form-row ncd-active-check">
+					<strong>Set Mode</strong>
+					<p> WARNING: If Mode is set to Raw it is recommended to also set the Destination Address configuration to the address of your Receiver/Gateway.</p>
+					<div>
+						<label for="node-input-mode_97_active"><i class="icon-tag"></i>Active:</label>
+						<input type="checkbox" id="node-input-mode_97_active" class="ncd-config-toggle" data-target-id="node-input-mode_97" value="1">
+					</div>
+					<div>
+						<label for="node-input-mode_97"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-mode_97">
+							<option value="0">Processed</option>
+							<option value="1">Raw</option>
+							<option value="2">Processed + Raw on demand</option>
+						</select>
+					</div>
+				</div>
 				<div class="form-row ncd-active-check">
 					<strong>Set Raw Length</strong>
 					<div>

package/wireless.js

@@ -1690,6 +1690,9 @@ module.exports = function(RED) {
 								if(config.boot_up_time_97_active){
 									promises.boot_up_time_97 = node.config_gateway.config_set_boot_up_time_97(mac, parseInt(config.boot_up_time_97));
 								}
+								if(config.mode_97_active){
+									promises.mode = node.config_gateway.config_set_mode_97(mac, parseInt(config.mode_97));
+								}
 								break;
 							case 98:
 								if(config.raw_length_97_active){
@@ -1704,6 +1707,9 @@ module.exports = function(RED) {
 								if(config.boot_up_time_97_active){
 									promises.boot_up_time_97 = node.config_gateway.config_set_boot_up_time_97(mac, parseInt(config.boot_up_time_97));
 								}
+								if(config.mode_97_active){
+									promises.mode = node.config_gateway.config_set_mode_97(mac, parseInt(config.mode_97));
+								}
 								// if(config.sensor_boot_time_420ma_active){
 								// 	promises.sensor_boot_time_420ma = node.config_gateway.config_set_sensor_boot_time_420ma(mac, parseInt(config.sensor_boot_time_420ma));
 								// }
@@ -1935,6 +1941,9 @@ module.exports = function(RED) {
 								if(config.fly_interval_110_active){
 									promises.fly_interval_110 = node.config_gateway.config_set_fly_interval_110(mac, parseInt(config.fly_interval_110));
 								}
+								if(config.acceleration_interrupt_threshold_p1_84_active){
+									promises.acceleration_interrupt_threshold_p1_84 = node.config_gateway.config_set_acceleration_interrupt_threshold_p1_84(mac, parseInt(config.acceleration_interrupt_threshold_p1_84));
+								}
 								break;
 							case 111:
 								if(config.output_data_rate_p1_81_active){
@@ -2012,6 +2021,12 @@ module.exports = function(RED) {
 								if(config.fly_interval_110_active){
 									promises.fly_interval_110 = node.config_gateway.config_set_fly_interval_110(mac, parseInt(config.fly_interval_110));
 								}
+								if(config.acceleration_interrupt_threshold_p1_84_active){
+									promises.acceleration_interrupt_threshold_p1_84 = node.config_gateway.config_set_acceleration_interrupt_threshold_p1_84(mac, parseInt(config.acceleration_interrupt_threshold_p1_84));
+								}
+								if(config.acceleration_interrupt_threshold_p2_84_active){
+									promises.acceleration_interrupt_threshold_p2_84 = node.config_gateway.config_set_acceleration_interrupt_threshold_p2_84(mac, parseInt(config.acceleration_interrupt_threshold_p2_84));
+								}
 								break;
 							case 112:
 								if(config.current_calibration_82_active){
@@ -2077,6 +2092,9 @@ module.exports = function(RED) {
 								if(config.fly_interval_110_active){
 									promises.fly_interval_110 = node.config_gateway.config_set_fly_interval_110(mac, parseInt(config.fly_interval_110));
 								}
+								if(config.acceleration_interrupt_threshold_p1_84_active){
+									promises.acceleration_interrupt_threshold_p1_84 = node.config_gateway.config_set_acceleration_interrupt_threshold_p1_84(mac, parseInt(config.acceleration_interrupt_threshold_p1_84));
+								}
 								break;
 							case 114:
 								if(config.output_data_rate_101_active){
@@ -2124,8 +2142,8 @@ module.exports = function(RED) {
 								if(config.led_velocity_threshold_84_active){
 									promises.led_velocity_threshold_84 = node.config_gateway.config_set_led_velocity_threshold_84(mac, parseInt(config.led_velocity_threshold_84));
 								}
-								if(config.acceleration_interrupt_threshold_84_active){
-									promises.acceleration_interrupt_threshold_84 = node.config_gateway.config_set_acceleration_interrupt_threshold_84(mac, parseInt(config.acceleration_interrupt_threshold_84));
+								if(config.acceleration_interrupt_threshold_p1_84_active){
+									promises.acceleration_interrupt_threshold_p1_84 = node.config_gateway.config_set_acceleration_interrupt_threshold_p1_84(mac, parseInt(config.acceleration_interrupt_threshold_p1_84));
 								}
 								if(config.payload_length_80_active){
 									promises.payload_length_80 = node.config_gateway.config_set_payload_length_80(mac, parseInt(config.payload_length_80));