@ncd-io/node-red-enterprise-sensors 2.0.2 → 2.0.4

package/lib/WirelessGateway.js

@@ -1063,6 +1063,9 @@ module.exports = class WirelessSensor{
 			if(value.html_id){
 				html_map[value.html_id] = key;
 			}
+			// else{
+			// 	html_map[key] = key;
+			// }
 		}
 		const response = {};
 		for (let [key, value] of Object.entries(configs)) {
@@ -1072,6 +1075,8 @@ module.exports = class WirelessSensor{
 				let active_key = '';
 				if(is_node_id_or_delay){
 					active_key = 'node_id_delay_active';
+				}else if(Object.hasOwn(html_map, key) && Object.hasOwn(config_map[html_map[key]], 'html_active_id')){
+					active_key = config_map[html_map[key]].html_active_id;
 				}else{
 					active_key = key+'_active';
 				}
@@ -1615,18 +1620,18 @@ module.exports = class WirelessSensor{
 		delete this.fly_101_in_progress;
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_roll_threshold_47(sensor_mac, threshold){
-		console.log('config_set_roll_threshold_47');
-		var packet = [244, 1, 0, 0, 47, 0, threshold];
-		console.log(packet);
-		return this.config_send(sensor_mac, packet);
-	}
-	config_set_pitch_threshold_47(sensor_mac, threshold){
-		console.log('config_set_pitch_threshold_47');
-		var packet = [244, 3, 0, 0, 47, 0, threshold];
-		console.log(packet);
-		return this.config_send(sensor_mac, packet);
-	}
+	// config_set_roll_threshold_47(sensor_mac, threshold){
+	// 	console.log('config_set_roll_threshold_47');
+	// 	var packet = [244, 1, 0, 0, 47, 0, threshold];
+	// 	console.log(packet);
+	// 	return this.config_send(sensor_mac, packet);
+	// }
+	// config_set_pitch_threshold_47(sensor_mac, threshold){
+	// 	console.log('config_set_pitch_threshold_47');
+	// 	var packet = [244, 3, 0, 0, 47, 0, threshold];
+	// 	console.log(packet);
+	// 	return this.config_send(sensor_mac, packet);
+	// }
 	config_set_accelerometer_threshold_108(sensor_mac, value){
 		console.log('config_set_accelerometer_threshold_108');
 		var packet = [244, 32, 0, 0, 0, value];
@@ -1943,21 +1948,21 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_number_of_regs_to_rd_539(sensor_mac, value){
-		console.log('config_set_number_of_regs_to_rd_539');
-		var packet = [244, 51, 0, 0, 23, value];
-		console.log(packet);
-		return this.config_send(sensor_mac, packet);
-	}
-	config_set_reg_539(sensor_mac, value, register){
-		console.log('config_set_reg_539');
-		// var packet = [244, 51, 0, 0, 23, ]
-		var packet = [244, 30 + register, 0, 0, 23];
-		let value_reg = int2Bytes((value), 2);
-		packet.push(...value_reg);
-		console.log(packet);
-		return this.config_send(sensor_mac, packet);
-	}
+	// config_set_number_of_regs_to_rd_539(sensor_mac, value){
+	// 	console.log('config_set_number_of_regs_to_rd_539');
+	// 	var packet = [244, 51, 0, 0, 23, value];
+	// 	console.log(packet);
+	// 	return this.config_send(sensor_mac, packet);
+	// }
+	// config_set_reg_539(sensor_mac, value, register){
+	// 	console.log('config_set_reg_539');
+	// 	// var packet = [244, 51, 0, 0, 23, ]
+	// 	var packet = [244, 30 + register, 0, 0, 23];
+	// 	let value_reg = int2Bytes((value), 2);
+	// 	packet.push(...value_reg);
+	// 	console.log(packet);
+	// 	return this.config_send(sensor_mac, packet);
+	// }
 	config_set_all_register_data_539(sensor_mac, number_of_registers, registers){
 		console.log('config_set_all_registers_539');
 		// registers is an arbitrary number of 16 bit integers
@@ -2736,23 +2741,23 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_oxygen_rate_536(sensor_mac, value){
-		console.log('config_set_oxygen_rate_536');
-		var packet = [244, 32, 0, 0, 0, value];
-		console.log(packet);
-		return this.config_send(sensor_mac, packet);
-	}
-	config_set_oxygen_timeout_536(sensor_mac, value){
-		console.log('config_set_oxygen_timeout_536');
-		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_rate_536(sensor_mac, value){
+	// 	console.log('config_set_oxygen_rate_536');
+	// 	var packet = [244, 32, 0, 0, 0, value];
+	// 	console.log(packet);
+	// 	return this.config_send(sensor_mac, packet);
+	// }
+	// config_set_oxygen_timeout_536(sensor_mac, value){
+	// 	console.log('config_set_oxygen_timeout_536');
+	// 	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_max_threshold_s1_536(sensor_mac, value){
 		console.log('config_set_oxygen_max_threshold_s1_536');
-		value = value * 100;
+		//value = value * 100;
 		var packet = [244, 34, 0, 0, 0, 1];
 		let value_ = int2Bytes(value, 2);
 		packet.push(...value_);
@@ -2761,7 +2766,7 @@ module.exports = class WirelessSensor{
 	}
 	config_set_oxygen_max_threshold_s2_536(sensor_mac, value){
 		console.log('config_set_oxygen_max_threshold_s2_536');
-		value = value * 100;
+		//value = value * 100;
 		var packet = [244, 34, 0, 0, 0, 2];
 		let value_ = int2Bytes(value, 2);
 		packet.push(...value_);
@@ -2769,7 +2774,7 @@ module.exports = class WirelessSensor{
 		return this.config_send(sensor_mac, packet);
 	}
 	config_set_oxygen_max_threshold_s3_536(sensor_mac, value){
-		value = value * 100;
+		//value = value * 100;
 		console.log('config_set_oxygen_max_threshold_s3_536');
 		var packet = [244, 34, 0, 0, 0, 3];
 		let value_ = int2Bytes(value, 2);
@@ -2778,7 +2783,7 @@ module.exports = class WirelessSensor{
 		return this.config_send(sensor_mac, packet);
 	}
 	config_set_oxygen_max_threshold_s4_536(sensor_mac, value){
-		value = value * 100;
+		//value = value * 100;
 		console.log('config_set_oxygen_max_threshold_s4_536');
 		var packet = [244, 34, 0, 0, 0, 4];
 		let value_ = int2Bytes(value, 2);
@@ -2788,7 +2793,7 @@ module.exports = class WirelessSensor{
 	}
 	config_set_oxygen_min_threshold_s1_536(sensor_mac, value){
 		console.log('config_set_oxygen_min_threshold_s1_536');
-		value = value * 100;
+		//value = value * 100;
 		var packet = [244, 39, 0, 0, 0, 1];
 		let value_ = int2Bytes(value, 2);
 		packet.push(...value_);
@@ -2797,7 +2802,7 @@ module.exports = class WirelessSensor{
 	}
 	config_set_oxygen_min_threshold_s2_536(sensor_mac, value){
 		console.log('config_set_oxygen_min_threshold_s2_536');
-		value = value * 100;
+		//value = value * 100;
 		var packet = [244, 39, 0, 0, 0, 2];
 		let value_ = int2Bytes(value, 2);
 		packet.push(...value_);
@@ -2805,7 +2810,7 @@ module.exports = class WirelessSensor{
 		return this.config_send(sensor_mac, packet);
 	}
 	config_set_oxygen_min_threshold_s3_536(sensor_mac, value){
-		value = value * 100;
+		//value = value * 100;
 		console.log('config_set_oxygen_min_threshold_s3_536');
 		var packet = [244, 39, 0, 0, 0, 3];
 		let value_ = int2Bytes(value, 2);
@@ -2814,7 +2819,7 @@ module.exports = class WirelessSensor{
 		return this.config_send(sensor_mac, packet);
 	}
 	config_set_oxygen_min_threshold_s4_536(sensor_mac, value){
-		value = value * 100;
+		//value = value * 100;
 		console.log('config_set_oxygen_min_threshold_s4_536');
 		var packet = [244, 39, 0, 0, 0, 4];
 		let value_ = int2Bytes(value, 2);
@@ -3040,6 +3045,126 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_reset_total_545(sensor_mac){
+		console.log('config_set_reset_total_545');
+		var packet = [244, 36, 0, 0, 0];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_cal_validation_545(sensor_mac){
+		console.log('config_set_cal_validation_545');
+		var packet = [244, 39, 0, 0, 0];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_boot_time_4(sensor_mac, value){
+		console.log('config_set_boot_time_4');
+		var packet = [244, 97, 0, 0, 23];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_operation_mode_4(sensor_mac, value){
+		console.log('config_set_operation_mode_4');
+		var packet = [244, 93, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_lube_on_time_1_105(sensor_mac, value){
+		console.log('config_set_lube_on_time_1_105');
+		var packet = [244, 87, 0, 0, 88, 1, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_lube_on_time_2_105(sensor_mac, value){
+		console.log('config_set_lube_on_time_2_105');
+		var packet = [244, 87, 0, 0, 88, 2, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_faulty_level_105(sensor_mac, value){
+		console.log('config_set_faulty_level_105');
+		var packet = [244, 83, 0, 0, 88, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_friction_level_105(sensor_mac, value){
+		console.log('config_set_friction_level_105');
+		var packet = [244, 85, 0, 0, 88, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_vibration_mode_115(sensor_mac, value){
+		console.log('config_set_vibration_mode_115');
+		var packet = [244, 32, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_offset_mode_115(sensor_mac, value){
+		console.log('config_set_offset_mode_115');
+		var packet = [244, 34, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_flow_sensor_baud_rate_536(sensor_mac, value){
+		console.log('config_set_flow_sensor_baud_rate_536');
+		var packet = [244, 55, 0, 0, 0];
+		let baudrate = int2Bytes((value), 4);
+		packet.push(...baudrate);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_sensor_baud_rate_536(sensor_mac, value){
+		console.log('config_set_oxygen_sensor_baud_rate_536');
+		var packet = [244, 61, 0, 0, 0];
+		let baudrate = int2Bytes((value), 4);
+		packet.push(...baudrate);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_flow_sensor_parity_bits_536(sensor_mac, value){
+		console.log('config_set_flow_sensor_parity_bits_536');
+		var packet = [244, 57, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_sensor_parity_bits_536(sensor_mac, value){
+		console.log('config_set_oxygen_sensor_parity_bits_536');
+		var packet = [244, 63, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_flow_sensor_stop_bits_536(sensor_mac, value){
+		console.log('config_set_flow_sensor_stop_bits_536');
+		var packet = [244, 59, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_sensor_stop_bits_536(sensor_mac, value){
+		console.log('config_set_oxygen_sensor_stop_bits_536');
+		var packet = [244, 65, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_tilt_mode_47(sensor_mac, value){
+		console.log('config_set_tilt_mode_47');
+		var packet = [244, 34, 0, 0 ,0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_tilt_angle_47(sensor_mac, value){
+		console.log('config_set_tilt_angle_47');
+		var packet = [244, 32, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_tilt_timer_47(sensor_mac, value){
+		console.log('config_set_tilt_timer_47');
+		var packet = [244, 36, 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) => {
@@ -4039,14 +4164,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'4': {
-			name: 'Thermocouple',
-			parse: (d) => {
-				return {
-					temperature: signInt(d.slice(0, 4).reduce(msbLsb), 32)/100,
-				};
-			}
-		},
 		'5': {
 			name: 'Gyro/Magneto/Temperature',
 			parse: (d) => {
@@ -4126,16 +4243,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'12': {
-			name: '3-Channel Thermocouple',
-			parse: (d) => {
-				return {
-					channel_1: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100,
-					channel_2: signInt(d.slice(4, 8).reduce(msbLsb), 32) / 100,
-					channel_3: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100
-				};
-			}
-		},
 		'13': {
 			name: 'Current Monitor',
 			parse: (d) => {
@@ -4154,79 +4261,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'15': {
-			name: '10-Bit 1-Channel ADC',
-			parse: (d) => {
-				var adc = d.slice(0, 2).reduce(msbLsb);
-				return {
-					adc: adc,
-					voltage: adc * 0.00322265625
-				};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 13){ // firmware 14 and above
-					let frame_data = {};
-					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
-					if(!auto_check_interval){
-						frame_data.auto_check_interval = 'Disabled';
-					}else{
-						frame_data.auto_check_interval = auto_check_interval + " sec";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
-						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
-						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
-						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
-						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
-						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-			}
-		},
 		'16': {
 			name: 'Soil Moisture Sensor',
 			parse: (d, payload) => {
@@ -4294,265 +4328,54 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'21': {
-			name: 'Differential Bidirectional Pressure Sensor',
-			parse: (payload, parsed, mac) => {
-				let pressure, temperature, raw_adc;
-
-				if (parsed.firmware <= 12) {
-					pressure = signInt(payload.slice(8, 10).reduce(msbLsb), 16) / 100;
-					temperature = signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100;
-					// raw_adc not present in firmware ≤ 12
-					return {
-							pressure,
-							temperature
-					};
-				} else {
-					pressure = signInt(payload.slice(8, 10).reduce(msbLsb), 16) / 1000;
-					temperature = signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100;
-					raw_adc = signInt(payload.slice(12, 14).reduce(msbLsb), 16);
-					return {
-							pressure,
-							temperature,
-							raw_adc
-					};
-				}
-			},
-			'parse_fly': (frame) => {
-				let sensor_type = '';
-				switch(frame[13]){
-					case 0:
-						sensor_type = 'AMS5812';
-						break;
-					case 1:
-						sensor_type = 'AMS5915';
-						break;
-				}
-				let sensor_range = '';
-				if(frame[13]){ // if sensor type is 5915
-					switch(frame[12]){
-						case 0:
-							sensor_range = '0005_D';
-							break;
-						case 1:
-							sensor_range = '0010_D';
-							break;
-						case 2:
-							sensor_range = '0002_D_B';
-							break;
-						case 3:
-							sensor_range = '0005_D_B';
-							break;
-						case 4:
-							sensor_range = '0010_D_B';
-							break;
-						case 5:
-							sensor_range = '0020_D';
-							break;
-						case 6:
-							sensor_range = '0035_D';
-							break;
-						case 7:
-							sensor_range = '0050_D';
-							break;
-						case 8:
-							sensor_range = '0100_D';
-							break;
-						case 9:
-							sensor_range = '0020_D_B';
-							break;
-						case 10:
-							sensor_range = '0035_D_B';
-							break;
-						case 11:
-							sensor_range = '0050_D_B';
-							break;
-						case 12:
-							sensor_range = '0100_D_B';
-							break;
-						case 13:
-							sensor_range = '0200_D';
-							break;
-						case 14:
-							sensor_range = '0350_D';
-							break;
-						case 15:
-							sensor_range = '0500_D';
-							break;
-						case 16:
-							sensor_range = '1000_D';
-							break;
-						case 17:
-							sensor_range = '2000_D';
-							break;
-						case 18:
-							sensor_range = '4000_D';
-							break;
-						case 19:
-							sensor_range = '7000_D';
-							break;
-						case 20:
-							sensor_range = '10000_D';
-							break;
-						case 21:
-							sensor_range = '0200_D_B';
-							break;
-						case 22:
-							sensor_range = '0350_D_B';
-							break;
-						case 23:
-							sensor_range = '0500_D_B';
-							break;
-						case 24:
-							sensor_range = '1000_D_B';
-							break;
-					}
-				}
-				else{ // sensor type is 5812
-					switch(frame[12]){
-						case 0:
-							sensor_range = '0000_D';
-							break;
-						case 1:
-							sensor_range = '0001_D';
-							break;
-						case 2:
-							sensor_range = '0000_D_B';
-							break;
-						case 3:
-							sensor_range = '0001_D_B';
-							break;
-						case 4:
-							sensor_range = '0003_D';
-							break;
-						case 5:
-							sensor_range = '0008_D';
-							break;
-						case 6:
-							sensor_range = '0015_D';
-							break;
-						case 7:
-							sensor_range = '0003_D_B';
-							break;
-						case 8:
-							sensor_range = '0008_D_B';
-							break;
-						case 9:
-							sensor_range = '0015_D_B';
-							break;
-						case 10:
-							sensor_range = '0030_D';
-							break;
-						case 11:
-							sensor_range = '0050_D';
-							break;
-						case 12:
-							sensor_range = '0150_D';
-							break;
-						case 13:
-							sensor_range = '0300_D';
-							break;
-						case 14:
-							sensor_range = '0600_D';
-							break;
-						case 15:
-							sensor_range = '1000_D';
-							break;
-						case 16:
-							sensor_range = '0030_D_B';
-							break;
-						case 17:
-							sensor_range = '0050_D_B';
-							break;
-						case 18:
-							sensor_range = '0150_D_B';
-							break;
-						case 19:
-							sensor_range = '0150_B';
-							break;
-						case 20:
-							sensor_range = '0150_A';
-							break;
-						case 21:
-							sensor_range = '0300_A';
-							break;
-					}
-				}
-				return {
-					'firmware': frame[2],
-					'sensor_range': sensor_range,
-					'sensor_type': sensor_type,
-					'hardware_id': frame.slice(14, 17),
-					'report_rate': frame.slice(17, 21).reduce(msbLsb) + ' sec',
-					'tx_counter': frame.slice(21, 25).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
-						'sensor_range': frame[12],
-						'sensor_type': frame[13],
-						'hardware_id': frame.slice(14, 17),
-						'report_rate': frame.slice(17, 21),
-						'tx_counter': frame.slice(21, 25)
-					}
-				}
-			}
-		},
-		'22': {
-			name: 'Voltage Detection Input',
-			parse: (d) => {
-				return {
-					input: d[0]
-				};
-			}
-		},
-		'23': {
-			name: '2-Channel Thermocouple',
-			parse: (d) => {
-				return {
-					channel_1: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100,
-					channel_2: signInt(d.slice(4, 8).reduce(msbLsb), 32) / 100,
-				};
-			}
-		},
-		'24': {
-			name: 'Activity Detection',
-			parse: (d) => {
-				return {
-					acc_x: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					acc_y: signInt(d.slice(2, 4).reduce(msbLsb), 16),
-					acc_z: signInt(d.slice(4, 6).reduce(msbLsb), 16),
-					temp_change: signInt(d.slice(6, 8).reduce(msbLsb), 16),
-				};
-			}
-		},
-		'25': {
-			name: 'Asset Monitor',
-			parse: (d) => {
-				return {
-					acc_x: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					acc_y: signInt(d.slice(2, 4).reduce(msbLsb), 16),
-					acc_z: signInt(d.slice(4, 6).reduce(msbLsb), 16),
-					temp_change: signInt(d.slice(6, 8).reduce(msbLsb), 16),
-				};
-			}
-		},
-		'26': {
-			name: 'Pressure & Temperature Sensor (PSI)',
-			parse: (d) => {
-				return {
-					pressure: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100,
-					temperature: signInt(d.slice(4, 6).reduce(msbLsb), 16) / 100
-				};
-			}
-		},
-		'27': {
-			name: 'Environmental',
-			parse: (d) => {
-				return {
-					temperature: signInt(d.slice(0, 2).reduce(msbLsb), 16) / 100,
-					pressure: d.slice(2, 6).reduce(msbLsb) / 100,
-					humidity: d.slice(6, 10).reduce(msbLsb) / 1000,
-					gas_resistance: d.slice(10, 14).reduce(msbLsb),
-					iaq: d.slice(14, 16).reduce(msbLsb)
+		'22': {
+			name: 'Voltage Detection Input',
+			parse: (d) => {
+				return {
+					input: d[0]
+				};
+			}
+		},
+		'24': {
+			name: 'Activity Detection',
+			parse: (d) => {
+				return {
+					acc_x: signInt(d.slice(0, 2).reduce(msbLsb), 16),
+					acc_y: signInt(d.slice(2, 4).reduce(msbLsb), 16),
+					acc_z: signInt(d.slice(4, 6).reduce(msbLsb), 16),
+					temp_change: signInt(d.slice(6, 8).reduce(msbLsb), 16),
+				};
+			}
+		},
+		'25': {
+			name: 'Asset Monitor',
+			parse: (d) => {
+				return {
+					acc_x: signInt(d.slice(0, 2).reduce(msbLsb), 16),
+					acc_y: signInt(d.slice(2, 4).reduce(msbLsb), 16),
+					acc_z: signInt(d.slice(4, 6).reduce(msbLsb), 16),
+					temp_change: signInt(d.slice(6, 8).reduce(msbLsb), 16),
+				};
+			}
+		},
+		'26': {
+			name: 'Pressure & Temperature Sensor (PSI)',
+			parse: (d) => {
+				return {
+					pressure: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100,
+					temperature: signInt(d.slice(4, 6).reduce(msbLsb), 16) / 100
+				};
+			}
+		},
+		'27': {
+			name: 'Environmental',
+			parse: (d) => {
+				return {
+					temperature: signInt(d.slice(0, 2).reduce(msbLsb), 16) / 100,
+					pressure: d.slice(2, 6).reduce(msbLsb) / 100,
+					humidity: d.slice(6, 10).reduce(msbLsb) / 1000,
+					gas_resistance: d.slice(10, 14).reduce(msbLsb),
+					iaq: d.slice(14, 16).reduce(msbLsb)
 
 				};
 			}
@@ -4717,67 +4540,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'39': {
-			name: 'RTD Temperature Sensor',
-			parse: (payload, parsed, mac) => {
-				if(parsed.firmware > 5){
-					let reserved = payload[7] >> 1; // Fault status (1-bit left shifted)
-					let fault_status = '';
-					if (reserved === 0) {
-						fault_status = 'data_valid';
-					} else if (reserved === 15) {
-						fault_status = 'data_invalid';
-					} else {
-						const faultTypeBits = reserved & 0b00111100;
-						switch (faultTypeBits) {
-							case 32: 
-								fault_status = 'ref_in_vbias'; 
-								break;
-							case 16: 
-								fault_status = 'ref_in_force_close'; 
-								break;
-							case 8: 
-								fault_status = 'rtd_in_force_open'; 
-								break;
-							case 4: 
-								fault_status = 'over_under_voltage'; 
-								break;
-						}
-					}
-					return {
-						fault_status: fault_status,
-						temperature: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100
-					};
-				} else {
-					return {
-						temperature: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100
-					};
-				}
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 5){
-					const interface_types = ["rtd_2_wire", "rtd_3_wire", "rtd_4_wire"];
-					const rtd_types = ["rtd_pt_100", "rtd_pt_1000"];
-					return {
-						'firmware': frame[2],
-						'sensor_interface': interface_types[frame[12]],
-						'sensor_type': rtd_types[frame[13]],
-						'hardware_id': frame.slice(14, 17),
-						'report_rate': frame.slice(17, 21).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(21, 25).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'sensor_interface': frame[12],
-							'sensor_type': frame[13],
-							'hardware_id': frame.slice(14, 17),
-							'report_rate': frame.slice(17, 21),
-							'tx_life_counter': frame.slice(21, 25)
-						}
-					}
-				}
-			}
-		},
 		'40': {
 			name: 'Vibration w/Time Domain (partial support)',
 			parse: (d, full) => {
@@ -4837,80 +4599,8 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'45': {
-			name: '16-Bit 1-Channel Passive 4-20mA Current Receiver',
-			parse: (d) => {
-				return {
-					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					mA: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
-					};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 13){ // firmware 14 and above
-					let frame_data = {};
-					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
-					if(!auto_check_interval){
-						frame_data.auto_check_interval = 'Disabled';
-					}else{
-						frame_data.auto_check_interval = auto_check_interval + " sec";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
-						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
-						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
-						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
-						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
-						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-			}
-		},
-		'46': {
-			name: 'Motion Detection Sensor',
+		'46': {
+			name: 'Motion Detection Sensor',
 			parse: (d) => {
 				return {
 					input_1: d[0]
@@ -4926,78 +4616,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'48': {
-			name: '16-Bit 1-Channel Active 4-20mA Current Loop Receiver',
-			parse: (d) => {
-				return {
-					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					mA: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
-					};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 13){ // firmware 14 and above
-					let frame_data = {};
-					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
-					if(!auto_check_interval){
-						frame_data.auto_check_interval = 'Disabled';
-					}else{
-						frame_data.auto_check_interval = auto_check_interval + " sec";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
-						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
-						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
-						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
-						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
-						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-			}
-		},
 		'49': {
 			name: '6-Channel Thermocouple',
 			parse: (d) => {
@@ -5061,149 +4679,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'52': {
-			name: '16-Bit 2-Channel 4-20mA',
-			parse: (d) => {
-				// This parser may be outdated if a customer has an issue check with Engineering
-				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
-				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
-				return {
-					adc1: adc1,
-					adc2: adc2,
-					mA1: signInt(d.slice(4, 6).reduce(msbLsb))/100,
-					mA2: signInt(d.slice(6, 8).reduce(msbLsb))/100
-				};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				let frame_data = {};
-				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;
-				}
-				if(firmware > 18){ // 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";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}else if(firmware > 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";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					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,
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(32, 36).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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-				else if(firmware > 12){
-					return {
-						'firmware': frame[2],
-						'report_rate': frame.slice(12, 16).reduce(msbLsb),
-						'fsr':frame_data.fsr,
-						'boot_up_time': frame[17],
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'report_rate': frame.slice(12, 16),
-							'fsr':frame[16],
-							'boot_up_time': frame[17],
-							'adc_pin_reading': frame.slice(18, 20),
-							'frame': frame
-						}
-					}
-				}else{
-					return {
-						'firmware': frame[2],
-						'report_rate': frame.slice(12, 16).reduce(msbLsb),
-						'fsr':frame_data.fsr,
-						'boot_up_time': frame[17],
-						'machine_values': {
-							'firmware': frame[2],
-							'report_rate': frame.slice(12, 16),
-							'fsr':frame[16],
-							'boot_up_time': frame[17],
-							'frame': frame
-						}
-					}
-				}
-			}
-		},
 		'53': {
 			'name': 'Air Quality CO2 and Particulate Matter Sensor',
 			parse: (d) => {
@@ -5225,256 +4700,30 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'54': {
-			name: '2-Channel RTD Temperature Sensor',
-			parse: (payload, parsed, mac) => {
-				if(parsed.firmware > 5){
-					let reserved = payload[7] >> 1; // Fault status (1-bit left shifted)
-					let fault_status = '';
-					if (reserved === 0) {
-						fault_status = 'data_valid';
-					} else if (reserved === 15) {
-						fault_status = 'data_invalid';
-					} else {
-						const fault_bits = (reserved >> 2) & 0b00001111;
-						switch (fault_bits) {
-							case 8: 
-								fault_status = 'ref_in_vbias'; 
-								break;
-							case 4: 
-								fault_status = 'ref_in_force_close'; 
-								break;
-							case 2: 
-								fault_status = 'rtd_in_force_open'; 
-								break;
-							case 1: 
-								fault_status = 'over_under_voltage'; 
-								break;
-						}
-						const channel_bits = reserved & 0b00000011;
-						switch (channel_bits) {
-							case 1:
-								fault_status = fault_status + '_ch1';
-								break;
-							case 2:
-								fault_status = fault_status + '_ch2';
-								break;
-						}
-					}
-					return {
-						fault_status: fault_status,
-						temperature_1: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
-						temperature_2: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100
-					};
-				} else {
-					return {
-						temperature_1: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
-						temperature_2: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100
-					};
-				}
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 5){
-					const interface_types = ["rtd_2_wire", "rtd_3_wire", "rtd_4_wire"];
-					const rtd_types = ["rtd_pt_100", "rtd_pt_1000"];
-					return {
-						'firmware': frame[2],
-						'sensor_interface_ch1': interface_types[frame[12]],
-						'sensor_type_ch1': rtd_types[frame[13]],
-						'sensor_interface_ch2': interface_types[frame[14]],
-						'sensor_type_ch2': rtd_types[frame[15]],
-						'hardware_id': frame.slice(16, 19),
-						'report_rate': frame.slice(19, 23).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(23, 27).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'sensor_interface_ch1': frame[12],
-							'sensor_type_ch1': frame[13],
-							'sensor_interface_ch2': frame[14],
-							'sensor_type_ch2': frame[15],
-							'hardware_id': frame.slice(16, 19),
-							'report_rate': frame.slice(19, 23),
-							'tx_life_counter': frame.slice(23, 27)
-						}
-					}
-				}
+		'58': {
+			name: 'Tank Level v3',
+			parse: (d) => {
+				return {
+					filtered_range: d.slice(0, 2).reduce(msbLsb),
+					long_range_algorithm: d.slice(2, 4).reduce(msbLsb),
+					second_chance:  d.slice(4, 6).reduce(msbLsb),
+					second_reading: d.slice(6, 8).reduce(msbLsb),
+					compare_reading:  d.slice(8, 10).reduce(msbLsb),
+					short_range_algorithm: d.slice(10, 12).reduce(msbLsb),
+					trusted_reading:  d.slice(12, 14).reduce(msbLsb),
+					final_filter:  d.slice(14, 16).reduce(msbLsb),
+					raw_final:  d.slice(16, 18).reduce(msbLsb),
+					final_index:  d.slice(18, 20).reduce(msbLsb),
+				};
 			}
 		},
-		'55': {
-			name: '3-Channel RTD Temperature Sensor',
-			parse: (payload, parsed, mac) => {
-				let reserved = payload[7] >> 1; // Fault status (1-bit left shifted)
-				let fault_status = '';
-				if (reserved === 0) {
-					fault_status = 'data_valid';
-				} else if (reserved === 15) {
-					fault_status = 'data_invalid';
-				} else {
-					const fault_bits = (reserved >> 2) & 0b00001111;
-					switch (fault_bits) {
-						case 8: 
-							fault_status = 'ref_in_vbias'; 
-							break;
-						case 4: 
-							fault_status = 'ref_in_force_close'; 
-							break;
-						case 2: 
-							fault_status = 'rtd_in_force_open'; 
-							break;
-						case 1: 
-							fault_status = 'over_under_voltage'; 
-							break;
-					}
-					const channel_bits = reserved & 0b00000011;
-					switch (channel_bits) {
-						case 1:
-							fault_status = fault_status + '_ch1';
-							break;
-						case 2:
-							fault_status = fault_status + '_ch2';
-							break;
-						case 3:
-							fault_status = fault_status + '_ch3';
-							break;
-					}
-				}
+		'60': {
+			name: 'Air Velocity and Precision Pressure & Temperature Sensor',
+			parse: (d) => {
 				return {
-					fault_status: fault_status,
-					temperature_1: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
-					temperature_2: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100,
-					temperature_3: signInt(payload.slice(16, 20).reduce(msbLsb), 32) / 100
-				};
-			},
-			'parse_fly': (frame) => {
-				const interface_types = ["rtd_2_wire", "rtd_3_wire", "rtd_4_wire"];
-				const rtd_types = ["rtd_pt_100", "rtd_pt_1000"];
-				return {
-					'firmware': frame[2],
-					'sensor_interface_ch1': interface_types[frame[12]],
-					'sensor_type_ch1': rtd_types[frame[13]],
-					'sensor_interface_ch2': interface_types[frame[14]],
-					'sensor_type_ch2': rtd_types[frame[15]],
-					'sensor_interface_ch3': interface_types[frame[16]],
-					'sensor_type_ch3': rtd_types[frame[17]],
-					'hardware_id': frame.slice(18, 21),
-					'report_rate': frame.slice(21, 25).reduce(msbLsb) + " sec",
-					'tx_life_counter': frame.slice(25, 29).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
-						'sensor_interface_ch1': frame[12],
-						'sensor_type_ch1': frame[13],
-						'sensor_interface_ch2': frame[14],
-						'sensor_type_ch2': frame[15],
-						'sensor_interface_ch3': frame[16],
-						'sensor_type_ch3': frame[17],
-						'hardware_id': frame.slice(18, 21),
-						'report_rate': frame.slice(21, 25),
-						'tx_life_counter': frame.slice(25, 29)
-					}
-				}
-			}
-		},
-		'56': {
-			name: '2 Channel 0-10VDC Receiver',
-			parse: (d) => {
-				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
-				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
-				return {
-					adc1: adc1,
-					adc2: adc2,
-					VDC1: parseFloat((adc1 * 0.00034122).toFixed(2)),
-					VDC2: parseFloat((adc2 * 0.00034122).toFixed(2))
-				};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 13){ // firmware 14 and above
-					let frame_data = {};
-					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
-					if(!auto_check_interval){
-						frame_data.auto_check_interval = 'Disabled';
-					}else{
-						frame_data.auto_check_interval = auto_check_interval + " sec";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
-						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
-						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
-						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
-						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
-						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-			}
-		},
-		'58': {
-			name: 'Tank Level v3',
-			parse: (d) => {
-				return {
-					filtered_range: d.slice(0, 2).reduce(msbLsb),
-					long_range_algorithm: d.slice(2, 4).reduce(msbLsb),
-					second_chance:  d.slice(4, 6).reduce(msbLsb),
-					second_reading: d.slice(6, 8).reduce(msbLsb),
-					compare_reading:  d.slice(8, 10).reduce(msbLsb),
-					short_range_algorithm: d.slice(10, 12).reduce(msbLsb),
-					trusted_reading:  d.slice(12, 14).reduce(msbLsb),
-					final_filter:  d.slice(14, 16).reduce(msbLsb),
-					raw_final:  d.slice(16, 18).reduce(msbLsb),
-					final_index:  d.slice(18, 20).reduce(msbLsb),
-				};
-			}
-		},
-		'60': {
-			name: 'Air Velocity and Precision Pressure & Temperature Sensor',
-			parse: (d) => {
-				return {
-					pressure: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 1000,
-					temperature: signInt(d.slice(4, 6).reduce(msbLsb), 16) / 100,
-					Air_Velocity: signInt(d.slice(6, 8).reduce(msbLsb), 16) / 1000
+					pressure: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 1000,
+					temperature: signInt(d.slice(4, 6).reduce(msbLsb), 16) / 100,
+					Air_Velocity: signInt(d.slice(6, 8).reduce(msbLsb), 16) / 1000
 				};
 			}
 		},
@@ -5674,79 +4923,6 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'75': {
-			name: 'Siemens Air Velocity Probe',
-			parse: (d) => {
-				return {
-					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					mA: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100,
-					Velocity: signInt(d.slice(4, 8).reduce(msbLsb), 32) / 100
-				};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 13){ // firmware 14 and above
-					let frame_data = {};
-					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
-					if(!auto_check_interval){
-						frame_data.auto_check_interval = 'Disabled';
-					}else{
-						frame_data.auto_check_interval = auto_check_interval + " sec";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
-						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
-						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
-						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
-						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
-						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-			}
-		},
 		'76': {
 			name: 'Wireless CO Sensor',
 			parse: (d) => {
@@ -8245,38 +7421,16 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'88': {
-			name: '1 Channel Ultrasound Vibration Sensor',
+		'90': {
+			name: 'DC Current Sensor',
 			parse: (d) => {
 				return {
 					raw_adc: d.slice(0, 2).reduce(msbLsb),
-					ma: d.slice(2, 4).reduce(msbLsb) / 100,
-					db: d.slice(4, 6).reduce(msbLsb) / 100
+					amps: d.slice(2, 6).reduce(msbLsb) / 10,
 				};
 			},
 			'parse_fly': (frame) => {
 				let firmware = frame[2];
-				let frame_data = {};
-				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;
-				}
 				if(firmware > 13){ // firmware 14 and above
 					let frame_data = {};
 					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
@@ -8285,7 +7439,27 @@ function sensor_types(parent){
 					}else{
 						frame_data.auto_check_interval = auto_check_interval + " sec";
 					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
+					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,
@@ -8295,212 +7469,31 @@ function sensor_types(parent){
 						'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),
+						'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_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),
+							'auto_check_threshold': 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{
-					return {
-						'firmware': frame[2],
-						'report_rate': frame.slice(12, 16).reduce(msbLsb),
-						'fsr':frame_data.fsr,
-						'boot_up_time': frame[17],
-						// 'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'report_rate': frame.slice(12, 16),
-							'fsr':frame[16],
-							'boot_up_time': frame[17],
-							// 'adc_pin_reading': frame.slice(18, 20),
-							'frame': frame
+							'hardware_id': frame.slice(29, 32),
+							'report_rate': frame.slice(32, 36),
+							'tx_life_counter': frame.slice(36, 40)
 						}
 					}
 				}
 			}
 		},
-		'89': {
-			name: '2 Channel Ultrasound Vibration Sensor',
+		'91': {
+			name: 'Wireless Air Velocity Sensor HVAC',
 			parse: (d) => {
 				return {
-					c1_raw_adc: d.slice(0, 2).reduce(msbLsb),
-					c1_ma: d.slice(2, 4).reduce(msbLsb) / 100,
-					c1_db: d.slice(4, 6).reduce(msbLsb) / 100,
-					c2_raw_adc: d.slice(6, 8).reduce(msbLsb),
-					c2_ma: d.slice(8, 10).reduce(msbLsb) / 100,
-					c2_db: d.slice(10, 12).reduce(msbLsb) / 100
-				};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				let frame_data = {};
-				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;
-				}
-				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_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}else{
-					return {
-						'firmware': frame[2],
-						'report_rate': frame.slice(12, 16).reduce(msbLsb),
-						'fsr':frame_data.fsr,
-						'boot_up_time': frame[17],
-						// 'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'report_rate': frame.slice(12, 16),
-							'fsr':frame[16],
-							'boot_up_time': frame[17],
-							// 'adc_pin_reading': frame.slice(18, 20),
-							'frame': frame
-						}
-					}
-				}
-			}
-		},
-		'90': {
-			name: 'DC Current Sensor',
-			parse: (d) => {
-				return {
-					raw_adc: d.slice(0, 2).reduce(msbLsb),
-					amps: d.slice(2, 6).reduce(msbLsb) / 10,
-				};
-			},
-			'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),
-						'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_up_time': frame[17],
-							'adc_pin_reading': frame.slice(18, 20),
-							'auto_check_interval': frame.slice(20, 22),
-							'auto_check_threshold': frame.slice(22, 24),
-							'always_on': frame[24],
-							'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)
-						}
-					}
-				}
-			}
-		},
-		'91': {
-			name: 'Wireless Air Velocity Sensor HVAC',
-			parse: (d) => {
-				return {
-					velocity_mps: signInt(msbLsb(d[0], d[1]), 16) / 1000
+					velocity_mps: signInt(msbLsb(d[0], d[1]), 16) / 1000
 				};
 			}
 		},
@@ -8512,206 +7505,62 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'95': {
-			name: '16-Bit 1-Channel 0-24VDC Receiver',
-			parse: (d) => {
-				return {
-					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					vdc: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
-				};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 13){ // firmware 14 and above
-					let frame_data = {};
-					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
-					if(!auto_check_interval){
-						frame_data.auto_check_interval = 'Disabled';
-					}else{
-						frame_data.auto_check_interval = auto_check_interval + " sec";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
-						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
-						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
-						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
-						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
-						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-			}
-		},
-		'96': {
-			name: '16-Bit 1-Channel 0-48VDC Receiver',
-			parse: (d) => {
-				return {
-					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					vdc: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
-				};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 13){ // firmware 14 and above
-					let frame_data = {};
-					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
-					if(!auto_check_interval){
-						frame_data.auto_check_interval = 'Disabled';
-					}else{
-						frame_data.auto_check_interval = auto_check_interval + " sec";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
-						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
-						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
-						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
-						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
-						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-			}
-		},
-		'97': {
-			name: 'One channel Dynamic Ultrasound vibration Sensor',
-			parse: (payload, parsed, mac) => {
-				if (payload[8] === 1) { // raw
-					var mode = payload[8];
-					var sampling_frequency = payload.slice(9, 13).reduce(msbLsb);
-					var sensor_index = payload[13];
-					var gain_db = payload[14];
-					var deviceAddr = mac;
-					var expected_packets = payload.slice(15, 17).reduce(msbLsb);
-					var current_packet = payload.slice(17, 19).reduce(msbLsb);
-					var sdata_start = 19;
-
-					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
-						// if(expected_packets == 1){
-						// 	this.build_102_data(payload, deviceAddr, hour, minute, sdata_start, current_packet, firmware);
-						// }
-
-						// if a packet is already stored with the same packet ID,
-						// or if packet ID is 1,
-						// or if current packet ID is not one more than last packet ID
-						if(current_packet == 1 && expected_packets != 1) {
-							if(current_packet in globalDevices[deviceAddr].data || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
-								console.log('bad packet breakdown, deleting stream. Current packet:');
-								console.log(current_packet);
-								console.log('Total Expected Packets:');
-								console.log(expected_packets);
-								// console.log(current_packet in globalDevices[deviceAddr].data && current_packet == 1 && expected_packets != 1);
-								// console.log(current_packet == 1);
-								// console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
-								if(this.hasOwnProperty('failure_no')){
-									this.failure_no = this.failure_no + 1;
-								}
-								else{
-									this.failure_no = 1;
-								}
-								if(this.hasOwnProperty('failure_no')){
-									console.log('####falure no');
-									console.log(this.failure_no);
-								}
-								delete globalDevices[deviceAddr];
-								if(current_packet != 1){
-									return;
-								} else{
-									if(current_packet != 1){
-										console.log('bad packet cleanup');
-										return;
-									}
-									globalDevices[deviceAddr] = {
-										// stream_size: expected_packets,
-										data: {},
-									}
-									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-									return;
-								}
-							}
+		'97': {
+			name: 'One channel Dynamic Ultrasound vibration Sensor',
+			parse: (payload, parsed, mac) => {
+				if (payload[8] === 1) { // raw
+					var mode = payload[8];
+					var sampling_frequency = payload.slice(9, 13).reduce(msbLsb);
+					var sensor_index = payload[13];
+					var gain_db = payload[14];
+					var deviceAddr = mac;
+					var expected_packets = payload.slice(15, 17).reduce(msbLsb);
+					var current_packet = payload.slice(17, 19).reduce(msbLsb);
+					var sdata_start = 19;
+
+					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
+						// if(expected_packets == 1){
+						// 	this.build_102_data(payload, deviceAddr, hour, minute, sdata_start, current_packet, firmware);
+						// }
+
+						// if a packet is already stored with the same packet ID,
+						// or if packet ID is 1,
+						// or if current packet ID is not one more than last packet ID
+						if(current_packet == 1 && expected_packets != 1) {
+							if(current_packet in globalDevices[deviceAddr].data || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
+								console.log('bad packet breakdown, deleting stream. Current packet:');
+								console.log(current_packet);
+								console.log('Total Expected Packets:');
+								console.log(expected_packets);
+								// console.log(current_packet in globalDevices[deviceAddr].data && current_packet == 1 && expected_packets != 1);
+								// console.log(current_packet == 1);
+								// console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
+								if(this.hasOwnProperty('failure_no')){
+									this.failure_no = this.failure_no + 1;
+								}
+								else{
+									this.failure_no = 1;
+								}
+								if(this.hasOwnProperty('failure_no')){
+									console.log('####falure no');
+									console.log(this.failure_no);
+								}
+								delete globalDevices[deviceAddr];
+								if(current_packet != 1){
+									return;
+								} else{
+									if(current_packet != 1){
+										console.log('bad packet cleanup');
+										return;
+									}
+									globalDevices[deviceAddr] = {
+										// stream_size: expected_packets,
+										data: {},
+									}
+									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+									return;
+								}
+							}
 						}
 						if(expected_packets == 1){
 							if(current_packet != 1){
@@ -9110,377 +7959,298 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'105': {
-			name: '1 Channel Automatic Luber With Ultrasound Vibration Sensor',
-			parse: (d) => {
-				return {
-					raw_adc: d.slice(0, 2).reduce(msbLsb),
-					ma: d.slice(2, 4).reduce(msbLsb) / 100,
-					db: d.slice(4, 6).reduce(msbLsb) / 100
-				};
+		'108': {
+			name: 'Machine Uptime Monitoring Sensor',
+			parse: (d, payload) => {
+				let firmware = payload[1];
+				// if((payload[7] & 2) != 0){
+				// 	console.log('Error found');
+				// 	// parsed.data = {error: 'Error found, Accelerometer Probe may be unattached'};
+				// 	let error = {error: 'Error found, Accelerometer Probe may be unattached'};
+				// 	return error;
+				// }
+				if(firmware > 4){
+					let report_type = "Regular";
+					switch(d[41]){
+						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;
+					}
+					let res = {
+						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(':')
+					};
+					if((payload[7] & 2) != 0){
+						res.error = {
+							accelerometer_counter: "Error found, Accelerometer Probe may be unattached",
+							accelerometer_uptime: "Error found, Accelerometer Probe may be unattached",
+							input_acc: "Error found, Accelerometer Probe may be unattached"
+						}
+						// res.accelerometer_counter = "No probe detected";
+						// res.accelerometer_uptime = "No probe detected";
+						// res.input_acc = "No probe detected";
+					};
+					return res;
+				}else{
+					let res = {
+						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
+					};
+					if((payload[7] & 2) != 0){
+						res.error = {
+							accelerometer_counter: "Error found, Accelerometer Probe may be unattached",
+							accelerometer_uptime: "Error found, Accelerometer Probe may be unattached",
+							input_acc: "Error found, Accelerometer Probe may be unattached"
+						}
+					};
+					return res;
+				}
 			},
 			'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";
+				if(frame[2] > 18){
+					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;
 					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
+					let acc_odr = "10 Hz";
+					switch(frame[40]){
 						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
+							acc_odr = "10 Hz";
+							break;
 						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
+							acc_odr = "20 Hz";
+							break;
 						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
+							acc_odr = "50 Hz";
+							break;
 						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
+							acc_odr = "100 Hz";
+							break;
+						case 4:
+							acc_odr = "200 Hz";
+							break;
 						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-			}
-		},
-		'106': {
-			name: '2 Channel Automatic Luber With Ultrasound Vibration Sensor',
-			parse: (d) => {
-				return {
-					c1_raw_adc: d.slice(0, 2).reduce(msbLsb),
-					c1_ma: d.slice(2, 4).reduce(msbLsb) / 100,
-					c1_db: d.slice(4, 6).reduce(msbLsb) / 100,
-					c2_raw_adc: d.slice(6, 8).reduce(msbLsb),
-					c2_ma: d.slice(8, 10).reduce(msbLsb) / 100,
-					c2_db: d.slice(10, 12).reduce(msbLsb) / 100
-				};
-			},
-			'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";
+							acc_odr = "400 Hz";
+							break;
 					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
+					let rtc_sampling_interval = "5 sec";
+					switch(frame[39]){
 						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
+							rtc_sampling_interval = "1 min";
+							break;
 						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
+							rtc_sampling_interval = "5 min";
+							break;
 						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
+							rtc_sampling_interval = "15 min";
+							break;
 						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
+							rtc_sampling_interval = "30 min";
+							break;
 						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
+							rtc_sampling_interval = "1 hour";
+							break;
 						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
+							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 sec";
+							break;
+						case 10:
+							rtc_sampling_interval = "10 sec";
+							break;
+						case 11:
+							rtc_sampling_interval = "15 sec";
+							break;
+						case 12:
+							rtc_sampling_interval = "30 sec";
+							break;
+					}
+					let screen_control = 0;
+					switch(frame[41]){
+						case 0:
+							screen_control = "IO1";
+							break;
+						case 1:
+							screen_control = "IO2";
+							break;
+						case 2:
+							screen_control = "IO3";
+							break;
+						case 3:
+							screen_control = "Accelero";
+							break;
+						case 4:
+							screen_control = "Magneto";
+							break;
 					}
 					return {
 						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
+						'accelerometer_threshold': (frame[16]* 32) + " mg",
+						'debouncing_timeout': frame.slice(17, 19).reduce(msbLsb) + " msec",
+						'accelero_state': frame[19]? "Enabled": "Disabled",
+						'input_1_active_edge': frame[20]? "Rising": "Falling",
+						'input_2_active_edge': frame[21]? "Rising": "Falling",
+						'input_3_active_edge': frame[22]? "Rising": "Falling",
+						'counter_threshold': frame.slice(23, 27).reduce(msbLsb),
+						'trasnmit_on_change_status': frame[27]? "Enabled": "Disabled",
+						'Shift_end_1': [
+							String(frame[28]).padStart(2, '0'),
+							String(frame[29]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_2': [
+							String(frame[30]).padStart(2, '0'),
+							String(frame[31]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_3': [
+							String(frame[32]).padStart(2, '0'),
+							String(frame[33]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_4': [
+							String(frame[34]).padStart(2, '0'),
+							String(frame[35]).padStart(2, '0')
+						].join(':'),
+						'reset_timeout': frame.slice(36, 38).reduce(msbLsb) + " min",
+						'counter_reset_mode': reset_mode,
+						'sampling_interval': rtc_sampling_interval,
+						'acc_odr': acc_odr,
+						'screen_control': screen_control,
+						'screen_on_time': frame[42] + ' sec',
+						'interrupt_timeout': frame.slice(43, 45).reduce(msbLsb) + ' msec',
+						'hardware_id': frame.slice(45, 48),
+						'report_rate': frame.slice(48, 52).reduce(msbLsb) + " sec",
+						'tx_life_counter': frame.slice(52, 56).reduce(msbLsb),
 						'machine_values': {
 							'firmware': frame[2],
-							'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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
+							'accelerometer_threshold': frame[16],
+							'debouncing_timeout': frame.slice(17, 19),
+							'accelero_state': frame[19],
+							'input_1_active_edge': frame[20],
+							'input_2_active_edge': frame[21],
+							'input_3_active_edge': frame[22],
+							'counter_threshold': frame.slice(23, 27),
+							'trasnmit_on_change_status': frame[27],
+							'Shift_end_1': frame.slice(28, 30),
+							'Shift_end_2': frame.slice(30, 32),
+							'Shift_end_3': frame.slice(32, 34),
+							'Shift_end_4': frame.slice(34, 36),
+							'reset_timeout': frame.slice(36, 38),
+							'counter_reset_mode': frame[38],
+							'sampling_interval': frame[39],
+							'acc_odr': frame[40],
+							'screen_control': frame[41],
+							'screen_on_time': frame[42],
+							'interrupt_timeout': frame.slice(43, 45),
+							'hardware_id': frame.slice(45, 48),
+							'report_rate': frame.slice(48, 52),
+							'tx_life_counter': frame.slice(52, 56)
 						}
 					}
-				}
-			}
-		},
-		'107': {
-			name: '16-Bit 4-Channel 4-20mA',
-			parse: (d) => {
-				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
-				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
-				var adc3 = signInt(d.slice(4, 6).reduce(msbLsb));
-				var adc4 = signInt(d.slice(6, 8).reduce(msbLsb));
-				var ma1 = (signInt(d.slice(8, 10).reduce(msbLsb)))/100.0;
-				var ma2 = (signInt(d.slice(10, 12).reduce(msbLsb)))/100.0;
-				var ma3 = (signInt(d.slice(12, 14).reduce(msbLsb)))/100.0;
-				var ma4 = (signInt(d.slice(14, 16).reduce(msbLsb)))/100.0;
-				return {
-					adc1: adc1,
-					adc2: adc2,
-					adc3: adc3,
-					adc4: adc4,
-					ma1: ma1,
-					ma2: ma2,
-					ma3: ma3,
-					ma4: ma4
-				};
-			},
-			'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";
+				}else if(frame[2] > 13){
+					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;
 					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
+					let acc_odr = "10Hz";
+					switch(frame[40]){
 						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
+							acc_odr = "10Hz";
+							break;
 						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
+							acc_odr = "20Hz";
+							break;
 						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
+							acc_odr = "50Hz";
+							break;
 						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
-						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-			}
-		},
-		'108': {
-			name: 'Machine Uptime Monitoring Sensor',
-			parse: (d, payload) => {
-				let firmware = payload[1];
-				// if((payload[7] & 2) != 0){
-				// 	console.log('Error found');
-				// 	// parsed.data = {error: 'Error found, Accelerometer Probe may be unattached'};
-				// 	let error = {error: 'Error found, Accelerometer Probe may be unattached'};
-				// 	return error;
-				// }
-				if(firmware > 4){
-					let report_type = "Regular";
-					switch(d[41]){
-						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;
-					}
-					let res = {
-						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(':')
-					};
-					if((payload[7] & 2) != 0){
-						res.error = {
-							accelerometer_counter: "Error found, Accelerometer Probe may be unattached",
-							accelerometer_uptime: "Error found, Accelerometer Probe may be unattached",
-							input_acc: "Error found, Accelerometer Probe may be unattached"
-						}
-						// res.accelerometer_counter = "No probe detected";
-						// res.accelerometer_uptime = "No probe detected";
-						// res.input_acc = "No probe detected";
-					};
-					return res;
-				}else{
-					let res = {
-						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
-					};
-					if((payload[7] & 2) != 0){
-						res.error = {
-							accelerometer_counter: "Error found, Accelerometer Probe may be unattached",
-							accelerometer_uptime: "Error found, Accelerometer Probe may be unattached",
-							input_acc: "Error found, Accelerometer Probe may be unattached"
-						}
-					};
-					return res;
-				}
-			},
-			'parse_fly': (frame) => {
-				if(frame[2] > 18){
-					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 = "10 Hz";
-					switch(frame[40]){
-						case 0:
-							acc_odr = "10 Hz";
-							break;
-						case 1:
-							acc_odr = "20 Hz";
-							break;
-						case 2:
-							acc_odr = "50 Hz";
-							break;
-						case 3:
-							acc_odr = "100 Hz";
+							acc_odr = "100Hz";
 							break;
 						case 4:
-							acc_odr = "200 Hz";
+							acc_odr = "200Hz";
 							break;
 						case 5:
-							acc_odr = "400 Hz";
+							acc_odr = "400Hz";
 							break;
 					}
-					let rtc_sampling_interval = "5 sec";
+					let rtc_sampling_interval = "5 seconds";
 					switch(frame[39]){
 						case 0:
-							rtc_sampling_interval = "1 min";
+							rtc_sampling_interval = "1 minute";
 							break;
 						case 1:
-							rtc_sampling_interval = "5 min";
+							rtc_sampling_interval = "5 minutes";
 							break;
 						case 2:
-							rtc_sampling_interval = "15 min";
+							rtc_sampling_interval = "15 minutes";
 							break;
 						case 3:
-							rtc_sampling_interval = "30 min";
+							rtc_sampling_interval = "30 minutes";
 							break;
 						case 4:
 							rtc_sampling_interval = "1 hour";
@@ -9498,40 +8268,22 @@ function sensor_types(parent){
 							rtc_sampling_interval = "12 hours";
 							break;
 						case 9:
-							rtc_sampling_interval = "5 sec";
+							rtc_sampling_interval = "5 seconds";
 							break;
 						case 10:
-							rtc_sampling_interval = "10 sec";
+							rtc_sampling_interval = "10 seconds";
 							break;
 						case 11:
-							rtc_sampling_interval = "15 sec";
+							rtc_sampling_interval = "15 seconds";
 							break;
 						case 12:
-							rtc_sampling_interval = "30 sec";
-							break;
-					}
-					let screen_control = 0;
-					switch(frame[41]){
-						case 0:
-							screen_control = "IO1";
-							break;
-						case 1:
-							screen_control = "IO2";
-							break;
-						case 2:
-							screen_control = "IO3";
-							break;
-						case 3:
-							screen_control = "Accelero";
-							break;
-						case 4:
-							screen_control = "Magneto";
+							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",
+						'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",
@@ -9554,16 +8306,14 @@ function sensor_types(parent){
 							String(frame[34]).padStart(2, '0'),
 							String(frame[35]).padStart(2, '0')
 						].join(':'),
-						'reset_timeout': frame.slice(36, 38).reduce(msbLsb) + " min",
+						'reset_timeout': frame.slice(36, 38).reduce(msbLsb) + "min",
 						'counter_reset_mode': reset_mode,
 						'sampling_interval': rtc_sampling_interval,
 						'acc_odr': acc_odr,
-						'screen_control': screen_control,
-						'screen_on_time': frame[42] + ' sec',
-						'interrupt_timeout': frame.slice(43, 45).reduce(msbLsb) + ' msec',
-						'hardware_id': frame.slice(45, 48),
-						'report_rate': frame.slice(48, 52).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(52, 56).reduce(msbLsb),
+						'counter_ignore_timeout': frame.slice(41, 43).reduce(msbLsb) + "sec",
+						'hardware_id': frame.slice(43, 46),
+						'report_rate': frame.slice(46, 50).reduce(msbLsb) + "sec",
+						'tx_life_counter': frame.slice(50, 54).reduce(msbLsb),
 						'machine_values': {
 							'firmware': frame[2],
 							'accelerometer_threshold': frame[16],
@@ -9582,15 +8332,13 @@ function sensor_types(parent){
 							'counter_reset_mode': frame[38],
 							'sampling_interval': frame[39],
 							'acc_odr': frame[40],
-							'screen_control': frame[41],
-							'screen_on_time': frame[42],
-							'interrupt_timeout': frame.slice(43, 45),
-							'hardware_id': frame.slice(45, 48),
-							'report_rate': frame.slice(48, 52),
-							'tx_life_counter': frame.slice(52, 56)
+							'counter_ignore_timeout': frame.slice(41, 43),
+							'hardware_id': frame.slice(43, 46),
+							'report_rate': frame.slice(46, 50),
+							'tx_life_counter': frame.slice(50, 54)
 						}
 					}
-				}else if(frame[2] > 13){
+				} else if(frame[2] > 9){
 					let reset_mode = "Disabled";
 					switch(frame[38]){
 						case 0:
@@ -9696,10 +8444,9 @@ function sensor_types(parent){
 						'counter_reset_mode': reset_mode,
 						'sampling_interval': rtc_sampling_interval,
 						'acc_odr': acc_odr,
-						'counter_ignore_timeout': frame.slice(41, 43).reduce(msbLsb) + "sec",
-						'hardware_id': frame.slice(43, 46),
-						'report_rate': frame.slice(46, 50).reduce(msbLsb) + "sec",
-						'tx_life_counter': frame.slice(50, 54).reduce(msbLsb),
+						'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],
@@ -9718,15 +8465,14 @@ function sensor_types(parent){
 							'counter_reset_mode': frame[38],
 							'sampling_interval': frame[39],
 							'acc_odr': frame[40],
-							'counter_ignore_timeout': frame.slice(41, 43),
-							'hardware_id': frame.slice(43, 46),
-							'report_rate': frame.slice(46, 50),
-							'tx_life_counter': frame.slice(50, 54)
+							'hardware_id': frame.slice(41, 44),
+							'report_rate': frame.slice(44, 48),
+							'tx_life_counter': frame.slice(48, 52)
 						}
 					}
-				} else if(frame[2] > 9){
+				} else if(frame[2] > 8){
 					let reset_mode = "Disabled";
-					switch(frame[38]){
+					switch(frame[37]){
 						case 0:
 							reset_mode = "Disabled";
 							break;
@@ -9738,7 +8484,7 @@ function sensor_types(parent){
 							break;
 					}
 					let acc_odr = "10Hz";
-					switch(frame[40]){
+					switch(frame[39]){
 						case 0:
 							acc_odr = "10Hz";
 							break;
@@ -9759,139 +8505,7 @@ function sensor_types(parent){
 							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:
-							reset_mode = "Disabled";
-							break;
-						case 1:
-							reset_mode = "Shift Ends";
-							break;
-						case 2:
-							reset_mode = "Timeout";
-							break;
-					}
-					let acc_odr = "10Hz";
-					switch(frame[39]){
-						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[38]){
+					switch(frame[38]){
 						case 0:
 							rtc_sampling_interval = "1 minute";
 							break;
@@ -10031,795 +8645,173 @@ function sensor_types(parent){
 						case 1:
 							reset_mode = "Shift Ends";
 							break;
-						case 2:
-							reset_mode = "Timeout";
-							break;
-					}
-					let acc_odr = "10Hz";
-					switch(frame[39]){
-						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[38]){
-						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[17] + "sec",
-						'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",
-						'trasnmit_on_change_status': frame[26]? "Enabled": "Disabled",
-						'Shift_end_1': [
-							String(frame[27]).padStart(2, '0'),
-							String(frame[28]).padStart(2, '0')
-						].join(':'),
-						'Shift_end_2': [
-							String(frame[29]).padStart(2, '0'),
-							String(frame[30]).padStart(2, '0')
-						].join(':'),
-						'Shift_end_3': [
-							String(frame[31]).padStart(2, '0'),
-							String(frame[32]).padStart(2, '0')
-						].join(':'),
-						'Shift_end_4': [
-							String(frame[33]).padStart(2, '0'),
-							String(frame[34]).padStart(2, '0')
-						].join(':'),
-						'reset_timeout': frame.slice(35, 37).reduce(msbLsb) + "min",
-						'counter_reset_mode': reset_mode,
-						'sampling_interval': rtc_sampling_interval,
-						'acc_odr': acc_odr,
-						'hardware_id': frame.slice(40, 43),
-						'report_rate': frame.slice(43, 47).reduce(msbLsb) + "sec",
-						'tx_life_counter': frame.slice(47, 51).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'accelerometer_threshold': frame[16],
-							'debouncing_timeout': frame[17],
-							'accelero_state': frame[18],
-							'input_1_active_edge': frame[19],
-							'input_2_active_edge': frame[20],
-							'input_3_active_edge': frame[21],
-							'counter_threshold': frame.slice(22, 26),
-							'trasnmit_on_change_status': frame[26],
-							'Shift_end_1': frame.slice(27, 29),
-							'Shift_end_2': frame.slice(29, 31),
-							'Shift_end_3': frame.slice(31, 33),
-							'Shift_end_4': frame.slice(33, 35),
-							'reset_timeout': frame.slice(35, 37),
-							'counter_reset_mode': frame[37],
-							'sampling_interval': frame[38],
-							'acc_odr': frame[39],
-							'hardware_id': frame.slice(40, 43),
-							'report_rate': frame.slice(43, 47),
-							'tx_life_counter': frame.slice(47, 51)
-						}
-					}
-				} else{
-					return {
-						'firmware': frame[2],
-						'report_rate': frame.slice(12, 16).reduce(msbLsb).toString() + "sec.",
-						'accelerometer_threshold': (frame[16]* 32).toString() + "mg.",
-						'debouncing_timeout': frame[17].toString() + "sec.",
-						'accelero_state': frame[18],
-						'digital_inputs_active_edge': frame.slice(19, 22),
-						'counter_threshold': frame.slice(22, 26).reduce(msbLsb).toString() + "sec.",
-						'trasnmit_on_change_status': frame[26],
-						'machine_values': {
-							'firmware': frame[2],
-							'report_rate': frame.slice(12, 16),
-							'accelerometer_threshold': frame[16],
-							'debouncing_timeout': frame[17],
-							'accelero_active_state': frame[18],
-							'digital_inputs_active_edge': frame.slice(19, 22),
-							'counter_threshold': frame.slice(22, 26),
-							'trasnmit_on_change_status': frame[26]
-						}
-					}
-				}
-			}
-		},
-		'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).reduce(msbLsb),
-						'tx_life_counter': frame.slice(19, 23).reduce(msbLsb)
-					}
-				}
-			}
-		},
-		'112': {
-			name: 'Condition Based/Predictive Maintenance Sensor v4',
-			parse: (payload, parsed, mac) => {
-				if(payload[7] & 2){
-					console.log('Error found');
-					console.log(payload[7]);
-					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
-					return parsed;
-				}
-				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
-				if (payload[8] === 1) {
-					var deviceAddr = mac;
-					// var firmware = payload[1];
-					// var hour = payload[12];
-					// var minute = payload[13];
-					var expected_packets = msbLsb(payload[16], payload[17]);
-					var current_packet = msbLsb(payload[18], payload[19]);
-					var sdata_start = 20;
-				
-				
-					if (globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1) {
-						if (expected_packets != 1) {
-							// if 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)) {
-								console.log('Recovering bad packet');
-								// clear stream object & timeout
-								parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
-				
-								// init new stream
-								parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
-				
-								globalDevices[deviceAddr].last_packet_counter = current_packet;
-								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-								return;
-							} else {
-								globalDevices[deviceAddr].last_packet_counter = current_packet;
-								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-							}
-						} else {
-							// clear stream object & timeout
-							parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
-				
-							// init new stream
-							parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
-				
-							globalDevices[deviceAddr].last_packet_counter = current_packet;
-							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-						}
-					} else {
-						// clear stream object & timeout
-						parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
-				
-						// init new stream
-						parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
-				
-						globalDevices[deviceAddr].last_packet_counter = current_packet;
-						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-					}
-					if (current_packet == expected_packets) {
-						// concatenate stream
-						sensor_data = parent.sensor_types[112].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
-						// clear stream object & timeout
-						parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
-						return sensor_data;
-					} else {
-						return;
-					}
-				}
-				else if(payload[8] === 0 || payload[8] === 2 || payload[8] === 3){
-					// mode byte most significant bit will indicate fft data.
-					// console.log(d);
-					var odr;
-					switch(payload[9]){
-						case 6:
-							odr = "50Hz"
-							break;
-						case 7:
-							odr = "100Hz";
-							break;
-						case 8:
-							odr = "200Hz";
-							break;
-						case 9:
-							odr = "400Hz";
-							break;
-						case 10:
-							odr = "800Hz";
-							break;
-						case 11:
-							odr = "1600Hz";
-							break;
-						case 12:
-							odr = "3200Hz";
-							break;
-						case 13:
-							odr = "6400Hz";
-							break;
-						case 14:
-							odr = "12800Hz";
-							break;
-						case 15:
-							odr = "25600Hz";
-							break;
-					}
-					return {
-						mode: payload[8],
-						msg_type: msg_type,
-
-						odr: odr,
-						temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
-						ext_temperature: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100,
-						current: signInt(payload.slice(16, 20).reduce(msbLsb), 32) / 1000,
-						x_rms_ACC_G: payload.slice(20, 22).reduce(msbLsb)/1000,
-						x_max_ACC_G: payload.slice(22, 24).reduce(msbLsb)/1000,
-						x_velocity_mm_sec: payload.slice(24, 26).reduce(msbLsb) / 100,
-						x_displacement_mm: payload.slice(26, 28).reduce(msbLsb) / 100,
-						x_peak_one_Hz: payload.slice(28, 30).reduce(msbLsb),
-						x_peak_two_Hz: payload.slice(30, 32).reduce(msbLsb),
-						x_peak_three_Hz: payload.slice(32, 34).reduce(msbLsb),
-
-						y_rms_ACC_G: payload.slice(34, 36).reduce(msbLsb)/1000,
-						y_max_ACC_G: payload.slice(36, 38).reduce(msbLsb)/1000,
-						y_velocity_mm_sec: payload.slice(38, 40).reduce(msbLsb) / 100,
-						y_displacement_mm: payload.slice(40, 42).reduce(msbLsb) / 100,
-						y_peak_one_Hz: payload.slice(42, 44).reduce(msbLsb),
-						y_peak_two_Hz: payload.slice(44, 46).reduce(msbLsb),
-						y_peak_three_Hz: payload.slice(46, 48).reduce(msbLsb),
-
-						z_rms_ACC_G: payload.slice(48, 50).reduce(msbLsb)/1000,
-						z_max_ACC_G: payload.slice(50, 52).reduce(msbLsb)/1000,
-						z_velocity_mm_sec: payload.slice(52, 54).reduce(msbLsb) / 100,
-						z_displacement_mm: payload.slice(54, 56).reduce(msbLsb) / 100,
-						z_peak_one_Hz: payload.slice(56, 58).reduce(msbLsb),
-						z_peak_two_Hz: payload.slice(58, 60).reduce(msbLsb),
-						z_peak_three_Hz: payload.slice(60, 62).reduce(msbLsb),
-						rpm: payload.slice(62, 64).reduce(msbLsb)
-					};
-				}
-				// else{
-				// 	parsed.data = {'error': 'Vibration mode error'}
-				// 	return parsed;
-				// }
-			},
-			'utils': {
-				'clear_globalDevices_stream': (deviceAddr) => {
-					if(Object.hasOwn(globalDevices, deviceAddr)){
-						if(Object.hasOwn(globalDevices[deviceAddr], 'packet_stream_timeout')){
-							clearTimeout(globalDevices[deviceAddr].packet_stream_timeout);
-						}
-						delete globalDevices[deviceAddr];
-					}
-				},
-				'init_globalDevices_stream'(deviceAddr, payload, expected_packets, parsed, msg_type){
-					globalDevices[deviceAddr] = {
-						data: {},
-						odr: msbLsb(payload[9], payload[10]),
-						mo: payload[8],
-						fsr: payload[11] >> 5,
-						hour: payload[12],
-						minute: payload[13],
-						temperature: msbLsb(payload[14], payload[15]) / 100,
-						expected_packets: expected_packets
-					}
-					globalDevices[deviceAddr].packet_stream_timeout = setTimeout(() => {
-						parsed.sensor_data = parent.sensor_types[112].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
-						parsed.sensor_data.error = 'Time Series Data Stream Timeout - incomplete data received';
-
-						parsed.sensor_name = parent.sensor_types[112].name;
-						parsed.type = 'sensor_data';
-						parsed.addr = deviceAddr;
-						parsed.received = Date.now();
-
-						parent._emitter.emit('sensor_data', parsed);
-						parent._emitter.emit('sensor_data-112', parsed);
-						parent._emitter.emit('sensor_data'+'-'+deviceAddr, parsed);
-					}, 60000);
-				},
-				'concat_fft_data': (deviceAddr, mode, msg_type) => {
-					var raw_data = new Array();
-					for(const packet in globalDevices[deviceAddr].data){
-						raw_data = raw_data.concat(globalDevices[deviceAddr].data[packet]);
-					}
-					var label = 0;
-
-					var fft_concat = {};
-
-					var en_axis_data = {};
-					en_axis_data.x_offset = 0;
-					en_axis_data.y_offset = 2;
-					en_axis_data.z_offset = 4;
-					en_axis_data.increment = 6;
-					fft_concat = {x: [], y: [], z: []};
-					
-					var fsr_mult = .00006;
-					var fsr_text = "";
-
-					switch(globalDevices[deviceAddr].fsr){
-						case 0:
-							fsr_mult = 0.00006;
-							break;
-						case 1:
-							fsr_mult = 0.00012;
-							break;
-						case 2:
-							fsr_mult = 0.00024;
-							break;
-						case 3:
-							fsr_mult = 0.00049;
-							break;
-					}
-					switch(globalDevices[deviceAddr].fsr){
-						case 0:
-							fsr_text = "2g";
-							break;
-						case 1:
-							fsr_text = "4g";
-							break;
-						case 2:
-							fsr_text = "8g";
-							break;
-						case 3:
-							fsr_text = "16g";
-							break;
-					}
-
-					for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
-						label++;
-
-						if('x_offset' in en_axis_data){
-							fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(3)));
-						}
-						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(3)));
-						}
-						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(3)));
-						}
-					}
-					var fft_concat_obj = {
-						mode: mode,
-						msg_type: msg_type,
-						time_id: [
-							String(globalDevices[deviceAddr].hour).padStart(2, '0'),
-							String(globalDevices[deviceAddr].minute).padStart(2, '0'),
-						].join(':'),
-						mac_address: deviceAddr,
-						fsr: fsr_text,
-						odr: globalDevices[deviceAddr].odr,
-						temperature: globalDevices[deviceAddr].temperature,
-						total_samples: label,
-						fft_confidence : ((Object.keys(globalDevices[deviceAddr].data).length / globalDevices[deviceAddr].expected_packets) * 100).toFixed(2) + '%',
-						data: fft_concat
-					};
-					return fft_concat_obj;
-				}
-			},
-			'parse_fly': (frame) => {
-				let frame_data = {};
-				switch(frame[16]){
-					case 0:
-						frame_data.mode = "Processed";
-						break;
-					case 1:
-						frame_data.mode = "Raw";
-						break;
-					case 2:
-						frame_data.mode = "Processed + Raw on demand";
-						break;
-					case 3:
-						frame_data.mode = "Smart";
-						break;
-				}
-				switch(frame[17]){
-					case 6:
-						frame_data.odr_1 = 50;
-						break;
-					case 7:
-						frame_data.odr_1 = 100;
-						break;
-					case 8:
-						frame_data.odr_1 = 200;
-						break;
-					case 9:
-						frame_data.odr_1 = 400;
-						break;
-					case 10:
-						frame_data.odr_1 = 800;
-						break;
-					case 11:
-						frame_data.odr_1 = 1600;
-						break;
-					case 12:
-						frame_data.odr_1 = 3200;
-						break;
-					case 13:
-						frame_data.odr_1 = 6400;
-						break;
-					case 14:
-						frame_data.odr_1 = 12800;
-						break;
-					case 15:
-						frame_data.odr_1 = 25600;
-						break;
-				}
-				frame_data.sampling_duration_1 = frame[18]*50 + "ms";
-				switch(frame[19]){
-					case 0:
-						frame_data.filter_status = "Disabled";
-						break;
-					case 1:
-						frame_data.filter_status = "Enabled";
-						break;
-				}
-				switch(frame[20]){
-					case 0:
-						frame_data.lpf_coeff_1 = 4;
-						break;
-					case 1:
-						frame_data.lpf_coeff_1 = 8;
-						break;
-					case 2:
-						frame_data.lpf_coeff_1 = 16;
-						break;
-					case 2:
-						frame_data.lpf_coeff_1 = 32;
-						break;
-					case 4:
-						frame_data.lpf_coeff_1 = 64;
-						break;
-					case 5:
-						frame_data.lpf_coeff_1 = 128;
-						break;
-					case 6:
-						frame_data.lpf_coeff_1 = 256;
-						break;
-					case 7:
-						frame_data.lpf_coeff_1 = 512;
-						break;
-					case 8:
-						frame_data.lpf_coeff_1 = 1024;
-						break;
-					case 9:
-						frame_data.lpf_coeff_1 = 2048;
-						break;
-				}
-				frame_data.lpf_freq_1 = frame_data.odr_1 / frame_data.lpf_coeff_1;
-				switch(frame[21]){
-					case 0:
-						frame_data.hpf_coeff_1 = 4;
-						break;
-					case 1:
-						frame_data.hpf_coeff_1 = 8;
-						break;
-					case 2:
-						frame_data.hpf_coeff_1 = 16;
-						break;
-					case 2:
-						frame_data.hpf_coeff_1 = 32;
-						break;
-					case 4:
-						frame_data.hpf_coeff_1 = 64;
-						break;
-					case 5:
-						frame_data.hpf_coeff_1 = 128;
-						break;
-					case 6:
-						frame_data.hpf_coeff_1 = 256;
-						break;
-					case 7:
-						frame_data.hpf_coeff_1 = 512;
-						break;
-					case 8:
-						frame_data.hpf_coeff_1 = 1024;
-						break;
-					case 9:
-						frame_data.hpf_coeff_1 = 2048;
-						break;
-				}
-				frame_data.hpf_freq_1 = frame_data.odr_1 / frame_data.hpf_coeff_1;
-				switch(frame[22]){
-					case 0:
-						frame_data.sampling_interval = "5 Minutes";
-						frame_data.sampling_interval_number = 5;
-						break;
-					case 1:
-						frame_data.sampling_interval = "10 Minutes";
-						frame_data.sampling_interval_number = 10;
-						break;
-					case 2:
-						frame_data.sampling_interval = "15 Minutes";
-						frame_data.sampling_interval_number = 15;
-						break;
-					case 2:
-						frame_data.sampling_interval = "20 Minutes";
-						frame_data.sampling_interval_number = 20;
-						break;
-					case 4:
-						frame_data.sampling_interval = "30 Minutes";
-						frame_data.sampling_interval_number = 30;
-						break;
-					case 5:
-						frame_data.sampling_interval = "60 Minutes";
-						frame_data.sampling_interval_number = 60;
-						break;
-					case 6:
-						frame_data.sampling_interval = "120 Minutes";
-						frame_data.sampling_interval_number = 120;
-						break;
-					case 7:
-						frame_data.sampling_interval = "180 Minutes";
-						frame_data.sampling_interval_number = 180;
-						break;
-					case 8:
-						frame_data.sampling_interval = "1 Minute";
-						frame_data.sampling_interval_number = 1;
-						break;
-				}
-				frame_data.on_request_timeout = frame[23] + " Seconds";
-				frame_data.deadband = frame[24] + "mg";
-
-				switch(frame[25]){
-					case 0:
-						frame_data.payload_length = "50 Bytes";
-						break;
-					case 1:
-						frame_data.payload_length = "100 Bytes";
-						break;
-					case 2:
-						frame_data.payload_length = "150 Bytes";
-						break;
-					case 3:
-						frame_data.payload_length = "180 Bytes";
-						break;
-				}
-				switch(frame[26]){
-					case 0:
-						frame_data.fsr_text = "2g";
-						break;
-					case 1:
-						frame_data.fsr_text = "4g";
-						break;
-					case 2:
-						frame_data.fsr_text = "8g";
-						break;
-					case 3:
-						frame_data.fsr_text = "16g";
-						break;
-				}
-				frame_data.rpm_status = frame[27]? 'Enabled': 'Disabled';
-				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] > 5){ // for Firmware v6 and above
-					frame_data.motion_to_delay = frame[41] * 50;
+						case 2:
+							reset_mode = "Timeout";
+							break;
+					}
+					let acc_odr = "10Hz";
+					switch(frame[39]){
+						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[38]){
+						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],
-						'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),
+						'accelerometer_threshold': (frame[16]* 32) + "mg",
+						'debouncing_timeout': frame[17] + "sec",
+						'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",
+						'trasnmit_on_change_status': frame[26]? "Enabled": "Disabled",
+						'Shift_end_1': [
+							String(frame[27]).padStart(2, '0'),
+							String(frame[28]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_2': [
+							String(frame[29]).padStart(2, '0'),
+							String(frame[30]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_3': [
+							String(frame[31]).padStart(2, '0'),
+							String(frame[32]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_4': [
+							String(frame[33]).padStart(2, '0'),
+							String(frame[34]).padStart(2, '0')
+						].join(':'),
+						'reset_timeout': frame.slice(35, 37).reduce(msbLsb) + "min",
+						'counter_reset_mode': reset_mode,
+						'sampling_interval': rtc_sampling_interval,
+						'acc_odr': acc_odr,
+						'hardware_id': frame.slice(40, 43),
+						'report_rate': frame.slice(43, 47).reduce(msbLsb) + "sec",
+						'tx_life_counter': frame.slice(47, 51).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)
+							'accelerometer_threshold': frame[16],
+							'debouncing_timeout': frame[17],
+							'accelero_state': frame[18],
+							'input_1_active_edge': frame[19],
+							'input_2_active_edge': frame[20],
+							'input_3_active_edge': frame[21],
+							'counter_threshold': frame.slice(22, 26),
+							'trasnmit_on_change_status': frame[26],
+							'Shift_end_1': frame.slice(27, 29),
+							'Shift_end_2': frame.slice(29, 31),
+							'Shift_end_3': frame.slice(31, 33),
+							'Shift_end_4': frame.slice(33, 35),
+							'reset_timeout': frame.slice(35, 37),
+							'counter_reset_mode': frame[37],
+							'sampling_interval': frame[38],
+							'acc_odr': frame[39],
+							'hardware_id': frame.slice(40, 43),
+							'report_rate': frame.slice(43, 47),
+							'tx_life_counter': frame.slice(47, 51)
 						}
 					}
-				} else if(frame[2] > 4){ // for Firmware v5 and above
+				} else{
 					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),
-						'hardware_id': frame.slice(41, 44),
-						'reserved': frame.slice(44, 48),
-						'tx_lifetime_counter': frame.slice(48, 52).reduce(msbLsb),
+						'report_rate': frame.slice(12, 16).reduce(msbLsb).toString() + "sec.",
+						'accelerometer_threshold': (frame[16]* 32).toString() + "mg.",
+						'debouncing_timeout': frame[17].toString() + "sec.",
+						'accelero_state': frame[18],
+						'digital_inputs_active_edge': frame.slice(19, 22),
+						'counter_threshold': frame.slice(22, 26).reduce(msbLsb).toString() + "sec.",
+						'trasnmit_on_change_status': frame[26],
 						'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),
-							'hardware_id': frame.slice(41, 44),
-							'reserved': frame.slice(44, 48),
-							'tx_lifetime_counter': frame.slice(48, 52)
+							'report_rate': frame.slice(12, 16),
+							'accelerometer_threshold': frame[16],
+							'debouncing_timeout': frame[17],
+							'accelero_active_state': frame[18],
+							'digital_inputs_active_edge': frame.slice(19, 22),
+							'counter_threshold': frame.slice(22, 26),
+							'trasnmit_on_change_status': frame[26]
 						}
 					}
-				}else{
-					return {
+				}
+			}
+		},
+		'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],
-						'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',
-						'hardware_id': frame.slice(39, 42),
-						'reserved': frame.slice(42, 46),
-						'tx_lifetime_counter': frame.slice(46, 50).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),
-							'hardware_id': frame.slice(39, 42),
-							'reserved': frame.slice(42, 46),
-							'tx_lifetime_counter': frame.slice(46, 50)
-						}
+						'hardware_id': frame.slice(12, 15),
+						'sample_rate': frame.slice(15, 19).reduce(msbLsb),
+						'tx_life_counter': frame.slice(19, 23).reduce(msbLsb)
 					}
 				}
 			}
@@ -11072,21 +9064,21 @@ function sensor_types(parent){
 		'118': {
 			name: 'Dual Pressure and Temperature Sensor',
 			parse: (payload, parsed, mac) => {
-                let res = {};
+				let res = {};
 
 				res.pressure_s1 = signInt(payload.slice(8, 12).reduce(msbLsb),32)/100;
 				res.temperature_s1 = signInt(payload.slice(12, 14).reduce(msbLsb),16)/100;
-                if((payload[7] & 2)){
-                    res.error_s1 = 'Error: Sensor Probe 1 communication error';
+				if((payload[7] & 2)){
+					res.error_s1 = 'Error: Sensor Probe 1 communication error';
 				}
 
 				res.pressure_s2 = signInt(payload.slice(14, 18).reduce(msbLsb),32)/100;
 				res.temperature_s2 = signInt(payload.slice(18, 20).reduce(msbLsb),16)/100;
-                if((payload[7] & 4)){
+				if((payload[7] & 4)){
 					res.error_s2 = 'Error: Sensor Probe 2 communication error';
 				}
-                return res;
-            },
+				return res;
+			},
 			'parse_fly': (frame) => {
 				let psi_1;
 				let psi_2;
@@ -11472,119 +9464,14 @@ function sensor_types(parent){
 				};
 			},
 			'parse_fly': (frame) => {
-				return {
-					'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': {
-						'hardware_id': frame.slice(12, 15),
-						'sample_rate': frame.slice(15, 19),
-						'tx_life_counter': frame.slice(19, 23)
-					}
-				}
-			}
-		},
-		'122': {
-			name: 'Wireless 4-20mA Current Splitter',
-			parse: (d) => {
-				// This parser may be outdated if a customer has an issue check with Engineering
-				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
-				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
-				return {
-					adc1: adc1,
-					adc2: adc2,
-					mA1: signInt(d.slice(4, 6).reduce(msbLsb))/100,
-					mA2: signInt(d.slice(6, 8).reduce(msbLsb))/100
-				};
-			},
-			'parse_fly': (frame) => {
-				let frame_data = {};
-				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;
-				}
-				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_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[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_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),
-							'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),
-						'fsr':frame_data.fsr,
-						'boot_up_time': frame[17],
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'report_rate': frame.slice(12, 16),
-							'fsr':frame[16],
-							'boot_up_time': frame[17],
-							'adc_pin_reading': frame.slice(18, 20),
-							'frame': frame
-						}
-					}
-				}else{
-					return {
-						'firmware': frame[2],
-						'report_rate': frame.slice(12, 16).reduce(msbLsb),
-						'fsr':frame_data.fsr,
-						'boot_up_time': frame[17],
-						'machine_values': {
-							'firmware': frame[2],
-							'report_rate': frame.slice(12, 16),
-							'fsr':frame[16],
-							'boot_up_time': frame[17],
-							'frame': frame
-						}
+				return {
+					'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': {
+						'hardware_id': frame.slice(12, 15),
+						'sample_rate': frame.slice(15, 19),
+						'tx_life_counter': frame.slice(19, 23)
 					}
 				}
 			}
@@ -13660,72 +11547,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'536': {
-			name: 'Wireless Oxygen Flow Meter',
-			parse: (payload, parsed) => {
-				return {
-					error_status: payload[0],
-					s1_oxygen_temp: payload.slice(1, 3).reduce(msbLsb)/100,
-					s2_oxygen_temp: payload.slice(3, 5).reduce(msbLsb)/100,
-					s3_oxygen_temp: payload.slice(5, 7).reduce(msbLsb)/100,
-					s4_oxygen_temp: payload.slice(7, 9).reduce(msbLsb)/100,
-					s1_saturation_percent: payload.slice(9, 13).reduce(msbLsb)/100,
-					s2_saturation_percent: payload.slice(13, 17).reduce(msbLsb)/100,
-					s3_saturation_percent: payload.slice(17, 21).reduce(msbLsb)/100,
-					s4_saturation_percent: payload.slice(21, 25).reduce(msbLsb)/100,
-					s1_oxigen_ppm: payload.slice(25, 29).reduce(msbLsb)/100,
-					s2_oxigen_ppm: payload.slice(29, 33).reduce(msbLsb)/100,
-					s3_oxigen_ppm: payload.slice(33, 37).reduce(msbLsb)/100,
-					s4_oxigen_ppm: payload.slice(37, 41).reduce(msbLsb)/100,
-					s1_oxigen_mg_l: payload.slice(41, 45).reduce(msbLsb)/100,
-					s2_oxigen_mg_l: payload.slice(45, 49).reduce(msbLsb)/100,
-					s3_oxigen_mg_l: payload.slice(49, 53).reduce(msbLsb)/100,
-					s4_oxigen_mg_l: payload.slice(53, 57).reduce(msbLsb)/100,
-					s1_flow_rate: payload.slice(57, 61).reduce(msbLsb)/100,
-					s2_flow_rate: payload.slice(61, 65).reduce(msbLsb)/100,
-					s3_flow_rate: payload.slice(65, 69).reduce(msbLsb)/100,
-					s4_flow_rate: payload.slice(69, 73).reduce(msbLsb)/100,
-					s1_solenoid_status: payload[73],
-					s2_solenoid_status: payload[74],
-					s3_solenoid_status: payload[75],
-					s4_solenoid_status: payload[76]
-				}
-			},
-			'parse_fly': (frame) => {
-				return {
-					'firmware': frame[2],
-					'oxygen_bootup_time': frame[12] + 'sec',
-					'flow_bootup_time': frame[13]+ 'sec',
-					's1_oxygen_addr': frame[14],
-					's2_oxygen_addr': frame[15],
-					's3_oxygen_addr': frame[16],
-					's4_oxygen_addr': frame[17],
-					's1_flow_addr': frame[18],
-					's2_flow_addr': frame[19],
-					's3_flow_addr': frame[20],
-					's4_flow_addr': frame[21],
-					'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],
-						'oxygen_bootup_time': frame[12],
-						'flow_bootup_time': frame[13],
-						's1_oxygen_addr': frame[14],
-						's2_oxygen_addr': frame[15],
-						's3_oxygen_addr': frame[16],
-						's4_oxygen_addr': frame[17],
-						's1_flow_addr': frame[18],
-						's2_flow_addr': frame[19],
-						's3_flow_addr': frame[20],
-						's4_flow_addr': frame[21],
-						'hardware_id': frame.slice(22, 25),
-						'report_rate': frame.slice(25, 29),
-						'tx_life_counter': frame.slice(29, 33)
-					}
-				}
-			}
-		},
 		'537': {
 			name: 'Type 537 - Custom Standalone Smart Vibration Sensor',
 			parse: (payload, parsed, mac) => {
@@ -14943,178 +12764,6 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'539': {
-			name: 'RS485 Modbus Wireless Converter',
-			parse: (d) => {
-				return {
-					subdevice_type: d[0],
-					number_of_registers: d[1],
-					status_24_31: d[2],
-					status_16_23: d[3],
-					status_8_15:  d[4],
-					status_0_7:   d[5],
-					// TODO we can automatically determine how many registers are here based on the number_of_registers and create data objects appropriately
-					// r1: d.slice(2,4),
-					// r2: d.slice(4,6),
-					// r3: d.slice(6,8),
-					// r4: d.slice(8,10),
-					data: d.slice(6)
-				};
-			},
-		},
-		'540': {
-			name: 'Wireless Ultrasonic Flow Meter FD-Q32C',
-			parse: (d) => {
-				return {
-					raw_adc: d.slice(0, 2).reduce(msbLsb),
-					ma: d.slice(2, 4).reduce(msbLsb) / 100,
-					flow_ltr_min: d.slice(4, 8).reduce(msbLsb) / 100
-				};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 13){ // firmware 14 and above
-					let frame_data = {};
-					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
-					if(!auto_check_interval){
-						frame_data.auto_check_interval = 'Disabled';
-					}else{
-						frame_data.auto_check_interval = auto_check_interval + " sec";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
-						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
-						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
-						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
-						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
-						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_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),
-							'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), 16),
-					adc2: signInt(d.slice(2, 4).reduce(msbLsb), 16),
-					mA1: signInt(d.slice(4, 6).reduce(msbLsb), 16)/100,
-					mA2: signInt(d.slice(6, 8).reduce(msbLsb), 16)/100,
-					flow_1: signInt(d.slice(8, 12).reduce(msbLsb), 32)/100,
-					flow_2:signInt(d.slice(12, 16).reduce(msbLsb), 32)/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)
-						}
-					}
-				}
-			}
-		},
 		'542': {
 			name: 'Custom LWGY Flow Sensor',
 			parse: (d) => {
@@ -15616,167 +13265,6 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'545': {
-			name: 'Fox Thermal Flow Sensor',
-			parse: (payload, parsed, mac) => {
-				let sensor_status = '';
-				const error_message = [];
-				if(payload[8] & 1){
-					error_message.push('pwr_up');
-				}
-				if(payload[8] & 2){
-					error_message.push('flw_hi_lim');
-				}
-				if(payload[8] & 4){
-					error_message.push('flw_lo_lim');
-				}
-				if(payload[8] & 8){
-					error_message.push('tmp_hi_lim');
-				}
-				if(payload[8] & 16){
-					error_message.push('tmp_lo_lim');
-				}
-				if(payload[8] & 32){
-					error_message.push('sensor_oor');
-				}
-				if(payload[8] & 64){
-					error_message.push('gas_mix_err');
-				}
-				if(payload[8] & 128){
-					error_message.push('inc_set');
-				}
-				if(error_message.length === 0){
-					sensor_status = 'ready';
-				} else {
-					sensor_status = error_message.join(', ');
-				}
-
-				const calv_value = payload.slice(9, 11).reduce(msbLsb) / 100;
-				let cal_val = '';
-				if(calv_value < 0.80){ 
-					cal_val = 'pass';
-				} else if(calv_value <= 1.0){ 
-					cal_val = 'warning';
-				} else { 
-					cal_val = 'fail';
-				}
-
-				return {
-					sensor_status: sensor_status,
-					calcv_value: payload.slice(9, 11).reduce(msbLsb) / 100,
-					calcv_status: cal_val,
-					flow: payload.slice(11, 15).reduce(msbLsb)/100,
-					ghv: payload.slice(15, 19).reduce(msbLsb)/100,
-					total_flow: payload.slice(19, 27).reduce(msbLsb)/100,
-					temperature: payload.slice(27,29).reduce(msbLsb)/100,
-					density: payload.slice(29, 31).reduce(msbLsb)/100
-				};
-			},
-			'parse_fly': (frame) => {
-				let frame_data = {};
-				switch(frame[12]){
-					case 0:
-						frame_data.flow_unit = 'scf_m';
-						break;
-					case 1:
-						frame_data.flow_unit = 'scf_h';
-						break;
-					case 2:
-						frame_data.flow_unit = 'nm3_h';
-						break;
-					case 3:
-						frame_data.flow_unit = 'nm3_m';
-						break;
-					case 4:
-						frame_data.flow_unit = 'kg_h';
-						break;
-					case 5:
-						frame_data.flow_unit = 'kg_m';
-						break;
-					case 6:
-						frame_data.flow_unit = 'kg_s';
-						break;
-					case 7:
-						frame_data.flow_unit = 'lbs_h';
-						break;
-					case 8:
-						frame_data.flow_unit = 'lbs_m';
-						break;
-					case 9:
-						frame_data.flow_unit = 'lbs_s';
-						break;
-					case 10:
-						frame_data.flow_unit = 'nlp_h';
-						break;
-					case 11:
-						frame_data.flow_unit = 'nlp_m';
-						break;
-					case 12:
-						frame_data.flow_unit = 'mmscf_d';
-						break;
-					case 13:
-						frame_data.flow_unit = 'lbs_d';
-						break;
-					case 14:
-						frame_data.flow_unit = 'slp_m';
-						break;
-					case 15:
-						frame_data.flow_unit = 'nlp_s';
-						break;
-					case 16:
-						frame_data.flow_unit = 'mscf_d';
-						break;
-					case 17:
-						frame_data.flow_unit = 'sm3_h';
-						break;
-					case 18:
-						frame_data.flow_unit = 'mt_h';
-						break;
-					case 19:
-						frame_data.flow_unit = 'nm3_d';
-						break;
-					case 20:
-						frame_data.flow_unit = 'mmscf_m';
-						break;
-					case 21:
-						frame_data.flow_unit = 'scf_d';
-						break;
-					case 22:
-						frame_data.flow_unit = 'mcf_d';
-						break;
-					case 23:
-						frame_data.flow_unit = 'sm3_m';
-						break;
-					case 24:
-						frame_data.flow_unit = 'sm3_d';
-						break;
-				}
-				switch(frame[13]){
-					case 0:
-						frame_data.temperature_unit = 'F';
-						break;
-					case 1:
-						frame_data.temperature_unit = 'C';
-						break;
-				}
-				return {
-					'firmware': frame[2],
-					'flow_unit': frame_data.flow_unit,
-					'temperature_unit': frame_data.temperature_unit,
-					'hardware_id': frame.slice(14, 17),
-					'report_rate': frame.slice(17, 21).reduce(msbLsb),
-					'tx_life_counter': frame.slice(21, 25).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
-						'flow_unit': frame[12],
-						'temperature_unit': frame[13],
-						'hardware_id': frame.slice(14, 17),
-						'report_rate': frame.slice(17, 21),
-						'tx_life_counter': frame.slice(21, 25)
-					}
-				}
-			}
-		},
 		'1010': {
 			name: 'RS232 Wireless Converter',
 			parse: (d) => {
@@ -15890,22 +13378,22 @@ function int2Bytes(i, l){
 	return bytes;
 }
 function msbLsb_to_SignedInt(value, addition) {
-    const bigValue = BigInt(value);
-    const bigAddition = BigInt(addition);
+	const bigValue = BigInt(value);
+	const bigAddition = BigInt(addition);
 
-    let result = (bigValue << 8n) + bigAddition;
+	let result = (bigValue << 8n) + bigAddition;
 
-    // Always return the result as an unsigned 64-bit BigInt.
-    return BigInt.asIntN(64, result);
+	// Always return the result as an unsigned 64-bit BigInt.
+	return BigInt.asIntN(64, result);
 };
 function msbLsb_to_UnsignedInt(value, addition) {
-    const bigValue = BigInt(value);
-    const bigAddition = BigInt(addition);
+	const bigValue = BigInt(value);
+	const bigAddition = BigInt(addition);
 
-    let result = (bigValue << 8n) + bigAddition;
+	let result = (bigValue << 8n) + bigAddition;
 
-    // Always return the result as a signed 64-bit BigInt.
-    return BigInt.asUintN(64, result);
+	// Always return the result as a signed 64-bit BigInt.
+	return BigInt.asUintN(64, result);
 };
 // TODO implement this function in future for decimal formatting on BigInt values
 // Untested. Requires multiplication by scale factor to account for decimal value loss before passing in. Might handle that in this function as well.