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

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,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,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,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,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) {
@@ -783,7 +783,7 @@ module.exports = class WirelessSensor{
 					data: payload.slice(8)
 				};
 				// #OTF
-			}else if(parsed.sensor_type == 21 || parsed.sensor_type == 33 || parsed.sensor_type == 39 || parsed.sensor_type == 29 || parsed.sensor_type == 54 || parsed.sensor_type == 55 || 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 == 103 || parsed.sensor_type == 110 || parsed.sensor_type == 111 || parsed.sensor_type == 112 || parsed.sensor_type == 114 || parsed.sensor_type == 117 || parsed.sensor_type == 118 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 202 || parsed.sensor_type == 217 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538 || parsed.sensor_type == 543){
+			}else if(parsed.sensor_type == 21 || parsed.sensor_type == 33 || parsed.sensor_type == 39 || parsed.sensor_type == 29 || parsed.sensor_type == 54 || parsed.sensor_type == 55 || 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 == 103 || parsed.sensor_type == 110 || parsed.sensor_type == 111 || parsed.sensor_type == 112 || parsed.sensor_type == 114 || parsed.sensor_type == 117 || parsed.sensor_type == 118 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 202 || parsed.sensor_type == 217 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538 || parsed.sensor_type == 543 || parsed.sensor_type == 545){
 				parsed.sensor_data = this.sensor_types[parsed.sensor_type].parse(payload, parsed, frame.mac);
 				if(!parsed.sensor_data){
 					return;
@@ -848,15 +848,28 @@ module.exports = class WirelessSensor{
 		return config_set_destination(sensor_mac, 0x0000FFFF);
 	}
 	config_set_destination(sensor_mac, modem_mac){
+		console.log('config_set_destination');
+		console.log(modem_mac);
 		var packet = [247, 3, 0, 0, 0];
 		var bytes = int2Bytes(modem_mac, 4);
 		packet.push(...bytes);
+		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
 	config_set_id_delay(sensor_mac, node_id, delay_s){
+		console.log('config_set_id_delay');
 		var packet = [247, 2, 0, 0, 0, node_id];
 		var delay_b = int2Bytes(delay_s, 3);
 		packet.push(...delay_b);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_only_delay(sensor_mac, delay_s){
+		console.log('config_set_only_delay');
+		var packet = [247, 2, 0, 0, 0, 0];
+		var delay_b = int2Bytes(delay_s, 3);
+		packet.push(...delay_b);
+		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
 	config_set_power(sensor_mac, pwr){
@@ -2517,6 +2530,46 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_max_num_motion_103(sensor_mac, value){
+		console.log('config_set_max_num_motion_103');
+		let packet = [244, 79, 0, 0, 101, 33, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_acc_output_data_rate_103(sensor_mac, value){
+		console.log('config_set_acc_output_data_rate_103');
+		let packet = [244, 79, 0, 0, 101, 25, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_temperature_unit_545(sensor_mac, value){
+		console.log('config_set_temperature_unit_545');
+		let packet = [244, 37, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_flow_unit_545(sensor_mac, value){
+		console.log('config_set_flow_unit_545');
+		let packet = [244, 38, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_gas_type_545(sensor_mac, value){
+		console.log('config_set_gas_type_545');
+		let packet = [244, 34, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_gas_type_mix_545(sensor_mac, num, gas_type, percentage){
+		console.log('config_set_gas_type_mix_545');
+		var packet = [244, 35, 0, 0, 0];
+		for(let index = 0; index < num; index++){
+			packet.push(...int2Bytes(gas_type[index], 1));
+			packet.push(...int2Bytes(percentage[index]*100, 2));
+		}
+		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) => {
@@ -3597,8 +3650,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -3611,8 +3664,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -4265,8 +4318,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -4279,8 +4332,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -4354,8 +4407,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -4368,8 +4421,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -4805,8 +4858,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -4819,8 +4872,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -5021,7 +5074,7 @@ function sensor_types(parent){
 						'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',
+						'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),
@@ -5101,8 +5154,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -5115,8 +5168,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -5174,8 +5227,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -5188,8 +5241,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -7858,8 +7911,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -7870,8 +7923,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_threshold': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -7942,8 +7995,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -7956,8 +8009,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -8014,8 +8067,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -8028,8 +8081,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -8390,8 +8443,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -8404,8 +8457,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -8480,14 +8533,46 @@ function sensor_types(parent){
 			name: 'Custom Wireless Accelerometer Sensor',
 			parse: (payload, parsed, mac) => {
 				if(payload[9] === 0){ // mode raw
+					var sensor_type = payload[8];
 					var deviceAddr = mac;
 					var data = {};
-					switch(payload[8]){
+					switch(sensor_type){
 						case 1:
 							data.sensor_type = 'Accel';
+							switch(payload[11]){
+								case 0:
+									data.odr = '8000Hz';
+									break;
+								case 1:
+									data.odr = '4000Hz';
+									break;
+								case 2:
+									data.odr = '2000Hz';
+									break;
+								case 3:
+									data.odr = '1000Hz';
+									break;
+								case 4:
+									data.odr = '100Hz';
+									break;
+							}
 						break;
 						case 2:
 							data.sensor_type = 'gyro';
+							switch(payload[11]){
+								case 0:
+									data.odr = '125Hz';
+									break;
+								case 1:
+									data.odr = '250Hz';
+									break;
+								case 2:
+									data.odr = '500Hz';
+									break;
+								case 3:
+									data.odr = '1000Hz';
+									break;
+							}
 						break;
 					}
 					switch(payload[10]){
@@ -8500,7 +8585,7 @@ function sensor_types(parent){
 					}
 
 					var mode = payload[9];
-					var odr = payload[11];
+					var odr = data.odr;
 					var en_axis = payload[12] & 7;
 					var fsr = payload[12] >> 5;
 					var hour = payload[13];
@@ -8511,23 +8596,6 @@ function sensor_types(parent){
 					var current_packet = payload.slice(21, 23).reduce(msbLsb);
 					var data_start = 23;
 
-					switch(odr){
-						case 0:
-							odr = '125Hz';
-							break;
-						case 1:
-							odr = '250Hz';
-							break;
-						case 2:
-							odr = '500Hz';
-							break;
-						case 3:
-							odr = '1000Hz';
-							break;
-						default:
-							odr = 0;
-					}
-
 					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
@@ -8613,28 +8681,28 @@ function sensor_types(parent){
 
 						/* Evaluate sensor type */
 						if(payload[8] == 1){ // accelerometer
-							var fsr_mult = 0.00030;
+							var fsr_mult = 0.00732;
 							var fsr_text = "";
 							switch(globalDevices[deviceAddr].fsr){
 								case 0:
-									fsr_mult = 0.00030;
+									fsr_mult = 0.00732;
 									break;
 								case 1:
-									fsr_mult = 0.00061;
+									fsr_mult = 0.01464;
 									break;
 								case 2:
-									fsr_mult = 0.00122;
+									fsr_mult = 0.02929;
 									break;
 							}
 							switch(globalDevices[deviceAddr].fsr){
 								case 0:
-									fsr_text = "10g";
+									fsr_text = "15g";
 									break;
 								case 1:
-									fsr_text = "20g";
+									fsr_text = "30g";
 									break;
 								case 2:
-									fsr_text = "40g";
+									fsr_text = "60g";
 									break;
 							}
 						}else{ // gyro
@@ -8707,210 +8775,395 @@ function sensor_types(parent){
 					}
 				}
 			},
-			'parse_fly': (frame) => {
-				let frame_data = {};
-				switch(frame[12]){
-					case 0:
-						frame_data.odr = 125;
-						break;
-					case 1:
-						frame_data.odr = 250;
-						break;
-					case 2:
-						frame_data.odr = 500;
-						break;
-					case 3:
-						frame_data.odr = 1000;
-						break;
-					default:
-						frame_data.odr = 0;
-				}
-				switch(frame[15]){
-					case 0:
-						frame_data.fsr_acc = "10g";
-						break;
-					case 1:
-						frame_data.fsr_acc = "20g";
-						break;
-					case 2:
-						frame_data.fsr_acc = "40g";
-						break;
-				}
-				switch(frame[16]){
-					case 0:
-						frame_data.fsr_gyro = "250dps";
-						break;
-					case 1:
-						frame_data.fsr_gyro = "500dps";
-						break;
-					case 2:
-						frame_data.fsr_gyro = "1000dps";
-						break;
-					case 3:
-						frame_data.fsr_gyro = "2000dps";
-						break;
-				}
-				switch(frame[17]){
-					case 7:
-						frame_data.en_axis = "all";
-						break;
-				}
-				switch(frame[20]){
-					case 1:
-						frame_data.en_sensors = "gyro_only";
-						break;
-					case 2:
-						frame_data.en_sensors = "accel_only";
-						break;
-					case 3:
-						frame_data.en_sensors = "all_enabled";
-						break;
-				}
-				switch(frame[18]){
-					case 0:
-						frame_data.sampling_interval = 5;
-						break;
-					case 1:
-						frame_data.sampling_interval = 10;
-						break;
-					case 2:
-						frame_data.sampling_interval = 15;
-						break;
-					case 3:
-						frame_data.sampling_interval = 20;
-						break;
-					case 4:
-						frame_data.sampling_interval = 30;
-						break;
-					case 5:
-						frame_data.sampling_interval = 60;
-						break;
-					case 6:
-						frame_data.sampling_interval = 120;
-						break;
-					case 7:
-						frame_data.sampling_interval = 180;
-						break;
-				}
-				switch(frame[14]){
-					case 0:
-						frame_data.hpf_cutoff = 0.00247;
-						break;
-					case 1:
-						frame_data.hpf_cutoff = 0.00062084;
-						break;
-					case 2:
-						frame_data.hpf_cutoff = 0.00015545;
-						break;
-					case 3:
-						frame_data.hpf_cutoff = 0.00003862;
-						break;
-					case 4:
-						frame_data.hpf_cutoff = 0.00000954;
-						break;
-					case 5:
-						frame_data.hpf_cutoff = 0.00000238;
-						break;
-				}
-				return {
-					'firmware': frame[2],
-					'sample_rate': frame_data.odr + 'Hz',
-					'sampling_duration': (frame[13]* 50) + 'msec',
-					'hpf_cutoff': (frame_data.hpf_cutoff * frame_data.odr).toFixed(2) + 'Hz',
-					'acc_fsr': frame_data.fsr_acc,
-					'gyro_fsr': frame_data.fsr_gyro,
-					'axis_enabled': frame_data.en_axis,
-					'sampling_interval': frame_data.sampling_interval + 'min',
-					'accelerometer_threshold': (frame[19]* 32) + "mg",
-					'enabled_sensors': frame_data.en_sensors,
-					'rtc': [
-						String(frame[21]).padStart(2, '0'),
-						String(frame[22]).padStart(2, '0'),
-						String(frame[23]).padStart(2, '0')
-					].join(':'),
-					'hardware_id': frame.slice(24, 27),
-					'report_rate': frame.slice(27, 31).reduce(msbLsb),
-					'tx_life_counter': frame.slice(31, 35).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
-						'odr': frame[12],
-						'sampling_duration': frame[13],
-						'hpf_cutoff': frame[14],
-						'acc_fsr': frame[15],
-						'gyro_fsr': frame[16],
-						'axis_enabled': frame[17],
-						'sampling_interval': frame[18],
-						'accelerometer_threshold': frame[19],
-						'enabled_sensors': frame[20],
-						'hour': frame[21],
-						'minute': frame[22],
-						'second': frame[23],
-						'hardware_id': frame.slice(24, 27),
-						'report_rate': frame.slice(27, 31),
-						'tx_life_counter': frame.slice(31, 35)
-					}
-				}
-			}
-		},
-		'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
-				};
-			},
 			'parse_fly': (frame) => {
 				let firmware = frame[2];
-				if(firmware > 13){ // firmware 14 and above
+				if(firmware > 1){
 					let frame_data = {};
-					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
-					if(!auto_check_interval){
-						frame_data.auto_check_interval = 'Disabled';
-					}else{
-						frame_data.auto_check_interval = auto_check_interval + " sec";
+					switch(frame[12]){
+						case 0:
+							frame_data.gyro_odr = 125;
+							break;
+						case 1:
+							frame_data.gyro_odr = 250;
+							break;
+						case 2:
+							frame_data.gyro_odr = 500;
+							break;
+						case 3:
+							frame_data.gyro_odr = 1000;
+							break;
 					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
+					switch(frame[13]){
 						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
+							frame_data.acc_odr = 8000;
+							break;
 						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
+							frame_data.acc_odr = 4000;
+							break;
 						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
+							frame_data.acc_odr = 2000;
+							break;
 						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
+							frame_data.acc_odr = 1000;
+							break;
 						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
+							frame_data.acc_odr = 100;
+							break;
+					}
+					switch(frame[15]){
+						case 0:
+							frame_data.hpf_cutoff = false;
+							break;
+						case 1:
+							frame_data.hpf_cutoff = 0.00247;
+							break;
+						case 2:
+							frame_data.hpf_cutoff = 0.00062084;
+							break;
+						case 3:
+							frame_data.hpf_cutoff = 0.00015545;
+							break;
+						case 4:
+							frame_data.hpf_cutoff = 0.00003862;
+							break;
 						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
+							frame_data.hpf_cutoff = 0.00000954;
+							break;
+						case 6:
+							frame_data.hpf_cutoff = 0.00000238;
+							break;
 					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
+					switch(frame[16]){
+						case 0:
+							frame_data.fsr_acc = "15g";
+							break;
+						case 1:
+							frame_data.fsr_acc = "30g";
+							break;
+						case 2:
+							frame_data.fsr_acc = "60g";
+							break;
+					}
+					switch(frame[17]){
+						case 0:
+							frame_data.fsr_gyro = "250dps";
+							break;
+						case 1:
+							frame_data.fsr_gyro = "500dps";
+							break;
+						case 2:
+							frame_data.fsr_gyro = "1000dps";
+							break;
+						case 3:
+							frame_data.fsr_gyro = "2000dps";
+							break;
+					}
+					switch(frame[18]){
+						case 1:
+							frame_data.en_axis = "X Axis";
+							break;
+						case 2:
+							frame_data.en_axis = "Y Axis";
+							break;
+						case 3:
+							frame_data.en_axis = "X-Y Axes";
+							break;
+						case 4:
+							frame_data.en_axis = "Z Axis";
+							break;
+						case 5:
+							frame_data.en_axis = "X-Z Axes";
+							break;
+						case 6:
+							frame_data.en_axis = "Y-Z Axes";
+							break;
+						case 7:
+							frame_data.en_axis = "All Axes";
+							break;
+					}
+					switch(frame[19]){
+						case 0:
+							frame_data.sampling_interval = 5;
+							break;
+						case 1:
+							frame_data.sampling_interval = 10;
+							break;
+						case 2:
+							frame_data.sampling_interval = 15;
+							break;
+						case 3:
+							frame_data.sampling_interval = 20;
+							break;
+						case 4:
+							frame_data.sampling_interval = 30;
+							break;
+						case 5:
+							frame_data.sampling_interval = 60;
+							break;
+						case 6:
+							frame_data.sampling_interval = 120;
+							break;
+						case 7:
+							frame_data.sampling_interval = 180;
+							break;
+					}
+					switch(frame[21]){
+						case 0:
+							frame_data.en_sensors = "acc_only";
+							break;
+						case 1:
+							frame_data.en_sensors = "gyro_only";
+							break;
+						case 2:
+							frame_data.en_sensors = "both_enabled";
+							break;
+					}
+					frame_data.hpf_cutoff = (frame_data.hpf_cutoff)?((frame_data.hpf_cutoff * frame_data.acc_odr).toFixed(2) + 'Hz'):'disabled';
+					return {
+						'firmware': firmware,
+						'gyro_sample_rate': frame_data.gyro_odr + 'Hz',
+						'acc_sample_rate': frame_data.acc_odr + 'Hz',
+						'sampling_duration': (frame[14]* 50) + 'msec',
+						'hpf_cutoff': frame_data.hpf_cutoff,
+						'acc_fsr': frame_data.fsr_acc,
+						'gyro_fsr': frame_data.fsr_gyro,
+						'axis_enabled': frame_data.en_axis,
+						'sampling_interval': frame_data.sampling_interval + 'min',
+						'accelerometer_threshold': (frame[20]* 32) + "mg",
+						'enabled_sensors': frame_data.en_sensors,
+						'max_num_of_motion_tx_per_interval': frame[22],
+						'rtc': [
+							String(frame[23]).padStart(2, '0'),
+							String(frame[24]).padStart(2, '0'),
+							String(frame[25]).padStart(2, '0')
+						].join(':'),
+						'hardware_id': frame.slice(26, 29),
+						'report_rate': frame.slice(29, 33).reduce(msbLsb),
+						'tx_life_counter': frame.slice(33, 37).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'gyro_sample_rate': frame[12],
+							'acc_sample_rate': frame[13],
+							'sampling_duration': frame[14],
+							'hpf_cutoff': frame[15],
+							'acc_fsr': frame[16],
+							'gyro_fsr': frame[17],
+							'axis_enabled': frame[18],
+							'sampling_interval': frame[19],
+							'accelerometer_threshold': frame[20],
+							'enabled_sensors': frame[21],
+							'max_num_of_motion_tx_per_interval': frame[22],
+							'hour': frame[23],
+							'minute': frame[24],
+							'second': frame[25],
+							'hardware_id': frame.slice(26, 29),
+							'report_rate': frame.slice(29, 33),
+							'tx_life_counter': frame.slice(33, 37)
+						}
+					}
+				}else{
+					let frame_data = {};
+					switch(frame[12]){
+						case 0:
+							frame_data.odr = 125;
+							break;
+						case 1:
+							frame_data.odr = 250;
+							break;
+						case 2:
+							frame_data.odr = 500;
+							break;
+						case 3:
+							frame_data.odr = 1000;
+							break;
+					}
+					switch(frame[15]){
+						case 0:
+							frame_data.fsr_acc = "10g";
+							break;
+						case 1:
+							frame_data.fsr_acc = "20g";
+							break;
+						case 2:
+							frame_data.fsr_acc = "40g";
+							break;
+					}
+					switch(frame[16]){
+						case 0:
+							frame_data.fsr_gyro = "250dps";
+							break;
+						case 1:
+							frame_data.fsr_gyro = "500dps";
+							break;
+						case 2:
+							frame_data.fsr_gyro = "1000dps";
+							break;
+						case 3:
+							frame_data.fsr_gyro = "2000dps";
+							break;
+					}
+					switch(frame[17]){
+						case 7:
+							frame_data.en_axis = "all";
+							break;
+					}
+					switch(frame[20]){
+						case 1:
+							frame_data.en_sensors = "gyro_only";
+							break;
+						case 2:
+							frame_data.en_sensors = "accel_only";
+							break;
+						case 3:
+							frame_data.en_sensors = "all_enabled";
+							break;
+					}
+					switch(frame[18]){
+						case 0:
+							frame_data.sampling_interval = 5;
+							break;
+						case 1:
+							frame_data.sampling_interval = 10;
+							break;
+						case 2:
+							frame_data.sampling_interval = 15;
+							break;
+						case 3:
+							frame_data.sampling_interval = 20;
+							break;
+						case 4:
+							frame_data.sampling_interval = 30;
+							break;
+						case 5:
+							frame_data.sampling_interval = 60;
+							break;
+						case 6:
+							frame_data.sampling_interval = 120;
+							break;
+						case 7:
+							frame_data.sampling_interval = 180;
+							break;
+					}
+					switch(frame[14]){
+						case 0:
+							frame_data.hpf_cutoff = 0.00247;
+							break;
+						case 1:
+							frame_data.hpf_cutoff = 0.00062084;
+							break;
+						case 2:
+							frame_data.hpf_cutoff = 0.00015545;
+							break;
+						case 3:
+							frame_data.hpf_cutoff = 0.00003862;
+							break;
+						case 4:
+							frame_data.hpf_cutoff = 0.00000954;
+							break;
+						case 5:
+							frame_data.hpf_cutoff = 0.00000238;
+							break;
+					}
+					return {
+						'firmware': firmware,
+						'sample_rate': frame_data.odr + 'Hz',
+						'sampling_duration': (frame[13]* 50) + 'msec',
+						'hpf_cutoff': (frame_data.hpf_cutoff * frame_data.odr).toFixed(2) + 'Hz',
+						'acc_fsr': frame_data.fsr_acc,
+						'gyro_fsr': frame_data.fsr_gyro,
+						'axis_enabled': frame_data.en_axis,
+						'sampling_interval': frame_data.sampling_interval + 'min',
+						'accelerometer_threshold': (frame[19]* 32) + "mg",
+						'enabled_sensors': frame_data.en_sensors,
+						'rtc': [
+							String(frame[21]).padStart(2, '0'),
+							String(frame[22]).padStart(2, '0'),
+							String(frame[23]).padStart(2, '0')
+						].join(':'),
+						'hardware_id': frame.slice(24, 27),
+						'report_rate': frame.slice(27, 31).reduce(msbLsb),
+						'tx_life_counter': frame.slice(31, 35).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'odr': frame[12],
+							'sampling_duration': frame[13],
+							'hpf_cutoff': frame[14],
+							'acc_fsr': frame[15],
+							'gyro_fsr': frame[16],
+							'axis_enabled': frame[17],
+							'sampling_interval': frame[18],
+							'accelerometer_threshold': frame[19],
+							'enabled_sensors': frame[20],
+							'hour': frame[21],
+							'minute': frame[22],
+							'second': frame[23],
+							'hardware_id': frame.slice(24, 27),
+							'report_rate': frame.slice(27, 31),
+							'tx_life_counter': frame.slice(31, 35)
+						}
+					}
+				}
+			}
+		},
+		'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
+				};
+			},
+			'parse_fly': (frame) => {
+				let firmware = frame[2];
+				if(firmware > 13){ // firmware 14 and above
+					let frame_data = {};
+					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
+					if(!auto_check_interval){
+						frame_data.auto_check_interval = 'Disabled';
+					}else{
+						frame_data.auto_check_interval = auto_check_interval + " sec";
+					}
+					frame_data.always_on = frame[24]?"Enabled":"Disabled";
+					switch(frame[16]){
+						case 0:
+							frame_data.fsr = "+-6.114 V";
+						break;
+						case 1:
+							frame_data.fsr = "+-4.096 V";
+						break;
+						case 2:
+							frame_data.fsr = "+-2.048 V";
+						break;
+						case 3:
+							frame_data.fsr = "+-1.024 V";
+						break;
+						case 4:
+							frame_data.fsr = "+-0.512 V";
+						break;
+						case 5:
+							frame_data.fsr = "+-0.256 V";
+						break;
+					}
+					return {
+						'firmware': frame[2],
+						'fsr': frame_data.fsr,
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
+						'auto_check_interval': frame_data.auto_check_interval,
+						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
+						'always_on': frame_data.always_on,
+						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
+						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
+						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
+						'hardware_id': frame.slice(37, 40),
+						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
+						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
+						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -8971,8 +9224,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -8985,8 +9238,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -9057,8 +9310,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -9071,8 +9324,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -10111,51 +10364,36 @@ function sensor_types(parent){
 
 					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);
+							// 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;
+							}
+							// 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];
-								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;
+								// 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] = {
-										// 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;
+								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);
 							}
 						}
@@ -10166,7 +10404,6 @@ function sensor_types(parent){
 							var temperature = msbLsb(payload[14], payload[15])/100;
 
 							globalDevices[deviceAddr] = {
-								// stream_size: expected_packets,
 								data: {},
 								odr: odr,
 								mo: mode,
@@ -10175,106 +10412,17 @@ function sensor_types(parent){
 								minute: minute,
 								temperature: temperature,
 							}
+							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
-							};
-							sensor_data = fft_concat_obj;
-							delete globalDevices[deviceAddr];
-							if(this.hasOwnProperty('failure_no')){
-								console.log('####falure no');
-								console.log(this.failure_no);
-							}
-
-							return sensor_data;
-						}
-						else{
-							return;
-						}
-					}else{
-
+					}
+					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,
@@ -10283,7 +10431,91 @@ function sensor_types(parent){
 							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];
+						return sensor_data;
+					}
+					else{
 						return;
 					}
 				}
@@ -10747,179 +10979,65 @@ function sensor_types(parent){
 
 					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;
-								}
-							}
-							else{
-								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,
-							}
-							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;
+							// 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;
 							}
+							// 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;
 
-							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)));
+								globalDevices[deviceAddr] = {
+									data: {},
+									odr: odr,
+									mo: mode,
+									fsr: fsr,
+									hour: hour,
+									minute: minute,
+									temperature: temperature,
 								}
-							}
-
-							// 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';
+								globalDevices[deviceAddr].last_packet_counter = current_packet;
+								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+								return;
 							}
 							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(':'),
-								probe: probe,
-								mac_address: deviceAddr,
-								fsr: fsr_text,
-								odr: globalDevices[deviceAddr].odr,
-								temperature: globalDevices[deviceAddr].temperature,
-								total_samples: label,
-								data: fft_concat
-							};
-							sensor_data = fft_concat_obj;
-							delete globalDevices[deviceAddr];
-							if(this.hasOwnProperty('failure_no')){
-								console.log('####falure no');
-								console.log(this.failure_no);
+								globalDevices[deviceAddr].last_packet_counter = current_packet;
+								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 							}
-
-							return sensor_data;
 						}
 						else{
-							return;
+							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,
+							}
+							globalDevices[deviceAddr].last_packet_counter = current_packet;
+							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						}
-					}else{
+					}
+					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,
@@ -10928,7 +11046,101 @@ function sensor_types(parent){
 							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)));
+							}
+						}
+						// 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];
+						return sensor_data;
+					}
+					else{
 						return;
 					}
 				}
