@ncd-io/node-red-enterprise-sensors 1.4.3 → 1.4.5

package/lib/WirelessGateway.js

@@ -160,7 +160,7 @@ module.exports = class WirelessSensor{
 				}
 			}
 			// #OTF
-			var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,101,102,103,105,106,107,108,109,110,111,112,114,117,118,120,121,122,123,180,181,202,217,211,270,519,520,521,531,535,537,538,539,540,541,1010,1011];
+			var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,101,102,103,105,106,107,108,109,110,111,112,114,117,118,119,120,121,122,123,124,180,181,202,217,211,270,519,520,521,531,535,536,537,538,539,540,541,542,543,1010,1011];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -235,6 +235,11 @@ module.exports = class WirelessSensor{
 			}else if(mode === 'ACK'){
 				this.sensor_pool[frame.mac].status = data.result;
 				if(data.data.length){
+					if(data.sensor_type == 110 || data.sensor_type == 111 || data.sensor_type == 112 || data.sensor_type == 114 || data.sensor_type == 543){
+						if(data.data[0] == 77 && data.data[1] == 79 && data.data[2] == 70 && data.data[3] == 70 && data.data[4] == 0){
+							this.sensor_pool[frame.mac].mode = 'MOFF';
+						}
+					}
 					this.sensor_pool[frame.mac].data = data.data;
 				};
 			}
