@ncd-io/node-red-enterprise-sensors 2.0.1 → 2.0.3

package/lib/WirelessGateway.js

@@ -3040,6 +3040,32 @@ 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_get_delay(sensor_mac){
 		return new Promise((fulfill, reject) => {
 			this.config_send(sensor_mac, [247, 21, 0, 0, 0]).then((res) => {
@@ -4009,7 +4035,21 @@ function sensor_types(parent){
 	var types = {
 		'2': {
 			name: '2 Channel Push Notification',
-			parse: (d) => {
+			parse: (d, payload) => {
+				let firmware = payload[1];
+				if(firmware > 5){
+					let report_type_byte = (payload[7] >> 5) & 1;
+					let report_type = "";
+					switch(report_type_byte){
+						case 0: report_type = 'Regular'; break;
+						case 1: report_type = 'Interrupt'; break;
+					}
+					return{
+						report_type: report_type,
+						input_1: d[0],
+						input_2: d[1]
+					}
+				}
 				return {
 					input_1: d[0],
 					input_2: d[1]
@@ -4025,14 +4065,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) => {
@@ -4112,16 +4144,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) => {
@@ -4140,79 +4162,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) => {
@@ -4490,15 +4439,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'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) => {
@@ -4703,67 +4643,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) => {
@@ -4823,78 +4702,6 @@ 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',
 			parse: (d) => {
@@ -4912,80 +4719,8 @@ 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',
+		'49': {
+			name: '6-Channel Thermocouple',
 			parse: (d) => {
 				return {
 					channel_1: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100,
@@ -5047,149 +4782,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) => {
@@ -5211,275 +4803,49 @@ 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
+					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
 				};
-			},
-			'parse_fly': (frame) => {
-				const interface_types = ["rtd_2_wire", "rtd_3_wire", "rtd_4_wire"];
-				const rtd_types = ["rtd_pt_100", "rtd_pt_1000"];
+			}
+		},
+
+		'61': {
+			name: 'pH and Temperature Sensor',
+			parse: (d) => {
 				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)
-					}
-				}
+					pH: signInt(d.slice(0, 2).reduce(msbLsb), 16) / 100,
+					Temp: signInt(d.slice(2, 4).reduce(msbLsb),16) / 100
+				};
 			}
 		},
-		'56': {
-			name: '2 Channel 0-10VDC Receiver',
+		'62': {
+			name: 'ORP and Temperature Sensor',
 			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
-				};
-			}
-		},
-
-		'61': {
-			name: 'pH and Temperature Sensor',
-			parse: (d) => {
-				return {
-					pH: signInt(d.slice(0, 2).reduce(msbLsb), 16) / 100,
-					Temp: signInt(d.slice(2, 4).reduce(msbLsb),16) / 100
-				};
-			}
-		},
-		'62': {
-			name: 'ORP and Temperature Sensor',
-			parse: (d) => {
-				return {
-					ORP: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					Temp: signInt(d.slice(2, 4).reduce(msbLsb),16) / 100
+					ORP: signInt(d.slice(0, 2).reduce(msbLsb), 16),
+					Temp: signInt(d.slice(2, 4).reduce(msbLsb),16) / 100
 				};
 			}
 		},
@@ -5660,79 +5026,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) => {
@@ -8213,369 +7506,30 @@ function sensor_types(parent){
 					'firmware': frame[2],
 					'sampling_rate': frame[16] + 'Hz',
 					'current_calibration': (frame.slice(17, 21).reduce(msbLsb)) * 10,
-					'deadband': frame.slice(21, 23).reduce(msbLsb) + 'mA',
-					'max_supported_ct': frame.slice(23, 27).reduce(msbLsb),
-					'hardware_id': frame.slice(27, 30),
-					'report_rate': frame.slice(30, 34).reduce(msbLsb) + "sec",
-					'tx_life_counter': frame.slice(34, 38).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
-						'sampling_rate': frame[16],
-						'current_calibration': frame.slice(17, 21),
-						'deadband': frame.slice(21, 23),
-						'max_supported_ct': frame.slice(23, 27),
-						'hardware_id': frame.slice(27, 30),
-						'report_rate': frame.slice(30, 34),
-						'tx_life_counter': frame.slice(34, 38)
-					}
-				}
-			}
-		},
-		'88': {
-			name: '1 Channel Ultrasound Vibration Sensor',
-			parse: (d) => {
-				return {
-					raw_adc: d.slice(0, 2).reduce(msbLsb),
-					ma: d.slice(2, 4).reduce(msbLsb) / 100,
-					db: d.slice(4, 6).reduce(msbLsb) / 100
-				};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				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
-						}
-					}
-				}
-			}
-		},
-		'89': {
-			name: '2 Channel 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];
-				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
-				};
-			}
-		},
-		'92': {
-			name: 'Sound Sensor',
-			parse: (d) => {
-				return {
-					sound: signInt(d[3], 8)/100
-				};
-			}
-		},
-		'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 {
+					'deadband': frame.slice(21, 23).reduce(msbLsb) + 'mA',
+					'max_supported_ct': frame.slice(23, 27).reduce(msbLsb),
+					'hardware_id': frame.slice(27, 30),
+					'report_rate': frame.slice(30, 34).reduce(msbLsb) + "sec",
+					'tx_life_counter': frame.slice(34, 38).reduce(msbLsb),
+					'machine_values': {
 						'firmware': frame[2],
-						'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)
-						}
+						'sampling_rate': frame[16],
+						'current_calibration': frame.slice(17, 21),
+						'deadband': frame.slice(21, 23),
+						'max_supported_ct': frame.slice(23, 27),
+						'hardware_id': frame.slice(27, 30),
+						'report_rate': frame.slice(30, 34),
+						'tx_life_counter': frame.slice(34, 38)
 					}
 				}
 			}
 		},
