@ncd-io/node-red-enterprise-sensors 1.6.0 → 1.6.2

package/lib/WirelessGateway.js

@@ -160,7 +160,7 @@ module.exports = class WirelessSensor{
 				}
 			}
 			// #OTF
-			var otf_devices = [4,12,21,23,26,29,32,33,39,44,45,48,52,53,54,55,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,101,102,103,105,106,107,108,109,110,111,112,114,117,118,119,120,121,122,123,124,180,181,202,217,211,270,519,520,521,531,535,536,537,538,539,540,541,542,543,545,1010,1011];
+			var otf_devices = [4,12,21,23,26,29,32,33,39,44,45,48,52,53,54,55,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,99,101,102,103,105,106,107,108,109,110,111,112,114,117,118,119,120,121,122,123,124,180,181,202,217,211,270,519,520,521,531,535,536,537,538,539,540,541,542,543,545,1010,1011];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -361,7 +361,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [4,12,21,23,26,29,32,33,39,44,45,48,52,53,54,55,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,101,102,103,105,106,107,108,109,110,111,112,114,117,118,119,120,121,122,123,124,180,181,202,211,217,270,519,520,521,531,535,536,537,538,539,540,541,542,543,545,1010,1011];
+		var otf_devices = [4,12,21,23,26,29,32,33,39,44,45,48,52,53,54,55,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,99,101,102,103,105,106,107,108,109,110,111,112,114,117,118,119,120,121,122,123,124,180,181,202,211,217,270,519,520,521,531,535,536,537,538,539,540,541,542,543,545,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) {
@@ -1342,8 +1342,8 @@ module.exports = class WirelessSensor{
 	}
 	config_set_counter_threshold_108(sensor_mac, value){
 		console.log('config_set_counter_threshold_108');
-		var packet = [244, 43, 0, 0, 0, 0, 0];
-		let threshold = int2Bytes((value), 2);
+		var packet = [244, 43, 0, 0, 0];
+		let threshold = int2Bytes((value), 4);
 		packet.push(...threshold);
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
@@ -2570,6 +2570,58 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_screen_on_time_217(sensor_mac, value){
+		console.log('config_set_screen_on_time_217');
+		let packet = [244, 40, 0, 0, 26, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_weight_unit_217(sensor_mac, value){
+		console.log('config_set_weight_unit_217');
+		let packet = [244, 38, 0, 0, 26, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_clean_cycle_99(sensor_mac, value){
+		console.log('config_set_clean_cycle_99');
+		let packet = [244, 34, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_wiper_rounds_number_99(sensor_mac, value){
+		console.log('config_set_wiper_rounds_number_99');
+		let packet = [244, 36, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_distance_under_strength_threshold_99(sensor_mac, distance, threshold){
+		console.log('config_set_distance_under_strength_threshold_99');
+		let packet = [244, 25, 0, 0, 0];
+		let distance_ = int2Bytes(distance, 2);
+		packet.push(...distance_);
+		let threshold_ = int2Bytes(threshold, 2);
+		packet.push(...threshold_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_clean_sensor_99(sensor_mac, value){
+		console.log('config_set_clean_sensor_99');
+		let packet = [244, 40, 0, 0, 0];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_reset_sensor_99(sensor_mac, value){
+		console.log('config_set_reset_sensor_99');
+		let packet = [244, 38, 0, 0, 0];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_factory_reset_sensor_99(sensor_mac, value){
+		console.log('config_set_factory_reset_sensor_99');
+		let packet = [244, 39, 0, 0, 0];
+		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) => {
@@ -4161,13 +4213,14 @@ function sensor_types(parent){
 			name: 'RTD Temperature Sensor',
 			parse: (payload, parsed, mac) => {
 				if(parsed.firmware > 5){
+					let reserved = payload[7] >> 1; // Fault status (1-bit left shifted)
 					let fault_status = '';
-					if (payload[7] === 0) {
+					if (reserved === 0) {
 						fault_status = 'data_valid';
-					} else if (payload[7] === 15) {
+					} else if (reserved === 15) {
 						fault_status = 'data_invalid';
 					} else {
-						const faultTypeBits = payload[7] & 0b00111100;
+						const faultTypeBits = reserved & 0b00111100;
 						switch (faultTypeBits) {
 							case 32: 
 								fault_status = 'ref_in_vbias'; 
@@ -4668,13 +4721,14 @@ function sensor_types(parent){
 			name: '2-Channel RTD Temperature Sensor',
 			parse: (payload, parsed, mac) => {
 				if(parsed.firmware > 5){
+					let reserved = payload[7] >> 1; // Fault status (1-bit left shifted)
 					let fault_status = '';
-					if (payload[7] === 0) {
+					if (reserved === 0) {
 						fault_status = 'data_valid';
-					} else if (payload[7] === 15) {
+					} else if (reserved === 15) {
 						fault_status = 'data_invalid';
 					} else {
-						const fault_bits = (payload[7] >> 2) & 0b00001111;
+						const fault_bits = (reserved >> 2) & 0b00001111;
 						switch (fault_bits) {
 							case 8: 
 								fault_status = 'ref_in_vbias'; 
@@ -4689,7 +4743,7 @@ function sensor_types(parent){
 								fault_status = 'over_under_voltage'; 
 								break;
 						}
-						const channel_bits = payload[7] & 0b00000011;
+						const channel_bits = reserved & 0b00000011;
 						switch (channel_bits) {
 							case 1:
 								fault_status = fault_status + '_ch1';
@@ -4742,13 +4796,14 @@ function sensor_types(parent){
 		'55': {
 			name: '3-Channel RTD Temperature Sensor',
 			parse: (payload, parsed, mac) => {
+				let reserved = payload[7] >> 1; // Fault status (1-bit left shifted)
 				let fault_status = '';
-				if (payload[7] === 0) {
+				if (reserved === 0) {
 					fault_status = 'data_valid';
-				} else if (payload[7] === 15) {
+				} else if (reserved === 15) {
 					fault_status = 'data_invalid';
 				} else {
-					const fault_bits = (payload[7] >> 2) & 0b00001111;
+					const fault_bits = (reserved >> 2) & 0b00001111;
 					switch (fault_bits) {
 						case 8: 
 							fault_status = 'ref_in_vbias'; 
@@ -4763,7 +4818,7 @@ function sensor_types(parent){
 							fault_status = 'over_under_voltage'; 
 							break;
 					}
-					const channel_bits = payload[7] & 0b00000011;
+					const channel_bits = reserved & 0b00000011;
 					switch (channel_bits) {
 						case 1:
 							fault_status = fault_status + '_ch1';
@@ -8521,6 +8576,28 @@ function sensor_types(parent){
 				}
 			}
 		},
+		'99': {
+			name: 'Laser Sensor',
+			parse: (d) => {
+				return {
+					distance: d.slice(0, 2).reduce(msbLsb)
+				};
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'hardware_id': frame.slice(12, 15),
+					'report_rate': frame.slice(15, 19).reduce(msbLsb) + " sec",
+					'tx_life_counter': frame.slice(19, 23).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'hardware_id': frame.slice(12, 15),
+						'report_rate': frame.slice(15, 19),
+						'tx_life_counter': frame.slice(19, 23)
+					}
+				}
+			}
+		},
 		'101':{
 			name: 'Pro Vibration',
 			parse: (d, full)=>{
@@ -9422,7 +9499,7 @@ function sensor_types(parent){
 				}
 			},
 			'parse_fly': (frame) => {
-				if(frame[2] == 19){ // Screen version fw 19
+				if(frame[2] > 18){
 					let reset_mode = "Disabled";
 					switch(frame[38]){
 						case 0:
@@ -9548,165 +9625,10 @@ function sensor_types(parent){
 						'acc_odr': acc_odr,
 						'screen_control': screen_control,
 						'screen_on_time': frame[42] + ' sec',
-						'interrupt_timeout': frame[43] + ' msec',
-						'hardware_id': frame.slice(44, 47),
-						'report_rate': frame.slice(47, 51).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(51, 55).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'accelerometer_threshold': frame[16],
-							'debouncing_timeout': frame.slice(17, 19),
-							'accelero_state': frame[19],
-							'input_1_active_edge': frame[20],
-							'input_2_active_edge': frame[21],
-							'input_3_active_edge': frame[22],
-							'counter_threshold': frame.slice(23, 27),
-							'trasnmit_on_change_status': frame[27],
-							'Shift_end_1': frame.slice(28, 30),
-							'Shift_end_2': frame.slice(30, 32),
-							'Shift_end_3': frame.slice(32, 34),
-							'Shift_end_4': frame.slice(34, 36),
-							'reset_timeout': frame.slice(36, 38),
-							'counter_reset_mode': frame[38],
-							'sampling_interval': frame[39],
-							'acc_odr': frame[40],
-							'screen_control': frame[41],
-							'screen_on_time': frame[42],
-							'interrupt_timeout': frame[43],
-							'hardware_id': frame.slice(44, 47),
-							'report_rate': frame.slice(47, 51),
-							'tx_life_counter': frame.slice(51, 55)
-						}
-					}
-				} else if(frame[2] == 16){ // Screen version
-					let reset_mode = "Disabled";
-					switch(frame[38]){
-						case 0:
-							reset_mode = "Disabled";
-							break;
-						case 1:
-							reset_mode = "Shift Ends";
-							break;
-						case 2:
-							reset_mode = "Timeout";
-							break;
-					}
-					let acc_odr = "10Hz";
-					switch(frame[40]){
-						case 0:
-							acc_odr = "10Hz";
-							break;
-						case 1:
-							acc_odr = "20Hz";
-							break;
-						case 2:
-							acc_odr = "50Hz";
-							break;
-						case 3:
-							acc_odr = "100Hz";
-							break;
-						case 4:
-							acc_odr = "200Hz";
-							break;
-						case 5:
-							acc_odr = "400Hz";
-							break;
-					}
-					let rtc_sampling_interval = "5 seconds";
-					switch(frame[39]){
-						case 0:
-							rtc_sampling_interval = "1 minute";
-							break;
-						case 1:
-							rtc_sampling_interval = "5 minutes";
-							break;
-						case 2:
-							rtc_sampling_interval = "15 minutes";
-							break;
-						case 3:
-							rtc_sampling_interval = "30 minutes";
-							break;
-						case 4:
-							rtc_sampling_interval = "1 hour";
-							break;
-						case 5:
-							rtc_sampling_interval = "2 hours";
-							break;
-						case 6:
-							rtc_sampling_interval = "3 hours";
-							break;
-						case 7:
-							rtc_sampling_interval = "6 hours";
-							break;
-						case 8:
-							rtc_sampling_interval = "12 hours";
-							break;
-						case 9:
-							rtc_sampling_interval = "5 seconds";
-							break;
-						case 10:
-							rtc_sampling_interval = "10 seconds";
-							break;
-						case 11:
-							rtc_sampling_interval = "15 seconds";
-							break;
-						case 12:
-							rtc_sampling_interval = "30 seconds";
-							break;
-					}
-					let screen_control = 0;
-					switch(frame[41]){
-						case 0:
-							screen_control = "IO1";
-							break;
-						case 1:
-							screen_control = "IO2";
-							break;
-						case 2:
-							screen_control = "IO3";
-							break;
-						case 3:
-							screen_control = "Accelero";
-							break;
-						case 4:
-							screen_control = "Magneto";
-							break;
-					}
-					return {
-						'firmware': frame[2],
-						'accelerometer_threshold': (frame[16]* 32) + "mg",
-						'debouncing_timeout': frame.slice(17, 19).reduce(msbLsb) + "msec",
-						'accelero_state': frame[19]? "Enabled": "Disabled",
-						'input_1_active_edge': frame[20]? "Rising": "Falling",
-						'input_2_active_edge': frame[21]? "Rising": "Falling",
-						'input_3_active_edge': frame[22]? "Rising": "Falling",
-						'counter_threshold': frame.slice(23, 27).reduce(msbLsb),
-						'trasnmit_on_change_status': frame[27]? "Enabled": "Disabled",
-						'Shift_end_1': [
-							String(frame[28]).padStart(2, '0'),
-							String(frame[29]).padStart(2, '0')
-						].join(':'),
-						'Shift_end_2': [
-							String(frame[30]).padStart(2, '0'),
-							String(frame[31]).padStart(2, '0')
-						].join(':'),
-						'Shift_end_3': [
-							String(frame[32]).padStart(2, '0'),
-							String(frame[33]).padStart(2, '0')
-						].join(':'),
-						'Shift_end_4': [
-							String(frame[34]).padStart(2, '0'),
-							String(frame[35]).padStart(2, '0')
-						].join(':'),
-						'reset_timeout': frame.slice(36, 38).reduce(msbLsb) + "min",
-						'counter_reset_mode': reset_mode,
-						'sampling_interval': rtc_sampling_interval,
-						'acc_odr': acc_odr,
-						'screen_control': screen_control,
-						'screen_on_time': frame[42] + 'sec',
-						'hardware_id': frame.slice(43, 46),
-						'report_rate': frame.slice(46, 50).reduce(msbLsb) + "sec",
-						'tx_life_counter': frame.slice(50, 54).reduce(msbLsb),
+						'interrupt_timeout': frame.slice(43, 45).reduce(msbLsb) + ' msec',
+						'hardware_id': frame.slice(45, 48),
+						'report_rate': frame.slice(48, 52).reduce(msbLsb) + " sec",
+						'tx_life_counter': frame.slice(52, 56).reduce(msbLsb),
 						'machine_values': {
 							'firmware': frame[2],
 							'accelerometer_threshold': frame[16],
@@ -9727,12 +9649,13 @@ function sensor_types(parent){
 							'acc_odr': frame[40],
 							'screen_control': frame[41],
 							'screen_on_time': frame[42],
-							'hardware_id': frame.slice(43, 46),
-							'report_rate': frame.slice(46, 50),
-							'tx_life_counter': frame.slice(50, 54)
+							'interrupt_timeout': frame.slice(43, 45),
+							'hardware_id': frame.slice(45, 48),
+							'report_rate': frame.slice(48, 52),
+							'tx_life_counter': frame.slice(52, 56)
 						}
 					}
-				} else if(frame[2] == 14){ // 14 
+				}else if(frame[2] > 13){
 					let reset_mode = "Disabled";
 					switch(frame[38]){
 						case 0:
@@ -9866,7 +9789,7 @@ function sensor_types(parent){
 							'tx_life_counter': frame.slice(50, 54)
 						}
 					}
-				} else if(frame[2] > 9){ // firmware 10 11 12 13 14 15
+				} else if(frame[2] > 9){
 					let reset_mode = "Disabled";
 					switch(frame[38]){
 						case 0:
@@ -10355,164 +10278,63 @@ function sensor_types(parent){
 				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
 				if(payload[8] === 1){
 					var deviceAddr = mac;
-					var firmware = payload[1];
-					var hour = payload[12];
-					var minute = payload[13];
+					// var firmware = payload[1];
+					// var hour = payload[12];
+					// var minute = payload[13];
 					var expected_packets = msbLsb(payload[16], payload[17]);
 					var current_packet = msbLsb(payload[18], payload[19]);
 					var sdata_start = 20;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
-						if(expected_packets != 1){
+						if (expected_packets != 1) {
 							// if current packet is equal to last one (duplicated data). This does not apply to the last package
-							if (globalDevices[deviceAddr].last_packet_counter == current_packet){
+							if (globalDevices[deviceAddr].last_packet_counter == current_packet) {
 								console.log('Duplicated message')
 								return;
 							}
 							// if current packet is equal to 1 or last packet counter is higher thant current packet
-							if(current_packet == 1 || (globalDevices[deviceAddr].last_packet_counter > current_packet)){
-								// clear stream
-								delete globalDevices[deviceAddr];
-								// create new stream
-								var mode = payload[8];
-								var odr = msbLsb(payload[9], payload[10]);
-								var fsr = payload[11] >> 5;
-								var temperature = msbLsb(payload[14], payload[15])/100;
-
-								globalDevices[deviceAddr] = {
-									data: {},
-									odr: odr,
-									mo: mode,
-									fsr: fsr,
-									hour: hour,
-									minute: minute,
-									temperature: temperature,
-								}
+							if (current_packet == 1 || (globalDevices[deviceAddr].last_packet_counter > current_packet)) {
+								console.log('Recovering bad packet');
+								// clear stream object & timeout
+								parent.sensor_types[110].utils.clear_globalDevices_stream(deviceAddr);
+				
+								// init new stream
+								parent.sensor_types[110].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
+				
 								globalDevices[deviceAddr].last_packet_counter = current_packet;
 								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 								return;
-							}
-							else{
+							} else {
 								globalDevices[deviceAddr].last_packet_counter = current_packet;
 								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 							}
 						}
 						else{
-							var mode = payload[8];
-							var odr = msbLsb(payload[9], payload[10]);
-							var fsr = payload[11] >> 5;
-							var temperature = msbLsb(payload[14], payload[15])/100;
+							 // clear stream object & timeout
+							 parent.sensor_types[110].utils.clear_globalDevices_stream(deviceAddr);
 
-							globalDevices[deviceAddr] = {
-								data: {},
-								odr: odr,
-								mo: mode,
-								fsr: fsr,
-								hour: hour,
-								minute: minute,
-								temperature: temperature,
-							}
-							globalDevices[deviceAddr].last_packet_counter = current_packet;
-							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+							 // init new stream
+							 parent.sensor_types[110].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
+
+							 globalDevices[deviceAddr].last_packet_counter = current_packet;
+							 globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						}
 					}
 					else{
-						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10]);
-						var fsr = payload[11] >> 5;
-						var temperature = msbLsb(payload[14], payload[15])/100;
+						// clear stream object & timeout
+						parent.sensor_types[110].utils.clear_globalDevices_stream(deviceAddr);
+
+						// init new stream
+						parent.sensor_types[110].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
 
-						globalDevices[deviceAddr] = {
-							data: {},
-							odr: odr,
-							mo: mode,
-							fsr: fsr,
-							hour: hour,
-							minute: minute,
-							temperature: temperature,
-						}
 						globalDevices[deviceAddr].last_packet_counter = current_packet;
 						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 					}
 					if(current_packet == 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 = {};
-						en_axis_data.x_offset = 0;
-						en_axis_data.y_offset = 2;
-						en_axis_data.z_offset = 4;
-						en_axis_data.increment = 6;
-						fft_concat = {x: [], y: [], z: []};
-						
-						var fsr_mult = .00006;
-						var fsr_text = "";
-
-						switch(globalDevices[deviceAddr].fsr){
-							case 0:
-								fsr_mult = 0.00006;
-								break;
-							case 1:
-								fsr_mult = 0.00012;
-								break;
-							case 2:
-								fsr_mult = 0.00024;
-								break;
-							case 3:
-								fsr_mult = 0.00049;
-								break;
-						}
-						switch(globalDevices[deviceAddr].fsr){
-							case 0:
-								fsr_text = "2g";
-								break;
-							case 1:
-								fsr_text = "4g";
-								break;
-							case 2:
-								fsr_text = "8g";
-								break;
-							case 3:
-								fsr_text = "16g";
-								break;
-						}
-
-						for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
-							label++;
-
-							if('x_offset' in en_axis_data){
-								fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
-							}
-							if('y_offset' in en_axis_data){
-								fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
-							}
-							if('z_offset' in en_axis_data){
-								fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
-							}
-						}
-						var fft_concat_obj = {
-							mode: payload[8],
-							msg_type: msg_type,
-							time_id: [
-								String(globalDevices[deviceAddr].hour).padStart(2, '0'),
-								String(globalDevices[deviceAddr].minute).padStart(2, '0'),
-							].join(':'),
-							mac_address: deviceAddr,
-							fsr: fsr_text,
-							odr: globalDevices[deviceAddr].odr,
-							temperature: globalDevices[deviceAddr].temperature,
-							total_samples: label,
-							fft_confidence : ((Object.keys(globalDevices[deviceAddr].data).length / expected_packets) * 100).toFixed(2) + '%',
-							data: fft_concat
-						};
-						sensor_data = fft_concat_obj;
-						delete globalDevices[deviceAddr];
+						// concatenate stream
+						sensor_data = parent.sensor_types[114].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
+						// clear stream object & timeout
+						parent.sensor_types[114].utils.clear_globalDevices_stream(deviceAddr);
 						return sensor_data;
 					}
 					else{
@@ -10593,6 +10415,119 @@ function sensor_types(parent){
 				// 	return parsed;
 				// }
 			},
+			'utils': {
+				'clear_globalDevices_stream': (deviceAddr) => {
+					if(Object.hasOwn(globalDevices, deviceAddr)){
+						if(Object.hasOwn(globalDevices[deviceAddr], 'packet_stream_timeout')){
+							clearTimeout(globalDevices[deviceAddr].packet_stream_timeout);
+						}
+						delete globalDevices[deviceAddr];
+					}
+				},
+				'init_globalDevices_stream'(deviceAddr, payload, expected_packets, parsed, msg_type){
+					globalDevices[deviceAddr] = {
+						data: {},
+						odr: msbLsb(payload[9], payload[10]),
+						mo: payload[8],
+						fsr: payload[11] >> 5,
+						hour: payload[12],
+						minute: payload[13],
+						temperature: msbLsb(payload[14], payload[15]) / 100,
+						expected_packets: expected_packets
+					}
+					globalDevices[deviceAddr].packet_stream_timeout = setTimeout(() => {
+						parsed.sensor_data = parent.sensor_types[110].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
+						parsed.sensor_data.error = 'Time Series Data Stream Timeout - incomplete data received';
+
+						parsed.sensor_name = parent.sensor_types[110].name;
+						parsed.type = 'sensor_data';
+						parsed.addr = deviceAddr;
+						parsed.received = Date.now();
+
+						parent._emitter.emit('sensor_data', parsed);
+						parent._emitter.emit('sensor_data-110', parsed);
+						parent._emitter.emit('sensor_data'+'-'+deviceAddr, parsed);
+					}, 60000);
+				},
+				'concat_fft_data': (deviceAddr, mode, msg_type) => {
+					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_concat = {};
+
+					var en_axis_data = {};
+					en_axis_data.x_offset = 0;
+					en_axis_data.y_offset = 2;
+					en_axis_data.z_offset = 4;
+					en_axis_data.increment = 6;
+					fft_concat = {x: [], y: [], z: []};
+					
+					var fsr_mult = .00006;
+					var fsr_text = "";
+
+					switch(globalDevices[deviceAddr].fsr){
+						case 0:
+							fsr_mult = 0.00006;
+							break;
+						case 1:
+							fsr_mult = 0.00012;
+							break;
+						case 2:
+							fsr_mult = 0.00024;
+							break;
+						case 3:
+							fsr_mult = 0.00049;
+							break;
+					}
+					switch(globalDevices[deviceAddr].fsr){
+						case 0:
+							fsr_text = "2g";
+							break;
+						case 1:
+							fsr_text = "4g";
+							break;
+						case 2:
+							fsr_text = "8g";
+							break;
+						case 3:
+							fsr_text = "16g";
+							break;
+					}
+
+					for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
+						label++;
+
+						if('x_offset' in en_axis_data){
+							fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+						if('y_offset' in en_axis_data){
+							fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+						if('z_offset' in en_axis_data){
+							fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+					}
+					var fft_concat_obj = {
+						mode: mode,
+						msg_type: msg_type,
+						time_id: [
+							String(globalDevices[deviceAddr].hour).padStart(2, '0'),
+							String(globalDevices[deviceAddr].minute).padStart(2, '0'),
+						].join(':'),
+						mac_address: deviceAddr,
+						fsr: fsr_text,
+						odr: globalDevices[deviceAddr].odr,
+						temperature: globalDevices[deviceAddr].temperature,
+						total_samples: label,
+						fft_confidence : ((Object.keys(globalDevices[deviceAddr].data).length / globalDevices[deviceAddr].expected_packets) * 100).toFixed(2) + '%',
+						data: fft_concat
+					};
+					return fft_concat_obj;
+				}
+			},
 			'parse_fly': (frame) => {
 				let frame_data = {};
 				switch(frame[16]){
@@ -10957,7 +10892,7 @@ function sensor_types(parent){
 		'111': {
 			name: 'Two Channel Vibration Plus v4',
 			parse: (payload, parsed, mac) => {
-				parsed.data = {};
+				// parsed.data = {};
 				if(payload[7] & 2){
 					parsed.data['probe_1_error'] = true;
 				}
@@ -10970,174 +10905,77 @@ function sensor_types(parent){
 				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
 				if(payload[8] === 1){
 					var deviceAddr = mac;
-					var firmware = payload[1];
-					var hour = payload[12];
-					var minute = payload[13];
+					// var firmware = payload[1];
+					// var hour = payload[12];
+					// var minute = payload[13];
 					var expected_packets = msbLsb(payload[16], payload[17]);
 					var current_packet = msbLsb(payload[18], payload[19]);
 					var sdata_start = 20;
+					// If 4th bit is 1 the packet is from the second probe, if 0 from the first
+					var probe;
+					if (payload[7] & 8) {
+						probe = 2;
+					} else {
+						probe = 1;
+					}
 
-					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
-						if(expected_packets != 1){
+					// initialize globalDevices for this sensor if it doesn't exist
+					// exlusively for multi-probe sensors
+					if(!Object.hasOwn(globalDevices, deviceAddr)){
+						globalDevices[deviceAddr] = {};
+					}
+					if(globalDevices[deviceAddr].hasOwnProperty(probe) || expected_packets == 1){
+						console.log('Continuing existing probe stream');
+						if (expected_packets != 1) {
+							console.log('Expected packets more than 1');
 							// if current packet is equal to last one (duplicated data). This does not apply to the last package
-							if (globalDevices[deviceAddr].last_packet_counter == current_packet){
+							if (globalDevices[deviceAddr][probe].last_packet_counter == current_packet) {
 								console.log('Duplicated message')
 								return;
 							}
 							// if current packet is equal to 1 or last packet counter is higher thant current packet
-							if(current_packet == 1 || (globalDevices[deviceAddr].last_packet_counter > current_packet)){
-								// clear stream
-								delete globalDevices[deviceAddr];
-								// create new stream
-								var mode = payload[8];
-								var odr = msbLsb(payload[9], payload[10]);
-								var fsr = payload[11] >> 5;
-								var temperature = msbLsb(payload[14], payload[15])/100;
+							if (current_packet == 1 || (globalDevices[deviceAddr][probe].last_packet_counter > current_packet)) {
+								console.log('Recovering bad packet');
+								// clear stream object & timeout
+								parent.sensor_types[111].utils.clear_globalDevices_stream(deviceAddr, probe);
 
-								globalDevices[deviceAddr] = {
-									data: {},
-									odr: odr,
-									mo: mode,
-									fsr: fsr,
-									hour: hour,
-									minute: minute,
-									temperature: temperature,
-								}
-								globalDevices[deviceAddr].last_packet_counter = current_packet;
-								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-								return;
-							}
-							else{
-								globalDevices[deviceAddr].last_packet_counter = current_packet;
-								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-							}
-						}
-						else{
-							var mode = payload[8];
-							var odr = msbLsb(payload[9], payload[10]);
-							var fsr = payload[11] >> 5;
-							var temperature = msbLsb(payload[14], payload[15])/100;
+								// init new stream
+								parent.sensor_types[111].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type, probe);
 
-							globalDevices[deviceAddr] = {
-								data: {},
-								odr: odr,
-								mo: mode,
-								fsr: fsr,
-								hour: hour,
-								minute: minute,
-								temperature: temperature,
+								globalDevices[deviceAddr][probe].last_packet_counter = current_packet;
+								globalDevices[deviceAddr][probe].data[current_packet] = payload.slice(sdata_start);
+								return;
+							} else {
+								globalDevices[deviceAddr][probe].last_packet_counter = current_packet;
+								globalDevices[deviceAddr][probe].data[current_packet] = payload.slice(sdata_start);
 							}
-							globalDevices[deviceAddr].last_packet_counter = current_packet;
-							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						} else {
+							// clear stream object & timeout
+							parent.sensor_types[111].utils.clear_globalDevices_stream(deviceAddr, probe);
+				
+							// init new stream
+							parent.sensor_types[111].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type, probe);
+				
+							globalDevices[deviceAddr][probe].last_packet_counter = current_packet;
+							globalDevices[deviceAddr][probe].data[current_packet] = payload.slice(sdata_start);
 						}
 					}
 					else{
-						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10]);
-						var fsr = payload[11] >> 5;
-						var temperature = msbLsb(payload[14], payload[15])/100;
+						// clear stream object & timeout
+						parent.sensor_types[111].utils.clear_globalDevices_stream(deviceAddr, probe);
 
-						globalDevices[deviceAddr] = {
-							data: {},
-							odr: odr,
-							mo: mode,
-							fsr: fsr,
-							hour: hour,
-							minute: minute,
-							temperature: temperature,
-						}
-						globalDevices[deviceAddr].last_packet_counter = current_packet;
-						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						// init new stream
+						parent.sensor_types[111].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type, probe);
+
+						globalDevices[deviceAddr][probe].last_packet_counter = current_packet;
+						globalDevices[deviceAddr][probe].data[current_packet] = payload.slice(sdata_start);
 					}
 					if(current_packet == 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;
+						// concatenate stream
+						sensor_data = parent.sensor_types[111].utils.concat_fft_data(deviceAddr, payload[8], msg_type, probe);
 
-						var fft = new Array();
-						var fft_concat = {};
-
-						var en_axis_data = {};
-						en_axis_data.x_offset = 0;
-						en_axis_data.y_offset = 2;
-						en_axis_data.z_offset = 4;
-						en_axis_data.increment = 6;
-						fft_concat = {x: [], y: [], z: []};
-						
-						var fsr_mult = .00006;
-						var fsr_text = "";
-
-						switch(globalDevices[deviceAddr].fsr){
-							case 0:
-								fsr_mult = 0.00006;
-								break;
-							case 1:
-								fsr_mult = 0.00012;
-								break;
-							case 2:
-								fsr_mult = 0.00024;
-								break;
-							case 3:
-								fsr_mult = 0.00049;
-								break;
-						}
-						switch(globalDevices[deviceAddr].fsr){
-							case 0:
-								fsr_text = "2g";
-								break;
-							case 1:
-								fsr_text = "4g";
-								break;
-							case 2:
-								fsr_text = "8g";
-								break;
-							case 3:
-								fsr_text = "16g";
-								break;
-						}
-
-						for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
-							label++;
-
-							if('x_offset' in en_axis_data){
-								fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
-							}
-							if('y_offset' in en_axis_data){
-								fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
-							}
-							if('z_offset' in en_axis_data){
-								fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
-							}
-						}
-						// If 4th bit is 1 the packet is from the second probe, if 0 from the first
-						var probe = '';
-						if(payload[7] & 8){
-							probe = '2';
-						}
-						else{
-							probe = '1';
-						}
-
-						var fft_concat_obj = {
-							mode: payload[8],
-							msg_type: msg_type,
-							probe: probe,
-							time_id: [
-								String(globalDevices[deviceAddr].hour).padStart(2, '0'),
-								String(globalDevices[deviceAddr].minute).padStart(2, '0'),
-							].join(':'),
-							mac_address: deviceAddr,
-							fsr: fsr_text,
-							odr: globalDevices[deviceAddr].odr,
-							temperature: globalDevices[deviceAddr].temperature,
-							total_samples: label,
-							fft_confidence : ((Object.keys(globalDevices[deviceAddr].data).length / expected_packets) * 100).toFixed(2) + '%',
-							data: fft_concat
-						};
-						sensor_data = fft_concat_obj;
-						delete globalDevices[deviceAddr];
+						// clear stream object & timeout
+						parent.sensor_types[111].utils.clear_globalDevices_stream(deviceAddr, probe);
 						return sensor_data;
 					}
 					else{
@@ -11288,6 +11126,120 @@ function sensor_types(parent){
 				// 	return parsed;
 				// }
 			},
+			'utils': {
+				'clear_globalDevices_stream': (deviceAddr, probe) => {
+					if(Object.hasOwn(globalDevices, deviceAddr) && Object.hasOwn(globalDevices[deviceAddr], probe)){
+						if(Object.hasOwn(globalDevices[deviceAddr][probe], 'packet_stream_timeout')){
+							clearTimeout(globalDevices[deviceAddr][probe].packet_stream_timeout);
+						}
+						delete globalDevices[deviceAddr][probe];
+					}
+				},
+				'init_globalDevices_stream'(deviceAddr, payload, expected_packets, parsed, msg_type, probe){
+					globalDevices[deviceAddr][probe] = {
+						data: {},
+						odr: msbLsb(payload[9], payload[10]),
+						mo: payload[8],
+						fsr: payload[11] >> 5,
+						hour: payload[12],
+						minute: payload[13],
+						temperature: msbLsb(payload[14], payload[15]) / 100,
+						expected_packets: expected_packets
+					}
+					globalDevices[deviceAddr][probe].packet_stream_timeout = setTimeout(() => {
+						parsed.sensor_data = parent.sensor_types[111].utils.concat_fft_data(deviceAddr, payload[8], msg_type, probe);
+						parsed.sensor_data.error = 'Time Series Data Stream Timeout - incomplete data received';
+
+						parsed.sensor_name = parent.sensor_types[111].name;
+						parsed.type = 'sensor_data';
+						parsed.addr = deviceAddr;
+						parsed.received = Date.now();
+
+						parent._emitter.emit('sensor_data', parsed);
+						parent._emitter.emit('sensor_data-111', parsed);
+						parent._emitter.emit('sensor_data'+'-'+deviceAddr, parsed);
+					}, 60000);
+				},
+				'concat_fft_data': (deviceAddr, mode, msg_type, probe) => {
+					var raw_data = new Array();
+					for(const packet in globalDevices[deviceAddr][probe].data){
+						raw_data = raw_data.concat(globalDevices[deviceAddr][probe].data[packet]);
+					}
+					var label = 0;
+
+					var fft_concat = {};
+
+					var en_axis_data = {};
+					en_axis_data.x_offset = 0;
+					en_axis_data.y_offset = 2;
+					en_axis_data.z_offset = 4;
+					en_axis_data.increment = 6;
+					fft_concat = {x: [], y: [], z: []};
+					
+					var fsr_mult = .00006;
+					var fsr_text = "";
+
+					switch(globalDevices[deviceAddr][probe].fsr){
+						case 0:
+							fsr_mult = 0.00006;
+							break;
+						case 1:
+							fsr_mult = 0.00012;
+							break;
+						case 2:
+							fsr_mult = 0.00024;
+							break;
+						case 3:
+							fsr_mult = 0.00049;
+							break;
+					}
+					switch(globalDevices[deviceAddr][probe].fsr){
+						case 0:
+							fsr_text = "2g";
+							break;
+						case 1:
+							fsr_text = "4g";
+							break;
+						case 2:
+							fsr_text = "8g";
+							break;
+						case 3:
+							fsr_text = "16g";
+							break;
+					}
+
+					for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
+						label++;
+
+						if('x_offset' in en_axis_data){
+							fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+						if('y_offset' in en_axis_data){
+							fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+						if('z_offset' in en_axis_data){
+							fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+					}
+					var fft_concat_obj = {
+						mode: mode,
+						msg_type: msg_type,
+						probe: probe,
+						time_id: [
+							String(globalDevices[deviceAddr][probe].hour).padStart(2, '0'),
+							String(globalDevices[deviceAddr][probe].minute).padStart(2, '0'),
+						].join(':'),
+						mac_address: deviceAddr,
+						fsr: fsr_text,
+						odr: globalDevices[deviceAddr][probe].odr,
+						temperature: globalDevices[deviceAddr][probe].temperature,
+						total_samples: label,
+						fft_confidence : ((Object.keys(globalDevices[deviceAddr][probe].data).length / globalDevices[deviceAddr][probe].expected_packets) * 100).toFixed(2) + '%',
+						data: fft_concat
+					};
+					return fft_concat_obj;
+				}
+			},
 			'parse_fly': (frame) => {
 				let frame_data = {};
 				switch(frame[16]){
@@ -11801,192 +11753,66 @@ function sensor_types(parent){
 					return parsed;
 				}
 				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
-				if(payload[8] === 1){
+				if (payload[8] === 1) {
 					var deviceAddr = mac;
-					var firmware = payload[1];
-					var hour = payload[12];
-					var minute = payload[13];
+					// var firmware = payload[1];
+					// var hour = payload[12];
+					// var minute = payload[13];
 					var expected_packets = msbLsb(payload[16], payload[17]);
 					var current_packet = msbLsb(payload[18], payload[19]);
 					var sdata_start = 20;
-
-					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-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 fsr = payload[11] >> 5;
-									var temperature = msbLsb(payload[14], payload[15])/100;
-
-									globalDevices[deviceAddr] = {
-										// stream_size: expected_packets,
-										data: {},
-										odr: odr,
-										mo: mode,
-										fsr: fsr,
-										hour: hour,
-										minute: minute,
-										temperature: temperature,
-									}
-									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-									return;
-								}
+				
+				
+					if (globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1) {
+						if (expected_packets != 1) {
+							// if current packet is equal to last one (duplicated data). This does not apply to the last package
+							if (globalDevices[deviceAddr].last_packet_counter == current_packet) {
+								console.log('Duplicated message')
+								return;
 							}
-							else{
+							// if current packet is equal to 1 or last packet counter is higher thant current packet
+							if (current_packet == 1 || (globalDevices[deviceAddr].last_packet_counter > current_packet)) {
+								console.log('Recovering bad packet');
+								// clear stream object & timeout
+								parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
+				
+								// init new stream
+								parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
+				
+								globalDevices[deviceAddr].last_packet_counter = current_packet;
+								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+								return;
+							} else {
+								globalDevices[deviceAddr].last_packet_counter = current_packet;
 								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 							}
-						}
-						else{
-							var mode = payload[8];
-							var odr = msbLsb(payload[9], payload[10]);
-							var fsr = payload[11] >> 5;
-							var temperature = msbLsb(payload[14], payload[15])/100;
-
-							globalDevices[deviceAddr] = {
-								// stream_size: expected_packets,
-								data: {},
-								odr: odr,
-								mo: mode,
-								fsr: fsr,
-								hour: hour,
-								minute: minute,
-								temperature: temperature,
-							}
+						} else {
+							// clear stream object & timeout
+							parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
+				
+							// init new stream
+							parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
+				
+							globalDevices[deviceAddr].last_packet_counter = current_packet;
 							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 = {};
-							en_axis_data.x_offset = 0;
-							en_axis_data.y_offset = 2;
-							en_axis_data.z_offset = 4;
-							en_axis_data.increment = 6;
-							fft_concat = {x: [], y: [], z: []};
-
-							var fsr_mult = .00006;
-							var fsr_text = "";
-							switch(globalDevices[deviceAddr].fsr){
-								case 0:
-									fsr_mult = 0.00006;
-									break;
-								case 1:
-									fsr_mult = 0.00012;
-									break;
-								case 2:
-									fsr_mult = 0.00024;
-									break;
-								case 3:
-									fsr_mult = 0.00049;
-									break;
-							}
-							switch(globalDevices[deviceAddr].fsr){
-								case 0:
-									fsr_text = "2g";
-									break;
-								case 1:
-									fsr_text = "4g";
-									break;
-								case 2:
-									fsr_text = "8g";
-									break;
-								case 3:
-									fsr_text = "16g";
-									break;
-							}
-
-							for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
-								label++;
-
-								if('x_offset' in en_axis_data){
-									fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
-								}
-								if('y_offset' in en_axis_data){
-									fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
-								}
-								if('z_offset' in en_axis_data){
-									fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
-								}
-							}
-							var fft_concat_obj = {
-								mode: payload[8],
-								msg_type: msg_type,
-								time_id: [
-									String(globalDevices[deviceAddr].hour).padStart(2, '0'),
-									String(globalDevices[deviceAddr].minute).padStart(2, '0'),
-								].join(':'),
-								mac_address: deviceAddr,
-								fsr: fsr_text,
-								odr: globalDevices[deviceAddr].odr,
-								temperature: globalDevices[deviceAddr].temperature,
-								total_samples: label,
-								data: fft_concat
-							};
-							// console.log(globalDevices[deviceAddr].data);
-							// console.log(raw_data);
-							sensor_data = fft_concat_obj;
-							// parsed.raw_packets = globalDevices[deviceAddr].data;
-							// parsed.raw_data = raw_data;
-							delete globalDevices[deviceAddr];
-							if(this.hasOwnProperty('failure_no')){
-								console.log('####falure no');
-								console.log(this.failure_no);
-							}
-
-							return sensor_data;
-						}
-						else{
-							return;
-						}
-					}else{
-
-						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10]);
-						var fsr = payload[11] >> 5;
-						var temperature = msbLsb(payload[14], payload[15])/100;
-
-						globalDevices[deviceAddr] = {
-							// stream_size: expected_packets,
-							data: {},
-							odr: odr,
-							mo: mode,
-							fsr: fsr,
-							hour: hour,
-							minute: minute,
-							temperature: temperature,
-						}
+					} else {
+						// clear stream object & timeout
+						parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
+				
+						// init new stream
+						parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
+				
+						globalDevices[deviceAddr].last_packet_counter = current_packet;
 						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+					}
+					if (current_packet == expected_packets) {
+						// concatenate stream
+						sensor_data = parent.sensor_types[112].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
+						// clear stream object & timeout
+						parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
+						return sensor_data;
+					} else {
 						return;
 					}
 				}
@@ -12065,6 +11891,119 @@ function sensor_types(parent){
 				// 	return parsed;
 				// }
 			},
+			'utils': {
+				'clear_globalDevices_stream': (deviceAddr) => {
+					if(Object.hasOwn(globalDevices, deviceAddr)){
+						if(Object.hasOwn(globalDevices[deviceAddr], 'packet_stream_timeout')){
+							clearTimeout(globalDevices[deviceAddr].packet_stream_timeout);
+						}
+						delete globalDevices[deviceAddr];
+					}
+				},
+				'init_globalDevices_stream'(deviceAddr, payload, expected_packets, parsed, msg_type){
+					globalDevices[deviceAddr] = {
+						data: {},
+						odr: msbLsb(payload[9], payload[10]),
+						mo: payload[8],
+						fsr: payload[11] >> 5,
+						hour: payload[12],
+						minute: payload[13],
+						temperature: msbLsb(payload[14], payload[15]) / 100,
+						expected_packets: expected_packets
+					}
+					globalDevices[deviceAddr].packet_stream_timeout = setTimeout(() => {
+						parsed.sensor_data = parent.sensor_types[112].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
+						parsed.sensor_data.error = 'Time Series Data Stream Timeout - incomplete data received';
+
+						parsed.sensor_name = parent.sensor_types[112].name;
+						parsed.type = 'sensor_data';
+						parsed.addr = deviceAddr;
+						parsed.received = Date.now();
+
+						parent._emitter.emit('sensor_data', parsed);
+						parent._emitter.emit('sensor_data-112', parsed);
+						parent._emitter.emit('sensor_data'+'-'+deviceAddr, parsed);
+					}, 60000);
+				},
+				'concat_fft_data': (deviceAddr, mode, msg_type) => {
+					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_concat = {};
+
+					var en_axis_data = {};
+					en_axis_data.x_offset = 0;
+					en_axis_data.y_offset = 2;
+					en_axis_data.z_offset = 4;
+					en_axis_data.increment = 6;
+					fft_concat = {x: [], y: [], z: []};
+					
+					var fsr_mult = .00006;
+					var fsr_text = "";
+
+					switch(globalDevices[deviceAddr].fsr){
+						case 0:
+							fsr_mult = 0.00006;
+							break;
+						case 1:
+							fsr_mult = 0.00012;
+							break;
+						case 2:
+							fsr_mult = 0.00024;
+							break;
+						case 3:
+							fsr_mult = 0.00049;
+							break;
+					}
+					switch(globalDevices[deviceAddr].fsr){
+						case 0:
+							fsr_text = "2g";
+							break;
+						case 1:
+							fsr_text = "4g";
+							break;
+						case 2:
+							fsr_text = "8g";
+							break;
+						case 3:
+							fsr_text = "16g";
+							break;
+					}
+
+					for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
+						label++;
+
+						if('x_offset' in en_axis_data){
+							fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+						if('y_offset' in en_axis_data){
+							fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+						if('z_offset' in en_axis_data){
+							fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+					}
+					var fft_concat_obj = {
+						mode: mode,
+						msg_type: msg_type,
+						time_id: [
+							String(globalDevices[deviceAddr].hour).padStart(2, '0'),
+							String(globalDevices[deviceAddr].minute).padStart(2, '0'),
+						].join(':'),
+						mac_address: deviceAddr,
+						fsr: fsr_text,
+						odr: globalDevices[deviceAddr].odr,
+						temperature: globalDevices[deviceAddr].temperature,
+						total_samples: label,
+						fft_confidence : ((Object.keys(globalDevices[deviceAddr].data).length / globalDevices[deviceAddr].expected_packets) * 100).toFixed(2) + '%',
+						data: fft_concat
+					};
+					return fft_concat_obj;
+				}
+			},
 			'parse_fly': (frame) => {
 				let frame_data = {};
 				switch(frame[16]){
@@ -12437,9 +12376,9 @@ function sensor_types(parent){
 				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
 				if(payload[8] === 1){
 					var deviceAddr = mac;
-					var firmware = payload[1];
-					var hour = payload[12];
-					var minute = payload[13];
+					// var firmware = payload[1];
+					// var hour = payload[12];
+					// var minute = payload[13];
 					var expected_packets = msbLsb(payload[16], payload[17]);
 					var current_packet = msbLsb(payload[18], payload[19]);
 					var sdata_start = 20;
@@ -12453,23 +12392,13 @@ function sensor_types(parent){
 							}
 							// if current packet is equal to 1 or last packet counter is higher thant current packet
 							if(current_packet == 1 || (globalDevices[deviceAddr].last_packet_counter > current_packet)){
-								// clear stream
-								delete globalDevices[deviceAddr];
-								// create new stream
-								var mode = payload[8];
-								var odr = msbLsb(payload[9], payload[10]);
-								var fsr = payload[11] >> 5;
-								var temperature = msbLsb(payload[14], payload[15])/100;
+								console.log('Recovering bad packet');
+								// clear stream object & timeout
+								parent.sensor_types[114].utils.clear_globalDevices_stream(deviceAddr);
+
+								// init new stream
+								parent.sensor_types[114].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
 
-								globalDevices[deviceAddr] = {
-									data: {},
-									odr: odr,
-									mo: mode,
-									fsr: fsr,
-									hour: hour,
-									minute: minute,
-									temperature: temperature,
-								}
 								globalDevices[deviceAddr].last_packet_counter = current_packet;
 								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 								return;
@@ -12480,121 +12409,31 @@ function sensor_types(parent){
 							}
 						}
 						else{
-							var mode = payload[8];
-							var odr = msbLsb(payload[9], payload[10]);
-							var fsr = payload[11] >> 5;
-							var temperature = msbLsb(payload[14], payload[15])/100;
+							// clear stream object & timeout
+							parent.sensor_types[114].utils.clear_globalDevices_stream(deviceAddr);
+
+							// init new stream
+							parent.sensor_types[114].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
 
-							globalDevices[deviceAddr] = {
-								data: {},
-								odr: odr,
-								mo: mode,
-								fsr: fsr,
-								hour: hour,
-								minute: minute,
-								temperature: temperature,
-							}
 							globalDevices[deviceAddr].last_packet_counter = current_packet;
 							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						}
 					}
 					else{
-						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10]);
-						var fsr = payload[11] >> 5;
-						var temperature = msbLsb(payload[14], payload[15])/100;
+						// clear stream object & timeout
+						parent.sensor_types[114].utils.clear_globalDevices_stream(deviceAddr);
+
+						// init new stream
+						parent.sensor_types[114].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
 
-						globalDevices[deviceAddr] = {
-							data: {},
-							odr: odr,
-							mo: mode,
-							fsr: fsr,
-							hour: hour,
-							minute: minute,
-							temperature: temperature,
-						}
 						globalDevices[deviceAddr].last_packet_counter = current_packet;
 						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 					}
 					if(current_packet == 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 = {};
-						en_axis_data.x_offset = 0;
-						en_axis_data.y_offset = 2;
-						en_axis_data.z_offset = 4;
-						en_axis_data.increment = 6;
-						fft_concat = {x: [], y: [], z: []};
-						
-						var fsr_mult = .00006;
-						var fsr_text = "";
-
-						switch(globalDevices[deviceAddr].fsr){
-							case 0:
-								fsr_mult = 0.00006;
-								break;
-							case 1:
-								fsr_mult = 0.00012;
-								break;
-							case 2:
-								fsr_mult = 0.00024;
-								break;
-							case 3:
-								fsr_mult = 0.00049;
-								break;
-						}
-						switch(globalDevices[deviceAddr].fsr){
-							case 0:
-								fsr_text = "2g";
-								break;
-							case 1:
-								fsr_text = "4g";
-								break;
-							case 2:
-								fsr_text = "8g";
-								break;
-							case 3:
-								fsr_text = "16g";
-								break;
-						}
-
-						for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
-							label++;
-
-							if('x_offset' in en_axis_data){
-								fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
-							}
-							if('y_offset' in en_axis_data){
-								fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
-							}
-							if('z_offset' in en_axis_data){
-								fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
-							}
-						}
-						var fft_concat_obj = {
-							mode: payload[8],
-							msg_type: msg_type,
-							time_id: [
-								String(globalDevices[deviceAddr].hour).padStart(2, '0'),
-								String(globalDevices[deviceAddr].minute).padStart(2, '0'),
-							].join(':'),
-							mac_address: deviceAddr,
-							fsr: fsr_text,
-							odr: globalDevices[deviceAddr].odr,
-							temperature: globalDevices[deviceAddr].temperature,
-							total_samples: label,
-							fft_confidence : ((Object.keys(globalDevices[deviceAddr].data).length / expected_packets) * 100).toFixed(2) + '%',
-							data: fft_concat
-						};
-						sensor_data = fft_concat_obj;
-						delete globalDevices[deviceAddr];
+						// concatenate stream
+						sensor_data = parent.sensor_types[114].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
+						// clear stream object & timeout
+						parent.sensor_types[114].utils.clear_globalDevices_stream(deviceAddr);
 						return sensor_data;
 					}
 					else{
@@ -12675,6 +12514,114 @@ function sensor_types(parent){
 				// 	return parsed;
 				// }
 			},
+			'utils': {
+				'clear_globalDevices_stream': (deviceAddr) => {
+					if(Object.hasOwn(globalDevices, deviceAddr)){
+						if(Object.hasOwn(globalDevices[deviceAddr], 'packet_stream_timeout')){
+							clearTimeout(globalDevices[deviceAddr].packet_stream_timeout);
+						}
+						delete globalDevices[deviceAddr];
+					}
+				},
+				'init_globalDevices_stream'(deviceAddr, payload, expected_packets, parsed, msg_type){
+					globalDevices[deviceAddr] = {
+						data: {},
+						odr: msbLsb(payload[9], payload[10]),
+						mo: payload[8],
+						fsr: payload[11] >> 5,
+						hour: payload[12],
+						minute: payload[13],
+						temperature: msbLsb(payload[14], payload[15]) / 100,
+						expected_packets: expected_packets
+					}
+					globalDevices[deviceAddr].packet_stream_timeout = setTimeout(() => {
+						parsed.sensor_data = parent.sensor_types[114].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
+						parsed.sensor_data.error = 'Time Series Data Stream Timeout - incomplete data received';
+
+						parent._emitter.emit('sensor_data', parsed);
+						parent._emitter.emit('sensor_data-114', parsed);
+						parent._emitter.emit('sensor_data'+'-'+deviceAddr, parsed);
+					}, 60000);
+				},
+				'concat_fft_data': (deviceAddr, mode, msg_type) => {
+					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_concat = {};
+
+					var en_axis_data = {};
+					en_axis_data.x_offset = 0;
+					en_axis_data.y_offset = 2;
+					en_axis_data.z_offset = 4;
+					en_axis_data.increment = 6;
+					fft_concat = {x: [], y: [], z: []};
+					
+					var fsr_mult = .00006;
+					var fsr_text = "";
+
+					switch(globalDevices[deviceAddr].fsr){
+						case 0:
+							fsr_mult = 0.00006;
+							break;
+						case 1:
+							fsr_mult = 0.00012;
+							break;
+						case 2:
+							fsr_mult = 0.00024;
+							break;
+						case 3:
+							fsr_mult = 0.00049;
+							break;
+					}
+					switch(globalDevices[deviceAddr].fsr){
+						case 0:
+							fsr_text = "2g";
+							break;
+						case 1:
+							fsr_text = "4g";
+							break;
+						case 2:
+							fsr_text = "8g";
+							break;
+						case 3:
+							fsr_text = "16g";
+							break;
+					}
+
+					for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
+						label++;
+
+						if('x_offset' in en_axis_data){
+							fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+						if('y_offset' in en_axis_data){
+							fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+						if('z_offset' in en_axis_data){
+							fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
+						}
+					}
+					var fft_concat_obj = {
+						mode: mode,
+						msg_type: msg_type,
+						time_id: [
+							String(globalDevices[deviceAddr].hour).padStart(2, '0'),
+							String(globalDevices[deviceAddr].minute).padStart(2, '0'),
+						].join(':'),
+						mac_address: deviceAddr,
+						fsr: fsr_text,
+						odr: globalDevices[deviceAddr].odr,
+						temperature: globalDevices[deviceAddr].temperature,
+						total_samples: label,
+						fft_confidence : ((Object.keys(globalDevices[deviceAddr].data).length / globalDevices[deviceAddr].expected_packets) * 100).toFixed(2) + '%',
+						data: fft_concat
+					};
+					return fft_concat_obj;
+				}
+			},
 			'parse_fly': (frame) => {
 				let frame_data = {};
 				switch(frame[16]){
@@ -13334,7 +13281,7 @@ function sensor_types(parent){
 			parse: (payload, parsed, mac) => {
                 let res = {};
                 if(!(payload[7] & 2)){
-                    res.pressure_s1 = signInt(payload.slice(8, 12).reduce(msbLsb),16)/100;
+                    res.pressure_s1 = signInt(payload.slice(8, 12).reduce(msbLsb),32)/100;
                     res.temperature_s1 = signInt(payload.slice(12, 14).reduce(msbLsb),16)/100;
                 }else{
                     res.pressure_s1 = null;
@@ -13342,7 +13289,7 @@ function sensor_types(parent){
                     res.error_s1 = 'Error: Sensor Probe 1 communication error';
                 }
                 if(!(payload[7] & 4)){
-                    res.pressure_s2 = signInt(payload.slice(14, 18).reduce(msbLsb),16)/100;
+                    res.pressure_s2 = signInt(payload.slice(14, 18).reduce(msbLsb),32)/100;
                     res.temperature_s2 = signInt(payload.slice(18, 20).reduce(msbLsb),16)/100;
                 }else{
                     res.pressure_s2 = null;
@@ -14559,12 +14506,85 @@ function sensor_types(parent){
 					parsed.data = {error: 'Error found, Load cell comm error'};
 					return parsed;
 				}
-				return {
-					weight: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100
-				};
+				let firmware = d[1];
+				if(firmware > 4){
+					let unit = 'Lb';
+					switch(d[12]){
+						case 1:
+							unit = 'Lb';
+						break;
+						case 2:
+							unit = 'Kg';
+						break;
+					}
+					return{
+						weight: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100,
+						unit: unit,
+						raw_adc: signInt(d.slice(13, 17).reduce(msbLsb), 32)
+					}
+				}
+				else {
+					return {
+						weight: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100
+					};
+				}
 			},
 			'parse_fly': (frame) => {
-				if(frame[2] > 3){
+				if(frame[2] > 4){
+					let date = [
+						String(frame.slice(20, 22).reduce(msbLsb)),
+						String(frame[22]).padStart(2, '0'),
+						String(frame[23]).padStart(2, '0')
+					].join('-');
+					let time = [
+						String(frame[24]).padStart(2, '0'),
+						String(frame[25]).padStart(2, '0'),
+						String(frame[26]).padStart(2, '0')
+					].join(':');
+					let screen_on_time = "always_off";
+					switch(frame[27]){
+						case 0:
+							screen_on_time = "always_off";
+						break;
+						case 255:
+							screen_on_time = "always_on";
+						break;
+						default:
+							screen_on_time = frame[27] + "Sec";
+						break;
+					}
+					let unit = "Lb";
+					switch(frame[28]){
+						case 1:
+							unit = "Lb";
+						break;
+						case 2:
+							unit = "Kg";
+						break;
+					}
+					return {
+						'firmware': frame[2],
+						'calibration_tare': frame.slice(12, 16).reduce(msbLsb),
+						'tare_counter': frame.slice(16, 20).reduce(msbLsb),
+						'timestamp': date + "T" + time,
+						'screen_on_time': screen_on_time,
+						'weight_unit': unit,
+						'hardware_id': frame.slice(29, 32),
+						'report_rate': frame.slice(32, 36).reduce(msbLsb) + "Sec",
+						'tx_life_counter': frame.slice(36, 40).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'calibration_tare': frame.slice(12, 16).reduce(msbLsb),
+							'tare_counter': frame.slice(16, 20).reduce(msbLsb),
+							'timestamp': date + "T" + time,
+							'screen_on_time': screen_on_time,
+							'weight_unit': unit,
+							'hardware_id': frame.slice(29, 32),
+							'report_rate': frame.slice(32, 36).reduce(msbLsb),
+							'tx_life_counter': frame.slice(36, 40).reduce(msbLsb)
+						}
+					}
+				}else if(frame[2] == 4){
 					let date = [
 						String(frame.slice(20, 22).reduce(msbLsb)),
 						String(frame[22]).padStart(2, '0'),