@ncd-io/node-red-enterprise-sensors 1.1.0 → 1.1.2

package/lib/WirelessGateway.js

@@ -141,7 +141,7 @@ module.exports = class WirelessSensor{
 				}
 			}
 			// #OTF
-			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 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,97,98,101,102,105,106,107,108,110,111,112,114,118,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];
 
@@ -150,6 +150,9 @@ module.exports = class WirelessSensor{
 					var broadcast_otf_devices = [101,102,202];
 					mode = "FLY";
 				}
+				if(frame.data[9] == 85 && frame.data[10] == 80 && frame.data[11] == 84 && frame.data[12] == 72 && frame.data[13] == 87 && frame.data[14] == 82 && frame.data[15] == 78) {
+					mode = "UPTHWRN";
+				}
 			}
 			if(mode == 'ACK'){
 				data.firmware_version = frame.data[5];
@@ -187,6 +190,7 @@ module.exports = class WirelessSensor{
 				type: data.sensor_type,
 				nodeId: data.nodeId,
 				mode: mode,
+				// data: data,
 				lastHeard: data.received
 			};
 
@@ -197,6 +201,8 @@ module.exports = class WirelessSensor{
 				// If we ever need to add any of the additional information of this packet we will need to rebuild to match
 				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;
 			}
 			var that = this;
 
@@ -218,7 +224,7 @@ module.exports = class WirelessSensor{
 					}).catch(console.log);
 				}
 			}
-			if(mode != 'FLY'){
+			if(mode != 'FLY' && mode !='UPTHWRN'){
 				var send_events = function(){
 					that._emitter.emit(type, data);
 					that._emitter.emit(type+'-'+data.sensor_type, data);
@@ -251,9 +257,10 @@ module.exports = class WirelessSensor{
 			nodeId: payload[0],
 			counter: payload[1],
 			sensor_type: msbLsb(payload[2], payload[3]),
+			result: payload[5],
 			data: payload.slice(6)
 		};
-	}
+	};
 	config_error(payload){
 		var errors = [
 			'Unknown',
@@ -293,7 +300,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		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 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,97,98,101,102,105,106,107,108,110,111,112,114,118,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) {
@@ -301,6 +308,10 @@ module.exports = class WirelessSensor{
 				return parsed;
 			}
 		}
+		if(frame.data[9] == 85 && frame.data[10] == 80 && frame.data[11] == 84 && frame.data[12] == 72 && frame.data[13] == 87 && frame.data[14] == 82 && frame.data[15] == 78) {
+			parsed.payload = "Upthwrn command";
+			return parsed;
+		}
 
 		// Sensor type 515 has a unique OTF that is indicated by a reserve byte value with MSb of 1
 		if(parsed.sensor_type == 515){
@@ -711,7 +722,7 @@ module.exports = class WirelessSensor{
 					data: payload.slice(8)
 				};
 				// #OTF
-			}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 == 202 || 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 == 97 || parsed.sensor_type == 98 || 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 == 202 || 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;
@@ -1150,9 +1161,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);
 	}