@@ -12264,8 +12476,8 @@ function sensor_types(parent){
 							}
 							else{
 								globalDevices[deviceAddr].last_packet_counter = current_packet;
-							 	globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-						 	}
+								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+							}
 						}
 						else{
 							var mode = payload[8];
@@ -13120,21 +13332,25 @@ function sensor_types(parent){
 		'118': {
 			name: 'Dual Pressure and Temperature Sensor',
 			parse: (payload, parsed, mac) => {
-				let res = {
-					pressure_s1: signInt(payload.slice(8, 12).reduce(msbLsb),16)/100,
-					temperature_s1: signInt(payload.slice(12, 14).reduce(msbLsb),16)/100,
-					pressure_s2: signInt(payload.slice(14, 18).reduce(msbLsb),16)/100,
-					temperature_s2: signInt(payload.slice(18, 20).reduce(msbLsb),16)/100
-				};
-				if(payload[7] & 2 && payload[7] & 4){
-					res.error = 'Error: Sensor Probe 1 and 2 communication error';
-				} else if(payload[7] & 2){
-					res.error = 'Error: Sensor Probe 1 communication error';
-				} else if(payload[7] & 4){
-					res.error = 'Error: Sensor Probe 2 communication error';
-				}
-				return res;
-			},
+                let res = {};
+                if(!(payload[7] & 2)){
+                    res.pressure_s1 = signInt(payload.slice(8, 12).reduce(msbLsb),16)/100;
+                    res.temperature_s1 = signInt(payload.slice(12, 14).reduce(msbLsb),16)/100;
+                }else{
+                    res.pressure_s1 = null;
+                    res.temperature_s1 = null;
+                    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.temperature_s2 = signInt(payload.slice(18, 20).reduce(msbLsb),16)/100;
+                }else{
+                    res.pressure_s2 = null;
+                    res.temperature_s2 = null;
+                    res.error_s2 = 'Error: Sensor Probe 2 communication error';
+                }
+                return res;
+            },
 			'parse_fly': (frame) => {
 				let psi_1;
 				let psi_2;
@@ -13577,7 +13793,7 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
+						'boot_up_time': frame[17] + " sec",
 						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
@@ -13591,7 +13807,7 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
+							'boot_up_time': frame[17],
 							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
@@ -14348,7 +14564,7 @@ function sensor_types(parent){
 				};
 			},
 			'parse_fly': (frame) => {
-				if(frame[2] > 2){
+				if(frame[2] > 3){
 					let date = [
 						String(frame.slice(20, 22).reduce(msbLsb)),
 						String(frame[22]).padStart(2, '0'),
@@ -16906,8 +17122,8 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
-						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
 						'auto_check_interval': frame_data.auto_check_interval,
 						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
 						'always_on': frame_data.always_on,
@@ -16920,8 +17136,8 @@ function sensor_types(parent){
 						'machine_values': {
 							'firmware': frame[2],
 							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
@@ -17517,6 +17733,167 @@ function sensor_types(parent){
 				}
 			}
 		},
+		'545': {
+			name: 'Fox Thermal Flow Sensor',
+			parse: (payload, parsed, mac) => {
+				let sensor_status = '';
+				const error_message = [];
+				if(payload[8] & 1){
+					error_message.push('pwr_up');
+				}
+				if(payload[8] & 2){
+					error_message.push('flw_hi_lim');
+				}
+				if(payload[8] & 4){
+					error_message.push('flw_lo_lim');
+				}
+				if(payload[8] & 8){
+					error_message.push('tmp_hi_lim');
+				}
+				if(payload[8] & 16){
+					error_message.push('tmp_lo_lim');
+				}
+				if(payload[8] & 32){
+					error_message.push('sensor_oor');
+				}
+				if(payload[8] & 64){
+					error_message.push('gas_mix_err');
+				}
+				if(payload[8] & 128){
+					error_message.push('inc_set');
+				}
+				if(error_message.length === 0){
+					sensor_status = 'ready';
+				} else {
+					sensor_status = error_message.join(', ');
+				}
+
+				const calv_value = payload.slice(9, 11).reduce(msbLsb) / 100;
+				let cal_val = '';
+				if(calv_value < 0.80){ 
+					cal_val = 'pass';
+				} else if(calv_value <= 1.0){ 
+					cal_val = 'warning';
+				} else { 
+					cal_val = 'fail';
+				}
+
+				return {
+					sensor_status: sensor_status,
+					calcv_value: payload.slice(9, 11).reduce(msbLsb) / 100,
+					calcv_status: cal_val,
+					flow: payload.slice(11, 15).reduce(msbLsb)/100,
+					ghv: payload.slice(15, 19).reduce(msbLsb)/100,
+					total_flow: payload.slice(19, 27).reduce(msbLsb)/100,
+					temperature: payload.slice(27,29).reduce(msbLsb)/100,
+					density: payload.slice(29, 31).reduce(msbLsb)/100
+				};
+			},
+			'parse_fly': (frame) => {
+				let frame_data = {};
+				switch(frame[12]){
+					case 0:
+						frame_data.flow_unit = 'scf_m';
+						break;
+					case 1:
+						frame_data.flow_unit = 'scf_h';
+						break;
+					case 2:
+						frame_data.flow_unit = 'nm3_h';
+						break;
+					case 3:
+						frame_data.flow_unit = 'nm3_m';
+						break;
+					case 4:
+						frame_data.flow_unit = 'kg_h';
+						break;
+					case 5:
+						frame_data.flow_unit = 'kg_m';
+						break;
+					case 6:
+						frame_data.flow_unit = 'kg_s';
+						break;
+					case 7:
+						frame_data.flow_unit = 'lbs_h';
+						break;
+					case 8:
+						frame_data.flow_unit = 'lbs_m';
+						break;
+					case 9:
+						frame_data.flow_unit = 'lbs_s';
+						break;
+					case 10:
+						frame_data.flow_unit = 'nlp_h';
+						break;
+					case 11:
+						frame_data.flow_unit = 'nlp_m';
+						break;
+					case 12:
+						frame_data.flow_unit = 'mmscf_d';
+						break;
+					case 13:
+						frame_data.flow_unit = 'lbs_d';
+						break;
+					case 14:
+						frame_data.flow_unit = 'slp_m';
+						break;
+					case 15:
+						frame_data.flow_unit = 'nlp_s';
+						break;
+					case 16:
+						frame_data.flow_unit = 'mscf_d';
+						break;
+					case 17:
+						frame_data.flow_unit = 'sm3_h';
+						break;
+					case 18:
+						frame_data.flow_unit = 'mt_h';
+						break;
+					case 19:
+						frame_data.flow_unit = 'nm3_d';
+						break;
+					case 20:
+						frame_data.flow_unit = 'mmscf_m';
+						break;
+					case 21:
+						frame_data.flow_unit = 'scf_d';
+						break;
+					case 22:
+						frame_data.flow_unit = 'mcf_d';
+						break;
+					case 23:
+						frame_data.flow_unit = 'sm3_m';
+						break;
+					case 24:
+						frame_data.flow_unit = 'sm3_d';
+						break;
+				}
+				switch(frame[13]){
+					case 0:
+						frame_data.temperature_unit = 'F';
+						break;
+					case 1:
+						frame_data.temperature_unit = 'C';
+						break;
+				}
+				return {
+					'firmware': frame[2],
+					'flow_unit': frame_data.flow_unit,
+					'temperature_unit': frame_data.temperature_unit,
+					'hardware_id': frame.slice(14, 17),
+					'report_rate': frame.slice(17, 21).reduce(msbLsb),
+					'tx_life_counter': frame.slice(21, 25).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'flow_unit': frame[12],
+						'temperature_unit': frame[13],
+						'hardware_id': frame.slice(14, 17),
+						'report_rate': frame.slice(17, 21),
+						'tx_life_counter': frame.slice(21, 25)
+					}
+				}
+			}
+		},
 		'1010': {
 			name: 'RS232 Wireless Converter',
 			parse: (d) => {