@ncd-io/node-red-enterprise-sensors 1.4.1 → 1.4.2

package/lib/WirelessGateway.js

@@ -160,7 +160,7 @@ module.exports = class WirelessSensor{
 				}
 			}
 			// #OTF
-			var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,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,120,121,122,180,181,202,217,519,520,521,531,535,537,538,539,540,1010,1011];
+			var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,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,120,121,122,123,180,181,202,217,211,270,519,520,521,531,535,537,538,539,540,541,1010,1011];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -334,7 +334,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,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,120,121,122,180,181,202,217,519,520,521,531,535,537,538,539,540,1010,1011];
+		var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,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,120,121,122,123,180,181,202,211,217,270,519,520,521,531,535,537,538,539,540,541,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) {
@@ -773,7 +773,8 @@ module.exports = class WirelessSensor{
 	firmware_set_to_ota_mode(sensor_mac){
 		console.log('firmware_set_to_ota_mode');
 		var packet = [245, 56, 0, 0, 0];
-		return this.config_send(sensor_mac, packet);
+		return this.config_send(sensor_mac, packet, {}, 5000);
+		// return this.config_send(sensor_mac, packet);
 	}
 	// TODO no code basis
 	firmware_exit_ota_mode(sensor_mac){
@@ -784,13 +785,13 @@ module.exports = class WirelessSensor{
 	firmware_request_manifest(sensor_mac){
 		console.log('firmware_request_manifest');
 		var packet = [245, 60, 0, 0, 0];
-		return this.config_send(sensor_mac, packet);
+		return this.config_send(sensor_mac, packet, {}, 1500, 500);
 	}
 	firmware_send_manifest(sensor_mac, manifest){
 		console.log('firmware_send_manifest');
 		// sensor_mac = "00:00:00:00:00:00:ff:ff";
 		let packet = [245, 58, 0, 0, 0].concat(Array.prototype.slice.call(manifest));
-		return this.config_send(sensor_mac, packet);
+		return this.config_send(sensor_mac, packet, {}, 1500, 500);
 	}
 	firmware_send_manifest_v13(sensor_mac, manifest){
 		console.log('firmware_send_manifest_v13');
@@ -1261,6 +1262,14 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_debounce_time_v10_108(sensor_mac, value){
+		console.log('config_set_debounce_time_v10_108');
+		var packet = [244, 39, 0, 0, 0];
+		let threshold = int2Bytes((value), 2);
+		packet.push(...threshold);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_clear_timers_108(sensor_mac, value){
 		console.log('config_clear_timers_108');
 		var packet = [244, 36, 0, 0, 0, value];
@@ -2087,6 +2096,155 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_motion_to_sampling_delay_110(sensor_mac, value){
+		console.log('config_set_motion_to_sampling_delay_110');
+		var packet = [244, 79, 0, 0, 101, 89, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_max_num_motion_tx_delay_110(sensor_mac, value){
+		console.log('config_set_max_num_motion_tx_delay_110');
+		var packet = [244, 79, 0, 0, 101, 91, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_enable_sensor_103(sensor_mac, value){
+		console.log('config_set_enable_sensor_103');
+		var packet = [244, 79, 0, 0, 101, 19, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_enable_hp_filter_cutoff_103(sensor_mac, value){
+		console.log('config_set_enable_hp_filter_cutoff_103');
+		var packet = [244, 79, 0, 0, 101, 17, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_gyro_fsr_103(sensor_mac, value){
+		console.log('config_set_gyro_fsr_103');
+		var packet = [244, 79, 0, 0, 101, 21, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_adxl_fsr_103(sensor_mac, value){
+		console.log('config_set_adxl_fsr_103');
+		var packet = [244, 79, 0, 0, 101, 11, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_acc_threshold_103(sensor_mac, value){
+		console.log('config_set_acc_threshold_103');
+		var packet = [244, 79, 0, 0, 101, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	// config_set_do_read_rate_270(sensor_mac, value){
+	// 	console.log('config_set_do_report_rate_270');
+	// 	var packet = [244, 32, 0, 0, 0, value];
+	// 	console.log(packet);
+	// 	return this.config_send(sensor_mac, packet);
+	// }
+	config_set_do_boot_time_270(sensor_mac, value){
+		console.log('config_set_do_boot_time_270');
+		var packet = [244, 34, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_do_dev_id_270(sensor_mac, id_1, id_2, id_3, id_4){
+		console.log('config_set_do_dev_id_270');
+		var packet = [244, 38, 0, 0, 0, id_1, id_2, id_3, id_4];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_ec_boot_time_270(sensor_mac, value){
+		console.log('config_set_ec_boot_time_270');
+		var packet = [244, 36, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_ec_dev_id_270(sensor_mac, id_1, id_2, id_3, id_4){
+		console.log('config_set_ec_dev_id_270');
+		var packet = [244, 40, 0, 0, 0, id_1, id_2, id_3, id_4];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_rate_211(sensor_mac, value){
+		console.log('config_set_oxygen_rate_211');
+		var packet = [244, 32, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_timeout_211(sensor_mac, value){
+		console.log('config_set_oxygen_timeout_211');
+		var packet = [244, 37, 0, 0, 0];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_threshold_211(sensor_mac, value){
+		console.log('config_set_oxygen_threshold_211');
+		var packet = [244, 34, 0, 0, 0];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_interrupt_timeout_108(sensor_mac, value){
+		console.log('config_set_interrupt_timeout_108');
+		var packet = [244, 65, 0, 0, 0];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_start_sps30_fan_cleaning_53(sensor_mac){
+		console.log('config_set_start_sps30_fan_cleaning_53');
+		var packet = [244, 26, 0, 0, 53];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_max_flow_541(sensor_mac, value){
+		console.log('config_set_max_flow_541');
+		var packet = [244, 85, 0, 0, 88, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_min_flow_541(sensor_mac, value){
+		console.log('config_set_min_flow_541');
+		var packet = [244, 83, 0, 0, 88, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_ct_constant_87(sensor_mac, value){
+		console.log('config_set_ct_constant_87');
+		var packet = [244, 80, 0, 0, 0, 1];
+		let value_ = int2Bytes(value, 4);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_deadband_87(sensor_mac, value){
+		console.log('config_set_deadband_87');
+		var packet = [244, 82, 0, 0, 0, 1];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_sampling_frequency_87(sensor_mac, value){
+		console.log('config_set_sampling_frequency_87');
+		var packet = [244, 78, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_raw_length_87(sensor_mac, value){
+		console.log('config_set_raw_length_87');
+		var packet = [244, 84, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+
 	config_get_delay(sensor_mac){
 		return new Promise((fulfill, reject) => {
 			this.config_send(sensor_mac, [247, 21, 0, 0, 0]).then((res) => {
@@ -2422,17 +2580,19 @@ module.exports = class WirelessSensor{
 			});
 		});
 	};
-	config_send(sensor_mac, data, opts, cmd_timeout = 1500){
+	config_send(sensor_mac, data, opts, cmd_timeout = 1500, cmd_pretimeout = 0){
 		var that = this;
 		return new Promise((fulfill, reject) => {
 			// Note: This code adds a delay before sending any communications. This is not generally required, but has shown increased reliability
 			// in some cases when used directly after changing modem module settings such as entering FON network ID. Leaving it here for future reference or quick add during support.
 			// consider adding a pre-time command parameter to allow this as in the v13 firmware send function.
-			// that.queue.add(() => {
-			// 	return new Promise((f, r) => {
-			// 		setTimeout(f, 500);
-			// 	});
-			// });
+			if(cmd_pretimeout != 0){
+				that.queue.add(() => {
+					return new Promise((f, r) => {
+						setTimeout(f, cmd_pretimeout);
+					});
+				});
+			};
 			that.queue.add(() => {
 				return new Promise((f, r) => {
 					var tout;
@@ -3135,25 +3295,31 @@ function sensor_types(parent){
 				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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -3161,12 +3327,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -3175,9 +3344,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -3185,16 +3357,34 @@ function sensor_types(parent){
 		},
 		'16': {
 			name: 'Soil Moisture Sensor',
-			parse: (d) => {
-				var adc1 = d.slice(0, 2).reduce(msbLsb);
-				var adc2 = d.slice(2, 4).reduce(msbLsb);
-				return {
-					adc1: adc1,
-					adc2: adc2,
-					voltage1: adc1 * 0.00322265625,
-					voltage2: adc2 * 0.00322265625,
-					percentage: adc1 > 870 ? 100 : Math.round(adc1 / 870 * 100)
-				};
+			parse: (d, payload) => {
+				if(payload[1] > 5) // firmware v6+
+				{
+					var adc1 = d.slice(0, 2).reduce(msbLsb);
+					var adc2 = d.slice(2, 4).reduce(msbLsb);
+					var vwc1 = d.slice(4, 6).reduce(msbLsb);
+					var vwc2 = d.slice(6, 8).reduce(msbLsb);
+					return {
+						adc1: adc1,
+						adc2: adc2,
+						vwc1: vwc1,
+						vwc2: vwc2,
+						voltage1: adc1 * 0.00322265625,
+						voltage2: adc2 * 0.00322265625,
+						percentage1: adc1 > 870 ? 100 : Math.round(adc1 / 870 * 100),
+						percentage2: adc2 > 870 ? 100 : Math.round(adc2 / 870 * 100)
+					};
+				} else{
+					var adc1 = d.slice(0, 2).reduce(msbLsb);
+					var adc2 = d.slice(2, 4).reduce(msbLsb);
+					return {
+						adc1: adc1,
+						adc2: adc2,
+						voltage1: adc1 * 0.00322265625,
+						voltage2: adc2 * 0.00322265625,
+						percentage: adc1 > 870 ? 100 : Math.round(adc1 / 870 * 100)
+					};
+				}
 			}
 		},
 		'17': {
@@ -3691,25 +3881,31 @@ function sensor_types(parent){
 				let firmware = frame[2];
 				if(firmware > 13){ // firmware 14 and above
 					let frame_data = {};
-					frame_data.always_on = frame[23]?"Enabled":"Disabled";
+					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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -3717,12 +3913,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -3731,9 +3930,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -3768,25 +3970,31 @@ function sensor_types(parent){
 				let firmware = frame[2];
 				if(firmware > 13){ // firmware 14 and above
 					let frame_data = {};
-					frame_data.always_on = frame[23]?"Enabled":"Disabled";
+					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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -3794,12 +4002,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -3808,9 +4019,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -3897,48 +4111,61 @@ function sensor_types(parent){
 				let frame_data = {};
 				switch(frame[16]){
 					case 0:
-						frame_data.fsr = "+-0.256 V";
+						frame_data.fsr = "+-6.114 V";
 					break;
 					case 1:
-						frame_data.fsr = "+-0.512 V";
+						frame_data.fsr = "+-4.096 V";
 					break;
 					case 2:
-						frame_data.fsr = "+-1.024 V";
+						frame_data.fsr = "+-2.048 V";
 					break;
 					case 3:
-						frame_data.fsr = "+-2.048 V";
+						frame_data.fsr = "+-1.024 V";
 					break;
 					case 4:
-						frame_data.fsr = "+-4.096 V";
+						frame_data.fsr = "+-0.512 V";
 					break;
 					case 5:
-						frame_data.fsr = "+-6.144 V";
+						frame_data.fsr = "+-0.256 V";
 					break;
 				}
 				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";
 					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.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -4022,25 +4249,31 @@ function sensor_types(parent){
 				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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -4048,12 +4281,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -4062,9 +4298,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -4306,25 +4545,31 @@ function sensor_types(parent){
 				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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -4332,12 +4577,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -4346,9 +4594,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -4367,25 +4618,31 @@ function sensor_types(parent){
 				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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -4393,12 +4650,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -4407,9 +4667,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -4505,66 +4768,51 @@ function sensor_types(parent){
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
+					var mode = payload[8];
+					var odr = payload[9];
+					var en_axis = payload[10] & 7;
+					var fsr = payload[10] >> 5;
+					var hour = payload[11];
+					var minute = payload[12];
+					var device_temp = msbLsb(payload[13], payload[14])/100;
+					var expected_packets = payload[15];
+					var current_packet = payload[16];
+					var sdata_start = 17;
 
-					if(firmware > 25){
-						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10]);
-						var en_axis = payload[11] & 7;
-						var fsr = payload[11] >> 5;
-						var hour = payload[12];
-						var minute = payload[13];
-						var device_temp = msbLsb(payload[14], payload[15])/100;
-						var expected_packets = payload[16];
-						var current_packet = payload[17];
-						var sdata_start = 18;
-
-					} else{
-						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var hour = payload[11];
-						var minute = payload[12];
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-						var expected_packets = payload[15];
-						var current_packet = payload[16];
-						var sdata_start = 17;
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
-					}
+					switch(odr){
+						case 6:
+							odr = 50;
+							break;
+						case 7:
+							odr = 100;
+							break;
+						case 8:
+							odr = 200;
+							break;
+						case 9:
+							odr = 400;
+							break;
+						case 10:
+							odr = 800;
+							break;
+						case 11:
+							odr = 1600;
+							break;
+						case 12:
+							odr = 3200;
+							break;
+						case 13:
+							odr = 6400;
+							break;
+						case 14:
+							odr = 12800;
+							break;
+						case 15:
+							odr = 25600;
+							break;
+						default:
+							odr = 0;
+					}
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -5056,65 +5304,50 @@ function sensor_types(parent){
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
+					var mode = payload[8];
+					var odr = payload[9];
+					var en_axis = payload[10] & 7;
+					var fsr = payload[10] >> 5;
+					var hour = payload[11];
+					var minute = payload[12];
+					var device_temp = msbLsb(payload[13], payload[14])/100;
+					var expected_packets = payload[15];
+					var current_packet = payload[16];
+					var sdata_start = 17;
 
-					if(firmware > 25){
-						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10]);
-						var en_axis = payload[11] & 7;
-						var fsr = payload[11] >> 5;
-						var hour = payload[12];
-						var minute = payload[13];
-						var device_temp = msbLsb(payload[14], payload[15])/100;
-						var expected_packets = payload[16];
-						var current_packet = payload[17];
-						var sdata_start = 18;
-
-					}else{
-						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var hour = payload[11];
-						var minute = payload[12];
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-						var expected_packets = payload[15];
-						var current_packet = payload[16];
-						var sdata_start = 17;
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
+					switch(odr){
+						case 6:
+							odr = 50;
+							break;
+						case 7:
+							odr = 100;
+							break;
+						case 8:
+							odr = 200;
+							break;
+						case 9:
+							odr = 400;
+							break;
+						case 10:
+							odr = 800;
+							break;
+						case 11:
+							odr = 1600;
+							break;
+						case 12:
+							odr = 3200;
+							break;
+						case 13:
+							odr = 6400;
+							break;
+						case 14:
+							odr = 12800;
+							break;
+						case 15:
+							odr = 25600;
+							break;
+						default:
+							odr = 0;
 					}
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
@@ -5794,65 +6027,50 @@ function sensor_types(parent){
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
+					var mode = payload[8];
+					var odr = payload[9];
+					var en_axis = payload[10] & 7;
+					var fsr = payload[10] >> 5;
+					var hour = payload[11];
+					var minute = payload[12];
+					var device_temp = msbLsb(payload[13], payload[14])/100;
+					var expected_packets = payload[15];
+					var current_packet = payload[16];
+					var sdata_start = 17;
 
-					if(firmware > 25){
-						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10]);
-						var en_axis = payload[11] & 7;
-						var fsr = payload[11] >> 5;
-						var hour = payload[12];
-						var minute = payload[13];
-						var device_temp = msbLsb(payload[14], payload[15])/100;
-						var expected_packets = payload[16];
-						var current_packet = payload[17];
-						var sdata_start = 18;
-
-					} else{
-						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var hour = payload[11];
-						var minute = payload[12];
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-						var expected_packets = payload[15];
-						var current_packet = payload[16];
-						var sdata_start = 17;
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
+					switch(odr){
+						case 6:
+							odr = 50;
+							break;
+						case 7:
+							odr = 100;
+							break;
+						case 8:
+							odr = 200;
+							break;
+						case 9:
+							odr = 400;
+							break;
+						case 10:
+							odr = 800;
+							break;
+						case 11:
+							odr = 1600;
+							break;
+						case 12:
+							odr = 3200;
+							break;
+						case 13:
+							odr = 6400;
+							break;
+						case 14:
+							odr = 12800;
+							break;
+						case 15:
+							odr = 25600;
+							break;
+						default:
+							odr = 0;
 					}
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
@@ -6338,65 +6556,50 @@ function sensor_types(parent){
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
+					var mode = payload[8];
+					var odr = payload[9];
+					var en_axis = payload[10] & 7;
+					var fsr = payload[10] >> 5;
+					var hour = payload[11];
+					var minute = payload[12];
+					var device_temp = msbLsb(payload[13], payload[14])/100;
+					var expected_packets = payload[15];
+					var current_packet = payload[16];
+					var sdata_start = 17;
 
-					if(firmware > 25){
-						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10]);
-						var en_axis = payload[11] & 7;
-						var fsr = payload[11] >> 5;
-						var hour = payload[12];
-						var minute = payload[13];
-						var device_temp = msbLsb(payload[14], payload[15])/100;
-						var expected_packets = payload[16];
-						var current_packet = payload[17];
-						var sdata_start = 18;
-
-					} else{
-						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var hour = payload[11];
-						var minute = payload[12];
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-						var expected_packets = payload[15];
-						var current_packet = payload[16];
-						var sdata_start = 17;
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
+					switch(odr){
+						case 6:
+							odr = 50;
+							break;
+						case 7:
+							odr = 100;
+							break;
+						case 8:
+							odr = 200;
+							break;
+						case 9:
+							odr = 400;
+							break;
+						case 10:
+							odr = 800;
+							break;
+						case 11:
+							odr = 1600;
+							break;
+						case 12:
+							odr = 3200;
+							break;
+						case 13:
+							odr = 6400;
+							break;
+						case 14:
+							odr = 12800;
+							break;
+						case 15:
+							odr = 25600;
+							break;
+						default:
+							odr = 0;
 					}
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
@@ -6872,7 +7075,7 @@ function sensor_types(parent){
 			}
 		},
 		'87': {
-			'name': '24-Bit 1-Channel Current Monitor',
+			'name': 'Gen 4 One Channel Wireless Current Sensor',
 			parse: (d) => {
 				return {
 					ct1_rms: d.slice(0, 4).reduce(msbLsb),
@@ -6880,6 +7083,28 @@ function sensor_types(parent){
 					ct1_peak_2_freq: d.slice(6, 8).reduce(msbLsb),
 					ct1_peak_3_freq: d.slice(8, 10).reduce(msbLsb),
 				}
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'sampling_rate': frame[16] + 'Hz',
+					'current_calibration': (frame.slice(17, 21).reduce(msbLsb)) * 10,
+					'deadband': frame.slice(21, 23).reduce(msbLsb) + 'mA',
+					'max_supported_ct': frame.slice(23, 27).reduce(msbLsb),
+					'hardware_id': frame.slice(27, 30),
+					'report_rate': frame.slice(30, 34).reduce(msbLsb) + "sec",
+					'tx_life_counter': frame.slice(34, 38).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'sampling_rate': frame[16],
+						'current_calibration': frame.slice(17, 21),
+						'deadband': frame.slice(21, 23),
+						'max_supported_ct': frame.slice(23, 27),
+						'hardware_id': frame.slice(27, 30),
+						'report_rate': frame.slice(30, 34),
+						'tx_life_counter': frame.slice(34, 38)
+					}
+				}
 			}
 		},
 		'88': {
@@ -6896,48 +7121,61 @@ function sensor_types(parent){
 				let frame_data = {};
 				switch(frame[16]){
 					case 0:
-						frame_data.fsr = "+-0.256 V";
+						frame_data.fsr = "+-6.114 V";
 					break;
 					case 1:
-						frame_data.fsr = "+-0.512 V";
+						frame_data.fsr = "+-4.096 V";
 					break;
 					case 2:
-						frame_data.fsr = "+-1.024 V";
+						frame_data.fsr = "+-2.048 V";
 					break;
 					case 3:
-						frame_data.fsr = "+-2.048 V";
+						frame_data.fsr = "+-1.024 V";
 					break;
 					case 4:
-						frame_data.fsr = "+-4.096 V";
+						frame_data.fsr = "+-0.512 V";
 					break;
 					case 5:
-						frame_data.fsr = "+-6.144 V";
+						frame_data.fsr = "+-0.256 V";
 					break;
 				}
 				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";
 					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.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}else{
@@ -6976,48 +7214,61 @@ function sensor_types(parent){
 				let frame_data = {};
 				switch(frame[16]){
 					case 0:
-						frame_data.fsr = "+-0.256 V";
+						frame_data.fsr = "+-6.114 V";
 					break;
 					case 1:
-						frame_data.fsr = "+-0.512 V";
+						frame_data.fsr = "+-4.096 V";
 					break;
 					case 2:
-						frame_data.fsr = "+-1.024 V";
+						frame_data.fsr = "+-2.048 V";
 					break;
 					case 3:
-						frame_data.fsr = "+-2.048 V";
+						frame_data.fsr = "+-1.024 V";
 					break;
 					case 4:
-						frame_data.fsr = "+-4.096 V";
+						frame_data.fsr = "+-0.512 V";
 					break;
 					case 5:
-						frame_data.fsr = "+-6.144 V";
+						frame_data.fsr = "+-0.256 V";
 					break;
 				}
 				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";
 					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.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}else{
@@ -7051,25 +7302,31 @@ function sensor_types(parent){
 				let firmware = frame[2];
 				if(firmware > 13){ // firmware 14 and above
 					let frame_data = {};
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
+					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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -7077,23 +7334,25 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
+						'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],
 							'fsr': frame[16],
 							'boot_time': frame[17],
 							'power_adc': frame.slice(18, 20),
 							'auto_check_interval': frame.slice(20, 22),
-							'auto_check_percentage': frame.slice(22, 24),
+							'auto_check_threshold': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'hardware_id': frame.slice(29, 32),
+							'report_rate': frame.slice(32, 36),
+							'tx_life_counter': frame.slice(36, 40)
 						}
 					}
 				}
@@ -7127,25 +7386,31 @@ function sensor_types(parent){
 				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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -7153,12 +7418,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -7167,9 +7435,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -7187,25 +7458,31 @@ function sensor_types(parent){
 				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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -7213,12 +7490,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -7227,9 +7507,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -7548,50 +7831,113 @@ function sensor_types(parent){
 				}
 			},
 			'parse_fly': (frame) => {
-				let frame_data = {};
-				frame_data.mode = frame[12] ? 'Raw':'Processed';
-				switch(frame[13]){
-					case 0:
-						frame_data.raw_lenght = 55;
-					break;
-					case 1:
-						frame_data.raw_lenght = 100;
-					break;
-					case 2:
-						frame_data.raw_lenght = 150;
-					break;
-					case 3:
-						frame_data.raw_lenght = 180;
-					break;
+				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_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': {
+							'firmware': frame[2],
+							'fsr': frame[16],
+							'boot_time': frame[17],
+							'power_adc': frame.slice(18, 20),
+							'auto_check_interval': frame.slice(20, 22),
+							'auto_check_percentage': frame.slice(22, 24),
+							'always_on': frame[24],
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
+						}
+					}
 				}
-				return {
-					'firmware': frame[2],
-					'mode': frame_data.mode,
-					'raw_length': frame_data.raw_lenght + " Bytes",
-					'raw_on_request_timeout': frame[14] + " sec",
-					'fly_rate': frame.slice(15, 17).reduce(msbLsb) + " min",
-					'c1_sensor_gain_db': frame[17] + " dB",
-					'c1_sensor_boot_time': frame[18] + " sec",
-					'c2_sensor_gain_db': frame[19] + " dB",
-					'c2_sensor_boot_time': frame[20] + " sec",
-					'sampling_frequency': frame.slice(21, 25).reduce(msbLsb) + " Hz",
-					// 'hardware_id': frame.slice(25, 28),
-					// 'report_rate': frame.slice(28, 32).reduce(msbLsb),
-					// 'tx_life_count': frame.slice(32, 36).reduce(msbLsb),
-					'machine_values': {
+				else{
+					let frame_data = {};
+					frame_data.mode = frame[12] ? 'Raw':'Processed';
+					switch(frame[13]){
+						case 0:
+							frame_data.raw_lenght = 55;
+						break;
+						case 1:
+							frame_data.raw_lenght = 100;
+						break;
+						case 2:
+							frame_data.raw_lenght = 150;
+						break;
+						case 3:
+							frame_data.raw_lenght = 180;
+						break;
+					}
+					return {
 						'firmware': frame[2],
-						'mode': frame[12],
-						'raw_lenght': frame[13],
-						'raw_on_request_timeout': frame[14],
-						'fly_rate': frame.slice(15, 17),
-						'c1_sensor_gain_db': frame[17],
-						'c1_sensor_boot_time': frame[18],
-						'c2_sensor_gain_db': frame[19],
-						'c2_sensor_boot_time': frame[20],
-						'sampling_frequency': frame.slice(21, 25)
+						'mode': frame_data.mode,
+						'raw_length': frame_data.raw_lenght + " Bytes",
+						'raw_on_request_timeout': frame[14] + " sec",
+						'fly_rate': frame.slice(15, 17).reduce(msbLsb) + " min",
+						'c1_sensor_gain_db': frame[17] + " dB",
+						'c1_sensor_boot_time': frame[18] + " sec",
+						'c2_sensor_gain_db': frame[19] + " dB",
+						'c2_sensor_boot_time': frame[20] + " sec",
+						'sampling_frequency': frame.slice(21, 25).reduce(msbLsb) + " Hz",
 						// 'hardware_id': frame.slice(25, 28),
-						// 'report_rate': frame.slice(28, 32),
-						// 'tx_life_count': frame.slice(32, 36)
+						// 'report_rate': frame.slice(28, 32).reduce(msbLsb),
+						// 'tx_life_count': frame.slice(32, 36).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'mode': frame[12],
+							'raw_lenght': frame[13],
+							'raw_on_request_timeout': frame[14],
+							'fly_rate': frame.slice(15, 17),
+							'c1_sensor_gain_db': frame[17],
+							'c1_sensor_boot_time': frame[18],
+							'c2_sensor_gain_db': frame[19],
+							'c2_sensor_boot_time': frame[20],
+							'sampling_frequency': frame.slice(21, 25)
+							// 'hardware_id': frame.slice(25, 28),
+							// 'report_rate': frame.slice(28, 32),
+							// 'tx_life_count': frame.slice(32, 36)
+						}
 					}
 				}
 			}
@@ -7612,7 +7958,7 @@ function sensor_types(parent){
 					var data = {};
 					switch(payload[8]){
 						case 1:
-							data.sensor_type = 'adxl';
+							data.sensor_type = 'Accel';
 						break;
 						case 2:
 							data.sensor_type = 'gyro';
@@ -7626,74 +7972,70 @@ function sensor_types(parent){
 							data.event_type = 'motion';
 							break;
 					}
+
+					var mode = payload[9];
+					var odr = payload[11];
+					var en_axis = payload[12] & 7;
+					var fsr = payload[12] >> 5;
 					var hour = payload[13];
 					var minute = payload[14];
+					var device_temp = payload.slice(15, 17).reduce(msbLsb) / 100;
+					var external_temperature = payload.slice(17, 19).reduce(msbLsb) / 100;
 					var expected_packets =  payload.slice(19, 21).reduce(msbLsb);
 					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 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[9];
-									var odr = payload[11];
-									var en_axis = payload[12] & 7;
-									var fsr = payload[12] >> 5;
-									var device_temp = payload.slice(15, 17).reduce(msbLsb) / 100;
-									var external_temperature = payload.slice(17, 19).reduce(msbLsb) / 100;
-
-									globalDevices[deviceAddr] = {
-										// stream_size: expected_packets,
-										data: {},
-										odr: odr,
-										mo: mode,
-										en_axis: en_axis,
-										fsr: fsr,
-										hour: hour,
-										minute: minute,
-										device_temp: device_temp,
-										external_temp: external_temperature
-									}
-									globalDevices[deviceAddr].data[current_packet] = payload.slice(data_start);
-									return;
+								// create new stream
+								globalDevices[deviceAddr] = {
+									// stream_size: expected_packets,
+									data: {},
+									odr: odr,
+									mo: mode,
+									en_axis: en_axis,
+									fsr: fsr,
+									hour: hour,
+									minute: minute,
+									device_temp: device_temp,
+									external_temp: external_temperature
 								}
+								globalDevices[deviceAddr].last_packet_counter = current_packet;
+								globalDevices[deviceAddr].data[current_packet] = payload.slice(data_start);
+								return;
 							}
 							else{
+								globalDevices[deviceAddr].last_packet_counter = current_packet;
 								globalDevices[deviceAddr].data[current_packet] = payload.slice(data_start);
 							}
 						}
 						else{
-							var mode = payload[9];
-							var odr = payload[11];
-							var en_axis = payload[12] & 7;
-							var fsr = payload[12] >> 5;
-							var device_temp = payload.slice(15, 17).reduce(msbLsb) / 100;
-							var external_temperature = payload.slice(17, 19).reduce(msbLsb) / 100;
-
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
 								data: {},
@@ -7706,185 +8048,282 @@ function sensor_types(parent){
 								device_temp: device_temp,
 								external_temp: external_temperature
 							}
+							globalDevices[deviceAddr].last_packet_counter = current_packet;
 							globalDevices[deviceAddr].data[current_packet] = payload.slice(data_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;
+					}
+					else{
 
-							var fft = new Array();
-							var fft_concat = {};
+						globalDevices[deviceAddr] = {
+							data: {},
+							odr: odr,
+							mo: mode,
+							en_axis: en_axis,
+							fsr: fsr,
+							hour: hour,
+							minute: minute,
+							device_temp: device_temp,
+							external_temp: external_temperature
+						}
+						globalDevices[deviceAddr].last_packet_counter = current_packet;
+						globalDevices[deviceAddr].data[current_packet] = payload.slice(data_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 en_axis_data = {};
-							switch (globalDevices[deviceAddr].en_axis){
-								case 1:
-									en_axis_data.x_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 2:
-									en_axis_data.y_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 3:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.increment = 4;
+						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: []};
+
+						/* Evaluate sensor type */
+						if(payload[8] == 1){ // accelerometer
+							var fsr_mult = 0.000019;
+							var fsr_text = "";
+							switch(globalDevices[deviceAddr].fsr){
+								case 0:
+									fsr_mult = 0.000019;
 									break;
-								case 4:
-									en_axis_data.z_offset = 0;
-									en_axis_data.increment = 2;
+								case 1:
+									fsr_mult = 0.000038;
 									break;
-								case 5:
-									en_axis_data.x_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
+								case 2:
+									fsr_mult = 0.000076;
 									break;
-								case 6:
-									en_axis_data.y_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
+							}
+							switch(globalDevices[deviceAddr].fsr){
+								case 0:
+									fsr_text = "10g";
 									break;
-								case 7:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.z_offset = 4;
-									en_axis_data.increment = 6;
+								case 1:
+									fsr_text = "20g";
+									break;
+								case 2:
+									fsr_text = "40g";
 									break;
-								default:
-									en_axis_data.increment = 0;
-							}
-							/* Evaluate sensor type */
-							if(payload[0] == 1){ // adxl
-								var fsr_mult = .00030;
-								var fsr_text = "";
-								switch(globalDevices[deviceAddr].fsr){
-									case 0:
-										fsr_mult = 0.00030;
-										break;
-									case 1:
-										fsr_mult = 0.00061;
-										break;
-									case 2:
-										fsr_mult = 0.00122;
-										break;
-								}
-								switch(globalDevices[deviceAddr].fsr){
-									case 0:
-										fsr_text = "10g";
-										break;
-									case 1:
-										fsr_text = "20g";
-										break;
-									case 2:
-										fsr_text = "40g";
-										break;
-								}
-							}else{ // gyro
-								var fsr_mult = 0.00047;
-								var fsr_text = "";
-								switch(globalDevices[deviceAddr].fsr){
-									case 0:
-										fsr_mult = 0.00047;
-										break;
-									case 1:
-										fsr_mult = 0.00095;
-										break;
-									case 2:
-										fsr_mult = 0.00190;
-										break;
-									case 3:
-										fsr_mult = 0.00381;
-										break;
-								}
-								switch(globalDevices[deviceAddr].fsr){
-									case 0:
-										fsr_text = "250dps";
-										break;
-									case 1:
-										fsr_text = "500dps";
-										break;
-									case 2:
-										fsr_text = "1000dps";
-										break;
-									case 3:
-										fsr_text = "2000dps";
-										break;
-								}
 							}
-
-							for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
-								label++;
-
-								fft_concat[label] = {};
-
-								if('x_offset' in en_axis_data){
-									fft_concat[label].x = 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[label].y = 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[label].z = 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));
-								}
+						}else{ // gyro
+							var fsr_mult = 0.0305;
+							var fsr_text = "";
+							switch(globalDevices[deviceAddr].fsr){
+								case 0:
+									fsr_mult = 0.0305;
+									break;
+								case 1:
+									fsr_mult = 0.061;
+									break;
+								case 2:
+									fsr_mult = 0.122;
+									break;
+								case 3:
+									fsr_mult = 0.244;
+									break;
 							}
-							var fft_concat_obj = {
-								mode: payload[9],
-								sensor_type: data.sensor_type,
-								msg_type: data.event_type,
-								time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
-								mac_address: deviceAddr,
-								en_axis: globalDevices[deviceAddr].en_axis,
-								fsr: fsr_text,
-								odr: globalDevices[deviceAddr].odr,
-								device_temp: globalDevices[deviceAddr].device_temp,
-								external_temp: globalDevices[deviceAddr].external_temp,
-								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);
+							switch(globalDevices[deviceAddr].fsr){
+								case 0:
+									fsr_text = "250dps";
+									break;
+								case 1:
+									fsr_text = "500dps";
+									break;
+								case 2:
+									fsr_text = "1000dps";
+									break;
+								case 3:
+									fsr_text = "2000dps";
+									break;
 							}
-
-							return sensor_data;
-						}
-						else{
-							return;
 						}
-					}else{
 
-						var mode = payload[9];
-						var odr = payload[11];
-						var en_axis = payload[12] & 7;
-						var fsr = payload[12] >> 5;
-						var device_temp = payload.slice(15, 17).reduce(msbLsb) / 100;
-						var external_temperature = payload.slice(17, 19).reduce(msbLsb) / 100;
+						for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
+							label++;
 
-						globalDevices[deviceAddr] = {
-							// stream_size: expected_packets,
-							data: {},
-							odr: odr,
-							mo: mode,
-							en_axis: en_axis,
-							fsr: fsr,
-							hour: hour,
-							minute: minute,
-							device_temp: device_temp,
-							external_temp: external_temperature
+							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[current_packet] = payload.slice(data_start);
+						var fft_concat_obj = {
+							mode: mode,
+							sensor_type: data.sensor_type,
+							msg_type: data.event_type,
+							time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
+							mac_address: deviceAddr,
+							en_axis: globalDevices[deviceAddr].en_axis,
+							fsr: fsr_text,
+							odr: globalDevices[deviceAddr].odr,
+							device_temp: globalDevices[deviceAddr].device_temp,
+							external_temp: globalDevices[deviceAddr].external_temp,
+							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;
 					}
 				}
+			},
+			'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': {
@@ -7900,25 +8339,31 @@ function sensor_types(parent){
 				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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -7926,12 +8371,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -7940,9 +8388,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -7964,25 +8415,31 @@ function sensor_types(parent){
 				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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -7990,12 +8447,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -8004,9 +8464,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -8038,25 +8501,31 @@ function sensor_types(parent){
 				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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -8064,12 +8533,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -8078,9 +8550,12 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
 						}
 					}
 				}
@@ -8113,50 +8588,182 @@ function sensor_types(parent){
 							break;
 					}
 					return {
-						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
-						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
-						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
-						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
-						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
-						opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
-						accelerometer_counter: d.slice(24, 28).reduce(msbLsb),
-						accelerometer_uptime: d.slice(28, 32).reduce(msbLsb),
-						magnetometer_counter: d.slice(32, 36).reduce(msbLsb),
-						magnetometer_uptime: d.slice(36, 40).reduce(msbLsb),
-						input_di: d[40] & 1 ? 1 : 0,
-						input_ct: d[40] & 2 ? 1 : 0,
-						input_opto: d[40] & 4 ? 1 : 0,
-						input_acc: d[40] & 8 ? 1 : 0,
-						input_mag: d[40] & 16 ? 1 : 0,
-						report_type: report_type,
-						rtc: [
-							String(d[42]).padStart(2, '0'),
-							String(d[43]).padStart(2, '0'),
-							String(d[44]).padStart(2, '0')
-						].join(':')
-					};
-				}else{
-					return {
-						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
-						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
-						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
-						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
-						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
-						opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
-						accelerometer_counter: d.slice(24, 28).reduce(msbLsb),
-						accelerometer_uptime: d.slice(28, 32).reduce(msbLsb),
-						magnetometer_counter: d.slice(32, 36).reduce(msbLsb),
-						magnetometer_uptime: d.slice(36, 40).reduce(msbLsb),
-						input_di: d[40] & 1 ? 1 : 0,
-						input_ct: d[40] & 2 ? 1 : 0,
-						input_opto: d[40] & 4 ? 1 : 0,
-						input_acc: d[40] & 8 ? 1 : 0,
-						input_mag: d[40] & 16 ? 1 : 0
-					};
-				}
-			},
-			'parse_fly': (frame) => {
-				if(frame[2] > 8){
+						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
+						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
+						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
+						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
+						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
+						opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
+						accelerometer_counter: d.slice(24, 28).reduce(msbLsb),
+						accelerometer_uptime: d.slice(28, 32).reduce(msbLsb),
+						magnetometer_counter: d.slice(32, 36).reduce(msbLsb),
+						magnetometer_uptime: d.slice(36, 40).reduce(msbLsb),
+						input_di: d[40] & 1 ? 1 : 0,
+						input_ct: d[40] & 2 ? 1 : 0,
+						input_opto: d[40] & 4 ? 1 : 0,
+						input_acc: d[40] & 8 ? 1 : 0,
+						input_mag: d[40] & 16 ? 1 : 0,
+						report_type: report_type,
+						rtc: [
+							String(d[42]).padStart(2, '0'),
+							String(d[43]).padStart(2, '0'),
+							String(d[44]).padStart(2, '0')
+						].join(':')
+					};
+				}else{
+					return {
+						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
+						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
+						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
+						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
+						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
+						opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
+						accelerometer_counter: d.slice(24, 28).reduce(msbLsb),
+						accelerometer_uptime: d.slice(28, 32).reduce(msbLsb),
+						magnetometer_counter: d.slice(32, 36).reduce(msbLsb),
+						magnetometer_uptime: d.slice(36, 40).reduce(msbLsb),
+						input_di: d[40] & 1 ? 1 : 0,
+						input_ct: d[40] & 2 ? 1 : 0,
+						input_opto: d[40] & 4 ? 1 : 0,
+						input_acc: d[40] & 8 ? 1 : 0,
+						input_mag: d[40] & 16 ? 1 : 0
+					};
+				}
+			},
+			'parse_fly': (frame) => {
+				if(frame[2] > 9){ // firmware 10 and above
+					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;
+					}
+					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,
+						'hardware_id': frame.slice(41, 44),
+						'report_rate': frame.slice(44, 48).reduce(msbLsb) + "sec",
+						'tx_life_counter': frame.slice(48, 52).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],
+							'hardware_id': frame.slice(41, 44),
+							'report_rate': frame.slice(44, 48),
+							'tx_life_counter': frame.slice(48, 52)
+						}
+					}
+				} else if(frame[2] > 8){
 					let reset_mode = "Disabled";
 					switch(frame[37]){
 						case 0:
@@ -8235,12 +8842,12 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'accelerometer_threshold': (frame[16]* 32) + "mg",
-						'debouncing_timeout': frame[17] + "sec",
+						'debouncing_timeout': frame[17] + "msec",
 						'accelero_state': frame[18]? "Enabled": "Disabled",
 						'input_1_active_edge': frame[19]? "Rising": "Falling",
 						'input_2_active_edge': frame[20]? "Rising": "Falling",
 						'input_3_active_edge': frame[21]? "Rising": "Falling",
-						'counter_threshold': frame.slice(22, 26).reduce(msbLsb) + "sec",
+						'counter_threshold': frame.slice(22, 26).reduce(msbLsb),
 						'trasnmit_on_change_status': frame[26]? "Enabled": "Disabled",
 						'Shift_end_1': [
 							String(frame[27]).padStart(2, '0'),
@@ -8292,11 +8899,11 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'report_rate': frame.slice(12, 16).reduce(msbLsb).toString() + "sec.",
-						'accelerometer_threshold': (frame[16]* 32).toString() + "mg.",
-						'debouncing_timeout': frame[17].toString() + "sec.",
+						'accelerometer_threshold': (frame[16]* 32) + "mg.",
+						'debouncing_timeout': frame[17].toString() + "msec.",
 						'accelero_state': frame[18],
 						'digital_inputs_active_edge': frame.slice(19, 22).reduce(msbLsb),
-						'counter_threshold': frame.slice(22, 26).reduce(msbLsb).toString() + "sec.",
+						'counter_threshold': frame.slice(22, 26).reduce(msbLsb),
 						'trasnmit_on_change_status': frame[26],
 						'machine_values': {
 							'firmware': frame[2],
@@ -8478,30 +9085,6 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'109': {
-			name: 'Wireless Custom Solar Sensor',
-			parse: (d) => {
-				return {
-					illuminance: d.slice(0, 4).reduce(msbLsb),
-					total_solar_radiation: d.slice(4, 6).reduce(msbLsb),
-					ultraviolet_radiation: d.slice(6, 8).reduce(msbLsb)
-				};
-			},
-			'parse_fly': (frame) => {
-				return {
-					'firmware': frame[2],
-					'hardware_id': frame.slice(12, 15),
-					'sample_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),
-						'sample_rate': frame.slice(15, 19),
-						'tx_life_counter': frame.slice(19, 23)
-					}
-				}
-			}
-		},
 		'109': {
 			name: 'Wireless Custom Solar Sensor',
 			parse: (d) => {
@@ -8574,7 +9157,7 @@ function sensor_types(parent){
 									var mode = payload[8];
 									var odr = msbLsb(payload[9], payload[10]);
 									var fsr = payload[11] >> 5;
-									var device_temp = msbLsb(payload[14], payload[15])/100;
+									var temperature = msbLsb(payload[14], payload[15])/100;
 
 									globalDevices[deviceAddr] = {
 										// stream_size: expected_packets,
@@ -8584,7 +9167,7 @@ function sensor_types(parent){
 										fsr: fsr,
 										hour: hour,
 										minute: minute,
-										device_temp: device_temp,
+										temperature: temperature,
 									}
 									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 									return;
@@ -8598,7 +9181,7 @@ function sensor_types(parent){
 							var mode = payload[8];
 							var odr = msbLsb(payload[9], payload[10]);
 							var fsr = payload[11] >> 5;
-							var device_temp = msbLsb(payload[14], payload[15])/100;
+							var temperature = msbLsb(payload[14], payload[15])/100;
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
@@ -8608,7 +9191,7 @@ function sensor_types(parent){
 								fsr: fsr,
 								hour: hour,
 								minute: minute,
-								device_temp: device_temp,
+								temperature: temperature,
 							}
 							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						}
@@ -8682,7 +9265,7 @@ function sensor_types(parent){
 								mac_address: deviceAddr,
 								fsr: fsr_text,
 								odr: globalDevices[deviceAddr].odr,
-								device_temp: globalDevices[deviceAddr].device_temp,
+								temperature: globalDevices[deviceAddr].temperature,
 								total_samples: label,
 								data: fft_concat
 							};
@@ -8703,7 +9286,7 @@ function sensor_types(parent){
 						var mode = payload[8];
 						var odr = msbLsb(payload[9], payload[10]);
 						var fsr = payload[11] >> 5;
-						var device_temp = msbLsb(payload[14], payload[15])/100;
+						var temperature = msbLsb(payload[14], payload[15])/100;
 
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
@@ -8713,7 +9296,7 @@ function sensor_types(parent){
 							fsr: fsr,
 							hour: hour,
 							minute: minute,
-							device_temp: device_temp,
+							temperature: temperature,
 						}
 						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						return;
@@ -8989,7 +9572,65 @@ function sensor_types(parent){
 				frame_data.auto_raw_interval = frame[32] * frame_data.sampling_interval_number || 'disabled';
 				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
 				frame_data.smart_mode_threshold = frame[34] * 50;
-				if(frame[2] > 4){ // for Firmware v5 and above
+				if(frame[2] > 5){ // for Firmware v6 and above
+					frame_data.motion_to_delay = frame[41] * 50;
+					return {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr': frame_data.odr_1+'Hz',
+						'sampling_duration': frame_data.sampling_duration_1,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff': frame_data.lpf_coeff_1,
+						'lpf_freq': frame_data.lpf_freq_1+'Hz',
+						'hpf_coeff': frame_data.hpf_coeff_1,
+						'hpf_freq': frame_data.hpf_freq_1+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
+						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
+						'auto_raw_interval': frame_data.auto_raw_interval,
+						'smart_mode_skip_count': frame[33],
+						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
+						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
+						'max_tx_raw_samples': frame.slice(39, 41).reduce(msbLsb),
+						'motion_to_sampling_delay': frame_data.motion_to_delay +'msec',
+						'max_num_of_motion_tx_per_interval': frame[42],
+						'hardware_id': frame.slice(43, 46),
+						'reserved': frame.slice(46, 50),
+						'tx_lifetime_counter': frame.slice(50, 54).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr': frame[17],
+							'sampling_duration': frame[18],
+							'filter_status': frame[19],
+							'lpf_coeff': frame[20],
+							'hpf_coeff': frame[21],
+							'sampling_interval': frame[22],
+							'on_request_timeout': frame[23],
+							'deadband': frame[24],
+							'payload_length': frame[25],
+							'fsr': frame[26],
+							'rpm_compute_status': frame[27],
+							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
+							'auto_raw_interval': frame[32],
+							'smart_mode_skip_count': frame[33],
+							'smart_mode_acc_threshold':frame[34],
+							'uptime_counter': frame.slice(35, 39),
+							'max_tx_raw_samples': frame.slice(39, 41),
+							'motion_to_sampling_delay': frame[41],
+							'max_num_of_motion_tx_per_interval': frame[42],
+							'hardware_id': frame.slice(43, 46),
+							'reserved': frame.slice(46, 50),
+							'tx_lifetime_counter': frame.slice(50, 54)
+						}
+					}
+				} else if(frame[2] > 4){ // for Firmware v5 and above
 					return {
 						'firmware': frame[2],
 						'destination_address': toMac(frame.slice(12, 16)),
@@ -9148,7 +9789,7 @@ function sensor_types(parent){
 									var mode = payload[8];
 									var odr = msbLsb(payload[9], payload[10]);
 									var fsr = payload[11] >> 5;
-									var device_temp = msbLsb(payload[14], payload[15])/100;
+									var temperature = msbLsb(payload[14], payload[15])/100;
 
 									globalDevices[deviceAddr] = {
 										// stream_size: expected_packets,
@@ -9158,7 +9799,7 @@ function sensor_types(parent){
 										fsr: fsr,
 										hour: hour,
 										minute: minute,
-										device_temp: device_temp,
+										temperature: temperature,
 									}
 									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 									return;
@@ -9172,7 +9813,7 @@ function sensor_types(parent){
 							var mode = payload[8];
 							var odr = msbLsb(payload[9], payload[10]);
 							var fsr = payload[11] >> 5;
-							var device_temp = msbLsb(payload[14], payload[15])/100;
+							var temperature = msbLsb(payload[14], payload[15])/100;
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
@@ -9182,7 +9823,7 @@ function sensor_types(parent){
 								fsr: fsr,
 								hour: hour,
 								minute: minute,
-								device_temp: device_temp,
+								temperature: temperature,
 							}
 							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						}
@@ -9267,7 +9908,7 @@ function sensor_types(parent){
 								mac_address: deviceAddr,
 								fsr: fsr_text,
 								odr: globalDevices[deviceAddr].odr,
-								device_temp: globalDevices[deviceAddr].device_temp,
+								temperature: globalDevices[deviceAddr].temperature,
 								total_samples: label,
 								data: fft_concat
 							};
@@ -9287,7 +9928,7 @@ function sensor_types(parent){
 						var mode = payload[8];
 						var odr = msbLsb(payload[9], payload[10]);
 						var fsr = payload[11] >> 5;
-						var device_temp = msbLsb(payload[14], payload[15])/100;
+						var temperature = msbLsb(payload[14], payload[15])/100;
 
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
@@ -9297,7 +9938,7 @@ function sensor_types(parent){
 							fsr: fsr,
 							hour: hour,
 							minute: minute,
-							device_temp: device_temp,
+							temperature: temperature,
 						}
 						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						return;
@@ -9743,7 +10384,79 @@ function sensor_types(parent){
 				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
 				frame_data.p1_smart_mode_threshold = frame[38] * 50;
 				frame_data.p2_smart_mode_threshold = frame[39] * 50;
-				if(frame[2] > 4){ // for Firmware v5 and above
+				if(frame[2] > 5){ // for Firmware v6 and above
+					frame_data.motion_to_delay = frame[50] * 50;
+					return {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr_1': frame_data.odr_1+'Hz',
+						'odr_2': frame_data.odr_2+'Hz',
+						'sampling_duration_1': frame_data.sampling_duration_1,
+						'sampling_duration_2': frame_data.sampling_duration_2,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff_1': frame_data.lpf_coeff_1,
+						'lpf_freq_1': frame_data.lpf_freq_1+'Hz',
+						'lpf_coeff_2': frame_data.lpf_coeff_2,
+						'lpf_freq_2': frame_data.lpf_freq_2+'Hz',
+						'hpf_coeff_1': frame_data.hpf_coeff_1,
+						'hpf_freq_1': frame_data.hpf_freq_1+'Hz',
+						'hpf_coeff_2': frame_data.hpf_coeff_2,
+						'hpf_freq_2': frame_data.hpf_freq_2+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
+						'auto_raw_destination_address': toMac(frame.slice(32 , 36)),
+						'auto_raw_interval': frame_data.auto_raw_interval,
+						'smart_mode_skip_count': frame[37],
+						'smart_mode_acc_threshold_probe_1': frame_data.p1_smart_mode_threshold+'mg',
+						'smart_mode_acc_threshold_probe_2': frame_data.p2_smart_mode_threshold+'mg',
+						'uptime_counter_probe_1': frame.slice(40, 44).reduce(msbLsb)+'sec',
+						'uptime_counter_probe_2': frame.slice(44, 48).reduce(msbLsb)+'sec',
+						'max_tx_raw_samples': frame.slice(48, 50).reduce(msbLsb),
+						'motion_to_sampling_delay': frame_data.motion_to_delay +'msec',
+						'max_num_of_motion_tx_per_interval': frame[51],
+						'hardware_id': frame.slice(52, 55),
+						'reserved': frame.slice(55, 59),
+						'tx_lifetime_counter': frame.slice(59, 63).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr_1': frame[17],
+							'odr_2': frame[18],
+							'sampling_duration_1': frame[19],
+							'sampling_duration_2': frame[20],
+							'filter_status': frame[21],
+							'lpf_coeff_1': frame[22],
+							'lpf_coeff_2': frame[23],
+							'hpf_coeff_1': frame[24],
+							'hpf_coeff_2': frame[25],
+							'sampling_interval': frame[26],
+							'on_request_timeout': frame[27],
+							'deadband': frame[28],
+							'payload_length': frame[29],
+							'fsm': frame[30],
+							'rpm_compute_status': frame[31],
+							'auto_raw_destination_address': toMac(frame.slice(32 , 36), false),
+							'auto_raw_interval': frame[36],
+							'smart_mode_skip_count': frame[37],
+							'smart_mode_acc_threshold_probe_1':frame[38],
+							'smart_mode_acc_threshold_probe_2':frame[39],
+							'uptime_counter_probe_1': frame.slice(40, 44),
+							'uptime_counter_probe_2': frame.slice(44, 48),
+							'max_tx_raw_samples': frame.slice(48, 50),
+							'motion_to_sampling_delay': frame[50],
+							'max_num_of_motion_tx_per_interval': frame[51],
+							'hardware_id': frame.slice(52, 55),
+							'reserved': frame.slice(55, 59),
+							'tx_lifetime_counter': frame.slice(59, 63)
+						}
+					}
+				} else if (frame[2] > 4){ // for Firmware v5 and above
 					return {
 						'firmware': frame[2],
 						'destination_address': toMac(frame.slice(12, 16)),
@@ -9927,7 +10640,7 @@ function sensor_types(parent){
 									var mode = payload[8];
 									var odr = msbLsb(payload[9], payload[10]);
 									var fsr = payload[11] >> 5;
-									var device_temp = msbLsb(payload[14], payload[15])/100;
+									var temperature = msbLsb(payload[14], payload[15])/100;
 
 									globalDevices[deviceAddr] = {
 										// stream_size: expected_packets,
@@ -9937,7 +10650,7 @@ function sensor_types(parent){
 										fsr: fsr,
 										hour: hour,
 										minute: minute,
-										device_temp: device_temp,
+										temperature: temperature,
 									}
 									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 									return;
@@ -9951,7 +10664,7 @@ function sensor_types(parent){
 							var mode = payload[8];
 							var odr = msbLsb(payload[9], payload[10]);
 							var fsr = payload[11] >> 5;
-							var device_temp = msbLsb(payload[14], payload[15])/100;
+							var temperature = msbLsb(payload[14], payload[15])/100;
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
@@ -9961,7 +10674,7 @@ function sensor_types(parent){
 								fsr: fsr,
 								hour: hour,
 								minute: minute,
-								device_temp: device_temp,
+								temperature: temperature,
 							}
 							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						}
@@ -10033,7 +10746,7 @@ function sensor_types(parent){
 								mac_address: deviceAddr,
 								fsr: fsr_text,
 								odr: globalDevices[deviceAddr].odr,
-								device_temp: globalDevices[deviceAddr].device_temp,
+								temperature: globalDevices[deviceAddr].temperature,
 								total_samples: label,
 								data: fft_concat
 							};
@@ -10058,7 +10771,7 @@ function sensor_types(parent){
 						var mode = payload[8];
 						var odr = msbLsb(payload[9], payload[10]);
 						var fsr = payload[11] >> 5;
-						var device_temp = msbLsb(payload[14], payload[15])/100;
+						var temperature = msbLsb(payload[14], payload[15])/100;
 
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
@@ -10068,7 +10781,7 @@ function sensor_types(parent){
 							fsr: fsr,
 							hour: hour,
 							minute: minute,
-							device_temp: device_temp,
+							temperature: temperature,
 						}
 						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						return;
@@ -10345,7 +11058,65 @@ function sensor_types(parent){
 				frame_data.auto_raw_interval = frame[32] * frame_data.sampling_interval_number || 'disabled';
 				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
 				frame_data.smart_mode_threshold = frame[34] * 50;
-				if(frame[2] > 4){ // for Firmware v5 and above
+				if(frame[2] > 5){ // for Firmware v6 and above
+					frame_data.motion_to_delay = frame[41] * 50;
+					return {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr': frame_data.odr_1+'Hz',
+						'sampling_duration': frame_data.sampling_duration_1,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff': frame_data.lpf_coeff_1,
+						'lpf_freq': frame_data.lpf_freq_1+'Hz',
+						'hpf_coeff': frame_data.hpf_coeff_1,
+						'hpf_freq': frame_data.hpf_freq_1+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
+						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
+						'auto_raw_interval': frame_data.auto_raw_interval,
+						'smart_mode_skip_count': frame[33],
+						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
+						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
+						'max_tx_raw_samples': frame.slice(39, 41).reduce(msbLsb),
+						'motion_to_sampling_delay': frame_data.motion_to_delay +'msec',
+						'max_num_of_motion_tx_per_interval': frame[42],
+						'hardware_id': frame.slice(43, 46),
+						'reserved': frame.slice(46, 50),
+						'tx_lifetime_counter': frame.slice(50, 54).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr': frame[17],
+							'sampling_duration': frame[18],
+							'filter_status': frame[19],
+							'lpf_coeff': frame[20],
+							'hpf_coeff': frame[21],
+							'sampling_interval': frame[22],
+							'on_request_timeout': frame[23],
+							'deadband': frame[24],
+							'payload_length': frame[25],
+							'fsr': frame[26],
+							'rpm_compute_status': frame[27],
+							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
+							'auto_raw_interval': frame[32],
+							'smart_mode_skip_count': frame[33],
+							'smart_mode_acc_threshold':frame[34],
+							'uptime_counter': frame.slice(35, 39),
+							'max_tx_raw_samples': frame.slice(39, 41),
+							'motion_to_sampling_delay': frame[41],
+							'max_num_of_motion_tx_per_interval': frame[42],
+							'hardware_id': frame.slice(43, 46),
+							'reserved': frame.slice(46, 50),
+							'tx_lifetime_counter': frame.slice(50, 54)
+						}
+					}
+				} else if(frame[2] > 4){ // for Firmware v5 and above
 					return {
 						'firmware': frame[2],
 						'destination_address': toMac(frame.slice(12, 16)),
@@ -10485,7 +11256,7 @@ function sensor_types(parent){
 								var mode = payload[8];
 								var odr = msbLsb(payload[9], payload[10]);
 								var fsr = payload[11] >> 5;
-								var device_temp = msbLsb(payload[14], payload[15])/100;
+								var temperature = msbLsb(payload[14], payload[15])/100;
 
 								globalDevices[deviceAddr] = {
 									data: {},
@@ -10494,7 +11265,7 @@ function sensor_types(parent){
 									fsr: fsr,
 									hour: hour,
 									minute: minute,
-									device_temp: device_temp,
+									temperature: temperature,
 								}
 								globalDevices[deviceAddr].last_packet_counter = current_packet;
 								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
@@ -10509,7 +11280,7 @@ function sensor_types(parent){
 							var mode = payload[8];
 							var odr = msbLsb(payload[9], payload[10]);
 							var fsr = payload[11] >> 5;
-							var device_temp = msbLsb(payload[14], payload[15])/100;
+							var temperature = msbLsb(payload[14], payload[15])/100;
 
 							globalDevices[deviceAddr] = {
 								data: {},
@@ -10518,7 +11289,7 @@ function sensor_types(parent){
 								fsr: fsr,
 								hour: hour,
 								minute: minute,
-								device_temp: device_temp,
+								temperature: temperature,
 							}
 							globalDevices[deviceAddr].last_packet_counter = current_packet;
 							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
@@ -10528,7 +11299,7 @@ function sensor_types(parent){
 						var mode = payload[8];
 						var odr = msbLsb(payload[9], payload[10]);
 						var fsr = payload[11] >> 5;
-						var device_temp = msbLsb(payload[14], payload[15])/100;
+						var temperature = msbLsb(payload[14], payload[15])/100;
 
 						globalDevices[deviceAddr] = {
 							data: {},
@@ -10537,7 +11308,7 @@ function sensor_types(parent){
 							fsr: fsr,
 							hour: hour,
 							minute: minute,
-							device_temp: device_temp,
+							temperature: temperature,
 						}
 						globalDevices[deviceAddr].last_packet_counter = current_packet;
 						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
@@ -10611,7 +11382,7 @@ function sensor_types(parent){
 							mac_address: deviceAddr,
 							fsr: fsr_text,
 							odr: globalDevices[deviceAddr].odr,
-							device_temp: globalDevices[deviceAddr].device_temp,
+							temperature: globalDevices[deviceAddr].temperature,
 							total_samples: label,
 							fft_confidence : ((Object.keys(globalDevices[deviceAddr].data).length / expected_packets) * 100).toFixed(2) + '%',
 							data: fft_concat
@@ -10894,7 +11665,65 @@ function sensor_types(parent){
 				frame_data.auto_raw_interval = frame[32] * frame_data.sampling_interval_number || 'disabled';
 				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
 				frame_data.smart_mode_threshold = frame[34] * 50;
-				if(frame[2] > 4){ // for Firmware v5 and above
+				if(frame[2] > 5){ // for Firmware v6 and above
+					frame_data.motion_to_delay = frame[41] * 50;
+					return {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr': frame_data.odr_1+'Hz',
+						'sampling_duration': frame_data.sampling_duration_1,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff': frame_data.lpf_coeff_1,
+						'lpf_freq': frame_data.lpf_freq_1+'Hz',
+						'hpf_coeff': frame_data.hpf_coeff_1,
+						'hpf_freq': frame_data.hpf_freq_1+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
+						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
+						'auto_raw_interval': frame_data.auto_raw_interval,
+						'smart_mode_skip_count': frame[33],
+						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
+						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
+						'max_tx_raw_samples': frame.slice(39, 41).reduce(msbLsb),
+						'motion_to_sampling_delay': frame_data.motion_to_delay +'msec',
+						'max_num_of_motion_tx_per_interval': frame[42],
+						'hardware_id': frame.slice(43, 46),
+						'reserved': frame.slice(46, 50),
+						'tx_lifetime_counter': frame.slice(50, 54).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr': frame[17],
+							'sampling_duration': frame[18],
+							'filter_status': frame[19],
+							'lpf_coeff': frame[20],
+							'hpf_coeff': frame[21],
+							'sampling_interval': frame[22],
+							'on_request_timeout': frame[23],
+							'deadband': frame[24],
+							'payload_length': frame[25],
+							'fsr': frame[26],
+							'rpm_compute_status': frame[27],
+							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
+							'auto_raw_interval': frame[32],
+							'smart_mode_skip_count': frame[33],
+							'smart_mode_acc_threshold':frame[34],
+							'uptime_counter': frame.slice(35, 39),
+							'max_tx_raw_samples': frame.slice(39, 41),
+							'motion_to_sampling_delay': frame[41],
+							'max_num_of_motion_tx_per_interval': frame[42],
+							'hardware_id': frame.slice(43, 46),
+							'reserved': frame.slice(46, 50),
+							'tx_lifetime_counter': frame.slice(50, 54)
+						}
+					}
+				} else if(frame[2] > 4){ // for Firmware v5 and above
 					return {
 						'firmware': frame[2],
 						'destination_address': toMac(frame.slice(12, 16)),
@@ -11030,7 +11859,7 @@ function sensor_types(parent){
 					var firmware = payload[1];
 					var odr = msbLsb(payload[10], payload[11]);
 					var fsr = payload[12];
-					var device_temp = msbLsb(payload[13], payload[14])/100;
+					var temperature = msbLsb(payload[13], payload[14])/100;
 					var expected_packets = msbLsb(payload[15], payload[16]);
 					var current_packet = msbLsb(payload[17], payload[18]);
 					var sdata_start = 19;
@@ -11398,25 +12227,62 @@ function sensor_types(parent){
 				let frame_data = {};
 				switch(frame[16]){
 					case 0:
-						frame_data.fsr = "+-0.256 V";
-					break;
+						frame_data.fsr = "+-6.114 V";
+						break;
 					case 1:
-						frame_data.fsr = "+-0.512 V";
-					break;
+						frame_data.fsr = "+-4.096 V";
+						break;
 					case 2:
-						frame_data.fsr = "+-1.024 V";
-					break;
-					case 3:
 						frame_data.fsr = "+-2.048 V";
-					break;
+						break;
+					case 3:
+						frame_data.fsr = "+-1.024 V";
+						break;
 					case 4:
-						frame_data.fsr = "+-4.096 V";
-					break;
+						frame_data.fsr = "+-0.512 V";
+						break;
 					case 5:
-						frame_data.fsr = "+-6.144 V";
-					break;
+						frame_data.fsr = "+-0.256 V";
+						break;
 				}
-				if(frame[2]>12){
+				if(frame[2]>13){ // firmware 14 and above
+					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";
+					}
+					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[24] ? 'Enabled' : 'Disabled',
+						'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),
+							'auto_check_interval': frame.slice(20, 22),
+							'auto_check_percentage': frame.slice(22, 24),
+							'always_on': frame[24],
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
+						}
+					}
+				}else if(frame[2]>12){
 					return {
 						'firmware': frame[2],
 						'report_rate': frame.slice(12, 16).reduce(msbLsb),
@@ -11449,6 +12315,155 @@ function sensor_types(parent){
 				}
 			}
 		},
+		'123': {
+			name: '3 Channel Production Counter',
+			parse: (d, payload) => {
+				if(payload[7] & 2 != 0){
+					console.log('Error found');
+					// parsed.data = {error: 'Error found, Acclerometer Probe may be unattached'};
+					let error = {error: 'Error found, Acclerometer Probe may be unattached'};
+					return error;
+				}
+				let report_type = "Regular";
+				switch(d[25]){
+					case 0:
+						report_type = "Regular";
+						break;
+					case 1:
+						report_type = "Shift end";
+						break;
+					case 2:
+						report_type = "Interrupt";
+						break;
+					case 3:
+						report_type = "Threshold";
+						break;
+				}
+				return {
+					digital_input_1_counter: d.slice(0, 4).reduce(msbLsb),
+					digital_input_1_uptime: d.slice(4, 8).reduce(msbLsb),
+					digital_input_2_counter: d.slice(8, 12).reduce(msbLsb),
+					digital_input_2_uptime: d.slice(12, 16).reduce(msbLsb),
+					digital_input_3_counter: d.slice(16, 20).reduce(msbLsb),
+					digital_input_3_uptime: d.slice(20, 24).reduce(msbLsb),
+					input_1: d[24] & 1 ? 1 : 0,
+					input_2: d[24] & 2 ? 1 : 0,
+					input_3: d[24] & 4 ? 1 : 0,
+					report_type: report_type,
+					rtc: [
+						String(d[26]).padStart(2, '0'),
+						String(d[27]).padStart(2, '0'),
+						String(d[28]).padStart(2, '0')
+					].join(':')
+				};
+			},
+			'parse_fly': (frame) => {
+				let reset_mode = "Disabled";
+				switch(frame[36]){
+					case 0:
+						reset_mode = "Disabled";
+						break;
+					case 1:
+						reset_mode = "Shift Ends";
+						break;
+					case 2:
+						reset_mode = "Timeout";
+						break;
+				}
+				let rtc_sampling_interval = "5sec";
+				switch(frame[37]){
+					case 0:
+						rtc_sampling_interval = "1min";
+						break;
+					case 1:
+						rtc_sampling_interval = "5min";
+						break;
+					case 2:
+						rtc_sampling_interval = "15min";
+						break;
+					case 3:
+						rtc_sampling_interval = "30min";
+						break;
+					case 4:
+						rtc_sampling_interval = "1h";
+						break;
+					case 5:
+						rtc_sampling_interval = "2h";
+						break;
+					case 6:
+						rtc_sampling_interval = "3h";
+						break;
+					case 7:
+						rtc_sampling_interval = "6h";
+						break;
+					case 8:
+						rtc_sampling_interval = "12h";
+						break;
+					case 9:
+						rtc_sampling_interval = "5sec";
+						break;
+					case 10:
+						rtc_sampling_interval = "10sec";
+						break;
+					case 11:
+						rtc_sampling_interval = "15sec";
+						break;
+					case 12:
+						rtc_sampling_interval = "30sec";
+						break;
+				}
+				return {
+					'firmware': frame[2],
+					'debouncing_timeout': frame.slice(16, 18).reduce(msbLsb) + "msec",
+					'input_1_active_edge': frame[18]? "Rising": "Falling",
+					'input_2_active_edge': frame[19]? "Rising": "Falling",
+					'input_3_active_edge': frame[20]? "Rising": "Falling",
+					'counter_threshold': frame.slice(21, 25).reduce(msbLsb),
+					'trasnmit_on_change_status': frame[25]? "Enabled": "Disabled",
+					'Shift_end_1': [
+						String(frame[26]).padStart(2, '0'),
+						String(frame[27]).padStart(2, '0')
+					].join(':'),
+					'Shift_end_2': [
+						String(frame[28]).padStart(2, '0'),
+						String(frame[29]).padStart(2, '0')
+					].join(':'),
+					'Shift_end_3': [
+						String(frame[30]).padStart(2, '0'),
+						String(frame[31]).padStart(2, '0')
+					].join(':'),
+					'Shift_end_4': [
+						String(frame[32]).padStart(2, '0'),
+						String(frame[33]).padStart(2, '0')
+					].join(':'),
+					'reset_timeout': frame.slice(34, 36).reduce(msbLsb) + "min",
+					'counter_reset_mode': reset_mode,
+					'sampling_interval': rtc_sampling_interval,
+					'hardware_id': frame.slice(38, 41),
+					'report_rate': frame.slice(41, 45).reduce(msbLsb) + "sec",
+					'tx_life_counter': frame.slice(45, 49).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'debouncing_timeout': frame.slice(16, 18),
+						'input_1_active_edge': frame[18],
+						'input_2_active_edge': frame[19],
+						'input_3_active_edge': frame[20],
+						'counter_threshold': frame.slice(21, 25),
+						'trasnmit_on_change_status': frame[25],
+						'Shift_end_1': frame.slice(26, 28),
+						'Shift_end_2': frame.slice(28, 30),
+						'Shift_end_3': frame.slice(30, 32),
+						'Shift_end_4': frame.slice(32, 34),
+						'reset_timeout': frame.slice(34, 36),
+						'counter_reset_mode': frame[36],
+						'sampling_interval': frame[37],
+						'hardware_id': frame.slice(38, 41),
+						'report_rate': frame.slice(41, 45),
+						'tx_life_counter': frame.slice(45, 49)
+					}
+				}
+			}
+		},
 		'180': {
 			name: 'C1D2 One Channel Vibration Plus',
 			parse: (payload, parsed, mac) => {
@@ -11496,6 +12511,59 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'211': {
+			name: 'D0 and Flow Sensor',
+			parse: (payload, parsed, mac) => {
+				if(payload[0] == 0){ // regular
+					return {
+						msg_type: 'regular',
+						temperature: signInt(payload.slice(1, 3).reduce(msbLsb), 16),
+						oxygen_saturation_percent: payload.slice(3, 7).reduce(msbLsb),
+						oxygen_ppm: payload.slice(7, 11).reduce(msbLsb),
+						oxygen_mg_l: payload.slice(11, 15).reduce(msbLsb)
+					};
+				}
+				else{ // theshold
+					let solenoid_status = payload[2];
+					if(solenoid_status == 1){ // Solenoid On
+						return {
+							msg_type: 'threshold',
+							solenoid_number: payload[1],
+							solenoid_status: 'on',
+							temperature: signInt(payload.slice(3, 5).reduce(msbLsb), 16),
+							oxygen_saturation_percent: payload.slice(5, 9).reduce(msbLsb),
+							oxygen_ppm: payload.slice(9, 13).reduce(msbLsb),
+							oxygen_mg_l: payload.slice(13, 17).reduce(msbLsb),
+							flow_rate: payload.slice(17, 21).reduce(msbLsb)
+						};
+					} else{ // Solenoid Off
+						return {
+							msg_type: 'threshold',
+							solenoid_number: payload[1],
+							solenoid_status: 'off',
+							temperature: signInt(payload.slice(3, 5).reduce(msbLsb), 16),
+							oxygen_saturation_percent: payload.slice(5, 9).reduce(msbLsb),
+							oxygen_ppm: payload.slice(9, 13).reduce(msbLsb),
+							oxygen_mg_l: payload.slice(13, 17).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)
+					}
+				}
+			}
+		},
 		'217': {
 			name: 'Wireless Weight Scale',
 			parse: (d) => {
@@ -11504,6 +12572,68 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'270': {
+			name: 'Custom Salinity DO sensor',
+			parse: (d) => {
+				return {
+					sensor_status: d[0],
+					do_temperature_1: d.slice(1, 3).reduce(msbLsb) / 100,
+					do_temperature_2: d.slice(3, 5).reduce(msbLsb) / 100,
+					do_temperature_3: d.slice(5, 7).reduce(msbLsb) / 100,
+					do_temperature_4: d.slice(7, 9).reduce(msbLsb) / 100,
+					ec_temperature_1: d.slice(9, 11).reduce(msbLsb) / 100,
+					ec_temperature_2: d.slice(11, 13).reduce(msbLsb) / 100,
+					ec_temperature_3: d.slice(13, 15).reduce(msbLsb) / 100,
+					ec_temperature_4: d.slice(15, 17).reduce(msbLsb) / 100,
+					do_saturation_perc_1: d.slice(17, 19).reduce(msbLsb) / 100,
+					do_saturation_perc_2: d.slice(19, 21).reduce(msbLsb) / 100,
+					do_saturation_perc_3: d.slice(21, 23).reduce(msbLsb) / 100,
+					do_saturation_perc_4: d.slice(23, 25).reduce(msbLsb) / 100,
+					do_ppm_1: d.slice(25, 27).reduce(msbLsb) / 100,
+					do_ppm_2: d.slice(27, 29).reduce(msbLsb) / 100,
+					do_ppm_3: d.slice(29, 31).reduce(msbLsb) / 100,
+					do_ppm_4: d.slice(31, 33).reduce(msbLsb) / 100,
+					do_mgl_1: d.slice(33, 35).reduce(msbLsb) / 100,
+					do_mgl_2: d.slice(35, 37).reduce(msbLsb) / 100,
+					do_mgl_3: d.slice(37, 39).reduce(msbLsb) / 100,
+					do_mgl_4: d.slice(39, 41).reduce(msbLsb) / 100,
+					ec_conductivity_1: d.slice(41, 43).reduce(msbLsb) / 100,
+					ec_conductivity_2: d.slice(43, 45).reduce(msbLsb) / 100,
+					ec_conductivity_3: d.slice(45, 47).reduce(msbLsb) / 100,
+					ec_conductivity_4: d.slice(47, 49).reduce(msbLsb) / 100,
+					ec_salinity_ppt_1: d.slice(49, 57).reduce(msbLsb) / 100,
+					ec_salinity_ppt_2: d.slice(57, 65).reduce(msbLsb) / 100,
+					ec_salinity_ppt_3: d.slice(65, 73).reduce(msbLsb) / 100,
+					ec_salinity_ppt_4: d.slice(73, 81).reduce(msbLsb) / 100,
+					ec_tds_1: d.slice(81, 85).reduce(msbLsb) / 100,
+					ec_tds_2: d.slice(85, 89).reduce(msbLsb) / 100,
+					ec_tds_3: d.slice(89, 93).reduce(msbLsb) / 100,
+					ec_tds_4: d.slice(93, 97).reduce(msbLsb) / 100
+				};
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'do_bootup_time': frame[12] + "Sec",
+					'ec_bootup_time': frame[13] + "Sec",
+					'device_ids_do_sensors': frame.slice(14, 18),
+					'device_ids_ec_sensors': frame.slice(18, 22),
+					'hardware_id': frame.slice(22, 25),
+					'report_rate': frame.slice(25, 29).reduce(msbLsb) + "Sec",
+					'tx_life_counter': frame.slice(29, 33).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'do_bootup_time': frame[12],
+						'ec_bootup_time': frame[13],
+						'device_ids_do_sensors': frame.slice(14, 18),
+						'device_ids_ec_sensors': frame.slice(18, 22),
+						'hardware_id': frame.slice(22, 25),
+						'report_rate': frame.slice(25, 29),
+						'tx_life_counter': frame.slice(29, 33)
+					}
+				}
+			}
+		},
 		'502': {
 			name: 'Custom Environmental Sensor',
 			parse: (d, full) => {
@@ -13872,25 +15002,31 @@ function sensor_types(parent){
 				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 = "+-0.256 V";
+							frame_data.fsr = "+-6.114 V";
 						break;
 						case 1:
-							frame_data.fsr = "+-0.512 V";
+							frame_data.fsr = "+-4.096 V";
 						break;
 						case 2:
-							frame_data.fsr = "+-1.024 V";
+							frame_data.fsr = "+-2.048 V";
 						break;
 						case 3:
-							frame_data.fsr = "+-2.048 V";
+							frame_data.fsr = "+-1.024 V";
 						break;
 						case 4:
-							frame_data.fsr = "+-4.096 V";
+							frame_data.fsr = "+-0.512 V";
 						break;
 						case 5:
-							frame_data.fsr = "+-6.144 V";
+							frame_data.fsr = "+-0.256 V";
 						break;
 					}
 					return {
@@ -13898,12 +15034,15 @@ function sensor_types(parent){
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
 						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame.slice(20, 22).reduce(msbLsb) + " sec",
-						'auto_check_percentage': frame.slice(22, 24).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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).reduce(msbLsb),
+						'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],
@@ -13912,9 +15051,92 @@ function sensor_types(parent){
 							'auto_check_interval': frame.slice(20, 22),
 							'auto_check_percentage': frame.slice(22, 24),
 							'always_on': frame[24],
-							'hardware_id': frame.slice(25, 28),
-							'report_rate': frame.slice(28, 32),
-							'tx_life_counter': frame.slice(32, 36)
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
+						}
+					}
+				}
+			}
+		},
+		'541': {
+			name: 'Custom Inline Flow Sensor',
+			parse: (d) => {
+				return {
+					adc1: signInt(d.slice(0, 2).reduce(msbLsb)),
+					adc2: signInt(d.slice(2, 4).reduce(msbLsb)),
+					mA1: signInt(d.slice(4, 6).reduce(msbLsb))/100,
+					mA2: signInt(d.slice(6, 8).reduce(msbLsb))/100,
+					flow_1: signInt(d.slice(8, 12).reduce(msbLsb))/100,
+					flow_2:signInt(d.slice(12, 16).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),
+						'min_flow_rate':frame.slice(37, 39).reduce(msbLsb),
+						'max_flow_rate':frame.slice(39, 41).reduce(msbLsb),
+						'hardware_id': frame.slice(41, 44),
+						'report_rate': frame.slice(44, 48).reduce(msbLsb) + " sec",
+						'tx_life_counter': frame.slice(48, 52).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'fsr': frame[16],
+							'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],
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'min_flow_rate':frame.slice(37, 39),
+							'max_flow_rate':frame.slice(39, 41),
+							'hardware_id': frame.slice(41, 44),
+							'report_rate': frame.slice(44, 48),
+							'tx_life_counter': frame.slice(48, 52),
 						}
 					}
 				}