@@ -287,6 +292,9 @@ module.exports = class WirelessSensor{
 		};
 	}
 	config_ack(payload){
+		if((msbLsb(payload[2], payload[3])) == 28){
+			payload[5] = payload[6];
+		}
 		return {
 			nodeId: payload[0],
 			counter: payload[1],
@@ -323,18 +331,37 @@ module.exports = class WirelessSensor{
 		};
 	}
 	sensor_data(payload, frame){
+
+		let sensor_type = msbLsb(payload[5], payload[6]);
+		let battery_percent = ((msbLsb(payload[2], payload[3]) * 0.361) - 269.66).toFixed(2);
+		let voltage = (msbLsb(payload[2], payload[3]) * 0.00322).toFixed(2);
+
+		if(sensor_type == 110 || sensor_type == 111 || sensor_type == 112 || sensor_type == 114 || sensor_type == 543){
+			const vMin = 2.5;
+			const vMax = 3.3;
+		  
+			if (voltage >= vMax){ 
+				battery_percent = '100';
+			} else if (voltage <= vMin){ 
+				battery_percent = '0';
+			} else {
+				const scale = 5.0; // tuning factor for steepness
+				const percent = 100 * (1 - Math.exp(-scale * (voltage - vMin)));
+				battery_percent = (Math.min(100, Math.max(0, percent))).toFixed(2);
+			}
+		}
 		var parsed = {
 			nodeId: payload[0],
 			firmware: payload[1],
-			battery: (msbLsb(payload[2], payload[3]) * 0.00322).toFixed(2),
+			battery: voltage,
 			//	battery_percent: (msbLsb(payload[2], payload[3]) * 0.537 - 449.9).toFixed(2),
-			battery_percent:  ((msbLsb(payload[2], payload[3]) * 0.361) - 269.66).toFixed(2),
+			battery_percent:  battery_percent,
 			counter: payload[4],
-			sensor_type: msbLsb(payload[5], payload[6]),
+			sensor_type: sensor_type
 		};
 
 		// #OTF
-		var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,101,102,103,105,106,107,108,109,110,111,112,114,117,118,120,121,122,123,180,181,202,211,217,270,519,520,521,531,535,537,538,539,540,541,1010,1011];
+		var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,101,102,103,105,106,107,108,109,110,111,112,114,117,118,119,120,121,122,123,124,180,181,202,211,217,270,519,520,521,531,535,536,537,538,539,540,541,542,543,1010,1011];
 		if(otf_devices.includes(parsed.sensor_type)){
 			// If the message says FLY and there is not FLY timer in progress.
 			if(payload[8] == 70 && payload[9] == 76 && payload[10] == 89) {
@@ -756,7 +783,7 @@ module.exports = class WirelessSensor{
 					data: payload.slice(8)
 				};
 				// #OTF
-			}else if(parsed.sensor_type == 21 || parsed.sensor_type == 33 || parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 97 || parsed.sensor_type == 98 || parsed.sensor_type == 103 || parsed.sensor_type == 110 || parsed.sensor_type == 111 || parsed.sensor_type == 112 || parsed.sensor_type == 114 || parsed.sensor_type == 117 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 202 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538){
+			}else if(parsed.sensor_type == 21 || parsed.sensor_type == 33 || parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 97 || parsed.sensor_type == 98 || parsed.sensor_type == 103 || parsed.sensor_type == 110 || parsed.sensor_type == 111 || parsed.sensor_type == 112 || parsed.sensor_type == 114 || parsed.sensor_type == 117 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 202 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538 || parsed.sensor_type == 543){
 				parsed.sensor_data = this.sensor_types[parsed.sensor_type].parse(payload, parsed, frame.mac);
 				if(!parsed.sensor_data){
 					return;
@@ -1336,7 +1363,7 @@ module.exports = class WirelessSensor{
 	}
 	config_set_quality_of_service_108(sensor_mac, value){
 		console.log('config_set_quality_of_service_108');
-		var packet = [244, 52, 0, 0, 0, value];
+		var packet = [247, 52, 0, 0, 0, value];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
@@ -1711,6 +1738,18 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_led_accelerometer_threshold_114(sensor_mac, value){
+		console.log('config_set_led_accelerometer_threshold_114');
+		var packet = [244, 79, 0, 0, 0, 62, 1, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_led_velocity_threshold_114(sensor_mac, value){
+		console.log('config_set_led_velocity_threshold_114');
+		var packet = [244, 79, 0, 0, 0, 64, 1, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_acceleration_interrupt_threshold_84(sensor_mac, value){
 		console.log('config_set_acceleration_interrupt_threshold_84');
 		var packet = [244, 79, 0, 0, 0, 60, value];
@@ -2244,7 +2283,200 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-
+	config_set_volume_flow_unit_124(sensor_mac, value){
+		console.log('config_set_volume_flow_unit_124');
+		var packet = [244, 51, 0, 0, 124, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_total_1_flow_unit_124(sensor_mac, value){
+		console.log('config_set_total_1_flow_unit_124');
+		var packet = [244, 52, 0, 0, 124, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_total_2_flow_unit_124(sensor_mac, value){
+		console.log('config_set_total_2_flow_unit_124');
+		var packet = [244, 53, 0, 0, 124, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_total_3_flow_unit_124(sensor_mac, value){
+		console.log('config_set_total_3_flow_unit_124');
+		var packet = [244, 54, 0, 0, 124, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_pressure_unit_124(sensor_mac, value){
+		console.log('config_set_pressure_unit_124');
+		var packet = [244, 55, 0, 0, 124, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_total_1_op_mode_124(sensor_mac, value){
+		console.log('config_set_total_1_op_mode_124');
+		var packet = [244, 48, 0, 0, 124, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_total_2_op_mode_124(sensor_mac, value){
+		console.log('config_set_total_2_op_mode_124');
+		var packet = [244, 49, 0, 0, 124, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_total_3_op_mode_124(sensor_mac, value){
+		console.log('config_set_total_3_op_mode_124');
+		var packet = [244, 50, 0, 0, 124, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_conductivity_unit_124(sensor_mac, value){
+		console.log('config_set_conductivity_unit_124');
+		var packet = [244, 56, 0, 0, 124, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_reset_all_totalizers_124(sensor_mac, value){
+		console.log('config_set_reset_all_totalizers_124');
+		var packet = [244, 64, 0, 0, 124, 1];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_screen_control_108(sensor_mac, value){
+		console.log('config_set_screen_control_108');
+		var packet = [244, 69, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_screen_on_time_108(sensor_mac, value){
+		console.log('config_set_screen_on_time_108');
+		var packet = [244, 67, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_boot_time_536(sensor_mac, value){
+		console.log('config_set_oxygen_boot_time_536');
+		var packet = [244, 41, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_flow_boot_time_536(sensor_mac, value){
+		console.log('config_set_flow_boot_time_536');
+		var packet = [244, 49, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_dev_addr_536(sensor_mac, id_1, id_2, id_3, id_4){
+		console.log('config_set_oxygen_dev_addr_536');
+		var packet = [244, 51, 0, 0, 0, id_1, id_2, id_3, id_4];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_flow_dev_addr_536(sensor_mac, id_1, id_2, id_3, id_4){
+		console.log('config_set_flow_dev_addr_536');
+		var packet = [244, 53, 0, 0, 0, id_1, id_2, id_3, id_4];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_rate_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;
+		var packet = [244, 34, 0, 0, 0, 1];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_max_threshold_s2_536(sensor_mac, value){
+		console.log('config_set_oxygen_max_threshold_s2_536');
+		value = value * 100;
+		var packet = [244, 34, 0, 0, 0, 2];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_max_threshold_s3_536(sensor_mac, value){
+		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);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_max_threshold_s4_536(sensor_mac, value){
+		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);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_min_threshold_s1_536(sensor_mac, value){
+		console.log('config_set_oxygen_min_threshold_s1_536');
+		value = value * 100;
+		var packet = [244, 39, 0, 0, 0, 1];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_min_threshold_s2_536(sensor_mac, value){
+		console.log('config_set_oxygen_min_threshold_s2_536');
+		value = value * 100;
+		var packet = [244, 39, 0, 0, 0, 2];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_min_threshold_s3_536(sensor_mac, value){
+		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);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_oxygen_min_threshold_s4_536(sensor_mac, value){
+		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);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_axis_enabled_119(sensor_mac, value){
+		console.log('config_set_axis_enabled_119');
+		var packet = [244, 73, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_raw_acc_data_119(sensor_mac, value){
+		console.log('config_set_raw_acc_data_119');
+		var packet = [244, 71, 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) => {
@@ -4183,12 +4415,9 @@ function sensor_types(parent){
 						'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),
+						'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],
@@ -8668,7 +8897,7 @@ function sensor_types(parent){
 				}
 			},
 			'parse_fly': (frame) => {
-				if(frame[2] > 9){ // firmware 10 and above
+				if(frame[2] == 19){ // Screen version fw 19
 					let reset_mode = "Disabled";
 					switch(frame[38]){
 						case 0:
@@ -8681,40 +8910,40 @@ function sensor_types(parent){
 							reset_mode = "Timeout";
 							break;
 					}
-					let acc_odr = "10Hz";
+					let acc_odr = "10 Hz";
 					switch(frame[40]){
 						case 0:
-							acc_odr = "10Hz";
+							acc_odr = "10 Hz";
 							break;
 						case 1:
-							acc_odr = "20Hz";
+							acc_odr = "20 Hz";
 							break;
 						case 2:
-							acc_odr = "50Hz";
+							acc_odr = "50 Hz";
 							break;
 						case 3:
-							acc_odr = "100Hz";
+							acc_odr = "100 Hz";
 							break;
 						case 4:
-							acc_odr = "200Hz";
+							acc_odr = "200 Hz";
 							break;
 						case 5:
-							acc_odr = "400Hz";
+							acc_odr = "400 Hz";
 							break;
 					}
-					let rtc_sampling_interval = "5 seconds";
+					let rtc_sampling_interval = "5 sec";
 					switch(frame[39]){
 						case 0:
-							rtc_sampling_interval = "1 minute";
+							rtc_sampling_interval = "1 min";
 							break;
 						case 1:
-							rtc_sampling_interval = "5 minutes";
+							rtc_sampling_interval = "5 min";
 							break;
 						case 2:
-							rtc_sampling_interval = "15 minutes";
+							rtc_sampling_interval = "15 min";
 							break;
 						case 3:
-							rtc_sampling_interval = "30 minutes";
+							rtc_sampling_interval = "30 min";
 							break;
 						case 4:
 							rtc_sampling_interval = "1 hour";
@@ -8732,22 +8961,40 @@ function sensor_types(parent){
 							rtc_sampling_interval = "12 hours";
 							break;
 						case 9:
-							rtc_sampling_interval = "5 seconds";
+							rtc_sampling_interval = "5 sec";
 							break;
 						case 10:
-							rtc_sampling_interval = "10 seconds";
+							rtc_sampling_interval = "10 sec";
 							break;
 						case 11:
-							rtc_sampling_interval = "15 seconds";
+							rtc_sampling_interval = "15 sec";
 							break;
 						case 12:
-							rtc_sampling_interval = "30 seconds";
+							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],
-						'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",
@@ -8770,13 +9017,16 @@ 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,
-						'hardware_id': frame.slice(41, 44),
-						'report_rate': frame.slice(44, 48).reduce(msbLsb) + "sec",
-						'tx_life_counter': frame.slice(48, 52).reduce(msbLsb),
+						'screen_control': screen_control,
+						'screen_on_time': frame[42] + ' sec',
+						'interrupt_timeout': frame[43] + ' msec',
+						'hardware_id': frame.slice(44, 47),
+						'report_rate': frame.slice(47, 51).reduce(msbLsb) + " sec",
+						'tx_life_counter': frame.slice(51, 55).reduce(msbLsb),
 						'machine_values': {
 							'firmware': frame[2],
 							'accelerometer_threshold': frame[16],
@@ -8795,14 +9045,17 @@ function sensor_types(parent){
 							'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)
+							'screen_control': frame[41],
+							'screen_on_time': frame[42],
+							'interrupt_timeout': frame[43],
+							'hardware_id': frame.slice(44, 47),
+							'report_rate': frame.slice(47, 51),
+							'tx_life_counter': frame.slice(51, 55)
 						}
 					}
-				} else if(frame[2] > 8){
+				} else if(frame[2] == 16){ // Screen version
 					let reset_mode = "Disabled";
-					switch(frame[37]){
+					switch(frame[38]){
 						case 0:
 							reset_mode = "Disabled";
 							break;
@@ -8814,7 +9067,7 @@ function sensor_types(parent){
 							break;
 					}
 					let acc_odr = "10Hz";
-					switch(frame[39]){
+					switch(frame[40]){
 						case 0:
 							acc_odr = "10Hz";
 							break;
@@ -8835,7 +9088,7 @@ function sensor_types(parent){
 							break;
 					}
 					let rtc_sampling_interval = "5 seconds";
-					switch(frame[38]){
+					switch(frame[39]){
 						case 0:
 							rtc_sampling_interval = "1 minute";
 							break;
@@ -8876,97 +9129,217 @@ function sensor_types(parent){
 							rtc_sampling_interval = "30 seconds";
 							break;
 					}
+					let screen_control = 0;
+					switch(frame[41]){
+						case 0:
+							screen_control = "IO1";
+							break;
+						case 1:
+							screen_control = "IO2";
+							break;
+						case 2:
+							screen_control = "IO3";
+							break;
+						case 3:
+							screen_control = "Accelero";
+							break;
+						case 4:
+							screen_control = "Magneto";
+							break;
+					}
 					return {
 						'firmware': frame[2],
 						'accelerometer_threshold': (frame[16]* 32) + "mg",
-						'debouncing_timeout': frame[17] + "msec",
-						'accelero_state': frame[18]? "Enabled": "Disabled",
-						'input_1_active_edge': frame[19]? "Rising": "Falling",
-						'input_2_active_edge': frame[20]? "Rising": "Falling",
-						'input_3_active_edge': frame[21]? "Rising": "Falling",
-						'counter_threshold': frame.slice(22, 26).reduce(msbLsb),
-						'trasnmit_on_change_status': frame[26]? "Enabled": "Disabled",
+						'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[27]).padStart(2, '0'),
-							String(frame[28]).padStart(2, '0')
+							String(frame[28]).padStart(2, '0'),
+							String(frame[29]).padStart(2, '0')
 						].join(':'),
 						'Shift_end_2': [
-							String(frame[29]).padStart(2, '0'),
-							String(frame[30]).padStart(2, '0')
+							String(frame[30]).padStart(2, '0'),
+							String(frame[31]).padStart(2, '0')
 						].join(':'),
 						'Shift_end_3': [
-							String(frame[31]).padStart(2, '0'),
-							String(frame[32]).padStart(2, '0')
+							String(frame[32]).padStart(2, '0'),
+							String(frame[33]).padStart(2, '0')
 						].join(':'),
 						'Shift_end_4': [
-							String(frame[33]).padStart(2, '0'),
-							String(frame[34]).padStart(2, '0')
+							String(frame[34]).padStart(2, '0'),
+							String(frame[35]).padStart(2, '0')
 						].join(':'),
-						'reset_timeout': frame.slice(35, 37).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,
-						'hardware_id': frame.slice(40, 43),
-						'report_rate': frame.slice(43, 47).reduce(msbLsb) + "sec",
-						'tx_life_counter': frame.slice(47, 51).reduce(msbLsb),
+						'screen_control': screen_control,
+						'screen_on_time': frame[42] + 'sec',
+						'hardware_id': frame.slice(43, 46),
+						'report_rate': frame.slice(46, 50).reduce(msbLsb) + "sec",
+						'tx_life_counter': frame.slice(50, 54).reduce(msbLsb),
 						'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) + "mg.",
-						'debouncing_timeout': frame[17].toString() + "msec.",
-						'accelero_state': frame[18],
-						'digital_inputs_active_edge': frame.slice(19, 22).reduce(msbLsb),
-						'counter_threshold': frame.slice(22, 26).reduce(msbLsb),
-						'trasnmit_on_change_status': frame[26],
-						'machine_values': {
-							'firmware': frame[2],
-							'report_rate': frame.slice(12, 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],
+							'hardware_id': frame.slice(43, 46),
+							'report_rate': frame.slice(46, 50),
+							'tx_life_counter': frame.slice(50, 54)
+						}
+					}
+				} else if(frame[2] > 9){ // firmware 10 11 12 13 14 15
+					let reset_mode = "Disabled";
+					switch(frame[38]){
+						case 0:
+							reset_mode = "Disabled";
+							break;
+						case 1:
+							reset_mode = "Shift Ends";
+							break;
+						case 2:
+							reset_mode = "Timeout";
+							break;
+					}
+					let acc_odr = "10Hz";
+					switch(frame[40]){
+						case 0:
+							acc_odr = "10Hz";
+							break;
+						case 1:
+							acc_odr = "20Hz";
+							break;
+						case 2:
+							acc_odr = "50Hz";
+							break;
+						case 3:
+							acc_odr = "100Hz";
+							break;
+						case 4:
+							acc_odr = "200Hz";
+							break;
+						case 5:
+							acc_odr = "400Hz";
+							break;
+					}
+					let rtc_sampling_interval = "5 seconds";
+					switch(frame[39]){
+						case 0:
+							rtc_sampling_interval = "1 minute";
+							break;
+						case 1:
+							rtc_sampling_interval = "5 minutes";
+							break;
+						case 2:
+							rtc_sampling_interval = "15 minutes";
+							break;
+						case 3:
+							rtc_sampling_interval = "30 minutes";
+							break;
+						case 4:
+							rtc_sampling_interval = "1 hour";
+							break;
+						case 5:
+							rtc_sampling_interval = "2 hours";
+							break;
+						case 6:
+							rtc_sampling_interval = "3 hours";
+							break;
+						case 7:
+							rtc_sampling_interval = "6 hours";
+							break;
+						case 8:
+							rtc_sampling_interval = "12 hours";
+							break;
+						case 9:
+							rtc_sampling_interval = "5 seconds";
+							break;
+						case 10:
+							rtc_sampling_interval = "10 seconds";
+							break;
+						case 11:
+							rtc_sampling_interval = "15 seconds";
+							break;
+						case 12:
+							rtc_sampling_interval = "30 seconds";
+							break;
+					}
+					return {
+						'firmware': frame[2],
+						'accelerometer_threshold': (frame[16]* 32) + "mg",
+						'debouncing_timeout': frame.slice(17, 19).reduce(msbLsb) + "msec",
+						'accelero_state': frame[19]? "Enabled": "Disabled",
+						'input_1_active_edge': frame[20]? "Rising": "Falling",
+						'input_2_active_edge': frame[21]? "Rising": "Falling",
+						'input_3_active_edge': frame[22]? "Rising": "Falling",
+						'counter_threshold': frame.slice(23, 27).reduce(msbLsb),
+						'trasnmit_on_change_status': frame[27]? "Enabled": "Disabled",
+						'Shift_end_1': [
+							String(frame[28]).padStart(2, '0'),
+							String(frame[29]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_2': [
+							String(frame[30]).padStart(2, '0'),
+							String(frame[31]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_3': [
+							String(frame[32]).padStart(2, '0'),
+							String(frame[33]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_4': [
+							String(frame[34]).padStart(2, '0'),
+							String(frame[35]).padStart(2, '0')
+						].join(':'),
+						'reset_timeout': frame.slice(36, 38).reduce(msbLsb) + "min",
+						'counter_reset_mode': reset_mode,
+						'sampling_interval': rtc_sampling_interval,
+						'acc_odr': acc_odr,
+						'hardware_id': frame.slice(41, 44),
+						'report_rate': frame.slice(44, 48).reduce(msbLsb) + "sec",
+						'tx_life_counter': frame.slice(48, 52).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
 							'accelerometer_threshold': frame[16],
-							'debouncing_timeout': frame[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]
+							'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)
 						}
 					}
-				}
-			}
-		},
-		'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) => {
-				if(frame[2] > 8){
+				} else if(frame[2] > 8){
 					let reset_mode = "Disabled";
 					switch(frame[37]){
 						case 0:
@@ -9045,12 +9418,12 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'accelerometer_threshold': (frame[16]* 32) + "mg",
-						'debouncing_timeout': frame[17] + "sec",
+						'debouncing_timeout': frame[17] + "msec",
 						'accelero_state': frame[18]? "Enabled": "Disabled",
 						'input_1_active_edge': frame[19]? "Rising": "Falling",
 						'input_2_active_edge': frame[20]? "Rising": "Falling",
 						'input_3_active_edge': frame[21]? "Rising": "Falling",
-						'counter_threshold': frame.slice(22, 26).reduce(msbLsb) + "sec",
+						'counter_threshold': frame.slice(22, 26).reduce(msbLsb),
 						'trasnmit_on_change_status': frame[26]? "Enabled": "Disabled",
 						'Shift_end_1': [
 							String(frame[27]).padStart(2, '0'),
@@ -9102,11 +9475,11 @@ function sensor_types(parent){
 					return {
 						'firmware': frame[2],
 						'report_rate': frame.slice(12, 16).reduce(msbLsb).toString() + "sec.",
-						'accelerometer_threshold': (frame[16]* 32).toString() + "mg.",
-						'debouncing_timeout': frame[17].toString() + "sec.",
+						'accelerometer_threshold': (frame[16]* 32) + "mg.",
+						'debouncing_timeout': frame[17].toString() + "msec.",
 						'accelero_state': frame[18],
 						'digital_inputs_active_edge': frame.slice(19, 22).reduce(msbLsb),
-						'counter_threshold': frame.slice(22, 26).reduce(msbLsb).toString() + "sec.",
+						'counter_threshold': frame.slice(22, 26).reduce(msbLsb),
 						'trasnmit_on_change_status': frame[26],
 						'machine_values': {
 							'firmware': frame[2],
@@ -9132,74 +9505,240 @@ function sensor_types(parent){
 				};
 			},
 			'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)
+				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;
 					}
-				}
-			}
-		},
-		'110': {
-			name: 'One Channel Vibration Plus v4',
-			parse: (payload, parsed, mac) => {
-				if(payload[7] & 2){
-					console.log('Error found');
-					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 a packet is already stored with the same packet ID, or if packet ID is 1, or if current packet ID is not one more than last packet ID
-							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !(((current_packet)-1) in globalDevices[deviceAddr].data)) {
-								console.log('-----');
-								console.log('bad packet breakdown deleting stream');
-								console.log(current_packet);
-								console.log(expected_packets);
-								console.log(current_packet in globalDevices[deviceAddr].data);
-								console.log(current_packet == 1);
-								console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
-								if(this.hasOwnProperty('failure_no')){
-									this.failure_no = this.failure_no + 1;
-								}
-								else{
-									this.failure_no = 1;
-								}
-								if(this.hasOwnProperty('failure_no')){
-									console.log('####falure no');
-									console.log(this.failure_no);
-								}
-								// console.log(globalDevices[deviceAddr].data);
-								delete globalDevices[deviceAddr];
-								if(current_packet != 1){
-									return;
-								} else{
-
-									var mode = payload[8];
-									var odr = msbLsb(payload[9], payload[10]);
-									var fsr = payload[11] >> 5;
-									var temperature = msbLsb(payload[14], payload[15])/100;
-
-									globalDevices[deviceAddr] = {
-										// stream_size: expected_packets,
-										data: {},
-										odr: odr,
+					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).reduce(msbLsb),
+						'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)
+					}
+				}
+			}
+		},
+		'110': {
+			name: 'One Channel Vibration Plus v4',
+			parse: (payload, parsed, mac) => {
+				if(payload[7] & 2){
+					console.log('Error found');
+					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 a packet is already stored with the same packet ID, or if packet ID is 1, or if current packet ID is not one more than last packet ID
+							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !(((current_packet)-1) in globalDevices[deviceAddr].data)) {
+								console.log('-----');
+								console.log('bad packet breakdown deleting stream');
+								console.log(current_packet);
+								console.log(expected_packets);
+								console.log(current_packet in globalDevices[deviceAddr].data);
+								console.log(current_packet == 1);
+								console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
+								if(this.hasOwnProperty('failure_no')){
+									this.failure_no = this.failure_no + 1;
+								}
+								else{
+									this.failure_no = 1;
+								}
+								if(this.hasOwnProperty('failure_no')){
+									console.log('####falure no');
+									console.log(this.failure_no);
+								}
+								// console.log(globalDevices[deviceAddr].data);
+								delete globalDevices[deviceAddr];
+								if(current_packet != 1){
+									return;
+								} else{
+
+									var mode = payload[8];
+									var odr = msbLsb(payload[9], payload[10]);
+									var fsr = payload[11] >> 5;
+									var temperature = msbLsb(payload[14], payload[15])/100;
+
+									globalDevices[deviceAddr] = {
+										// stream_size: expected_packets,
+										data: {},
+										odr: odr,
 										mo: mode,
 										fsr: fsr,
 										hour: hour,
@@ -12128,10 +12667,10 @@ function sensor_types(parent){
 			name: 'Dual Pressure and Temperature Sensor',
 			parse: (d) => {
 				return{
-					pressure_s1: signInt(d.slice(0, 4).reduce(msbLsb)) / 100,
-					temperature_s1: signInt(d.slice(4, 6).reduce(msbLsb))/100,
-					pressure_s2: signInt(d.slice(6, 10).reduce(msbLsb)) / 100,
-					temperature_s2: signInt(d.slice(10, 12).reduce(msbLsb))/100
+					pressure_s1: signInt(d.slice(0, 4).reduce(msbLsb),16)/100,
+					temperature_s1: signInt(d.slice(4, 6).reduce(msbLsb),16)/100,
+					pressure_s2: signInt(d.slice(6, 10).reduce(msbLsb),16)/100,
+					temperature_s2: signInt(d.slice(10, 12).reduce(msbLsb),16)/100
 				};
 			},
 			'parse_fly': (frame) => {
@@ -12207,35 +12746,308 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'120': {
-			name: 'Wireless H2S Sensor',
-			parse: (d) => {
-				return {
-					ppm: d.slice(0, 2).reduce(msbLsb),
-					temperature: signInt(d.slice(2, 4).reduce(msbLsb), 16) / 100,
-					humidity: signInt(d.slice(4, 6).reduce(msbLsb), 16) / 100
-				};
-			},
-			'parse_fly': (frame) => {
-				return {
-					'firmware': frame[2],
-					'h2s_threshold': frame[12],
-					'always_on_status': frame[13],
-					'hardware_id': frame.slice(14, 17),
-					'sample_rate': frame.slice(17, 21).reduce(msbLsb) + " Sec.",
-					'tx_life_counter': frame.slice(21, 25).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
-						'h2s threshold': frame[12],
-						'always_on_status': frame[13],
-						'hardware_id': frame.slice(14, 17),
-						'sample_rate': frame.slice(17, 21).reduce(msbLsb),
-						'tx_life_counter': frame.slice(21, 25).reduce(msbLsb)
-					}
+		'119': {
+			name: 'Wireless Machine Run Time Hour Meter',
+			parse: (d, payload) => {
+				let firmware = payload[1];
+				if(payload[7] & 2 != 0){
+					console.log('Error found');
+					// parsed.data = {error: 'Error found, Acclerometer Probe may be unattached'};
+					let error = {error: 'Error found, Acclerometer Probe may be unattached'};
+					return error;
 				}
-			}
-		},
-		'121':{
+				let report_type = "Regular";
+				switch(d[17]){
+					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;
+				}
+				if ((payload[7] & 4) != 0) {
+					return {
+						raw_data: "Enabled",
+						accelerometer_counter: d.slice(0, 4).reduce(msbLsb),
+						accelerometer_uptime: d.slice(4, 8).reduce(msbLsb),
+						magnetometer_counter: d.slice(8, 12).reduce(msbLsb),
+						magnetometer_uptime: d.slice(12, 16).reduce(msbLsb),
+						input_acc: d[16] & 8 ? 1 : 0,
+						input_mag: d[16] & 16 ? 1 : 0,
+						report_type: report_type,
+						rtc: [
+							String(d[18]).padStart(2, '0'),
+							String(d[19]).padStart(2, '0'),
+							String(d[20]).padStart(2, '0')
+						].join(':'),
+						'temperature': d.slice(21, 23).reduce(msbLsb)/100,
+						'accelero_sample_1':{
+							x:[signInt(d.slice(23, 25).reduce(msbLsb),16)/100],
+							y:[signInt(d.slice(25, 27).reduce(msbLsb),16)/100],
+							z:[signInt(d.slice(27, 29).reduce(msbLsb),16)/100]
+						},
+						'accelero_sample_2':{
+							x:[signInt(d.slice(29, 31).reduce(msbLsb),16)/100],
+							y:[signInt(d.slice(31, 33).reduce(msbLsb),16)/100],
+							z:[signInt(d.slice(33, 35).reduce(msbLsb),16)/100]
+						},
+						'accelero_sample_3':{
+							x:[signInt(d.slice(35, 37).reduce(msbLsb),16)/100],
+							y:[signInt(d.slice(37, 39).reduce(msbLsb),16)/100],
+							z:[signInt(d.slice(39, 41).reduce(msbLsb),16)/100]
+						},
+						'accelero_sample_4':{
+							x:[signInt(d.slice(41, 43).reduce(msbLsb),16)/100],
+							y:[signInt(d.slice(43, 45).reduce(msbLsb),16)/100],
+							z:[signInt(d.slice(45, 47).reduce(msbLsb),16)/100]
+						},
+						'accelero_sample_5':{
+							x:[signInt(d.slice(47, 49).reduce(msbLsb),16)/100],
+							y:[signInt(d.slice(49, 51).reduce(msbLsb),16)/100],
+							z:[signInt(d.slice(51, 53).reduce(msbLsb),16)/100]
+						},
+						'accelero_sample_6':{
+							x:[signInt(d.slice(53, 55).reduce(msbLsb),16)/100],
+							y:[signInt(d.slice(55, 57).reduce(msbLsb),16)/100],
+							z:[signInt(d.slice(57, 59).reduce(msbLsb),16)/100]
+						},
+						'accelero_sample_7':{
+							x:[signInt(d.slice(59, 61).reduce(msbLsb),16)/100],
+							y:[signInt(d.slice(61, 63).reduce(msbLsb),16)/100],
+							z:[signInt(d.slice(63, 65).reduce(msbLsb),16)/100]
+						},
+						'accelero_sample_8':{
+							x:[signInt(d.slice(65, 67).reduce(msbLsb),16)/100],
+							y:[signInt(d.slice(67, 69).reduce(msbLsb),16)/100],
+							z:[signInt(d.slice(69, 71).reduce(msbLsb),16)/100]
+						},
+						'accelero_sample_9':{
+							x:[signInt(d.slice(71, 73).reduce(msbLsb),16)/100],
+							y:[signInt(d.slice(73, 75).reduce(msbLsb),16)/100],
+							z:[signInt(d.slice(75, 77).reduce(msbLsb),16)/100]
+						},
+						'accelero_sample_10':{
+							x:[signInt(d.slice(77, 79).reduce(msbLsb),16)/100],
+							y:[signInt(d.slice(79, 81).reduce(msbLsb),16)/100],
+							z:[signInt(d.slice(81, 83).reduce(msbLsb),16)/100]
+						}
+					};
+				}else{
+					return {
+						raw_data: "Disabled",
+						accelerometer_counter: d.slice(0, 4).reduce(msbLsb),
+						accelerometer_uptime: d.slice(4, 8).reduce(msbLsb),
+						magnetometer_counter: d.slice(8, 12).reduce(msbLsb),
+						magnetometer_uptime: d.slice(12, 16).reduce(msbLsb),
+						input_acc: d[16] & 8 ? 1 : 0,
+						input_mag: d[16] & 16 ? 1 : 0,
+						report_type: report_type,
+						rtc: [
+							String(d[18]).padStart(2, '0'),
+							String(d[19]).padStart(2, '0'),
+							String(d[20]).padStart(2, '0')
+						].join(':'),
+						'temperature': d.slice(21, 23).reduce(msbLsb)/100
+					};
+				}
+			},
+			'parse_fly': (frame) => {
+				let reset_mode = "Disabled";
+				switch(frame[35]){
+					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[37]){
+					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";
+						break;
+					case 4:
+						acc_odr = "200 Hz";
+						break;
+					case 5:
+						acc_odr = "400 Hz";
+						break;
+				}
+				let rtc_sampling_interval = "5 sec";
+				switch(frame[36]){
+					case 0:
+						rtc_sampling_interval = "1 min";
+						break;
+					case 1:
+						rtc_sampling_interval = "5 min";
+						break;
+					case 2:
+						rtc_sampling_interval = "15 min";
+						break;
+					case 3:
+						rtc_sampling_interval = "30 min";
+						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 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 acc_enabled_axis = 'Disabled All';
+				switch(frame[40]){
+					case 0:
+						acc_enabled_axis = 'Disabled All';
+						break;
+					case 1:
+						acc_enabled_axis = 'x axis';
+						break;
+					case 2:
+						acc_enabled_axis = 'y axis';
+						break;
+					case 3:
+						acc_enabled_axis = 'z axis';
+						break;
+					case 7:
+						acc_enabled_axis = 'all axis';
+						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",
+					'counter_threshold': frame.slice(20, 24).reduce(msbLsb),
+					'trasnmit_on_change_status': frame[24]? "Enabled": "Disabled",
+					'Shift_end_1': [
+						String(frame[25]).padStart(2, '0'),
+						String(frame[26]).padStart(2, '0')
+					].join(':'),
+					'Shift_end_2': [
+						String(frame[27]).padStart(2, '0'),
+						String(frame[28]).padStart(2, '0')
+					].join(':'),
+					'Shift_end_3': [
+						String(frame[29]).padStart(2, '0'),
+						String(frame[30]).padStart(2, '0')
+					].join(':'),
+					'Shift_end_4': [
+						String(frame[31]).padStart(2, '0'),
+						String(frame[32]).padStart(2, '0')
+					].join(':'),
+					'reset_timeout': frame.slice(33, 35).reduce(msbLsb) + " min",
+					'counter_reset_mode': reset_mode,
+					'sampling_interval': rtc_sampling_interval,
+					'acc_odr': acc_odr,
+					'interrupt_timeout': frame.slice(38, 40).reduce(msbLsb) + ' msec',
+					'acc_enabled_axis': acc_enabled_axis,
+					'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]* 32),
+						'debouncing_timeout': frame.slice(17, 19),
+						'accelero_state': frame[19],
+						'counter_threshold': frame.slice(20, 24),
+						'trasnmit_on_change_status': frame[24],
+						'Shift_end_1': [
+							frame[25],
+							frame[26]
+						],
+						'Shift_end_2': [
+							frame[27],
+							frame[28]
+						],
+						'Shift_end_3': [
+							frame[29],
+							frame[30]
+						],
+						'Shift_end_4': [
+							frame[31],
+							frame[32]
+						],
+						'reset_timeout': frame.slice(33, 35),
+						'counter_reset_mode': frame[35],
+						'sampling_interval': frame[36],
+						'acc_odr': frame[37],
+						'interrupt_timeout': frame.slice(38, 40),
+						'acc_enabled_axis': frame[40],
+						'hardware_id': frame.slice(41, 44),
+						'report_rate': frame.slice(44, 48),
+						'tx_life_counter': frame.slice(48, 52)
+					}
+				}
+			}
+		},
+		'120': {
+			name: 'Wireless H2S Sensor',
+			parse: (d) => {
+				return {
+					ppm: d.slice(0, 2).reduce(msbLsb),
+					temperature: signInt(d.slice(2, 4).reduce(msbLsb), 16) / 100,
+					humidity: signInt(d.slice(4, 6).reduce(msbLsb), 16) / 100
+				};
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'h2s_threshold': frame[12],
+					'always_on_status': frame[13],
+					'hardware_id': frame.slice(14, 17),
+					'sample_rate': frame.slice(17, 21).reduce(msbLsb) + " Sec.",
+					'tx_life_counter': frame.slice(21, 25).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'h2s threshold': frame[12],
+						'always_on_status': frame[13],
+						'hardware_id': frame.slice(14, 17),
+						'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 {
@@ -12305,7 +13117,7 @@ function sensor_types(parent){
 						'firmware': frame[2],
 						'fsr': frame_data.fsr,
 						'boot_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'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',
@@ -12319,7 +13131,7 @@ function sensor_types(parent){
 							'firmware': frame[2],
 							'fsr': frame[16],
 							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
+							'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],
@@ -12488,9 +13300,10 @@ function sensor_types(parent){
 					'reset_timeout': frame.slice(34, 36).reduce(msbLsb) + "min",
 					'counter_reset_mode': reset_mode,
 					'sampling_interval': rtc_sampling_interval,
-					'hardware_id': frame.slice(38, 41),
-					'report_rate': frame.slice(41, 45).reduce(msbLsb) + "sec",
-					'tx_life_counter': frame.slice(45, 49).reduce(msbLsb),
+					'interrupt_timeout': frame.slice(38, 40).reduce(msbLsb) + "msec",
+					'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],
 						'debouncing_timeout': frame.slice(16, 18),
@@ -12506,185 +13319,639 @@ function sensor_types(parent){
 						'reset_timeout': frame.slice(34, 36),
 						'counter_reset_mode': frame[36],
 						'sampling_interval': frame[37],
-						'hardware_id': frame.slice(38, 41),
-						'report_rate': frame.slice(41, 45),
-						'tx_life_counter': frame.slice(45, 49)
+						'interrupt_timeout': frame.slice(38, 40),
+						'hardware_id': frame.slice(40, 43),
+						'report_rate': frame.slice(43, 47),
+						'tx_life_counter': frame.slice(47, 51)
 					}
 				}
 			}
 		},
-		'180': {
-			name: 'C1D2 One Channel Vibration Plus',
-			parse: (payload, parsed, mac) => {
-				return parent.sensor_types[80].parse(payload, parsed, mac);
-			},
-			parse_fly: (payload, parsed, mac) => {
-				return parent.sensor_types[80].parse_fly(payload, parsed, mac);
-			},
-		},
-		'181': {
-			name: 'C1D2 Two Channel Vibration Plus',
-			parse: (payload, parsed, mac) => {
-				return parent.sensor_types[81].parse(payload, parsed, mac);
-			},
-			parse_fly: (payload, parsed, mac) => {
-				return parent.sensor_types[81].parse_fly(payload, parsed, mac);
-			},
-		},
-		'200': {
-			name: '4-20mA Pass Through',
+		'124': {
+			name: 'Wireless EH Flow Sensor',
 			parse: (d) => {
-				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
-				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
-				var dac1 = signInt(d.slice(4, 6).reduce(msbLsb));
-				return {
-					adc1: adc1,
-					adc2: adc2,
-					dac1: dac1,
-					mA1: parseFloat((adc1/100.00).toFixed(2)),
-					raw_adc: adc2,
-					raw_dac: dac1
-				};
-			}
-		},
-		'202': {
-			name: 'Wireless Weather Station',
-			parse: (payload, parsed, mac) => {
 				return {
-					Temp: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
-					Humid: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100,
-					Pressure: signInt(payload.slice(16, 20).reduce(msbLsb), 32) / 100,
-					WindSpd: signInt(payload.slice(20, 24).reduce(msbLsb),32) / 100,
-					WindDir: signInt(payload.slice(24, 28).reduce(msbLsb),32) / 100,
-					reserve: payload[7]
-				};
-			}
-		},
-		'211': {
-			name: 'D0 and Flow Sensor',
-			parse: (payload, parsed, mac) => {
-				if(payload[0] == 0){ // regular
-					return {
-						msg_type: 'regular',
-						temperature: signInt(payload.slice(1, 3).reduce(msbLsb), 16),
-						oxygen_saturation_percent: payload.slice(3, 7).reduce(msbLsb),
-						oxygen_ppm: payload.slice(7, 11).reduce(msbLsb),
-						oxygen_mg_l: payload.slice(11, 15).reduce(msbLsb)
-					};
-				}
-				else{ // theshold
-					let solenoid_status = payload[2];
-					if(solenoid_status == 1){ // Solenoid On
-						return {
-							msg_type: 'threshold',
-							solenoid_number: payload[1],
-							solenoid_status: 'on',
-							temperature: signInt(payload.slice(3, 5).reduce(msbLsb), 16),
-							oxygen_saturation_percent: payload.slice(5, 9).reduce(msbLsb),
-							oxygen_ppm: payload.slice(9, 13).reduce(msbLsb),
-							oxygen_mg_l: payload.slice(13, 17).reduce(msbLsb),
-							flow_rate: payload.slice(17, 21).reduce(msbLsb)
-						};
-					} else{ // Solenoid Off
-						return {
-							msg_type: 'threshold',
-							solenoid_number: payload[1],
-							solenoid_status: 'off',
-							temperature: signInt(payload.slice(3, 5).reduce(msbLsb), 16),
-							oxygen_saturation_percent: payload.slice(5, 9).reduce(msbLsb),
-							oxygen_ppm: payload.slice(9, 13).reduce(msbLsb),
-							oxygen_mg_l: payload.slice(13, 17).reduce(msbLsb)
-						};
-					}
-				}
-			},
-			'parse_fly': (frame) => {
-				return {
-					'firmware': frame[2],
-					'hardware_id': frame.slice(12, 15),
-					'report_rate': frame.slice(15, 19).reduce(msbLsb) + "Sec",
-					'tx_life_counter': frame.slice(19, 23).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
-						'hardware_id': frame.slice(12, 15),
-						'report_rate': frame.slice(15, 19),
-						'tx_life_counter': frame.slice(19, 23)
-					}
-				}
-			}
-		},
-		'217': {
-			name: 'Wireless Weight Scale',
-			parse: (d) => {
-				return {
-					weight: signInt(d.slice(0, 4).reduce(msbLsb)) / 100
-				};
-			}
-		},
-		'270': {
-			name: 'Custom Salinity DO sensor',
-			parse: (d) => {
-				return {
-					sensor_status: d[0],
-					do_temperature_1: d.slice(1, 3).reduce(msbLsb) / 100,
-					do_temperature_2: d.slice(3, 5).reduce(msbLsb) / 100,
-					do_temperature_3: d.slice(5, 7).reduce(msbLsb) / 100,
-					do_temperature_4: d.slice(7, 9).reduce(msbLsb) / 100,
-					ec_temperature_1: d.slice(9, 11).reduce(msbLsb) / 100,
-					ec_temperature_2: d.slice(11, 13).reduce(msbLsb) / 100,
-					ec_temperature_3: d.slice(13, 15).reduce(msbLsb) / 100,
-					ec_temperature_4: d.slice(15, 17).reduce(msbLsb) / 100,
-					do_saturation_perc_1: d.slice(17, 19).reduce(msbLsb) / 100,
-					do_saturation_perc_2: d.slice(19, 21).reduce(msbLsb) / 100,
-					do_saturation_perc_3: d.slice(21, 23).reduce(msbLsb) / 100,
-					do_saturation_perc_4: d.slice(23, 25).reduce(msbLsb) / 100,
-					do_ppm_1: d.slice(25, 27).reduce(msbLsb) / 100,
-					do_ppm_2: d.slice(27, 29).reduce(msbLsb) / 100,
-					do_ppm_3: d.slice(29, 31).reduce(msbLsb) / 100,
-					do_ppm_4: d.slice(31, 33).reduce(msbLsb) / 100,
-					do_mgl_1: d.slice(33, 35).reduce(msbLsb) / 100,
-					do_mgl_2: d.slice(35, 37).reduce(msbLsb) / 100,
-					do_mgl_3: d.slice(37, 39).reduce(msbLsb) / 100,
-					do_mgl_4: d.slice(39, 41).reduce(msbLsb) / 100,
-					ec_conductivity_1: d.slice(41, 43).reduce(msbLsb) / 100,
-					ec_conductivity_2: d.slice(43, 45).reduce(msbLsb) / 100,
-					ec_conductivity_3: d.slice(45, 47).reduce(msbLsb) / 100,
-					ec_conductivity_4: d.slice(47, 49).reduce(msbLsb) / 100,
-					ec_salinity_ppt_1: d.slice(49, 57).reduce(msbLsb) / 100,
-					ec_salinity_ppt_2: d.slice(57, 65).reduce(msbLsb) / 100,
-					ec_salinity_ppt_3: d.slice(65, 73).reduce(msbLsb) / 100,
-					ec_salinity_ppt_4: d.slice(73, 81).reduce(msbLsb) / 100,
-					ec_tds_1: d.slice(81, 85).reduce(msbLsb) / 100,
-					ec_tds_2: d.slice(85, 89).reduce(msbLsb) / 100,
-					ec_tds_3: d.slice(89, 93).reduce(msbLsb) / 100,
-					ec_tds_4: d.slice(93, 97).reduce(msbLsb) / 100
+					volume_flow: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100,
+					conductivity: d.slice(4, 8).reduce(msbLsb),
+					flow_velocity: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100,
+					pressure: signInt(d.slice(12, 16).reduce(msbLsb),32) / 100,
+					// WARNING doesn't handle decimal values and will round to whole number.
+					total_flow_1: d.slice(16, 24).reduce(msbLsb_to_SignedInt, 0n) / BigInt(100),
+					total_flow_2: d.slice(24, 32).reduce(msbLsb_to_SignedInt, 0n) / BigInt(100),
+					total_flow_3: d.slice(32, 40).reduce(msbLsb_to_SignedInt, 0n) / BigInt(100),
+					battery_life: d.slice(40, 42).reduce(msbLsb),
+					battery_state: d[42],
+					total_flow_1_raw: d.slice(16, 24),
+					total_flow_2_raw: d.slice(24, 32),
+					total_flow_3_raw: d.slice(32, 40)
 				};
 			},
 			'parse_fly': (frame) => {
+				let frame_data = {};
+				switch(frame[12]){
+					case 0:
+						frame_data.flow_unit = 'cm³/s';
+						break;
+					case 1:
+						frame_data.flow_unit = 'cm³/min';
+						break;
+					case 2:
+						frame_data.flow_unit = 'cm³/h';
+						break;
+					case 3:
+						frame_data.flow_unit = 'cm³/d';
+						break;
+					case 4:
+						frame_data.flow_unit = 'dm³/s';
+						break;
+					case 5:
+						frame_data.flow_unit = 'dm³/min';
+						break;
+					case 6:
+						frame_data.flow_unit = 'dm³/h';
+						break;
+					case 7:
+						frame_data.flow_unit = 'dm³/d';
+						break;
+					case 8:
+						frame_data.flow_unit = 'm³/s';
+						break;
+					case 9:
+						frame_data.flow_unit = 'm³/min';
+						break;
+					case 10:
+						frame_data.flow_unit = 'm³/h';
+						break;
+					case 11:
+						frame_data.flow_unit = 'm³/d';
+						break;
+					case 12:
+						frame_data.flow_unit = 'ml/s';
+						break;
+					case 13:
+						frame_data.flow_unit = 'ml/min';
+						break;
+					case 14:
+						frame_data.flow_unit = 'ml/h';
+						break;
+					case 15:
+						frame_data.flow_unit = 'ml/d';
+						break;
+					case 16:
+						unitStrframe_data.flow_uniting = 'l/s';
+						break;
+					case 17:
+						frame_data.flow_unit = 'l/min';
+						break;
+					case 18:
+						frame_data.flow_unit = 'l/h';
+						break;
+					case 19:
+						frame_data.flow_unit = 'l/d';
+						break;
+					case 20:
+						frame_data.flow_unit = 'hl/s';
+						break;
+					case 21:
+						frame_data.flow_unit = 'hl/min';
+						break;
+					case 22:
+						frame_data.flow_unit = 'hl/h';
+						break;
+					case 23:
+						frame_data.flow_unit = 'hl/d';
+						break;
+					case 24:
+						frame_data.flow_unit = 'Ml/s';
+						break;
+					case 25:
+						frame_data.flow_unit = 'Ml/min';
+						break;
+					case 26:
+						frame_data.flow_unit = 'Ml/h';
+						break;
+					case 27:
+						frame_data.flow_unit = 'Ml/d';
+						break;
+
+					// US Customary & Imperial Flow Rates
+					case 32:
+						frame_data.flow_unit = 'af/s';
+						break;
+					case 33:
+						frame_data.flow_unit = 'af/min';
+						break;
+					case 34:
+						frame_data.flow_unit = 'af/h';
+						break;
+					case 35:
+						frame_data.flow_unit = 'af/d';
+						break;
+					case 36:
+						frame_data.flow_unit = 'ft³/s';
+						break;
+					case 37:
+						frame_data.flow_unit = 'ft³/min';
+						break;
+					case 38:
+						frame_data.flow_unit = 'ft³/h';
+						break;
+					case 39:
+						frame_data.flow_unit = 'ft³/d';
+						break;
+					case 40:
+						frame_data.flow_unit = 'fl oz/s (us)';
+						break;
+					case 41:
+						frame_data.flow_unit = 'fl oz/min (us)';
+						break;
+					case 42:
+						frame_data.flow_unit = 'fl oz/h (us)';
+						break;
+					case 43:
+						frame_data.flow_unit = 'fl oz/d (us)';
+						break;
+					case 44:
+						frame_data.flow_unit = 'gal/s (us)';
+						break;
+					case 45:
+						frame_data.flow_unit = 'gal/min (us)';
+						break;
+					case 46:
+						frame_data.flow_unit = 'gal/h (us)';
+						break;
+					case 47:
+						frame_data.flow_unit = 'gal/d (us)';
+						break;
+					case 48:
+						frame_data.flow_unit = 'Mgal/s (us)';
+						break;
+					case 49:
+						frame_data.flow_unit = 'Mgal/min (us)';
+						break;
+					case 50:
+						frame_data.flow_unit = 'Mgal/h (us)';
+						break;
+					case 51:
+						frame_data.flow_unit = 'Mgal/d (us)';
+						break;
+					case 52:
+						frame_data.flow_unit = 'bbl/s (us;liq.)';
+						break;
+					case 53:
+						frame_data.flow_unit = 'bbl/min (us;liq.)';
+						break;
+					case 54:
+						frame_data.flow_unit = 'bbl/h (us;liq.)';
+						break;
+					case 55:
+						frame_data.flow_unit = 'bbl/d (us;liq.)';
+						break;
+					case 56:
+						frame_data.flow_unit = 'bbl/s (us;beer)';
+						break;
+					case 57:
+						frame_data.flow_unit = 'bbl/min (us;beer)';
+						break;
+					case 58:
+						frame_data.flow_unit = 'bbl/h (us;beer)';
+						break;
+					case 59:
+						frame_data.flow_unit = 'bbl/d (us;beer)';
+						break;
+					case 60:
+						frame_data.flow_unit = 'bbl/s (us;oil)';
+						break;
+					case 61:
+						frame_data.flow_unit = 'bbl/min (us;oil)';
+						break;
+					case 62:
+						frame_data.flow_unit = 'bbl/h (us;oil)';
+						break;
+					case 63:
+						frame_data.flow_unit = 'bbl/d (us;oil)';
+						break;
+					case 64:
+						frame_data.flow_unit = 'bbl/s (us;tank)';
+						break;
+					case 65:
+						frame_data.flow_unit = 'bbl/min (us;tank)';
+						break;
+					case 66:
+						frame_data.flow_unit = 'bbl/h (us;tank)';
+						break;
+					case 67:
+						frame_data.flow_unit = 'bbl/d (us;tank)';
+						break;
+					case 68:
+						frame_data.flow_unit = 'gal/s (imp)';
+						break;
+					case 69:
+						frame_data.flow_unit = 'gal/min (imp)';
+						break;
+					case 70:
+						frame_data.flow_unit = 'gal/h (imp)';
+						break;
+					case 71:
+						frame_data.flow_unit = 'gal/d (imp)';
+						break;
+					case 72:
+						frame_data.flow_unit = 'Mgal/s (imp)';
+						break;
+					case 73:
+						frame_data.flow_unit = 'Mgal/min (imp)';
+						break;
+					case 74:
+						frame_data.flow_unit = 'Mgal/h (imp)';
+						break;
+					case 75:
+						frame_data.flow_unit = 'Mgal/d (imp)';
+						break;
+					case 76:
+						frame_data.flow_unit = 'bbl/s (imp;beer)';
+						break;
+					case 77:
+						frame_data.flow_unit = 'bbl/min (imp;beer)';
+						break;
+					case 78:
+						frame_data.flow_unit = 'bbl/h (imp;beer)';
+						break;
+					case 79:
+						frame_data.flow_unit = 'bbl/d (imp;beer)';
+						break;
+					case 80:
+						frame_data.flow_unit = 'bbl/s (imp;oil)';
+						break;
+					case 81:
+						frame_data.flow_unit = 'bbl/min (imp;oil)';
+						break;
+					case 82:
+						frame_data.flow_unit = 'bbl/h (imp;oil)';
+						break;
+					case 83:
+						frame_data.flow_unit = 'bbl/d (imp;oil)';
+						break;
+					case 88:
+						frame_data.flow_unit = 'kgal/s (us)';
+						break;
+					case 89:
+						frame_data.flow_unit = 'kgal/min (us)';
+						break;
+					case 90:
+						frame_data.flow_unit = 'kgal/h (us)';
+						break;
+					case 91:
+						frame_data.flow_unit = 'kgal/d (us)';
+						break;
+					case 92:
+						frame_data.flow_unit = 'MMft³/s';
+						break;
+					case 93:
+						frame_data.flow_unit = 'MMft³/min';
+						break;
+					case 94:
+						frame_data.flow_unit = 'MMft³/h';
+						break;
+					case 96:
+						frame_data.flow_unit = 'Mft³/d';
+						break;
+				}
+				switch(frame[13]){
+					case 0:
+						frame_data.pressure_unit = 'bar';
+						break;
+					case 1:
+						frame_data.pressure_unit = 'psi a';
+						break;
+					case 2:
+						frame_data.pressure_unit = 'bar g';
+						break;
+					case 3:
+						frame_data.pressure_unit = 'psi g';
+						break;
+					case 4:
+						frame_data.pressure_unit = 'Pa a';
+						break;
+					case 5:
+						frame_data.pressure_unit = 'kPa a';
+						break;
+					case 6:
+						frame_data.pressure_unit = 'MPa a';
+						break;
+					case 7:
+						frame_data.pressure_unit = 'Pa g';
+						break;
+					case 8:
+						frame_data.pressure_unit = 'kPa g';
+						break;
+					case 9:
+						frame_data.pressure_unit = 'MPa g';
+						break;
+				}
+				switch(frame[14]){
+					case 1:
+						frame_data.conductivity_unit = 'MS/m';
+						break;
+					case 2:
+						frame_data.conductivity_unit = 'kS/m';
+						break;
+					case 3:
+						frame_data.conductivity_unit = 'S/m';
+						break;
+					case 4:
+						frame_data.conductivity_unit = 'S/cm';
+						break;
+					case 5:
+						frame_data.conductivity_unit = 'mS/m';
+						break;
+					case 6:
+						frame_data.conductivity_unit = 'mS/cm';
+						break;
+					case 7:
+						frame_data.conductivity_unit = 'μS/m';
+						break;
+					case 8:
+						frame_data.conductivity_unit = 'μS/cm';
+						break;
+					case 9:
+						frame_data.conductivity_unit = 'μS/mm';
+						break;
+					case 10:
+						frame_data.conductivity_unit = 'nS/cm';
+						break;
+				}
+
+				frame_data.totalizer_unit = [];
+
+				for (let index = 0; index < 3; index++) {
+					switch(frame[index + 15]){
+						case 0:
+							frame_data.totalizer_unit[index] = 'cm³';
+							break;
+						case 1:
+							frame_data.totalizer_unit[index] = 'dm³';
+							break;
+						case 2:
+							frame_data.totalizer_unit[index] = 'm³';
+							break;
+						case 3:
+							frame_data.totalizer_unit[index] = 'ml';
+							break;
+						case 4:
+							frame_data.totalizer_unit[index] = 'l';
+							break;
+						case 5:
+							frame_data.totalizer_unit[index] = 'hl';
+							break;
+						case 6:
+							frame_data.totalizer_unit[index] = 'Ml Mega';
+							break;
+						case 8:
+							frame_data.totalizer_unit[index] = 'af';
+							break;
+						case 9:
+							frame_data.totalizer_unit[index] = 'ft³';
+							break;
+						case 10:
+							frame_data.totalizer_unit[index] = 'fl oz (us)';
+							break;
+						case 11:
+							frame_data.totalizer_unit[index] = 'gal (us)';
+							break;
+						case 12:
+							frame_data.totalizer_unit[index] = 'Mgal (us)';
+							break;
+						case 13:
+							frame_data.totalizer_unit[index] = 'bbl (us;liq.)';
+							break;
+						case 14:
+							frame_data.totalizer_unit[index] = 'bbl (us;beer)';
+							break;
+						case 15:
+							frame_data.totalizer_unit[index] = 'bbl (us;oil)';
+							break;
+						case 16:
+							frame_data.totalizer_unit[index] = 'bbl (us;tank)';
+							break;
+						case 17:
+							frame_data.totalizer_unit[index] = 'gal (imp)';
+							break;
+						case 18:
+							frame_data.totalizer_unit[index] = 'Mgal (imp)';
+							break;
+						case 19:
+							frame_data.totalizer_unit[index] = 'bbl (imp;beer)';
+							break;
+						case 20:
+							frame_data.totalizer_unit[index] = 'bbl (imp;oil)';
+							break;
+						case 22:
+							frame_data.totalizer_unit[index] = 'kgal (us)';
+							break;
+						case 23:
+							frame_data.totalizer_unit[index] = 'Mft³';
+							break;
+					}
+					
+				}
 				return {
 					'firmware': frame[2],
-					'do_bootup_time': frame[12] + "Sec",
-					'ec_bootup_time': frame[13] + "Sec",
-					'device_ids_do_sensors': frame.slice(14, 18),
-					'device_ids_ec_sensors': frame.slice(18, 22),
-					'hardware_id': frame.slice(22, 25),
-					'report_rate': frame.slice(25, 29).reduce(msbLsb) + "Sec",
-					'tx_life_counter': frame.slice(29, 33).reduce(msbLsb),
+					'flow_unit': frame_data.flow_unit,
+					'pressure_unit': frame_data.pressure_unit,
+					'conductivity_unit': frame_data.conductivity_unit,
+					'totalizer_1_unit': frame_data.totalizer_unit[0],
+					'totalizer_2_unit': frame_data.totalizer_unit[1],
+					'totalizer_3_unit': frame_data.totalizer_unit[2],
+					'hardware_id': frame.slice(18, 21),
+					'sample_rate': frame.slice(21, 25).reduce(msbLsb),
+					'tx_life_counter': frame.slice(25, 29).reduce(msbLsb),
 					'machine_values': {
 						'firmware': frame[2],
-						'do_bootup_time': frame[12],
-						'ec_bootup_time': frame[13],
-						'device_ids_do_sensors': frame.slice(14, 18),
-						'device_ids_ec_sensors': frame.slice(18, 22),
-						'hardware_id': frame.slice(22, 25),
-						'report_rate': frame.slice(25, 29),
-						'tx_life_counter': frame.slice(29, 33)
+						'flow_unit': frame[12],
+						'pressure_unit': frame[13],
+						'conductivity_unit': frame[14],
+						'totalizer_1_unit': frame[15],
+						'totalizer_2_unit': frame[16],
+						'totalizer_3_unit': frame[17],
+						'hardware_id': frame.slice(18, 21),
+						'sample_rate': frame.slice(21, 25),
+						'tx_life_counter': frame.slice(25, 29)
 					}
 				}
 			}
 		},
-		'502': {
-			name: 'Custom Environmental Sensor',
+		'180': {
+			name: 'C1D2 One Channel Vibration Plus',
+			parse: (payload, parsed, mac) => {
+				return parent.sensor_types[80].parse(payload, parsed, mac);
+			},
+			parse_fly: (payload, parsed, mac) => {
+				return parent.sensor_types[80].parse_fly(payload, parsed, mac);
+			},
+		},
+		'181': {
+			name: 'C1D2 Two Channel Vibration Plus',
+			parse: (payload, parsed, mac) => {
+				return parent.sensor_types[81].parse(payload, parsed, mac);
+			},
+			parse_fly: (payload, parsed, mac) => {
+				return parent.sensor_types[81].parse_fly(payload, parsed, mac);
+			},
+		},
+		'200': {
+			name: '4-20mA Pass Through',
+			parse: (d) => {
+				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
+				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
+				var dac1 = signInt(d.slice(4, 6).reduce(msbLsb));
+				return {
+					adc1: adc1,
+					adc2: adc2,
+					dac1: dac1,
+					mA1: parseFloat((adc1/100.00).toFixed(2)),
+					raw_adc: adc2,
+					raw_dac: dac1
+				};
+			}
+		},
+		'202': {
+			name: 'Wireless Weather Station',
+			parse: (payload, parsed, mac) => {
+				return {
+					Temp: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
+					Humid: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100,
+					Pressure: signInt(payload.slice(16, 20).reduce(msbLsb), 32) / 100,
+					WindSpd: signInt(payload.slice(20, 24).reduce(msbLsb),32) / 100,
+					WindDir: signInt(payload.slice(24, 28).reduce(msbLsb),32) / 100,
+					reserve: payload[7]
+				};
+			}
+		},
+		'211': {
+			name: 'DO and Flow Sensor',
+			parse: (payload, parsed, mac) => {
+				if(payload[0] == 0){ // regular
+					return {
+						msg_type: 'regular',
+						temperature: signInt(payload.slice(1, 3).reduce(msbLsb), 16),
+						oxygen_saturation_percent: payload.slice(3, 7).reduce(msbLsb),
+						oxygen_ppm: payload.slice(7, 11).reduce(msbLsb),
+						oxygen_mg_l: payload.slice(11, 15).reduce(msbLsb)
+					};
+				}
+				else{ // theshold
+					let solenoid_status = payload[2];
+					if(solenoid_status == 1){ // Solenoid On
+						return {
+							msg_type: 'threshold',
+							solenoid_number: payload[1],
+							solenoid_status: 'on',
+							temperature: signInt(payload.slice(3, 5).reduce(msbLsb), 16),
+							oxygen_saturation_percent: payload.slice(5, 9).reduce(msbLsb),
+							oxygen_ppm: payload.slice(9, 13).reduce(msbLsb),
+							oxygen_mg_l: payload.slice(13, 17).reduce(msbLsb),
+							flow_rate: payload.slice(17, 21).reduce(msbLsb)
+						};
+					} else{ // Solenoid Off
+						return {
+							msg_type: 'threshold',
+							solenoid_number: payload[1],
+							solenoid_status: 'off',
+							temperature: signInt(payload.slice(3, 5).reduce(msbLsb), 16),
+							oxygen_saturation_percent: payload.slice(5, 9).reduce(msbLsb),
+							oxygen_ppm: payload.slice(9, 13).reduce(msbLsb),
+							oxygen_mg_l: payload.slice(13, 17).reduce(msbLsb)
+						};
+					}
+				}
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'hardware_id': frame.slice(12, 15),
+					'report_rate': frame.slice(15, 19).reduce(msbLsb) + "Sec",
+					'tx_life_counter': frame.slice(19, 23).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'hardware_id': frame.slice(12, 15),
+						'report_rate': frame.slice(15, 19),
+						'tx_life_counter': frame.slice(19, 23)
+					}
+				}
+			}
+		},
+		'217': {
+			name: 'Wireless Weight Scale',
+			parse: (d) => {
+				return {
+					weight: signInt(d.slice(0, 4).reduce(msbLsb)) / 100
+				};
+			}
+		},
+		'270': {
+			name: 'Custom Salinity DO sensor',
+			parse: (d) => {
+				return {
+					sensor_status: d[0],
+					do_temperature_1: d.slice(1, 3).reduce(msbLsb) / 100,
+					do_temperature_2: d.slice(3, 5).reduce(msbLsb) / 100,
+					do_temperature_3: d.slice(5, 7).reduce(msbLsb) / 100,
+					do_temperature_4: d.slice(7, 9).reduce(msbLsb) / 100,
+					ec_temperature_1: d.slice(9, 11).reduce(msbLsb) / 100,
+					ec_temperature_2: d.slice(11, 13).reduce(msbLsb) / 100,
+					ec_temperature_3: d.slice(13, 15).reduce(msbLsb) / 100,
+					ec_temperature_4: d.slice(15, 17).reduce(msbLsb) / 100,
+					do_saturation_perc_1: d.slice(17, 19).reduce(msbLsb) / 100,
+					do_saturation_perc_2: d.slice(19, 21).reduce(msbLsb) / 100,
+					do_saturation_perc_3: d.slice(21, 23).reduce(msbLsb) / 100,
+					do_saturation_perc_4: d.slice(23, 25).reduce(msbLsb) / 100,
+					do_ppm_1: d.slice(25, 27).reduce(msbLsb) / 100,
+					do_ppm_2: d.slice(27, 29).reduce(msbLsb) / 100,
+					do_ppm_3: d.slice(29, 31).reduce(msbLsb) / 100,
+					do_ppm_4: d.slice(31, 33).reduce(msbLsb) / 100,
+					do_mgl_1: d.slice(33, 35).reduce(msbLsb) / 100,
+					do_mgl_2: d.slice(35, 37).reduce(msbLsb) / 100,
+					do_mgl_3: d.slice(37, 39).reduce(msbLsb) / 100,
+					do_mgl_4: d.slice(39, 41).reduce(msbLsb) / 100,
+					ec_conductivity_1: d.slice(41, 43).reduce(msbLsb) / 100,
+					ec_conductivity_2: d.slice(43, 45).reduce(msbLsb) / 100,
+					ec_conductivity_3: d.slice(45, 47).reduce(msbLsb) / 100,
+					ec_conductivity_4: d.slice(47, 49).reduce(msbLsb) / 100,
+					ec_salinity_ppt_1: d.slice(49, 57).reduce(msbLsb) / 100,
+					ec_salinity_ppt_2: d.slice(57, 65).reduce(msbLsb) / 100,
+					ec_salinity_ppt_3: d.slice(65, 73).reduce(msbLsb) / 100,
+					ec_salinity_ppt_4: d.slice(73, 81).reduce(msbLsb) / 100,
+					ec_tds_1: d.slice(81, 85).reduce(msbLsb) / 100,
+					ec_tds_2: d.slice(85, 89).reduce(msbLsb) / 100,
+					ec_tds_3: d.slice(89, 93).reduce(msbLsb) / 100,
+					ec_tds_4: d.slice(93, 97).reduce(msbLsb) / 100
+				};
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'do_bootup_time': frame[12] + "Sec",
+					'ec_bootup_time': frame[13] + "Sec",
+					'device_ids_do_sensors': frame.slice(14, 18),
+					'device_ids_ec_sensors': frame.slice(18, 22),
+					'hardware_id': frame.slice(22, 25),
+					'report_rate': frame.slice(25, 29).reduce(msbLsb) + "Sec",
+					'tx_life_counter': frame.slice(29, 33).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'do_bootup_time': frame[12],
+						'ec_bootup_time': frame[13],
+						'device_ids_do_sensors': frame.slice(14, 18),
+						'device_ids_ec_sensors': frame.slice(18, 22),
+						'hardware_id': frame.slice(22, 25),
+						'report_rate': frame.slice(25, 29),
+						'tx_life_counter': frame.slice(29, 33)
+					}
+				}
+			}
+		},
+		'502': {
+			name: 'Custom Environmental Sensor',
 			parse: (d, full) => {
 				reserve = full[7];
 				if (reserve == 0xAA){
@@ -13802,8 +15069,682 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'537': {
-			name: 'Type 537 - Custom Standalone Smart Vibration Sensor',
+		'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) => {
+				if(payload[7] >> 1 != 0){
+					console.log('Error found');
+					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
+					return parsed;
+				}
+
+				if(payload[8] === 1){
+					var deviceAddr = mac;
+					var firmware = payload[1];
+					var hour = payload[11];
+					var minute = payload[12];
+					var expected_packets = payload[15];
+					var current_packet = payload[16];
+					var sdata_start = 17;
+
+					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
+						if(expected_packets != 1){
+							// if a packet is already stored with the same packet ID, or if packet ID is 1, or if current packet ID is not one more than last packet ID
+							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !((current_packet-1) in globalDevices[deviceAddr].data)) {
+								console.log('-----');
+								console.log('bad packet breakdown deleting stream');
+								console.log(current_packet);
+								console.log(expected_packets);
+								console.log(current_packet in globalDevices[deviceAddr].data);
+								console.log(current_packet == 1);
+								console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
+								if(this.hasOwnProperty('failure_no')){
+									this.failure_no = this.failure_no + 1;
+								}
+								else{
+									this.failure_no = 1;
+								}
+								if(this.hasOwnProperty('failure_no')){
+									console.log('####falure no');
+									console.log(this.failure_no);
+								}
+								// console.log(globalDevices[deviceAddr].data);
+								delete globalDevices[deviceAddr];
+								if(current_packet != 1){
+									return;
+								} else{
+
+									var mode = payload[8];
+									var odr = payload[9];
+									var en_axis = payload[10] & 7;
+									var fsr = payload[10] >> 5;
+									var device_temp = msbLsb(payload[13], payload[14])/100;
+
+
+									switch(odr){
+										case 6:
+											odr = 50;
+											break;
+										case 7:
+											odr = 100;
+											break;
+										case 8:
+											odr = 200;
+											break;
+										case 9:
+											odr = 400;
+											break;
+										case 10:
+											odr = 800;
+											break;
+										case 11:
+											odr = 1600;
+											break;
+										case 12:
+											odr = 3200;
+											break;
+										case 13:
+											odr = 6400;
+											break;
+										case 14:
+											odr = 12800;
+											break;
+										case 15:
+											odr = 25600;
+											break;
+										default:
+											odr = 0;
+									}
+
+									globalDevices[deviceAddr] = {
+										// stream_size: expected_packets,
+										data: {},
+										odr: odr,
+										mo: mode,
+										en_axis: en_axis,
+										fsr: fsr,
+										hour: hour,
+										minute: minute,
+										device_temp: device_temp,
+									}
+									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+									return;
+								}
+							}
+							else{
+								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+							}
+						}
+						else{
+							var mode = payload[8];
+							var odr = payload[9];
+							var en_axis = payload[10] & 7;
+							var fsr = payload[10] >> 5;
+							var device_temp = msbLsb(payload[13], payload[14])/100;
+
+
+							switch(odr){
+								case 6:
+									odr = 50;
+									break;
+								case 7:
+									odr = 100;
+									break;
+								case 8:
+									odr = 200;
+									break;
+								case 9:
+									odr = 400;
+									break;
+								case 10:
+									odr = 800;
+									break;
+								case 11:
+									odr = 1600;
+									break;
+								case 12:
+									odr = 3200;
+									break;
+								case 13:
+									odr = 6400;
+									break;
+								case 14:
+									odr = 12800;
+									break;
+								case 15:
+									odr = 25600;
+									break;
+								default:
+									odr = 0;
+							}
+
+							globalDevices[deviceAddr] = {
+								// stream_size: expected_packets,
+								data: {},
+								odr: odr,
+								mo: mode,
+								en_axis: en_axis,
+								fsr: fsr,
+								hour: hour,
+								minute: minute,
+								device_temp: device_temp,
+							}
+							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						}
+						if(Object.keys(globalDevices[deviceAddr].data).length == expected_packets){
+							var raw_data = new Array();
+							for(const packet in globalDevices[deviceAddr].data){
+								raw_data = raw_data.concat(globalDevices[deviceAddr].data[packet]);
+							}
+							var label = 0;
+
+							var fft = new Array();
+							var fft_concat = {};
+
+							var en_axis_data = {};
+							switch (globalDevices[deviceAddr].en_axis){
+								case 1:
+									en_axis_data.x_offset = 0;
+									en_axis_data.increment = 2;
+									break;
+								case 2:
+									en_axis_data.y_offset = 0;
+									en_axis_data.increment = 2;
+									break;
+								case 3:
+									en_axis_data.x_offset = 0;
+									en_axis_data.y_offset = 2;
+									en_axis_data.increment = 4;
+									break;
+								case 4:
+									en_axis_data.z_offset = 0;
+									en_axis_data.increment = 2;
+									break;
+								case 5:
+									en_axis_data.x_offset = 0;
+									en_axis_data.z_offset = 2;
+									en_axis_data.increment = 4;
+									break;
+								case 6:
+									en_axis_data.y_offset = 0;
+									en_axis_data.z_offset = 2;
+									en_axis_data.increment = 4;
+									break;
+								case 7:
+									en_axis_data.x_offset = 0;
+									en_axis_data.y_offset = 2;
+									en_axis_data.z_offset = 4;
+									en_axis_data.increment = 6;
+									break;
+								default:
+									en_axis_data.increment = 0;
+							}
+
+							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++;
+
+								fft_concat[label] = {};
+
+								if('x_offset' in en_axis_data){
+									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
+								}
+								if('y_offset' in en_axis_data){
+									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
+								}
+								if('z_offset' in en_axis_data){
+									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
+								}
+							}
+							var fft_concat_obj = {
+								time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
+								mac_address: deviceAddr,
+								en_axis: globalDevices[deviceAddr].en_axis,
+								fsr: fsr_text,
+								odr: globalDevices[deviceAddr].odr,
+								device_temp: globalDevices[deviceAddr].device_temp,
+								data: fft_concat
+							};
+							sensor_data = fft_concat_obj;
+							delete globalDevices[deviceAddr];
+							if(this.hasOwnProperty('failure_no')){
+								console.log('####falure no');
+								console.log(this.failure_no);
+							}
+
+							return sensor_data;
+						}
+						else{
+							return;
+						}
+					}else{
+
+						var mode = payload[8];
+						var odr = payload[9];
+						var en_axis = payload[10] & 7;
+						var fsr = payload[10] >> 5;
+						var device_temp = msbLsb(payload[13], payload[14])/100;
+
+
+						switch(odr){
+							case 6:
+								odr = 50;
+								break;
+							case 7:
+								odr = 100;
+								break;
+							case 8:
+								odr = 200;
+								break;
+							case 9:
+								odr = 400;
+								break;
+							case 10:
+								odr = 800;
+								break;
+							case 11:
+								odr = 1600;
+								break;
+							case 12:
+								odr = 3200;
+								break;
+							case 13:
+								odr = 6400;
+								break;
+							case 14:
+								odr = 12800;
+								break;
+							case 15:
+								odr = 25600;
+								break;
+							default:
+								odr = 0;
+						}
+
+						globalDevices[deviceAddr] = {
+							// stream_size: expected_packets,
+							data: {},
+							odr: odr,
+							mo: mode,
+							en_axis: en_axis,
+							fsr: fsr,
+							hour: hour,
+							minute: minute,
+							device_temp: device_temp,
+						}
+						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						return;
+					}
+				}
+				else if(payload[8] === 0 || payload[8] === 2){
+					// 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],
+
+						odr: odr,
+						temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
+
+						x_rms_ACC_G: payload.slice(12, 14).reduce(msbLsb)/1000,
+						x_max_ACC_G: payload.slice(14, 16).reduce(msbLsb)/1000,
+						x_velocity_mm_sec: payload.slice(16, 18).reduce(msbLsb) / 100,
+						x_displacement_mm: payload.slice(18, 20).reduce(msbLsb) / 100,
+						x_peak_one_Hz: payload.slice(20, 22).reduce(msbLsb),
+						x_peak_two_Hz: payload.slice(22, 24).reduce(msbLsb),
+						x_peak_three_Hz: payload.slice(24, 26).reduce(msbLsb),
+
+						y_rms_ACC_G: payload.slice(26, 28).reduce(msbLsb)/1000,
+						y_max_ACC_G: payload.slice(28, 30).reduce(msbLsb)/1000,
+						y_velocity_mm_sec: payload.slice(30, 32).reduce(msbLsb) / 100,
+						y_displacement_mm: payload.slice(32, 34).reduce(msbLsb) / 100,
+						y_peak_one_Hz: payload.slice(34, 36).reduce(msbLsb),
+						y_peak_two_Hz: payload.slice(36, 38).reduce(msbLsb),
+						y_peak_three_Hz: payload.slice(38, 40).reduce(msbLsb),
+
+						z_rms_ACC_G: payload.slice(40, 42).reduce(msbLsb)/1000,
+						z_max_ACC_G: payload.slice(42, 44).reduce(msbLsb)/1000,
+						z_velocity_mm_sec: payload.slice(44, 46).reduce(msbLsb) / 100,
+						z_displacement_mm: payload.slice(46, 48).reduce(msbLsb) / 100,
+						z_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
+						z_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
+						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
+					};
+				}
+				// else{
+				// 	parsed.data = {'error': 'Vibration mode error'}
+				// 	return parsed;
+				// }
+			},
+			'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;
+				}
+				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[19]*50 + "ms";
+				switch(frame[21]){
+					case 0:
+						frame_data.filter_status = "Disabled";
+						break;
+					case 1:
+						frame_data.filter_status = "Enabled";
+						break;
+				}
+				switch(frame[22]){
+					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[24]){
+					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[26]){
+					case 0:
+						frame_data.sampling_interval = "5 Minutes";
+						break;
+					case 1:
+						frame_data.sampling_interval = "10 Minutes";
+						break;
+					case 2:
+						frame_data.sampling_interval = "15 Minutes";
+						break;
+					case 2:
+						frame_data.sampling_interval = "20 Minutes";
+						break;
+					case 4:
+						frame_data.sampling_interval = "30 Minutes";
+						break;
+					case 5:
+						frame_data.sampling_interval = "60 Minutes";
+						break;
+					case 6:
+						frame_data.sampling_interval = "120 Minutes";
+						break;
+					case 7:
+						frame_data.sampling_interval = "180 Minutes";
+						break;
+					case 8:
+						frame_data.sampling_interval = "1 Minute";
+						break;
+				}
+				frame_data.on_request_timeout = frame[27] + " Seconds";
+				frame_data.deadband = frame[28] + "mg";
+
+				switch(frame[29]){
+					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;
+				}
+
+				return {
+					'firmware': frame[2],
+					'destination_address': toMac(frame.slice(12, 16)),
+					'mode': frame_data.mode,
+					'odr_1': frame_data.odr_1+'Hz',
+					'sampling_duration_1': frame_data.sampling_duration_1,
+					'filter_status': frame_data.filter_status,
+					'lpf_coeff_1': frame_data.lpf_coeff_1,
+					'lpf_freq_1': frame_data.lpf_freq_1+'Hz',
+					'hpf_coeff_1': frame_data.hpf_coeff_1,
+					'hpf_freq_1': 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,
+					'machine_values': {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16), false),
+						'mode': frame[16],
+						'odr_1': frame[17],
+						'sampling_duration_1': frame[19],
+						'filter_status': frame[21],
+						'lpf_coeff_1': frame[22],
+						'hpf_coeff_1': frame[24],
+						'sampling_interval': frame[26],
+						'on_request_timeout': frame[27],
+						'deadband': frame[28],
+						'payload_length': frame[29]
+					}
+				}
+			}
+		},
+		'538': {
+			name: 'One Channel Vibration Plus',
 			parse: (payload, parsed, mac) => {
 				if(payload[7] >> 1 != 0){
 					console.log('Error found');
@@ -13823,7 +15764,7 @@ function sensor_types(parent){
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
 							// if a packet is already stored with the same packet ID, or if packet ID is 1, or if current packet ID is not one more than last packet ID
-							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !((current_packet-1) in globalDevices[deviceAddr].data)) {
+							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
 								console.log('-----');
 								console.log('bad packet breakdown deleting stream');
 								console.log(current_packet);
@@ -13964,6 +15905,7 @@ function sensor_types(parent){
 							}
 							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						}
+
 						if(Object.keys(globalDevices[deviceAddr].data).length == expected_packets){
 							var raw_data = new Array();
 							for(const packet in globalDevices[deviceAddr].data){
@@ -14410,28 +16352,223 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'538': {
-			name: 'One Channel Vibration Plus',
+		'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_time': frame[17] + " sec",
+						'power_adc': frame.slice(18, 20).reduce(msbLsb),
+						'auto_check_interval': frame_data.auto_check_interval,
+						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
+						'always_on': frame_data.always_on,
+						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
+						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
+						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
+						'hardware_id': frame.slice(37, 40),
+						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
+						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'fsr': frame[16],
+							'boot_time': frame[17],
+							'power_adc': frame.slice(18, 20),
+							'auto_check_interval': frame.slice(20, 22),
+							'auto_check_percentage': frame.slice(22, 24),
+							'always_on': frame[24],
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
+						}
+					}
+				}
+			}
+		},
+		'541': {
+			name: 'Custom Inline Flow Sensor',
+			parse: (d) => {
+				return {
+					adc1: signInt(d.slice(0, 2).reduce(msbLsb)),
+					adc2: signInt(d.slice(2, 4).reduce(msbLsb)),
+					mA1: signInt(d.slice(4, 6).reduce(msbLsb))/100,
+					mA2: signInt(d.slice(6, 8).reduce(msbLsb))/100,
+					flow_1: signInt(d.slice(8, 12).reduce(msbLsb))/100,
+					flow_2:signInt(d.slice(12, 16).reduce(msbLsb))/100
+				};
+			},
+			'parse_fly': (frame) => {
+				let firmware = frame[2];
+				if(firmware > 13){ // firmware 14 and above
+					let frame_data = {};
+					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
+					if(!auto_check_interval){
+						frame_data.auto_check_interval = 'Disabled';
+					}else{
+						frame_data.auto_check_interval = auto_check_interval + " sec";
+					}
+					frame_data.always_on = frame[24]?"Enabled":"Disabled";
+					switch(frame[16]){
+						case 0:
+							frame_data.fsr = "+-6.114 V";
+						break;
+						case 1:
+							frame_data.fsr = "+-4.096 V";
+						break;
+						case 2:
+							frame_data.fsr = "+-2.048 V";
+						break;
+						case 3:
+							frame_data.fsr = "+-1.024 V";
+						break;
+						case 4:
+							frame_data.fsr = "+-0.512 V";
+						break;
+						case 5:
+							frame_data.fsr = "+-0.256 V";
+						break;
+					}
+					return {
+						'firmware': frame[2],
+						'fsr': frame_data.fsr,
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
+						'auto_check_interval': frame_data.auto_check_interval,
+						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
+						'always_on': frame_data.always_on,
+						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
+						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
+						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
+						'min_flow_rate':frame.slice(37, 39).reduce(msbLsb),
+						'max_flow_rate':frame.slice(39, 41).reduce(msbLsb),
+						'hardware_id': frame.slice(41, 44),
+						'report_rate': frame.slice(44, 48).reduce(msbLsb) + " sec",
+						'tx_life_counter': frame.slice(48, 52).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'fsr': frame[16],
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
+							'auto_check_interval': frame.slice(20, 22),
+							'auto_check_percentage': frame.slice(22, 24),
+							'always_on': frame[24],
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'min_flow_rate':frame.slice(37, 39),
+							'max_flow_rate':frame.slice(39, 41),
+							'hardware_id': frame.slice(41, 44),
+							'report_rate': frame.slice(44, 48),
+							'tx_life_counter': frame.slice(48, 52)
+						}
+					}
+				}
+			}
+		},
+		'542': {
+			name: 'Custom LWGY Flow Sensor',
+			parse: (d) => {
+				return {
+					frequency: d.slice(0, 2).reduce(msbLsb),
+					vol_flow: d.slice(2, 4).reduce(msbLsb)/100
+				};
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'hardware_id': frame.slice(12, 15),
+					'report_rate': frame.slice(15, 19).reduce(msbLsb) + " sec",
+					'tx_life_counter': frame.slice(19, 23).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'hardware_id': frame.slice(12, 15),
+						'report_rate': frame.slice(15, 19),
+						'tx_life_counter': frame.slice(19, 23)
+					}
+				}
+			}
+		},
+		'543': {
+			name: 'Custom Seismic Vibration Sensor',
 			parse: (payload, parsed, mac) => {
-				if(payload[7] >> 1 != 0){
+				if(payload[7] & 2){
 					console.log('Error found');
 					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
 					return parsed;
 				}
-
+				let msg_type = 'regular'; // (payload[7] & 16)? 'motion' : 'regular';
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
-					var hour = payload[11];
-					var minute = payload[12];
-					var expected_packets = payload[15];
-					var current_packet = payload[16];
-					var sdata_start = 17;
+					var hour = payload[12];
+					var minute = payload[13];
+					var expected_packets = msbLsb(payload[16], payload[17]);
+					var current_packet = msbLsb(payload[18], payload[19]);
+					var sdata_start = 20;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
 							// if a packet is already stored with the same packet ID, or if packet ID is 1, or if current packet ID is not one more than last packet ID
-							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
+							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !(((current_packet)-1) in globalDevices[deviceAddr].data)) {
 								console.log('-----');
 								console.log('bad packet breakdown deleting stream');
 								console.log(current_packet);
@@ -14450,63 +16587,25 @@ function sensor_types(parent){
 									console.log(this.failure_no);
 								}
 								// console.log(globalDevices[deviceAddr].data);
-								delete globalDevices[deviceAddr];
-								if(current_packet != 1){
-									return;
-								} else{
-
-									var mode = payload[8];
-									var odr = payload[9];
-									var en_axis = payload[10] & 7;
-									var fsr = payload[10] >> 5;
-									var device_temp = msbLsb(payload[13], payload[14])/100;
-
+								delete globalDevices[deviceAddr];
+								if(current_packet != 1){
+									return;
+								} else{
 
-									switch(odr){
-										case 6:
-											odr = 50;
-											break;
-										case 7:
-											odr = 100;
-											break;
-										case 8:
-											odr = 200;
-											break;
-										case 9:
-											odr = 400;
-											break;
-										case 10:
-											odr = 800;
-											break;
-										case 11:
-											odr = 1600;
-											break;
-										case 12:
-											odr = 3200;
-											break;
-										case 13:
-											odr = 6400;
-											break;
-										case 14:
-											odr = 12800;
-											break;
-										case 15:
-											odr = 25600;
-											break;
-										default:
-											odr = 0;
-									}
+									var mode = payload[8];
+									var odr = msbLsb(payload[9], payload[10]);
+									var fsr = payload[11] >> 5;
+									var temperature = msbLsb(payload[14], payload[15])/100;
 
 									globalDevices[deviceAddr] = {
 										// stream_size: expected_packets,
 										data: {},
 										odr: odr,
 										mo: mode,
-										en_axis: en_axis,
 										fsr: fsr,
 										hour: hour,
 										minute: minute,
-										device_temp: device_temp,
+										temperature: temperature,
 									}
 									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 									return;
@@ -14518,57 +16617,19 @@ function sensor_types(parent){
 						}
 						else{
 							var mode = payload[8];
-							var odr = payload[9];
-							var en_axis = payload[10] & 7;
-							var fsr = payload[10] >> 5;
-							var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-							switch(odr){
-								case 6:
-									odr = 50;
-									break;
-								case 7:
-									odr = 100;
-									break;
-								case 8:
-									odr = 200;
-									break;
-								case 9:
-									odr = 400;
-									break;
-								case 10:
-									odr = 800;
-									break;
-								case 11:
-									odr = 1600;
-									break;
-								case 12:
-									odr = 3200;
-									break;
-								case 13:
-									odr = 6400;
-									break;
-								case 14:
-									odr = 12800;
-									break;
-								case 15:
-									odr = 25600;
-									break;
-								default:
-									odr = 0;
-							}
+							var odr = msbLsb(payload[9], payload[10]);
+							var fsr = payload[11] >> 5;
+							var temperature = msbLsb(payload[14], payload[15])/100;
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
 								data: {},
 								odr: odr,
 								mo: mode,
-								en_axis: en_axis,
 								fsr: fsr,
 								hour: hour,
 								minute: minute,
-								device_temp: device_temp,
+								temperature: temperature,
 							}
 							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						}
@@ -14584,58 +16645,23 @@ function sensor_types(parent){
 							var fft_concat = {};
 
 							var en_axis_data = {};
-							switch (globalDevices[deviceAddr].en_axis){
-								case 1:
-									en_axis_data.x_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 2:
-									en_axis_data.y_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 3:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 4:
-									en_axis_data.z_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 5:
-									en_axis_data.x_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 6:
-									en_axis_data.y_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 7:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.z_offset = 4;
-									en_axis_data.increment = 6;
-									break;
-								default:
-									en_axis_data.increment = 0;
-							}
+							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;
+									fsr_mult = 0.0000608;
 									break;
 								case 1:
-									fsr_mult = 0.00012;
+									fsr_mult = 0.0001216;
 									break;
 								case 2:
-									fsr_mult = 0.00024;
-									break;
-								case 3:
-									fsr_mult = 0.00049;
+									fsr_mult = 0.0002448;
 									break;
 							}
 							switch(globalDevices[deviceAddr].fsr){
@@ -14648,33 +16674,34 @@ function sensor_types(parent){
 								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++;
 
-								fft_concat[label] = {};
-
 								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 							}
 							var fft_concat_obj = {
-								time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
+								mode: payload[8],
+								msg_type: msg_type,
+								time_id: [
+									String(globalDevices[deviceAddr].hour).padStart(2, '0'),
+									String(globalDevices[deviceAddr].minute).padStart(2, '0'),
+								].join(':'),
 								mac_address: deviceAddr,
-								en_axis: globalDevices[deviceAddr].en_axis,
 								fsr: fsr_text,
 								odr: globalDevices[deviceAddr].odr,
-								device_temp: globalDevices[deviceAddr].device_temp,
+								temperature: globalDevices[deviceAddr].temperature,
+								total_samples: label,
 								data: fft_concat
 							};
 							sensor_data = fft_concat_obj;
@@ -14692,100 +16719,48 @@ function sensor_types(parent){
 					}else{
 
 						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
+						var odr = msbLsb(payload[9], payload[10]);
+						var fsr = payload[11] >> 5;
+						var temperature = msbLsb(payload[14], payload[15])/100;
 
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
 							data: {},
 							odr: odr,
 							mo: mode,
-							en_axis: en_axis,
 							fsr: fsr,
 							hour: hour,
 							minute: minute,
-							device_temp: device_temp,
+							temperature: temperature,
 						}
 						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						return;
 					}
 				}
-				else if(payload[8] === 0 || payload[8] === 2){
+				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";
+						case 3:
+							odr = "32.25Hz"
 							break;
-						case 12:
-							odr = "3200Hz";
+						case 4:
+							odr = "62.5Hz";
 							break;
-						case 13:
-							odr = "6400Hz";
+						case 5:
+							odr = "125Hz";
 							break;
-						case 14:
-							odr = "12800Hz";
+						case 6:
+							odr = "250Hz";
 							break;
-						case 15:
-							odr = "25600Hz";
+						case 7:
+							odr = "500Hz";
 							break;
 					}
 					return {
 						mode: payload[8],
+						msg_type: msg_type,
 
 						odr: odr,
 						temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
@@ -14812,7 +16787,7 @@ function sensor_types(parent){
 						z_displacement_mm: payload.slice(46, 48).reduce(msbLsb) / 100,
 						z_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
 						z_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
-						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
+						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb)
 					};
 				}
 				// else{
@@ -14829,44 +16804,32 @@ function sensor_types(parent){
 					case 1:
 						frame_data.mode = "Raw";
 						break;
-					case 2:
-						frame_data.mode = "Processed + Raw on demand";
-						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;
+					case 2:
+						frame_data.mode = "Processed + Raw on demand";
 						break;
-					case 10:
-						frame_data.odr_1 = 800;
+					case 3:
+						frame_data.mode = "Smart";
 						break;
-					case 11:
-						frame_data.odr_1 = 1600;
+				}
+				switch(frame[17]){
+					case 3:
+						frame_data.odr_1 = 31.25;
 						break;
-					case 12:
-						frame_data.odr_1 = 3200;
+					case 4:
+						frame_data.odr_1 = 62.5;
 						break;
-					case 13:
-						frame_data.odr_1 = 6400;
+					case 5:
+						frame_data.odr_1 = 125;
 						break;
-					case 14:
-						frame_data.odr_1 = 12800;
+					case 6:
+						frame_data.odr_1 = 250;
 						break;
-					case 15:
-						frame_data.odr_1 = 25600;
+					case 7:
+						frame_data.odr_1 = 500;
 						break;
 				}
-				frame_data.sampling_duration_1 = frame[19]*50 + "ms";
-				switch(frame[21]){
+				frame_data.sampling_duration_1 = frame[18]*50 + "ms";
+				switch(frame[19]){
 					case 0:
 						frame_data.filter_status = "Disabled";
 						break;
@@ -14874,7 +16837,7 @@ function sensor_types(parent){
 						frame_data.filter_status = "Enabled";
 						break;
 				}
-				switch(frame[22]){
+				switch(frame[20]){
 					case 0:
 						frame_data.lpf_coeff_1 = 4;
 						break;
@@ -14907,7 +16870,7 @@ function sensor_types(parent){
 						break;
 				}
 				frame_data.lpf_freq_1 = frame_data.odr_1 / frame_data.lpf_coeff_1;
-				switch(frame[24]){
+				switch(frame[21]){
 					case 0:
 						frame_data.hpf_coeff_1 = 4;
 						break;
@@ -14939,40 +16902,49 @@ function sensor_types(parent){
 						frame_data.hpf_coeff_1 = 2048;
 						break;
 				}
-				frame_data.hpf_freq_1 = frame_data.odr_1 / frame_data.hpf_coeff_1;
-				switch(frame[26]){
+				frame_data.hpf_freq_1 = (frame_data.odr_1 / frame_data.hpf_coeff_1).toFixed(4);
+				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[27] + " Seconds";
-				frame_data.deadband = frame[28] + "mg";
+				frame_data.on_request_timeout = frame[23] + " Seconds";
+				frame_data.deadband = frame[24] + "mg";
 
-				switch(frame[29]){
+				switch(frame[25]){
 					case 0:
 						frame_data.payload_length = "50 Bytes";
 						break;
@@ -14986,207 +16958,69 @@ function sensor_types(parent){
 						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;
+				}
+
+				frame_data.auto_raw_interval = frame[31] * 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[33] * 50;
+				frame_data.motion_to_delay = frame[41] * 50;
 
 				return {
 					'firmware': frame[2],
 					'destination_address': toMac(frame.slice(12, 16)),
 					'mode': frame_data.mode,
-					'odr_1': frame_data.odr_1+'Hz',
-					'sampling_duration_1': frame_data.sampling_duration_1,
+					'odr': frame_data.odr_1+'Hz',
+					'sampling_duration': frame_data.sampling_duration_1,
 					'filter_status': frame_data.filter_status,
-					'lpf_coeff_1': frame_data.lpf_coeff_1,
-					'lpf_freq_1': frame_data.lpf_freq_1+'Hz',
-					'hpf_coeff_1': frame_data.hpf_coeff_1,
-					'hpf_freq_1': frame_data.hpf_freq_1+'Hz',
+					'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,
+					'auto_raw_destination_address': toMac(frame.slice(27 , 31)),
+					'auto_raw_interval': frame_data.auto_raw_interval,
+					'smart_mode_skip_count': frame[32],
+					'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
+					'max_tx_raw_samples': frame.slice(34, 36).reduce(msbLsb),
+					'hardware_id': frame.slice(36, 39),
+					'reserved': frame.slice(39, 43),
+					'tx_lifetime_counter': frame.slice(43, 46).reduce(msbLsb),
 					'machine_values': {
 						'firmware': frame[2],
 						'destination_address': toMac(frame.slice(12, 16), false),
 						'mode': frame[16],
-						'odr_1': frame[17],
-						'sampling_duration_1': frame[19],
-						'filter_status': frame[21],
-						'lpf_coeff_1': frame[22],
-						'hpf_coeff_1': frame[24],
-						'sampling_interval': frame[26],
-						'on_request_timeout': frame[27],
-						'deadband': frame[28],
-						'payload_length': frame[29]
-					}
-				}
-			}
-		},
-		'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_time': frame[17] + " sec",
-						'power_adc': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'hardware_id': frame.slice(37, 40),
-						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_time': frame[17],
-							'power_adc': frame.slice(18, 20),
-							'auto_check_interval': frame.slice(20, 22),
-							'auto_check_percentage': frame.slice(22, 24),
-							'always_on': frame[24],
-							'calibration_one': frame.slice(25, 29),
-							'calibration_two':frame.slice(29, 33),
-							'calibration_three':frame.slice(33, 37),
-							'hardware_id': frame.slice(37, 40),
-							'report_rate': frame.slice(40, 44),
-							'tx_life_counter': frame.slice(44, 48)
-						}
-					}
-				}
-			}
-		},
-		'541': {
-			name: 'Custom Inline Flow Sensor',
-			parse: (d) => {
-				return {
-					adc1: signInt(d.slice(0, 2).reduce(msbLsb)),
-					adc2: signInt(d.slice(2, 4).reduce(msbLsb)),
-					mA1: signInt(d.slice(4, 6).reduce(msbLsb))/100,
-					mA2: signInt(d.slice(6, 8).reduce(msbLsb))/100,
-					flow_1: signInt(d.slice(8, 12).reduce(msbLsb))/100,
-					flow_2:signInt(d.slice(12, 16).reduce(msbLsb))/100
-				};
-			},
-			'parse_fly': (frame) => {
-				let firmware = frame[2];
-				if(firmware > 13){ // firmware 14 and above
-					let frame_data = {};
-					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
-					if(!auto_check_interval){
-						frame_data.auto_check_interval = 'Disabled';
-					}else{
-						frame_data.auto_check_interval = auto_check_interval + " sec";
-					}
-					frame_data.always_on = frame[24]?"Enabled":"Disabled";
-					switch(frame[16]){
-						case 0:
-							frame_data.fsr = "+-6.114 V";
-						break;
-						case 1:
-							frame_data.fsr = "+-4.096 V";
-						break;
-						case 2:
-							frame_data.fsr = "+-2.048 V";
-						break;
-						case 3:
-							frame_data.fsr = "+-1.024 V";
-						break;
-						case 4:
-							frame_data.fsr = "+-0.512 V";
-						break;
-						case 5:
-							frame_data.fsr = "+-0.256 V";
-						break;
-					}
-					return {
-						'firmware': frame[2],
-						'fsr': frame_data.fsr,
-						'boot_up_time': frame[17] + " sec",
-						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
-						'auto_check_interval': frame_data.auto_check_interval,
-						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
-						'always_on': frame_data.always_on,
-						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
-						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
-						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
-						'min_flow_rate':frame.slice(37, 39).reduce(msbLsb),
-						'max_flow_rate':frame.slice(39, 41).reduce(msbLsb),
-						'hardware_id': frame.slice(41, 44),
-						'report_rate': frame.slice(44, 48).reduce(msbLsb) + " sec",
-						'tx_life_counter': frame.slice(48, 52).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'fsr': frame[16],
-							'boot_up_time': frame[17],
-							'adc_pin_reading': frame.slice(18, 20),
-							'auto_check_interval': frame.slice(20, 22),
-							'auto_check_percentage': frame.slice(22, 24),
-							'always_on': frame[24],
-							'calibration_one': frame.slice(25, 29),
-							'calibration_two':frame.slice(29, 33),
-							'calibration_three':frame.slice(33, 37),
-							'min_flow_rate':frame.slice(37, 39),
-							'max_flow_rate':frame.slice(39, 41),
-							'hardware_id': frame.slice(41, 44),
-							'report_rate': frame.slice(44, 48),
-							'tx_life_counter': frame.slice(48, 52),
-						}
+						'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],
+						'auto_raw_destination_address': toMac(frame.slice(27 , 31), false),
+						'auto_raw_interval': frame[31],
+						'smart_mode_skip_count': frame[32],
+						'smart_mode_acc_threshold':frame[33],
+						'max_tx_raw_samples': frame.slice(34, 36),
+						'hardware_id': frame.slice(36, 39),
+						'reserved': frame.slice(39, 43),
+						'tx_lifetime_counter': frame.slice(43, 46)
 					}
 				}
 			}
@@ -15303,6 +17137,38 @@ function int2Bytes(i, l){
 	}
 	return bytes;
 }
+function msbLsb_to_SignedInt(value, addition) {
+    const bigValue = BigInt(value);
+    const bigAddition = BigInt(addition);
+
+    let result = (bigValue << 8n) + bigAddition;
+
+    // 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);
+
+    let result = (bigValue << 8n) + bigAddition;
+
+    // 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.
+// function formatFixedPoint(bigIntValue, decimalPlaces) {
+//     let sign = bigIntValue < 0n ? "-" : "";
+//     let absValue = bigIntValue < 0n ? -bigIntValue : bigIntValue;
+
+//     let s = absValue.toString();
+//     if (s.length <= decimalPlaces) {
+//         s = '0'.repeat(decimalPlaces - s.length + 1) + s;
+//     }
+
+//     let decimalIndex = s.length - decimalPlaces;
+//     return sign + s.substring(0, decimalIndex) + '.' + s.substring(decimalIndex);
+// }
 function signInt(i, b){
 	if(i.toString(2).length != b) return i;
 	return -(((~i) & ((1 << (b-1))-1))+1);