-		'96': {
-			name: '16-Bit 1-Channel 0-48VDC Receiver',
+		'90': {
+			name: 'DC Current Sensor',
 			parse: (d) => {
 				return {
-					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					vdc: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
+					raw_adc: d.slice(0, 2).reduce(msbLsb),
+					amps: d.slice(2, 6).reduce(msbLsb) / 10,
 				};
 			},
 			'parse_fly': (frame) => {
@@ -8588,7 +7542,7 @@ 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";
@@ -8618,30 +7572,42 @@ 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)
+							'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
+				};
+			}
+		},
+		'92': {
+			name: 'Sound Sensor',
+			parse: (d) => {
+				return {
+					sound: signInt(d[3], 8)/100
+				};
+			}
+		},
 		'97': {
 			name: 'One channel Dynamic Ultrasound vibration Sensor',
 			parse: (payload, parsed, mac) => {
@@ -9245,92 +8211,6 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'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";
-					}
-					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)
-						}
-					}
-				}
-			}
-		},
 		'108': {
 			name: 'Machine Uptime Monitoring Sensor',
 			parse: (d, payload) => {
@@ -11443,134 +10323,29 @@ function sensor_types(parent){
 						'sample_rate': frame.slice(17, 21).reduce(msbLsb),
 						'tx_life_counter': frame.slice(21, 25).reduce(msbLsb)
 					}
-				}
-			}
-		},
-		'121':{
-			name: 'Wireless Wood Moisture Sensor',
-			parse: (d) => {
-				return {
-					wood_type: d[0],
-					temperature: signInt(d.slice(1, 3).reduce(msbLsb), 16) / 100,
-					humidity: d.slice(3, 5).reduce(msbLsb) / 100,
-					wood_moisture: d.slice(5, 7).reduce(msbLsb) / 100,
-					wood_resistance: (d.slice(7, 15)).reduce(msbLsb) / 100
-				};
-			},
-			'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
-						}
+				}
+			}
+		},
+		'121':{
+			name: 'Wireless Wood Moisture Sensor',
+			parse: (d) => {
+				return {
+					wood_type: d[0],
+					temperature: signInt(d.slice(1, 3).reduce(msbLsb), 16) / 100,
+					humidity: d.slice(3, 5).reduce(msbLsb) / 100,
+					wood_moisture: d.slice(5, 7).reduce(msbLsb) / 100,
+					wood_resistance: (d.slice(7, 15)).reduce(msbLsb) / 100
+				};
+			},
+			'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)
 					}
 				}
 			}
@@ -14929,178 +13704,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) => {
@@ -15602,167 +14205,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) => {