@@ -1260,12 +1277,6 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_qos_108(sensor_mac, value){
-		console.log('config_set_qos_108');
-		var packet = [247, 52, 0, 0, 0, value];
-		console.log(packet);
-		return this.config_send(sensor_mac, packet);
-	}
 	config_set_deactivate_activate_accelero_108(sensor_mac, value){
 		console.log('config_set_deactivate_activate_accelero_108');
 		var packet = [244, 37, 0, 0, 0, value];
@@ -1399,6 +1410,36 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_filter_thermocouple(sensor_mac, value){
+		console.log('config_set_filter_thermocouple');
+		let packet = [244, 85, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_cold_junction_thermocouple(sensor_mac, value){
+		console.log('config_set_cold_junction_thermocouple');
+		let packet = [244, 87, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_sample_resolution_thermocouple(sensor_mac, value){
+		console.log('config_set_sample_resolution_thermocouple');
+		let packet = [244, 89, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_number_of_samples_thermocouple(sensor_mac, value){
+		console.log('config_set_number_of_samples_thermocouple');
+		let packet = [244, 91, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_measurement_type_thermocouple(sensor_mac, value){
+		console.log('config_set_number_of_samples_thermocouple');
+		let packet = [244, 95, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_debounce_time_2(sensor_mac, value){
 		console.log('config_set_debounce_time_2');
 		var packet = [244, 66, 0, 0, 2, value];
@@ -1503,7 +1544,7 @@ module.exports = class WirelessSensor{
 	}
 	config_set_auto_raw_interval_110(sensor_mac, value){
 		console.log('config_set_raw_interval_110');
-		var packet = [244, 79, 0, 0, 80, 76, value];
+		var packet = [244, 79, 0, 0, 80, 70, value];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
@@ -1515,9 +1556,9 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_clear_probe_uptimers_110(sensor_mac, value){
+	config_set_clear_probe_uptimers_110(sensor_mac){
 		console.log('config_set_clear_probe_uptimers_110');
-		var packet = [244, 79, 0, 0, 80, value];
+		var packet = [244, 79, 0, 0, 80, 75];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
@@ -1529,9 +1570,13 @@ module.exports = class WirelessSensor{
 	}
 	config_set_smart_threshold_110(sensor_mac, value){
 		console.log('config_set_smart_threshold_110');
-		var packet = [244, 79, 0, 0, 101];
-		let value_th = int2Bytes((value), 2);
-		packet.push(...value_th);
+		var packet = [244, 79, 0, 0, 101, 78, 1, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_smart_threshold_p2_110(sensor_mac, value){
+		console.log('config_set_smart_threshold_p2_110');
+		var packet = [244, 79, 0, 0, 101, 78, 2, value];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
@@ -1706,6 +1751,72 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_pressure_sensor_fs_ch1_118(sensor_mac, value){
+		console.log('config_set_pressure_sensor_fs_ch1_118');
+		var packet = [244, 64, 0, 0, 26, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_pressure_sensor_fs_ch2_118(sensor_mac, value){
+		console.log('config_set_pressure_sensor_fs_ch2_118');
+		var packet = [244, 64, 0, 0, 118, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_auto_check_interval_118(sensor_mac, value){
+		console.log('config_set_auto_check_interval_118');
+		var packet = [244, 66, 0, 0, 26];
+		let value_ = int2Bytes((value), 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_press_auto_check_percent_118(sensor_mac, value){
+		console.log('config_set_press_auto_check_percent_118');
+		var packet = [244, 68, 0, 0, 26, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_temp_auto_check_percent_118(sensor_mac, value){
+		console.log('config_set_temp_auto_check_percent_118');
+		var packet = [244, 70, 0, 0, 26, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_raw_length_97(sensor_mac, value){
+		console.log('config_set_raw_length_97');
+		var packet = [244, 67, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_raw_timeout_97(sensor_mac, value){
+		console.log('config_set_raw_timeout_97');
+		var packet = [244, 71, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_fly_rate_97(sensor_mac, value){
+		console.log('config_set_fly_rate_97');
+		var packet = [244, 73, 0, 0, 0];
+		let value_ = int2Bytes((value), 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_boot_up_time_97(sensor_mac, value){
+		console.log('config_set_boot_up_time_97');
+		var packet = [244, 51, 0, 0, 0];
+		let value_ = int2Bytes((value), 2);
+		packet.push(...value_);
+		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) => {
@@ -1928,6 +2039,7 @@ module.exports = class WirelessSensor{
 					function pass(packet){
 						clearTimeout(tout);
 						that._emitter.removeListener('config_error-'+sensor_mac, fail);
+						packet.sent = data;
 						fulfill(packet);
 						f();
 					};
@@ -1977,8 +2089,8 @@ module.exports = class WirelessSensor{
 		}
 		// var odr;
 		var odr = payload[8];
-		var device_temp = msbLsb(payload[11], payload[12])/100;
-		var probe_temp = msbLsb(payload[13], payload[14])/100;
+		var device_temp = signInt((msbLsb(payload[11], payload[12])), 16)/100;
+		var probe_temp = signInt((msbLsb(payload[13], payload[14])), 16)/100;
 
 		switch(odr){
 			case 6:
@@ -2026,7 +2138,8 @@ module.exports = class WirelessSensor{
 		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 device_temp = signInt((msbLsb(payload[13], payload[14])), 16)/100;
 		switch(odr){
 			case 0:
 				odr = 4000;
@@ -2076,7 +2189,7 @@ module.exports = class WirelessSensor{
 			device_temp: device_temp,
 		}
 		if(firmware > 0){
-			var probe_temp = msbLsb(payload[15], payload[16])/100;
+			var probe_temp = signInt((msbLsb(payload[15], payload[16])), 16)/100;
 			globalDevices[deviceAddr].probe_temp = probe_temp;
 		}
 		globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
@@ -3113,20 +3226,78 @@ 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).reverse()).reduce(msbLsb)/ 100,
-					// TODO Check if the iaq_accuracy should still be d[27]
-					iaq_accuracy: d[26]
-				};
+			name: 'Wireless Temp Humidity Pressure Air quality Sensor V2',
+			parse: (d, parsed) => {
+				if(parsed[1] > 1){ // Firmware version
+					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[26]
+					};
+				}
+				else{
+					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).reverse()).reduce(msbLsb)/ 100,
+						// TODO Check if the iaq_accuracy should still be d[27]
+						iaq_accuracy: d[26]
+					};
+				}
+			},
+			'parse_fly': (frame) => {
+				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] + ' days',
+						'sensor_update_rate':frame.slice(13, 15).reduce(msbLsb) + ' sec',
+						'hardware_id': frame.slice(15, 18),
+						'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),
+						}
+					};
+				}
 			}
 		},
 		'75': {
@@ -6036,167 +6207,36 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'101':{
-			name: 'Pro Vibration',
-			parse: (d, full)=>{
-				return{
-					mode: full[7] == 1? "raw" : "normal"
-				};
-			}
-		},
-		'105': {
-			name: '1 Channel Automatic Luber With Ultrasound Vibration Sensor',
-			parse: (d) => {
-				return {
-					raw_adc: d.slice(0, 2).reduce(msbLsb),
-					ma: d.slice(2, 4).reduce(msbLsb) / 100,
-					db: d.slice(4, 6).reduce(msbLsb) / 100
-				};
-			}
-		},
-		'106': {
-			name: '2 Channel Automatic Luber With Ultrasound Vibration Sensor',
-			parse: (d) => {
-				return {
-					c1_raw_adc: d.slice(0, 2).reduce(msbLsb),
-					c1_ma: d.slice(2, 4).reduce(msbLsb) / 100,
-					c1_db: d.slice(4, 6).reduce(msbLsb) / 100,
-					c2_raw_adc: d.slice(6, 8).reduce(msbLsb),
-					c2_ma: d.slice(8, 10).reduce(msbLsb) / 100,
-					c2_db: d.slice(10, 12).reduce(msbLsb) / 100
-				};
-			}
-		},
-		'107': {
-			name: '16-Bit 4-Channel 4-20mA',
-			parse: (d) => {
-				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
-				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
-				var adc3 = signInt(d.slice(4, 6).reduce(msbLsb));
-				var adc4 = signInt(d.slice(6, 8).reduce(msbLsb));
-				var ma1 = (signInt(d.slice(8, 10).reduce(msbLsb)))/100.0;
-				var ma2 = (signInt(d.slice(10, 12).reduce(msbLsb)))/100.0;
-				var ma3 = (signInt(d.slice(12, 14).reduce(msbLsb)))/100.0;
-				var ma4 = (signInt(d.slice(14, 16).reduce(msbLsb)))/100.0;
-				return {
-					adc1: adc1,
-					adc2: adc2,
-					adc3: adc3,
-					adc4: adc4,
-					ma1: ma1,
-					ma2: ma2,
-					ma3: ma3,
-					ma4: ma4
-				};
-			}
-		},
-		'108': {
-			name: 'Machine Uptime Monitoring Sensor',
-			parse: (d, payload) => {
-				let firmware = payload[1];
-				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;
-				}
-				if(firmware > 4){
-					let report_type = d[41]? "Shift": "Regular";
-					return {
-						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
-						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
-						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
-						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
-						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
-						opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
-						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),
-						input_di: d[40] & 1 ? 1 : 0,
-						input_ct: d[40] & 2 ? 1 : 0,
-						input_opto: d[40] & 4 ? 1 : 0,
-						input_acc: d[40] & 8 ? 1 : 0,
-						input_mag: d[40] & 16 ? 1 : 0,
-						report_type: report_type,
-						rtc: [
-							String(d[42]).padStart(2, '0'),
-							String(d[43]).padStart(2, '0'),
-							String(d[44]).padStart(2, '0')
-						].join(':')
-					};
-				}else{
-					return {
-						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
-						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
-						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
-						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
-						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
-						opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
-						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),
-						input_di: d[40] & 1 ? 1 : 0,
-						input_ct: d[40] & 2 ? 1 : 0,
-						input_opto: d[40] & 4 ? 1 : 0,
-						input_acc: d[40] & 8 ? 1 : 0,
-						input_mag: d[40] & 16 ? 1 : 0
-					};
-				}
-			},
-			'parse_fly': (frame) => {
-				return {
-					'firmware': frame[2],
-					'report_rate': frame.slice(12, 16).reduce(msbLsb).toString() + "sec.",
-					'accelerometer_threshold': (frame[16]* 32).toString() + "mg.",
-					'debouncing_timeout': frame[17].toString() + "sec.",
-					'accelero_active_state': frame[18],
-					'digital_inputs_active_edge': frame.slice(19, 22).reduce(msbLsb),
-					'counter_threshold': frame.slice(22, 26).reduce(msbLsb).toString() + "sec.",
-					'trasnmit_on_change_status': frame[26],
-					'machine_values': {
-						'firmware': frame[2],
-						'report_rate': frame.slice(12, 16),
-						'accelerometer_threshold': frame[16],
-						'debouncing_timeout': frame[17],
-						'accelero_active_state': frame[18],
-						'digital_inputs_active_edge': frame.slice(19, 22),
-						'counter_threshold': frame.slice(22, 26),
-						'trasnmit_on_change_status': frame[26]
-					}
-				}
-			}
-		},
-		'110': {
-			name: 'One Channel Vibration Plus v4',
+		'97': {
+			name: 'One channel Dynamic Ultrasound vibration Sensor',
 			parse: (payload, parsed, mac) => {
-				if(payload[7] >> 1 != 0){
-					console.log('Error found');
-					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
-					return parsed;
-				}
-
-				if(payload[8] === 1){
+				if (payload[8] === 1) { // raw
+					var mode = payload[8];
+					var sampling_frequency = payload.slice(9, 13).reduce(msbLsb);
+					var sensor_index = payload[13];
+					var gain_db = payload[14];
 					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 expected_packets = payload.slice(15, 17).reduce(msbLsb);
+					var current_packet = payload.slice(17, 19).reduce(msbLsb);
+					var sdata_start = 19;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
-						if(expected_packets != 1){
-							// if a packet is already stored with the same packet ID, or if packet ID is 1, or if current packet ID is not one more than last packet ID
-							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
-								console.log('-----');
-								console.log('bad packet breakdown deleting stream');
-								console.log(current_packet);
+						// if(expected_packets == 1){
+						// 	this.build_102_data(payload, deviceAddr, hour, minute, sdata_start, current_packet, firmware);
+						// }
+
+						// if a packet is already stored with the same packet ID,
+						// or if packet ID is 1,
+						// or if current packet ID is not one more than last packet ID
+						if(current_packet == 1 && expected_packets != 1) {
+							if(current_packet in globalDevices[deviceAddr].data || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
+								console.log('bad packet breakdown, deleting stream. Current packet:');
+								console.log(current_packet);
+								console.log('Total Expected Packets:');
 								console.log(expected_packets);
-								console.log(current_packet in globalDevices[deviceAddr].data);
-								console.log(current_packet == 1);
-								console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
+								// console.log(current_packet in globalDevices[deviceAddr].data && current_packet == 1 && expected_packets != 1);
+								// console.log(current_packet == 1);
+								// console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
 								if(this.hasOwnProperty('failure_no')){
 									this.failure_no = this.failure_no + 1;
 								}
@@ -6207,115 +6247,535 @@ function sensor_types(parent){
 									console.log('####falure no');
 									console.log(this.failure_no);
 								}
-								// console.log(globalDevices[deviceAddr].data);
 								delete globalDevices[deviceAddr];
 								if(current_packet != 1){
 									return;
 								} else{
+									if(current_packet != 1){
+										console.log('bad packet cleanup');
+										return;
+									}
+									globalDevices[deviceAddr] = {
+										// stream_size: expected_packets,
+										data: {},
+									}
+									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+									return;
+								}
+							}
+						}
+						if(expected_packets == 1){
+							if(current_packet != 1){
+								console.log('bad packet cleanup');
+								return;
+							}
+							globalDevices[deviceAddr] = {
+								// stream_size: expected_packets,
+								data: {},
+							}
+							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+							//return;
+						} else{
+							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 = {
+							// 	data: new Array()
+							// 	// test: new Array()
+							// };
+							var fft = new Array();
+							var adc = {};
 
-									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;
+							for(var i = 0; i < raw_data.length; i+=2){
+								label++;
+								adc[label] = (raw_data[i]<<8)+(raw_data[i+1]);
+							}
+							// var data = globalDevices[deviceAddr];
+							delete globalDevices[deviceAddr];
+							if(this.hasOwnProperty('failure_no')){
+								console.log('####falure no');
+								console.log(this.failure_no);
+							}
+							return{
+								'mode': mode,
+								'sampling_frequency': sampling_frequency,
+								'sensor_index': sensor_index,
+								'gain_db':gain_db,
+								'adc':adc,
+								'raw_data':raw_data
+							}
+						}
+						else{
+							return;
+						}
 
+					}else{
+						if(current_packet != 1){
+							console.log('bad packet cleanup');
+							return;
+						}
+						globalDevices[deviceAddr] = {
+							// stream_size: expected_packets,
+							data: {},
+						}
+						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						return;
+					}
+				}
+				else if(payload[8] === 0){ // processed mode
+					return {
+						mode: payload[8],
+						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),
+					};
+				}
 
-									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;
-									}
+			},
+			'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],
+					'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],
+						'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)
+					}
+				}
+			}
+		},
+		'98': {
+			name: 'Two channel Dynamic Ultrasound vibration Sensor',
+			parse: (payload, parsed, mac) => {
+				if (payload[8] === 1) { // raw
+					var mode = payload[8];
+					var sampling_frequency = payload.slice(9, 13).reduce(msbLsb);
+					var sensor_index = payload[13];
+					var gain_db = payload[14];
+					var deviceAddr = mac;
+					var expected_packets = payload.slice(15, 17).reduce(msbLsb);
+					var current_packet = payload.slice(17, 19).reduce(msbLsb);
+					var sdata_start = 19;
+
+					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
+						// if(expected_packets == 1){
+						// 	this.build_102_data(payload, deviceAddr, hour, minute, sdata_start, current_packet, firmware);
+						// }
 
+						// if a packet is already stored with the same packet ID,
+						// or if packet ID is 1,
+						// or if current packet ID is not one more than last packet ID
+						if(current_packet == 1 && expected_packets != 1) {
+							if(current_packet in globalDevices[deviceAddr].data || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
+								console.log('bad packet breakdown, deleting stream. Current packet:');
+								console.log(current_packet);
+								console.log('Total Expected Packets:');
+								console.log(expected_packets);
+								// console.log(current_packet in globalDevices[deviceAddr].data && current_packet == 1 && expected_packets != 1);
+								// console.log(current_packet == 1);
+								// console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
+								if(this.hasOwnProperty('failure_no')){
+									this.failure_no = this.failure_no + 1;
+								}
+								else{
+									this.failure_no = 1;
+								}
+								if(this.hasOwnProperty('failure_no')){
+									console.log('####falure no');
+									console.log(this.failure_no);
+								}
+								delete globalDevices[deviceAddr];
+								if(current_packet != 1){
+									return;
+								} else{
+									if(current_packet != 1){
+										console.log('bad packet cleanup');
+										return;
+									}
 									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);
 									return;
 								}
 							}
-							else{
-								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						}
+						if(expected_packets == 1){
+							if(current_packet != 1){
+								console.log('bad packet cleanup');
+								return;
+							}
+							globalDevices[deviceAddr] = {
+								// stream_size: expected_packets,
+								data: {},
+							}
+							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+							//return;
+						} else{
+							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 = {
+							// 	data: new Array()
+							// 	// test: new Array()
+							// };
+							var fft = new Array();
+							var adc = {};
+
+							for(var i = 0; i < raw_data.length; i+=2){
+								label++;
+								adc[label] = (raw_data[i]<<8)+(raw_data[i+1]);
+							}
+							// var data = globalDevices[deviceAddr];
+							delete globalDevices[deviceAddr];
+							if(this.hasOwnProperty('failure_no')){
+								console.log('####falure no');
+								console.log(this.failure_no);
+							}
+							return{
+								'mode': mode,
+								'sampling_frequency': sampling_frequency,
+								'sensor_index': sensor_index,
+								'gain_db':gain_db,
+								'adc':adc,
+								'raw_data':raw_data
 							}
 						}
 						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;
+							return;
+						}
+
+					}else{
+						if(current_packet != 1){
+							console.log('bad packet cleanup');
+							return;
+						}
+						globalDevices[deviceAddr] = {
+							// stream_size: expected_packets,
+							data: {},
+						}
+						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						return;
+					}
+				}
+				else if(payload[8] === 0){ // processed mode
+					return {
+						mode: payload[8],
+						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],
+					'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],
+						'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)
+					}
+				}
+			}
+		},
+		'101':{
+			name: 'Pro Vibration',
+			parse: (d, full)=>{
+				return{
+					mode: full[7] == 1? "raw" : "normal"
+				};
+			}
+		},
+		'105': {
+			name: '1 Channel Automatic Luber With Ultrasound Vibration Sensor',
+			parse: (d) => {
+				return {
+					raw_adc: d.slice(0, 2).reduce(msbLsb),
+					ma: d.slice(2, 4).reduce(msbLsb) / 100,
+					db: d.slice(4, 6).reduce(msbLsb) / 100
+				};
+			}
+		},
+		'106': {
+			name: '2 Channel Automatic Luber With Ultrasound Vibration Sensor',
+			parse: (d) => {
+				return {
+					c1_raw_adc: d.slice(0, 2).reduce(msbLsb),
+					c1_ma: d.slice(2, 4).reduce(msbLsb) / 100,
+					c1_db: d.slice(4, 6).reduce(msbLsb) / 100,
+					c2_raw_adc: d.slice(6, 8).reduce(msbLsb),
+					c2_ma: d.slice(8, 10).reduce(msbLsb) / 100,
+					c2_db: d.slice(10, 12).reduce(msbLsb) / 100
+				};
+			}
+		},
+		'107': {
+			name: '16-Bit 4-Channel 4-20mA',
+			parse: (d) => {
+				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
+				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
+				var adc3 = signInt(d.slice(4, 6).reduce(msbLsb));
+				var adc4 = signInt(d.slice(6, 8).reduce(msbLsb));
+				var ma1 = (signInt(d.slice(8, 10).reduce(msbLsb)))/100.0;
+				var ma2 = (signInt(d.slice(10, 12).reduce(msbLsb)))/100.0;
+				var ma3 = (signInt(d.slice(12, 14).reduce(msbLsb)))/100.0;
+				var ma4 = (signInt(d.slice(14, 16).reduce(msbLsb)))/100.0;
+				return {
+					adc1: adc1,
+					adc2: adc2,
+					adc3: adc3,
+					adc4: adc4,
+					ma1: ma1,
+					ma2: ma2,
+					ma3: ma3,
+					ma4: ma4
+				};
+			}
+		},
+		'108': {
+			name: 'Machine Uptime Monitoring Sensor',
+			parse: (d, payload) => {
+				let firmware = payload[1];
+				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;
+				}
+				if(firmware > 4){
+					let report_type = d[41]? "Shift": "Regular";
+					return {
+						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
+						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
+						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
+						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
+						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
+						opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
+						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),
+						input_di: d[40] & 1 ? 1 : 0,
+						input_ct: d[40] & 2 ? 1 : 0,
+						input_opto: d[40] & 4 ? 1 : 0,
+						input_acc: d[40] & 8 ? 1 : 0,
+						input_mag: d[40] & 16 ? 1 : 0,
+						report_type: report_type,
+						rtc: [
+							String(d[42]).padStart(2, '0'),
+							String(d[43]).padStart(2, '0'),
+							String(d[44]).padStart(2, '0')
+						].join(':')
+					};
+				}else{
+					return {
+						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
+						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
+						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
+						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
+						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
+						opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
+						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),
+						input_di: d[40] & 1 ? 1 : 0,
+						input_ct: d[40] & 2 ? 1 : 0,
+						input_opto: d[40] & 4 ? 1 : 0,
+						input_acc: d[40] & 8 ? 1 : 0,
+						input_mag: d[40] & 16 ? 1 : 0
+					};
+				}
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'report_rate': frame.slice(12, 16).reduce(msbLsb).toString() + "sec.",
+					'accelerometer_threshold': (frame[16]* 32).toString() + "mg.",
+					'debouncing_timeout': frame[17].toString() + "sec.",
+					'accelero_active_state': frame[18],
+					'digital_inputs_active_edge': frame.slice(19, 22).reduce(msbLsb),
+					'counter_threshold': frame.slice(22, 26).reduce(msbLsb).toString() + "sec.",
+					'trasnmit_on_change_status': frame[26],
+					'machine_values': {
+						'firmware': frame[2],
+						'report_rate': frame.slice(12, 16),
+						'accelerometer_threshold': frame[16],
+						'debouncing_timeout': frame[17],
+						'accelero_active_state': frame[18],
+						'digital_inputs_active_edge': frame.slice(19, 22),
+						'counter_threshold': frame.slice(22, 26),
+						'trasnmit_on_change_status': frame[26]
+					}
+				}
+			}
+		},
+		'110': {
+			name: 'One Channel Vibration Plus v4',
+			parse: (payload, parsed, mac) => {
+				if(payload[7] >> 1 != 0){
+					console.log('Error found');
+					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
+					return parsed;
+				}
 
+				if(payload[8] === 1){
+					var deviceAddr = mac;
+					var firmware = payload[1];
+					var hour = payload[12];
+					var minute = payload[13];
+					var expected_packets = payload[16];
+					var current_packet = payload[17];
+					var sdata_start = 18;
 
-							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;
+					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
+						if(expected_packets != 1){
+							// if a packet is already stored with the same packet ID, or if packet ID is 1, or if current packet ID is not one more than last packet ID
+							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
+								console.log('-----');
+								console.log('bad packet breakdown deleting stream');
+								console.log(current_packet);
+								console.log(expected_packets);
+								console.log(current_packet in globalDevices[deviceAddr].data);
+								console.log(current_packet == 1);
+								console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
+								if(this.hasOwnProperty('failure_no')){
+									this.failure_no = this.failure_no + 1;
+								}
+								else{
+									this.failure_no = 1;
+								}
+								if(this.hasOwnProperty('failure_no')){
+									console.log('####falure no');
+									console.log(this.failure_no);
+								}
+								// console.log(globalDevices[deviceAddr].data);
+								delete globalDevices[deviceAddr];
+								if(current_packet != 1){
+									return;
+								} else{
+
+									var mode = payload[8];
+									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);
+									return;
+								}
+							}
+							else{
+								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 							}
+						}
+						else{
+							var mode = payload[8];
+							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,
@@ -6450,46 +6910,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,
@@ -6571,6 +6995,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)
 					};
 				}
 				// else{
@@ -6794,11 +7219,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){
@@ -6827,45 +7252,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,
@@ -6888,46 +7278,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,
@@ -7073,46 +7427,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,
@@ -7237,6 +7555,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),
 
 						s2_odr: odr2,
 						s2_temperature: signInt(payload.slice(55, 57).reduce(msbLsb), 16) / 100,
@@ -7263,7 +7582,8 @@ function sensor_types(parent){
 						z2_displacement_mm: payload.slice(91, 93).reduce(msbLsb) / 100,
 						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)
+						z2_peak_three_Hz: payload.slice(97, 99).reduce(msbLsb),
+						rpm_2: payload.slice(99, 101).reduce(msbLsb)
 					};
 				}
 				// else{
@@ -7592,11 +7912,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){
@@ -7619,53 +7939,17 @@ function sensor_types(parent){
 									console.log('####falure no');
 									console.log(this.failure_no);
 								}
-								// console.log(globalDevices[deviceAddr].data);
-								delete globalDevices[deviceAddr];
-								if(current_packet != 1){
-									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;
-									}
+								// console.log(globalDevices[deviceAddr].data);
+								delete globalDevices[deviceAddr];
+								if(current_packet != 1){
+									return;
+								} else{
+
+									var mode = payload[8];
+									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,
@@ -7688,46 +7972,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,
@@ -7865,46 +8113,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,
@@ -7987,6 +8199,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)
 					};
 				}
 				// else{
@@ -8205,11 +8418,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){
@@ -8239,46 +8452,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,
@@ -8301,46 +8478,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,
@@ -8474,46 +8615,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,
@@ -8595,6 +8700,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
 					};
 				}
 				// else{
@@ -8801,7 +8907,89 @@ function sensor_types(parent){
 				}
 			}
 		},
-
+		'118': {
+			name: 'Dual Pressure and Temperature Sensor',
+			parse: (d) => {
+				return{
+					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)) / 100,
+					temperature_s2: signInt(d.slice(10, 12).reduce(msbLsb))/100
+				};
+			},
+			'parse_fly': (frame) => {
+				let psi_1;
+				let psi_2;
+				switch(frame[12]){
+					case 0:
+						psi_1 = "10 PSI"
+						break;
+					case 1:
+						psi_1 = "20 PSI"
+						break;
+					case 2:
+						psi_1 = "100 PSI"
+						break;
+					case 3:
+						psi_1 = "500 PSI"
+						break;
+					case 4:
+						psi_1 = "1000 PSI"
+						break;
+					case 5:
+						psi_1 = "5000 PSI"
+						break;
+					case 6:
+						psi_1 = "10000 PSI"
+						break;
+				}
+				switch(frame[13]){
+					case 0:
+						psi_2 = "10 PSI"
+						break;
+					case 1:
+						psi_2 = "20 PSI"
+						break;
+					case 2:
+						psi_2 = "100 PSI"
+						break;
+					case 3:
+						psi_2 = "500 PSI"
+						break;
+					case 4:
+						psi_2 = "1000 PSI"
+						break;
+					case 5:
+						psi_2 = "5000 PSI"
+						break;
+					case 6:
+						psi_2 = "10000 PSI"
+						break;
+				}
+				return {
+					'firmware': frame[2],
+					'sensor_1_fs': psi_1,
+					'sensor_2_fs': psi_2,
+					'auto_check_interval': frame.slice(14, 16).reduce(msbLsb) + " Sec.",
+					'press_auto_check_percent': frame[17] + " %",
+					'temp_auto_check_percent': frame[17] + " %",
+					'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': {
+						'firmware': frame[2],
+						'sensor_1_fs': frame[12],
+						'sensor_2_fs': frame[13],
+						'auto_check_interval': frame.slice(14, 16),
+						'press_auto_check_percent': frame[16],
+						'temp_auto_check_percent': frame[17],
+						'hardware_id': frame.slice(18, 21),
+						'sample_rate': frame.slice(21, 25),
+						'tx_life_counter': frame.slice(25, 29),
+					}
+				}
+			}
+		},
 		'180': {
 			name: 'C1D2 One Channel Vibration Plus',
 			parse: (payload, parsed, mac) => {