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

package/lib/WirelessGateway.js

@@ -428,16 +428,19 @@ module.exports = class WirelessSensor{
 		const sensor_type = rep_buffer.readUInt16BE(5);
 		let report = {};
 		if(rep_buffer[2] === 0xff ){
+			const values = this.sensor_libs[sensor_type].sync_parse(rep_buffer);
 			try{
 				report = {
 					type: 'sync_acknowledgment',
 					address: frame.mac,
+					sensor_type: sensor_type,
 					payload: {
 						type: 'sync_acknowledgment',
 						address: frame.mac,
+						sensor_type: sensor_type,
 						sync_success: true,
 						response_bytes: rep_buffer,
-						...this.sensor_libs[sensor_type].sync_parse(rep_buffer),
+						...values,
 					},
 					description: 'Acknowledgment received from sensor in response to sync command. This report includes the current sensor information or errors.',
 				};
@@ -450,12 +453,14 @@ module.exports = class WirelessSensor{
 			report = {
 				type: 'sync_acknowledgment',
 				address: frame.mac,
+				sensor_type: sensor_type,
 				payload: {
 					type: 'sync_acknowledgment',
 					address: frame.mac,
+					sensor_type: sensor_type,
 					sync_success: false,
 					response_bytes: rep_buffer,
-					...this.sensor_libs[sensor_type].sync_parse(rep_buffer),
+					// ...this.sensor_libs[sensor_type].sync_parse(rep_buffer),
 				},
 				description: 'Acknowledgment received from sensor in response to sync command. This report includes the current sensor information or errors.',
 			};
@@ -478,15 +483,19 @@ module.exports = class WirelessSensor{
 
 		// this._emitter.emit('sensor_mode', temp_fly_message);
 		// this._emitter.emit('sensor_mode-'+frame.mac, temp_fly_message);
+		
+		const values = this.sensor_libs[sensor_type].sync_parse(rep_buffer);
 
 		try{
 			const report = {
 				type: 'manual_sync_check_in',
 				address: frame.mac,
+				sensor_type: sensor_type,
 				payload: {
 					type: 'manual_sync_check_in',
 					address: frame.mac,
-					...this.sensor_libs[sensor_type].sync_parse(rep_buffer),
+					sensor_type: sensor_type,
+					...values,
 				},
 				description: 'Manual Sync Check-in received from sensor. This check-in reports sensor information and allows for sync initialization if configuration changes are necessary.',
 				'packet_info': frame.receive_options
@@ -512,14 +521,18 @@ module.exports = class WirelessSensor{
 		// this._emitter.emit('sensor_mode', temp_fly_message);
 		// this._emitter.emit('sensor_mode-'+frame.mac, temp_fly_message);
 
+		const values = this.sensor_libs[sensor_type].sync_parse(rep_buffer);
+
 		try{
 			const report = {
 				type: 'sync_check_in',
 				address: frame.mac,
+				sensor_type: sensor_type,
 				payload: {
 					type: 'sync_check_in',
 					address: frame.mac,
-					...this.sensor_libs[sensor_type].sync_parse(rep_buffer),
+					sensor_type: sensor_type,
+					...values,
 				},
 				description: 'Check-in received from sensor. This check-in reports sensor information and allows for sync initialization if configuration changes are necessary.',
 				'packet_info': frame.receive_options
@@ -535,14 +548,19 @@ module.exports = class WirelessSensor{
 	sync_end(payload, frame){
 		const rep_buffer = Buffer.from(frame.data);
 		const sensor_type = rep_buffer.readUInt16BE(5);
+
+		const values = this.sensor_libs[sensor_type].sync_parse(rep_buffer);
+
 		try{
 			const report = {
 				type: 'sync_end',
 				address: frame.mac,
+				sensor_type: sensor_type,
 				payload: {
 					type: 'sync_end',
 					address: frame.mac,
-					...this.sensor_libs[sensor_type].sync_parse(rep_buffer),
+					sensor_type: sensor_type,
+					...values,
 				},
 				description: 'Sync process finished. Sensor is reporting its new values after Syn and resuming normal operations.',
 				'packet_info': frame.receive_options
@@ -1039,7 +1057,7 @@ module.exports = class WirelessSensor{
 		return this.config_send_sync(addr, packet);
 	};
 	get_intended_wireless_node_configs(data, configs){
-		const config_map = this.sensor_libs[data.payload.sensor_type].get_config_map(data.payload.firmware_version);
+		const config_map = this.sensor_libs[data.payload.machine_values.sensor_type].get_config_map(data.payload.machine_values.firmware_version);
 		const html_map = {};
 		for(const [key, value] of Object.entries(config_map)){
 			if(value.html_id){
@@ -3001,7 +3019,27 @@ module.exports = class WirelessSensor{
 		var packet = [244, 79, 0, 0, 101, 35, value];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
-	};
+	}
+	config_set_adc_threshold_128(sensor_mac, value){
+		console.log('config_set_adc_threshold_128');
+		var packet = [244, 32, 0, 0, 21];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_auto_check_interval_128(sensor_mac, value){
+		console.log('config_set_auto_check_interval_128');
+		var packet = [244, 34, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_auto_calibration_128(sensor_mac){
+		console.log('config_set_auto_calibration_128');
+		var packet = [244, 33, 0, 0, 0, 1];
+		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) => {
@@ -3971,7 +4009,21 @@ function sensor_types(parent){
 	var types = {
 		'2': {
 			name: '2 Channel Push Notification',
-			parse: (d) => {
+			parse: (d, payload) => {
+				let firmware = payload[1];
+				if(firmware > 5){
+					let report_type_byte = (payload[7] >> 5) & 1;
+					let report_type = "";
+					switch(report_type_byte){
+						case 0: report_type = 'Regular'; break;
+						case 1: report_type = 'Interrupt'; break;
+					}
+					return{
+						report_type: report_type,
+						input_1: d[0],
+						input_2: d[1]
+					}
+				}
 				return {
 					input_1: d[0],
 					input_2: d[1]
@@ -4595,49 +4647,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'33': {
-			name: 'AC Current Detect Sensor',
-			parse: (payload, parsed, mac) => {
-				if(parsed.firmware > 4){ // 5 and above
-					let report_type = "Regular";
-					switch(payload[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;
-					}
-					return {
-						input_counter: payload.slice(8, 12).reduce(msbLsb),
-						input_uptime: payload.slice(12, 16).reduce(msbLsb),
-						input: payload[16] & 1 ? 1 : 0,
-						report_type: report_type,
-						rtc: [
-							String(payload[18]).padStart(2, '0'),
-							String(payload[19]).padStart(2, '0'),
-							String(payload[20]).padStart(2, '0')
-						].join(':')
-					};
-				} else if(parsed.firmware > 3){ // 4
-					return {
-						current_detect: payload[8],
-						total_uptime: payload.slice(9, 13).reduce(msbLsb),
-						total_cycle_count: payload.slice(13, 17).reduce(msbLsb)
-					};
-				}else{
-					return {
-						input_1: payload[8]
-					};
-				};
-			}
-		},
 		'34': {
 			name: 'Tank Level Sensor',
 			parse: (d) => {
@@ -8503,29 +8512,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'93': {
-			name: 'Oil Temperature and Moisture Sensor',
-			parse: (payload, parsed, mac) => {
-				let status = payload[7] >> 1; // status (1-bit left shifted)
-				let res = {
-					temperature: signInt(payload.slice(8, 10).reduce(msbLsb), 16)/100,
-					dielectic_const: payload.slice(10, 12).reduce(msbLsb)/100
-				};
-				if(status == 0){
-					res.error = {
-						temperature: "read_failed",
-						dielectic_const: "read_failed"
-					}
-				}
-				if(status == 1){
-					res.error = {
-						temperature: "addr_failed",
-						dielectic_const: "addr_failed"
-					}
-				}
-				return res;
-			}
-		},
 		'95': {
 			name: '16-Bit 1-Channel 0-24VDC Receiver',
 			parse: (d) => {
@@ -10216,16 +10202,17 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'110': {
-			name: 'One Channel Vibration Plus v4',
+		'112': {
+			name: 'Condition Based/Predictive Maintenance Sensor v4',
 			parse: (payload, parsed, mac) => {
 				if(payload[7] & 2){
 					console.log('Error found');
+					console.log(payload[7]);
 					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
 					return parsed;
 				}
 				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
-				if(payload[8] === 1){
+				if (payload[8] === 1) {
 					var deviceAddr = mac;
 					// var firmware = payload[1];
 					// var hour = payload[12];
@@ -10233,8 +10220,9 @@ function sensor_types(parent){
 					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 (globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1) {
 						if (expected_packets != 1) {
 							// if current packet is equal to last one (duplicated data). This does not apply to the last package
 							if (globalDevices[deviceAddr].last_packet_counter == current_packet) {
@@ -10245,10 +10233,10 @@ function sensor_types(parent){
 							if (current_packet == 1 || (globalDevices[deviceAddr].last_packet_counter > current_packet)) {
 								console.log('Recovering bad packet');
 								// clear stream object & timeout
-								parent.sensor_types[110].utils.clear_globalDevices_stream(deviceAddr);
+								parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
 				
 								// init new stream
-								parent.sensor_types[110].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
+								parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
 				
 								globalDevices[deviceAddr].last_packet_counter = current_packet;
 								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
@@ -10257,36 +10245,33 @@ function sensor_types(parent){
 								globalDevices[deviceAddr].last_packet_counter = current_packet;
 								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 							}
+						} else {
+							// clear stream object & timeout
+							parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
+				
+							// init new stream
+							parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
+				
+							globalDevices[deviceAddr].last_packet_counter = current_packet;
+							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						}
-						else{
-							 // clear stream object & timeout
-							 parent.sensor_types[110].utils.clear_globalDevices_stream(deviceAddr);
-
-							 // init new stream
-							 parent.sensor_types[110].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
-
-							 globalDevices[deviceAddr].last_packet_counter = current_packet;
-							 globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-						}
-					}
-					else{
+					} else {
 						// clear stream object & timeout
-						parent.sensor_types[110].utils.clear_globalDevices_stream(deviceAddr);
-
+						parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
+				
 						// init new stream
-						parent.sensor_types[110].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
-
+						parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
+				
 						globalDevices[deviceAddr].last_packet_counter = current_packet;
 						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 					}
-					if(current_packet == expected_packets){
+					if (current_packet == expected_packets) {
 						// concatenate stream
-						sensor_data = parent.sensor_types[114].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
+						sensor_data = parent.sensor_types[112].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
 						// clear stream object & timeout
-						parent.sensor_types[114].utils.clear_globalDevices_stream(deviceAddr);
+						parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
 						return sensor_data;
-					}
-					else{
+					} else {
 						return;
 					}
 				}
@@ -10332,31 +10317,32 @@ function sensor_types(parent){
 
 						odr: odr,
 						temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
+						ext_temperature: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100,
+						current: signInt(payload.slice(16, 20).reduce(msbLsb), 32) / 1000,
+						x_rms_ACC_G: payload.slice(20, 22).reduce(msbLsb)/1000,
+						x_max_ACC_G: payload.slice(22, 24).reduce(msbLsb)/1000,
+						x_velocity_mm_sec: payload.slice(24, 26).reduce(msbLsb) / 100,
+						x_displacement_mm: payload.slice(26, 28).reduce(msbLsb) / 100,
+						x_peak_one_Hz: payload.slice(28, 30).reduce(msbLsb),
+						x_peak_two_Hz: payload.slice(30, 32).reduce(msbLsb),
+						x_peak_three_Hz: payload.slice(32, 34).reduce(msbLsb),
 
-						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),
+						y_rms_ACC_G: payload.slice(34, 36).reduce(msbLsb)/1000,
+						y_max_ACC_G: payload.slice(36, 38).reduce(msbLsb)/1000,
+						y_velocity_mm_sec: payload.slice(38, 40).reduce(msbLsb) / 100,
+						y_displacement_mm: payload.slice(40, 42).reduce(msbLsb) / 100,
+						y_peak_one_Hz: payload.slice(42, 44).reduce(msbLsb),
+						y_peak_two_Hz: payload.slice(44, 46).reduce(msbLsb),
+						y_peak_three_Hz: payload.slice(46, 48).reduce(msbLsb),
 
-						z_rms_ACC_G: payload.slice(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),
-						rpm: payload.slice(54, 56).reduce(msbLsb)
+						z_rms_ACC_G: payload.slice(48, 50).reduce(msbLsb)/1000,
+						z_max_ACC_G: payload.slice(50, 52).reduce(msbLsb)/1000,
+						z_velocity_mm_sec: payload.slice(52, 54).reduce(msbLsb) / 100,
+						z_displacement_mm: payload.slice(54, 56).reduce(msbLsb) / 100,
+						z_peak_one_Hz: payload.slice(56, 58).reduce(msbLsb),
+						z_peak_two_Hz: payload.slice(58, 60).reduce(msbLsb),
+						z_peak_three_Hz: payload.slice(60, 62).reduce(msbLsb),
+						rpm: payload.slice(62, 64).reduce(msbLsb)
 					};
 				}
 				// else{
@@ -10385,16 +10371,16 @@ function sensor_types(parent){
 						expected_packets: expected_packets
 					}
 					globalDevices[deviceAddr].packet_stream_timeout = setTimeout(() => {
-						parsed.sensor_data = parent.sensor_types[110].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
+						parsed.sensor_data = parent.sensor_types[112].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
 						parsed.sensor_data.error = 'Time Series Data Stream Timeout - incomplete data received';
 
-						parsed.sensor_name = parent.sensor_types[110].name;
+						parsed.sensor_name = parent.sensor_types[112].name;
 						parsed.type = 'sensor_data';
 						parsed.addr = deviceAddr;
 						parsed.received = Date.now();
 
 						parent._emitter.emit('sensor_data', parsed);
-						parent._emitter.emit('sensor_data-110', parsed);
+						parent._emitter.emit('sensor_data-112', parsed);
 						parent._emitter.emit('sensor_data'+'-'+deviceAddr, parsed);
 					}, 60000);
 				},
@@ -10838,1505 +10824,29 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'111': {
-			name: 'Two Channel Vibration Plus v4',
+		'117': {
+			name: 'Custom Vibration Sensor PPV',
 			parse: (payload, parsed, mac) => {
-				parsed.data = {};
 				if(payload[7] & 2){
-					parsed.data['probe_1_error'] = true;
-				}
-				if(payload[7] & 4){
-					parsed.data['probe_2_error'] = true;
-				}
-				if(payload[7] & 2 && payload[7] & 4){
+					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 4th bit is 1 the packet is from the second probe, if 0 from the first
-					var probe;
-					if (payload[7] & 8) {
-						probe = 2;
-					} else {
-						probe = 1;
-					}
-
-					// initialize globalDevices for this sensor if it doesn't exist
-					// exlusively for multi-probe sensors
-					if(!Object.hasOwn(globalDevices, deviceAddr)){
-						globalDevices[deviceAddr] = {};
-					}
-					if(globalDevices[deviceAddr].hasOwnProperty(probe) || expected_packets == 1){
-						console.log('Continuing existing probe stream');
-						if (expected_packets != 1) {
-							console.log('Expected packets more than 1');
-							// if current packet is equal to last one (duplicated data). This does not apply to the last package
-							if (globalDevices[deviceAddr][probe].last_packet_counter == current_packet) {
-								console.log('Duplicated message')
-								return;
-							}
-							// if current packet is equal to 1 or last packet counter is higher thant current packet
-							if (current_packet == 1 || (globalDevices[deviceAddr][probe].last_packet_counter > current_packet)) {
-								console.log('Recovering bad packet');
-								// clear stream object & timeout
-								parent.sensor_types[111].utils.clear_globalDevices_stream(deviceAddr, probe);
-
-								// init new stream
-								parent.sensor_types[111].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type, probe);
-
-								globalDevices[deviceAddr][probe].last_packet_counter = current_packet;
-								globalDevices[deviceAddr][probe].data[current_packet] = payload.slice(sdata_start);
-								return;
-							} else {
-								globalDevices[deviceAddr][probe].last_packet_counter = current_packet;
-								globalDevices[deviceAddr][probe].data[current_packet] = payload.slice(sdata_start);
-							}
-						} else {
-							// clear stream object & timeout
-							parent.sensor_types[111].utils.clear_globalDevices_stream(deviceAddr, probe);
-				
-							// init new stream
-							parent.sensor_types[111].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type, probe);
-				
-							globalDevices[deviceAddr][probe].last_packet_counter = current_packet;
-							globalDevices[deviceAddr][probe].data[current_packet] = payload.slice(sdata_start);
-						}
-					}
-					else{
-						// clear stream object & timeout
-						parent.sensor_types[111].utils.clear_globalDevices_stream(deviceAddr, probe);
-
-						// init new stream
-						parent.sensor_types[111].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type, probe);
-
-						globalDevices[deviceAddr][probe].last_packet_counter = current_packet;
-						globalDevices[deviceAddr][probe].data[current_packet] = payload.slice(sdata_start);
-					}
-					if(current_packet == expected_packets){
-						// concatenate stream
-						sensor_data = parent.sensor_types[111].utils.concat_fft_data(deviceAddr, payload[8], msg_type, probe);
-
-						// clear stream object & timeout
-						parent.sensor_types[111].utils.clear_globalDevices_stream(deviceAddr, probe);
-						return sensor_data;
-					}
-					else{
-						return;
-					}
-				}
-				else if(payload[8] === 0 || payload[8] === 2 || payload[8] === 3){
-					// mode byte most significant bit will indicate fft data.
-					// console.log(d);
-					var odr1;
+					let mode = payload[8];
+					let msg_type = '';
 					switch(payload[9]){
-						case 6:
-							odr1 = "50Hz"
+						case 0:
+							msg_type = 'Regular';
 							break;
-						case 7:
-							odr1 = "100Hz";
+						case 1:
+							msg_type = 'Cautionay';
 							break;
-						case 8:
-							odr1 = "200Hz";
+						case 2:
+							msg_type = 'Artwork';
 							break;
-						case 9:
-							odr1 = "400Hz";
-							break;
-						case 10:
-							odr1 = "800Hz";
-							break;
-						case 11:
-							odr1 = "1600Hz";
-							break;
-						case 12:
-							odr1 = "3200Hz";
-							break;
-						case 13:
-							odr1 = "6400Hz";
-							break;
-						case 14:
-							odr1 = "12800Hz";
-							break;
-						case 15:
-							odr1 = "25600Hz";
-							break;
-					}
-					var odr2;
-					switch(payload[56]){
-						case 6:
-							odr2 = "50Hz"
-							break;
-						case 7:
-							odr2 = "100Hz";
-							break;
-						case 8:
-							odr2 = "200Hz";
-							break;
-						case 9:
-							odr2 = "400Hz";
-							break;
-						case 10:
-							odr2 = "800Hz";
-							break;
-						case 11:
-							odr2 = "1600Hz";
-							break;
-						case 12:
-							odr2 = "3200Hz";
-							break;
-						case 13:
-							odr2 = "6400Hz";
-							break;
-						case 14:
-							odr2 = "12800Hz";
-							break;
-						case 15:
-							odr2 = "25600Hz";
-							break;
-					}
-
-					// If 4th bit is 1 the packet is from the second probe, if 0 from the first
-					// var probe = '';
-					// if(payload[7] & 8){
-					// 	probe = '2';
-					// }
-					// else{
-					// 	probe = '1';
-					// }
-					return {
-						mode: payload[8],
-						msg_type: msg_type,
-
-						s1_odr: odr1,
-						s1_temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
-
-						x1_rms_ACC_G: payload.slice(12, 14).reduce(msbLsb)/1000,
-						x1_max_ACC_G: payload.slice(14, 16).reduce(msbLsb)/1000,
-						x1_velocity_mm_sec: payload.slice(16, 18).reduce(msbLsb) / 100,
-						x1_displacement_mm: payload.slice(18, 20).reduce(msbLsb) / 100,
-						x1_peak_one_Hz: payload.slice(20, 22).reduce(msbLsb),
-						x1_peak_two_Hz: payload.slice(22, 24).reduce(msbLsb),
-						x1_peak_three_Hz: payload.slice(24, 26).reduce(msbLsb),
-
-						y1_rms_ACC_G: payload.slice(26, 28).reduce(msbLsb)/1000,
-						y1_max_ACC_G: payload.slice(28, 30).reduce(msbLsb)/1000,
-						y1_velocity_mm_sec: payload.slice(30, 32).reduce(msbLsb) / 100,
-						y1_displacement_mm: payload.slice(32, 34).reduce(msbLsb) / 100,
-						y1_peak_one_Hz: payload.slice(34, 36).reduce(msbLsb),
-						y1_peak_two_Hz: payload.slice(36, 38).reduce(msbLsb),
-						y1_peak_three_Hz: payload.slice(38, 40).reduce(msbLsb),
-
-						z1_rms_ACC_G: payload.slice(40, 42).reduce(msbLsb)/1000,
-						z1_max_ACC_G: payload.slice(42, 44).reduce(msbLsb)/1000,
-						z1_velocity_mm_sec: payload.slice(44, 46).reduce(msbLsb) / 100,
-						z1_displacement_mm: payload.slice(46, 48).reduce(msbLsb) / 100,
-						z1_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
-						z1_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
-						z1_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
-						rpm_1: payload.slice(54, 56).reduce(msbLsb),
-
-						s2_odr: odr2,
-						s2_temperature: signInt(payload.slice(57, 59).reduce(msbLsb), 16) / 100,
-
-						x2_rms_ACC_G: payload.slice(59, 61).reduce(msbLsb)/1000,
-						x2_max_ACC_G: payload.slice(61, 63).reduce(msbLsb)/1000,
-						x2_velocity_mm_sec: payload.slice(63, 65).reduce(msbLsb) / 100,
-						x2_displacement_mm: payload.slice(65, 67).reduce(msbLsb) / 100,
-						x2_peak_one_Hz: payload.slice(67, 69).reduce(msbLsb),
-						x2_peak_two_Hz: payload.slice(69, 71).reduce(msbLsb),
-						x2_peak_three_Hz: payload.slice(71, 73).reduce(msbLsb),
-
-						y2_rms_ACC_G: payload.slice(73, 75).reduce(msbLsb)/1000,
-						y2_max_ACC_G: payload.slice(75, 77).reduce(msbLsb)/1000,
-						y2_velocity_mm_sec: payload.slice(77, 79).reduce(msbLsb) / 100,
-						y2_displacement_mm: payload.slice(79, 81).reduce(msbLsb) / 100,
-						y2_peak_one_Hz: payload.slice(81, 83).reduce(msbLsb),
-						y2_peak_two_Hz: payload.slice(83, 85).reduce(msbLsb),
-						y2_peak_three_Hz: payload.slice(85, 87).reduce(msbLsb),
-
-						z2_rms_ACC_G: payload.slice(87, 89).reduce(msbLsb)/1000,
-						z2_max_ACC_G: payload.slice(89, 91).reduce(msbLsb)/1000,
-						z2_velocity_mm_sec: payload.slice(91, 93).reduce(msbLsb) / 100,
-						z2_displacement_mm: payload.slice(93, 95).reduce(msbLsb) / 100,
-						z2_peak_one_Hz: payload.slice(95, 97).reduce(msbLsb),
-						z2_peak_two_Hz: payload.slice(97, 99).reduce(msbLsb),
-						z2_peak_three_Hz: payload.slice(99, 101).reduce(msbLsb),
-						rpm_2: payload.slice(101, 103).reduce(msbLsb)
-					};
-				}
-				// else{
-				// 	parsed.data = {'error': 'Vibration mode error'}
-				// 	return parsed;
-				// }
-			},
-			'utils': {
-				'clear_globalDevices_stream': (deviceAddr, probe) => {
-					if(Object.hasOwn(globalDevices, deviceAddr) && Object.hasOwn(globalDevices[deviceAddr], probe)){
-						if(Object.hasOwn(globalDevices[deviceAddr][probe], 'packet_stream_timeout')){
-							clearTimeout(globalDevices[deviceAddr][probe].packet_stream_timeout);
-						}
-						delete globalDevices[deviceAddr][probe];
-					}
-				},
-				'init_globalDevices_stream'(deviceAddr, payload, expected_packets, parsed, msg_type, probe){
-					globalDevices[deviceAddr][probe] = {
-						data: {},
-						odr: msbLsb(payload[9], payload[10]),
-						mo: payload[8],
-						fsr: payload[11] >> 5,
-						hour: payload[12],
-						minute: payload[13],
-						temperature: msbLsb(payload[14], payload[15]) / 100,
-						expected_packets: expected_packets
-					}
-					globalDevices[deviceAddr][probe].packet_stream_timeout = setTimeout(() => {
-						parsed.sensor_data = parent.sensor_types[111].utils.concat_fft_data(deviceAddr, payload[8], msg_type, probe);
-						parsed.sensor_data.error = 'Time Series Data Stream Timeout - incomplete data received';
-
-						parsed.sensor_name = parent.sensor_types[111].name;
-						parsed.type = 'sensor_data';
-						parsed.addr = deviceAddr;
-						parsed.received = Date.now();
-
-						parent._emitter.emit('sensor_data', parsed);
-						parent._emitter.emit('sensor_data-111', parsed);
-						parent._emitter.emit('sensor_data'+'-'+deviceAddr, parsed);
-					}, 60000);
-				},
-				'concat_fft_data': (deviceAddr, mode, msg_type, probe) => {
-					var raw_data = new Array();
-					for(const packet in globalDevices[deviceAddr][probe].data){
-						raw_data = raw_data.concat(globalDevices[deviceAddr][probe].data[packet]);
-					}
-					var label = 0;
-
-					var fft_concat = {};
-
-					var en_axis_data = {};
-					en_axis_data.x_offset = 0;
-					en_axis_data.y_offset = 2;
-					en_axis_data.z_offset = 4;
-					en_axis_data.increment = 6;
-					fft_concat = {x: [], y: [], z: []};
-					
-					var fsr_mult = .00006;
-					var fsr_text = "";
-
-					switch(globalDevices[deviceAddr][probe].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][probe].fsr){
-						case 0:
-							fsr_text = "2g";
-							break;
-						case 1:
-							fsr_text = "4g";
-							break;
-						case 2:
-							fsr_text = "8g";
-							break;
-						case 3:
-							fsr_text = "16g";
-							break;
-					}
-
-					for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
-						label++;
-
-						if('x_offset' in en_axis_data){
-							fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(3)));
-						}
-						if('y_offset' in en_axis_data){
-							fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(3)));
-						}
-						if('z_offset' in en_axis_data){
-							fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(3)));
-						}
-					}
-					var fft_concat_obj = {
-						mode: mode,
-						msg_type: msg_type,
-						probe: probe,
-						time_id: [
-							String(globalDevices[deviceAddr][probe].hour).padStart(2, '0'),
-							String(globalDevices[deviceAddr][probe].minute).padStart(2, '0'),
-						].join(':'),
-						mac_address: deviceAddr,
-						fsr: fsr_text,
-						odr: globalDevices[deviceAddr][probe].odr,
-						temperature: globalDevices[deviceAddr][probe].temperature,
-						total_samples: label,
-						fft_confidence : ((Object.keys(globalDevices[deviceAddr][probe].data).length / globalDevices[deviceAddr][probe].expected_packets) * 100).toFixed(2) + '%',
-						data: fft_concat
-					};
-					return fft_concat_obj;
-				}
-			},
-			'parse_fly': (frame) => {
-				let frame_data = {};
-				switch(frame[16]){
-					case 0:
-						frame_data.mode = "Processed";
-						break;
-					case 1:
-						frame_data.mode = "Raw";
-						break;
-					case 2:
-						frame_data.mode = "Processed + Raw on demand";
-						break;
-					case 3:
-						frame_data.mode = "Smart";
-						break;
-				}
-				switch(frame[17]){
-					case 6:
-						frame_data.odr_1 = 50;
-						break;
-					case 7:
-						frame_data.odr_1 = 100;
-						break;
-					case 8:
-						frame_data.odr_1 = 200;
-						break;
-					case 9:
-						frame_data.odr_1 = 400;
-						break;
-					case 10:
-						frame_data.odr_1 = 800;
-						break;
-					case 11:
-						frame_data.odr_1 = 1600;
-						break;
-					case 12:
-						frame_data.odr_1 = 3200;
-						break;
-					case 13:
-						frame_data.odr_1 = 6400;
-						break;
-					case 14:
-						frame_data.odr_1 = 12800;
-						break;
-					case 15:
-						frame_data.odr_1 = 25600;
-						break;
-				}
-				switch(frame[18]){
-					case 6:
-						frame_data.odr_2 = 50;
-						break;
-					case 7:
-						frame_data.odr_2 = 100;
-						break;
-					case 8:
-						frame_data.odr_2 = 200;
-						break;
-					case 9:
-						frame_data.odr_2 = 400;
-						break;
-					case 10:
-						frame_data.odr_2 = 800;
-						break;
-					case 11:
-						frame_data.odr_2 = 1600;
-						break;
-					case 12:
-						frame_data.odr_2 = 3200;
-						break;
-					case 13:
-						frame_data.odr_2 = 6400;
-						break;
-					case 14:
-						frame_data.odr_2 = 12800;
-						break;
-					case 15:
-						frame_data.odr_2 = 25600;
-						break;
-				}
-				frame_data.sampling_duration_1 = frame[19]*50 + "ms";
-				frame_data.sampling_duration_2 = frame[20]*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[23]){
-					case 0:
-						frame_data.lpf_coeff_2 = 4;
-						break;
-					case 1:
-						frame_data.lpf_coeff_2 = 8;
-						break;
-					case 2:
-						frame_data.lpf_coeff_2 = 16;
-						break;
-					case 2:
-						frame_data.lpf_coeff_2 = 32;
-						break;
-					case 4:
-						frame_data.lpf_coeff_2 = 64;
-						break;
-					case 5:
-						frame_data.lpf_coeff_2 = 128;
-						break;
-					case 6:
-						frame_data.lpf_coeff_2 = 256;
-						break;
-					case 7:
-						frame_data.lpf_coeff_2 = 512;
-						break;
-					case 8:
-						frame_data.lpf_coeff_2 = 1024;
-						break;
-					case 9:
-						frame_data.lpf_coeff_2 = 2048;
-						break;
-				}
-				frame_data.lpf_freq_2 = frame_data.odr_2 / frame_data.lpf_coeff_2;
-				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[25]){
-					case 0:
-						frame_data.hpf_coeff_2 = 4;
-						break;
-					case 1:
-						frame_data.hpf_coeff_2 = 8;
-						break;
-					case 2:
-						frame_data.hpf_coeff_2 = 16;
-						break;
-					case 2:
-						frame_data.hpf_coeff_2 = 32;
-						break;
-					case 4:
-						frame_data.hpf_coeff_2 = 64;
-						break;
-					case 5:
-						frame_data.hpf_coeff_2 = 128;
-						break;
-					case 6:
-						frame_data.hpf_coeff_2 = 256;
-						break;
-					case 7:
-						frame_data.hpf_coeff_2 = 512;
-						break;
-					case 8:
-						frame_data.hpf_coeff_2 = 1024;
-						break;
-					case 9:
-						frame_data.hpf_coeff_2 = 2048;
-						break;
-				}
-				frame_data.hpf_freq_2 = frame_data.odr_2 / frame_data.hpf_coeff_2;
-				switch(frame[26]){
-					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";
-
-				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;
-				}
-				switch(frame[30]){
-					case 0:
-						frame_data.fsr_text = "2g";
-						break;
-					case 1:
-						frame_data.fsr_text = "4g";
-						break;
-					case 2:
-						frame_data.fsr_text = "8g";
-						break;
-					case 3:
-						frame_data.fsr_text = "16g";
-						break;
-				}
-				frame_data.rpm_status = frame[31]? 'Enabled': 'Disabled';
-				frame_data.auto_raw_interval = frame[36] * 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.p1_smart_mode_threshold = frame[38] * 50;
-				frame_data.p2_smart_mode_threshold = frame[39] * 50;
-				if(frame[2] > 5){ // for Firmware v6 and above
-					frame_data.motion_to_delay = frame[50] * 50;
-					return {
-						'firmware': frame[2],
-						'destination_address': toMac(frame.slice(12, 16)),
-						'mode': frame_data.mode,
-						'odr_1': frame_data.odr_1+'Hz',
-						'odr_2': frame_data.odr_2+'Hz',
-						'sampling_duration_1': frame_data.sampling_duration_1,
-						'sampling_duration_2': frame_data.sampling_duration_2,
-						'filter_status': frame_data.filter_status,
-						'lpf_coeff_1': frame_data.lpf_coeff_1,
-						'lpf_freq_1': frame_data.lpf_freq_1+'Hz',
-						'lpf_coeff_2': frame_data.lpf_coeff_2,
-						'lpf_freq_2': frame_data.lpf_freq_2+'Hz',
-						'hpf_coeff_1': frame_data.hpf_coeff_1,
-						'hpf_freq_1': frame_data.hpf_freq_1+'Hz',
-						'hpf_coeff_2': frame_data.hpf_coeff_2,
-						'hpf_freq_2': frame_data.hpf_freq_2+'Hz',
-						'sampling_interval': frame_data.sampling_interval,
-						'on_request_timeout': frame_data.on_request_timeout,
-						'deadband': frame_data.deadband,
-						'payload_length': frame_data.payload_length,
-						'fsr': frame_data.fsr_text,
-						'rpm_compute_status': frame_data.rpm_status,
-						'auto_raw_destination_address': toMac(frame.slice(32 , 36)),
-						'auto_raw_interval': frame_data.auto_raw_interval,
-						'smart_mode_skip_count': frame[37],
-						'smart_mode_acc_threshold_probe_1': frame_data.p1_smart_mode_threshold+'mg',
-						'smart_mode_acc_threshold_probe_2': frame_data.p2_smart_mode_threshold+'mg',
-						'uptime_counter_probe_1': frame.slice(40, 44).reduce(msbLsb)+'sec',
-						'uptime_counter_probe_2': frame.slice(44, 48).reduce(msbLsb)+'sec',
-						'max_tx_raw_samples': frame.slice(48, 50).reduce(msbLsb),
-						'motion_to_sampling_delay': frame_data.motion_to_delay +'msec',
-						'max_num_of_motion_tx_per_interval': frame[51],
-						'hardware_id': frame.slice(52, 55),
-						'reserved': frame.slice(55, 59),
-						'tx_lifetime_counter': frame.slice(59, 63).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'destination_address': toMac(frame.slice(12, 16), false),
-							'mode': frame[16],
-							'odr_1': frame[17],
-							'odr_2': frame[18],
-							'sampling_duration_1': frame[19],
-							'sampling_duration_2': frame[20],
-							'filter_status': frame[21],
-							'lpf_coeff_1': frame[22],
-							'lpf_coeff_2': frame[23],
-							'hpf_coeff_1': frame[24],
-							'hpf_coeff_2': frame[25],
-							'sampling_interval': frame[26],
-							'on_request_timeout': frame[27],
-							'deadband': frame[28],
-							'payload_length': frame[29],
-							'fsm': frame[30],
-							'rpm_compute_status': frame[31],
-							'auto_raw_destination_address': toMac(frame.slice(32 , 36), false),
-							'auto_raw_interval': frame[36],
-							'smart_mode_skip_count': frame[37],
-							'smart_mode_acc_threshold_probe_1':frame[38],
-							'smart_mode_acc_threshold_probe_2':frame[39],
-							'uptime_counter_probe_1': frame.slice(40, 44),
-							'uptime_counter_probe_2': frame.slice(44, 48),
-							'max_tx_raw_samples': frame.slice(48, 50),
-							'motion_to_sampling_delay': frame[50],
-							'max_num_of_motion_tx_per_interval': frame[51],
-							'hardware_id': frame.slice(52, 55),
-							'reserved': frame.slice(55, 59),
-							'tx_lifetime_counter': frame.slice(59, 63)
-						}
-					}
-				} else if (frame[2] > 4){ // for Firmware v5 and above
-					return {
-						'firmware': frame[2],
-						'destination_address': toMac(frame.slice(12, 16)),
-						'mode': frame_data.mode,
-						'odr_1': frame_data.odr_1+'Hz',
-						'odr_2': frame_data.odr_2+'Hz',
-						'sampling_duration_1': frame_data.sampling_duration_1,
-						'sampling_duration_2': frame_data.sampling_duration_2,
-						'filter_status': frame_data.filter_status,
-						'lpf_coeff_1': frame_data.lpf_coeff_1,
-						'lpf_freq_1': frame_data.lpf_freq_1+'Hz',
-						'lpf_coeff_2': frame_data.lpf_coeff_2,
-						'lpf_freq_2': frame_data.lpf_freq_2+'Hz',
-						'hpf_coeff_1': frame_data.hpf_coeff_1,
-						'hpf_freq_1': frame_data.hpf_freq_1+'Hz',
-						'hpf_coeff_2': frame_data.hpf_coeff_2,
-						'hpf_freq_2': frame_data.hpf_freq_2+'Hz',
-						'sampling_interval': frame_data.sampling_interval,
-						'on_request_timeout': frame_data.on_request_timeout,
-						'deadband': frame_data.deadband,
-						'payload_length': frame_data.payload_length,
-						'fsr': frame_data.fsr_text,
-						'rpm_compute_status': frame_data.rpm_status,
-						'auto_raw_destination_address': toMac(frame.slice(32 , 36)),
-						'auto_raw_interval': frame_data.auto_raw_interval,
-						'smart_mode_skip_count': frame[37],
-						'smart_mode_acc_threshold_probe_1': frame_data.p1_smart_mode_threshold+'mg',
-						'smart_mode_acc_threshold_probe_2': frame_data.p2_smart_mode_threshold+'mg',
-						'uptime_counter_probe_1': frame.slice(40, 44).reduce(msbLsb)+'sec',
-						'uptime_counter_probe_2': frame.slice(44, 48).reduce(msbLsb)+'sec',
-						'max_tx_raw_samples': frame.slice(48, 50).reduce(msbLsb),
-						'hardware_id': frame.slice(50, 53),
-						'reserved': frame.slice(53, 57),
-						'tx_lifetime_counter': frame.slice(57, 61).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'destination_address': toMac(frame.slice(12, 16), false),
-							'mode': frame[16],
-							'odr_1': frame[17],
-							'odr_2': frame[18],
-							'sampling_duration_1': frame[19],
-							'sampling_duration_2': frame[20],
-							'filter_status': frame[21],
-							'lpf_coeff_1': frame[22],
-							'lpf_coeff_2': frame[23],
-							'hpf_coeff_1': frame[24],
-							'hpf_coeff_2': frame[25],
-							'sampling_interval': frame[26],
-							'on_request_timeout': frame[27],
-							'deadband': frame[28],
-							'payload_length': frame[29],
-							'fsm': frame[30],
-							'rpm_compute_status': frame[31],
-							'auto_raw_destination_address': toMac(frame.slice(32 , 36), false),
-							'auto_raw_interval': frame[36],
-							'smart_mode_skip_count': frame[37],
-							'smart_mode_acc_threshold_probe_1':frame[38],
-							'smart_mode_acc_threshold_probe_2':frame[39],
-							'uptime_counter_probe_1': frame.slice(40, 44),
-							'uptime_counter_probe_2': frame.slice(44, 48),
-							'max_tx_raw_samples': frame.slice(48, 50),
-							'hardware_id': frame.slice(50, 53),
-							'reserved': frame.slice(53, 57),
-							'tx_lifetime_counter': frame.slice(57, 61)
-						}
-					}
-				}else{
-					return {
-						'firmware': frame[2],
-						'destination_address': toMac(frame.slice(12, 16)),
-						'mode': frame_data.mode,
-						'odr_1': frame_data.odr_1+'Hz',
-						'odr_2': frame_data.odr_2+'Hz',
-						'sampling_duration_1': frame_data.sampling_duration_1,
-						'sampling_duration_2': frame_data.sampling_duration_2,
-						'filter_status': frame_data.filter_status,
-						'lpf_coeff_1': frame_data.lpf_coeff_1,
-						'lpf_freq_1': frame_data.lpf_freq_1+'Hz',
-						'lpf_coeff_2': frame_data.lpf_coeff_2,
-						'lpf_freq_2': frame_data.lpf_freq_2+'Hz',
-						'hpf_coeff_1': frame_data.hpf_coeff_1,
-						'hpf_freq_1': frame_data.hpf_freq_1+'Hz',
-						'hpf_coeff_2': frame_data.hpf_coeff_2,
-						'hpf_freq_2': frame_data.hpf_freq_2+'Hz',
-						'sampling_interval': frame_data.sampling_interval,
-						'on_request_timeout': frame_data.on_request_timeout,
-						'deadband': frame_data.deadband,
-						'payload_length': frame_data.payload_length,
-						'fsr': frame_data.fsr_text,
-						'rpm_compute_status': frame_data.rpm_status,
-						'auto_raw_destination_address': toMac(frame.slice(32 , 36)),
-						'auto_raw_interval': frame_data.auto_raw_interval,
-						'smart_mode_skip_count': frame[37],
-						'smart_mode_acc_threshold_probe_1': frame_data.p1_smart_mode_threshold+'mg',
-						'smart_mode_acc_threshold_probe_2': frame_data.p2_smart_mode_threshold+'mg',
-						'uptime_counter_probe_1': frame.slice(40, 44).reduce(msbLsb)+'sec',
-						'uptime_counter_probe_2': frame.slice(44, 48).reduce(msbLsb)+'sec',
-						'hardware_id': frame.slice(48, 51),
-						'reserved': frame.slice(51, 55),
-						'tx_lifetime_counter': frame.slice(55, 59).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'destination_address': toMac(frame.slice(12, 16), false),
-							'mode': frame[16],
-							'odr_1': frame[17],
-							'odr_2': frame[18],
-							'sampling_duration_1': frame[19],
-							'sampling_duration_2': frame[20],
-							'filter_status': frame[21],
-							'lpf_coeff_1': frame[22],
-							'lpf_coeff_2': frame[23],
-							'hpf_coeff_1': frame[24],
-							'hpf_coeff_2': frame[25],
-							'sampling_interval': frame[26],
-							'on_request_timeout': frame[27],
-							'deadband': frame[28],
-							'payload_length': frame[29],
-							'fsm': frame[30],
-							'rpm_compute_status': frame[31],
-							'auto_raw_destination_address': toMac(frame.slice(32 , 36), false),
-							'auto_raw_interval': frame[36],
-							'smart_mode_skip_count': frame[37],
-							'smart_mode_acc_threshold_probe_1':frame[38],
-							'smart_mode_acc_threshold_probe_2':frame[39],
-							'uptime_counter_probe_1': frame.slice(40, 44),
-							'uptime_counter_probe_2': frame.slice(44, 48),
-							'hardware_id': frame.slice(48, 51),
-							'reserved': frame.slice(51, 55),
-							'tx_lifetime_counter': frame.slice(55, 59)
-						}
-					}
-				}
-			}
-		},
-		'112': {
-			name: 'Condition Based/Predictive Maintenance Sensor v4',
-			parse: (payload, parsed, mac) => {
-				if(payload[7] & 2){
-					console.log('Error found');
-					console.log(payload[7]);
-					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
-					return parsed;
-				}
-				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
-				if (payload[8] === 1) {
-					var deviceAddr = mac;
-					// var firmware = payload[1];
-					// var hour = payload[12];
-					// var minute = payload[13];
-					var expected_packets = msbLsb(payload[16], payload[17]);
-					var current_packet = msbLsb(payload[18], payload[19]);
-					var sdata_start = 20;
-				
-				
-					if (globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1) {
-						if (expected_packets != 1) {
-							// if current packet is equal to last one (duplicated data). This does not apply to the last package
-							if (globalDevices[deviceAddr].last_packet_counter == current_packet) {
-								console.log('Duplicated message')
-								return;
-							}
-							// if current packet is equal to 1 or last packet counter is higher thant current packet
-							if (current_packet == 1 || (globalDevices[deviceAddr].last_packet_counter > current_packet)) {
-								console.log('Recovering bad packet');
-								// clear stream object & timeout
-								parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
-				
-								// init new stream
-								parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
-				
-								globalDevices[deviceAddr].last_packet_counter = current_packet;
-								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-								return;
-							} else {
-								globalDevices[deviceAddr].last_packet_counter = current_packet;
-								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-							}
-						} else {
-							// clear stream object & timeout
-							parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
-				
-							// init new stream
-							parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
-				
-							globalDevices[deviceAddr].last_packet_counter = current_packet;
-							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-						}
-					} else {
-						// clear stream object & timeout
-						parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
-				
-						// init new stream
-						parent.sensor_types[112].utils.init_globalDevices_stream(deviceAddr, payload, expected_packets, parsed, msg_type);
-				
-						globalDevices[deviceAddr].last_packet_counter = current_packet;
-						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-					}
-					if (current_packet == expected_packets) {
-						// concatenate stream
-						sensor_data = parent.sensor_types[112].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
-						// clear stream object & timeout
-						parent.sensor_types[112].utils.clear_globalDevices_stream(deviceAddr);
-						return sensor_data;
-					} else {
-						return;
-					}
-				}
-				else if(payload[8] === 0 || payload[8] === 2 || payload[8] === 3){
-					// mode byte most significant bit will indicate fft data.
-					// console.log(d);
-					var odr;
-					switch(payload[9]){
-						case 6:
-							odr = "50Hz"
-							break;
-						case 7:
-							odr = "100Hz";
-							break;
-						case 8:
-							odr = "200Hz";
-							break;
-						case 9:
-							odr = "400Hz";
-							break;
-						case 10:
-							odr = "800Hz";
-							break;
-						case 11:
-							odr = "1600Hz";
-							break;
-						case 12:
-							odr = "3200Hz";
-							break;
-						case 13:
-							odr = "6400Hz";
-							break;
-						case 14:
-							odr = "12800Hz";
-							break;
-						case 15:
-							odr = "25600Hz";
-							break;
-					}
-					return {
-						mode: payload[8],
-						msg_type: msg_type,
-
-						odr: odr,
-						temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
-						ext_temperature: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100,
-						current: signInt(payload.slice(16, 20).reduce(msbLsb), 32) / 1000,
-						x_rms_ACC_G: payload.slice(20, 22).reduce(msbLsb)/1000,
-						x_max_ACC_G: payload.slice(22, 24).reduce(msbLsb)/1000,
-						x_velocity_mm_sec: payload.slice(24, 26).reduce(msbLsb) / 100,
-						x_displacement_mm: payload.slice(26, 28).reduce(msbLsb) / 100,
-						x_peak_one_Hz: payload.slice(28, 30).reduce(msbLsb),
-						x_peak_two_Hz: payload.slice(30, 32).reduce(msbLsb),
-						x_peak_three_Hz: payload.slice(32, 34).reduce(msbLsb),
-
-						y_rms_ACC_G: payload.slice(34, 36).reduce(msbLsb)/1000,
-						y_max_ACC_G: payload.slice(36, 38).reduce(msbLsb)/1000,
-						y_velocity_mm_sec: payload.slice(38, 40).reduce(msbLsb) / 100,
-						y_displacement_mm: payload.slice(40, 42).reduce(msbLsb) / 100,
-						y_peak_one_Hz: payload.slice(42, 44).reduce(msbLsb),
-						y_peak_two_Hz: payload.slice(44, 46).reduce(msbLsb),
-						y_peak_three_Hz: payload.slice(46, 48).reduce(msbLsb),
-
-						z_rms_ACC_G: payload.slice(48, 50).reduce(msbLsb)/1000,
-						z_max_ACC_G: payload.slice(50, 52).reduce(msbLsb)/1000,
-						z_velocity_mm_sec: payload.slice(52, 54).reduce(msbLsb) / 100,
-						z_displacement_mm: payload.slice(54, 56).reduce(msbLsb) / 100,
-						z_peak_one_Hz: payload.slice(56, 58).reduce(msbLsb),
-						z_peak_two_Hz: payload.slice(58, 60).reduce(msbLsb),
-						z_peak_three_Hz: payload.slice(60, 62).reduce(msbLsb),
-						rpm: payload.slice(62, 64).reduce(msbLsb)
-					};
-				}
-				// else{
-				// 	parsed.data = {'error': 'Vibration mode error'}
-				// 	return parsed;
-				// }
-			},
-			'utils': {
-				'clear_globalDevices_stream': (deviceAddr) => {
-					if(Object.hasOwn(globalDevices, deviceAddr)){
-						if(Object.hasOwn(globalDevices[deviceAddr], 'packet_stream_timeout')){
-							clearTimeout(globalDevices[deviceAddr].packet_stream_timeout);
-						}
-						delete globalDevices[deviceAddr];
-					}
-				},
-				'init_globalDevices_stream'(deviceAddr, payload, expected_packets, parsed, msg_type){
-					globalDevices[deviceAddr] = {
-						data: {},
-						odr: msbLsb(payload[9], payload[10]),
-						mo: payload[8],
-						fsr: payload[11] >> 5,
-						hour: payload[12],
-						minute: payload[13],
-						temperature: msbLsb(payload[14], payload[15]) / 100,
-						expected_packets: expected_packets
-					}
-					globalDevices[deviceAddr].packet_stream_timeout = setTimeout(() => {
-						parsed.sensor_data = parent.sensor_types[112].utils.concat_fft_data(deviceAddr, payload[8], msg_type);
-						parsed.sensor_data.error = 'Time Series Data Stream Timeout - incomplete data received';
-
-						parsed.sensor_name = parent.sensor_types[112].name;
-						parsed.type = 'sensor_data';
-						parsed.addr = deviceAddr;
-						parsed.received = Date.now();
-
-						parent._emitter.emit('sensor_data', parsed);
-						parent._emitter.emit('sensor_data-112', parsed);
-						parent._emitter.emit('sensor_data'+'-'+deviceAddr, parsed);
-					}, 60000);
-				},
-				'concat_fft_data': (deviceAddr, mode, msg_type) => {
-					var raw_data = new Array();
-					for(const packet in globalDevices[deviceAddr].data){
-						raw_data = raw_data.concat(globalDevices[deviceAddr].data[packet]);
-					}
-					var label = 0;
-
-					var fft_concat = {};
-
-					var en_axis_data = {};
-					en_axis_data.x_offset = 0;
-					en_axis_data.y_offset = 2;
-					en_axis_data.z_offset = 4;
-					en_axis_data.increment = 6;
-					fft_concat = {x: [], y: [], z: []};
-					
-					var fsr_mult = .00006;
-					var fsr_text = "";
-
-					switch(globalDevices[deviceAddr].fsr){
-						case 0:
-							fsr_mult = 0.00006;
-							break;
-						case 1:
-							fsr_mult = 0.00012;
-							break;
-						case 2:
-							fsr_mult = 0.00024;
-							break;
-						case 3:
-							fsr_mult = 0.00049;
-							break;
-					}
-					switch(globalDevices[deviceAddr].fsr){
-						case 0:
-							fsr_text = "2g";
-							break;
-						case 1:
-							fsr_text = "4g";
-							break;
-						case 2:
-							fsr_text = "8g";
-							break;
-						case 3:
-							fsr_text = "16g";
-							break;
-					}
-
-					for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
-						label++;
-
-						if('x_offset' in en_axis_data){
-							fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(3)));
-						}
-						if('y_offset' in en_axis_data){
-							fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(3)));
-						}
-						if('z_offset' in en_axis_data){
-							fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(3)));
-						}
-					}
-					var fft_concat_obj = {
-						mode: mode,
-						msg_type: msg_type,
-						time_id: [
-							String(globalDevices[deviceAddr].hour).padStart(2, '0'),
-							String(globalDevices[deviceAddr].minute).padStart(2, '0'),
-						].join(':'),
-						mac_address: deviceAddr,
-						fsr: fsr_text,
-						odr: globalDevices[deviceAddr].odr,
-						temperature: globalDevices[deviceAddr].temperature,
-						total_samples: label,
-						fft_confidence : ((Object.keys(globalDevices[deviceAddr].data).length / globalDevices[deviceAddr].expected_packets) * 100).toFixed(2) + '%',
-						data: fft_concat
-					};
-					return fft_concat_obj;
-				}
-			},
-			'parse_fly': (frame) => {
-				let frame_data = {};
-				switch(frame[16]){
-					case 0:
-						frame_data.mode = "Processed";
-						break;
-					case 1:
-						frame_data.mode = "Raw";
-						break;
-					case 2:
-						frame_data.mode = "Processed + Raw on demand";
-						break;
-					case 3:
-						frame_data.mode = "Smart";
-						break;
-				}
-				switch(frame[17]){
-					case 6:
-						frame_data.odr_1 = 50;
-						break;
-					case 7:
-						frame_data.odr_1 = 100;
-						break;
-					case 8:
-						frame_data.odr_1 = 200;
-						break;
-					case 9:
-						frame_data.odr_1 = 400;
-						break;
-					case 10:
-						frame_data.odr_1 = 800;
-						break;
-					case 11:
-						frame_data.odr_1 = 1600;
-						break;
-					case 12:
-						frame_data.odr_1 = 3200;
-						break;
-					case 13:
-						frame_data.odr_1 = 6400;
-						break;
-					case 14:
-						frame_data.odr_1 = 12800;
-						break;
-					case 15:
-						frame_data.odr_1 = 25600;
-						break;
-				}
-				frame_data.sampling_duration_1 = frame[18]*50 + "ms";
-				switch(frame[19]){
-					case 0:
-						frame_data.filter_status = "Disabled";
-						break;
-					case 1:
-						frame_data.filter_status = "Enabled";
-						break;
-				}
-				switch(frame[20]){
-					case 0:
-						frame_data.lpf_coeff_1 = 4;
-						break;
-					case 1:
-						frame_data.lpf_coeff_1 = 8;
-						break;
-					case 2:
-						frame_data.lpf_coeff_1 = 16;
-						break;
-					case 2:
-						frame_data.lpf_coeff_1 = 32;
-						break;
-					case 4:
-						frame_data.lpf_coeff_1 = 64;
-						break;
-					case 5:
-						frame_data.lpf_coeff_1 = 128;
-						break;
-					case 6:
-						frame_data.lpf_coeff_1 = 256;
-						break;
-					case 7:
-						frame_data.lpf_coeff_1 = 512;
-						break;
-					case 8:
-						frame_data.lpf_coeff_1 = 1024;
-						break;
-					case 9:
-						frame_data.lpf_coeff_1 = 2048;
-						break;
-				}
-				frame_data.lpf_freq_1 = frame_data.odr_1 / frame_data.lpf_coeff_1;
-				switch(frame[21]){
-					case 0:
-						frame_data.hpf_coeff_1 = 4;
-						break;
-					case 1:
-						frame_data.hpf_coeff_1 = 8;
-						break;
-					case 2:
-						frame_data.hpf_coeff_1 = 16;
-						break;
-					case 2:
-						frame_data.hpf_coeff_1 = 32;
-						break;
-					case 4:
-						frame_data.hpf_coeff_1 = 64;
-						break;
-					case 5:
-						frame_data.hpf_coeff_1 = 128;
-						break;
-					case 6:
-						frame_data.hpf_coeff_1 = 256;
-						break;
-					case 7:
-						frame_data.hpf_coeff_1 = 512;
-						break;
-					case 8:
-						frame_data.hpf_coeff_1 = 1024;
-						break;
-					case 9:
-						frame_data.hpf_coeff_1 = 2048;
-						break;
-				}
-				frame_data.hpf_freq_1 = frame_data.odr_1 / frame_data.hpf_coeff_1;
-				switch(frame[22]){
-					case 0:
-						frame_data.sampling_interval = "5 Minutes";
-						frame_data.sampling_interval_number = 5;
-						break;
-					case 1:
-						frame_data.sampling_interval = "10 Minutes";
-						frame_data.sampling_interval_number = 10;
-						break;
-					case 2:
-						frame_data.sampling_interval = "15 Minutes";
-						frame_data.sampling_interval_number = 15;
-						break;
-					case 2:
-						frame_data.sampling_interval = "20 Minutes";
-						frame_data.sampling_interval_number = 20;
-						break;
-					case 4:
-						frame_data.sampling_interval = "30 Minutes";
-						frame_data.sampling_interval_number = 30;
-						break;
-					case 5:
-						frame_data.sampling_interval = "60 Minutes";
-						frame_data.sampling_interval_number = 60;
-						break;
-					case 6:
-						frame_data.sampling_interval = "120 Minutes";
-						frame_data.sampling_interval_number = 120;
-						break;
-					case 7:
-						frame_data.sampling_interval = "180 Minutes";
-						frame_data.sampling_interval_number = 180;
-						break;
-					case 8:
-						frame_data.sampling_interval = "1 Minute";
-						frame_data.sampling_interval_number = 1;
-						break;
-				}
-				frame_data.on_request_timeout = frame[23] + " Seconds";
-				frame_data.deadband = frame[24] + "mg";
-
-				switch(frame[25]){
-					case 0:
-						frame_data.payload_length = "50 Bytes";
-						break;
-					case 1:
-						frame_data.payload_length = "100 Bytes";
-						break;
-					case 2:
-						frame_data.payload_length = "150 Bytes";
-						break;
-					case 3:
-						frame_data.payload_length = "180 Bytes";
-						break;
-				}
-				switch(frame[26]){
-					case 0:
-						frame_data.fsr_text = "2g";
-						break;
-					case 1:
-						frame_data.fsr_text = "4g";
-						break;
-					case 2:
-						frame_data.fsr_text = "8g";
-						break;
-					case 3:
-						frame_data.fsr_text = "16g";
-						break;
-				}
-				frame_data.rpm_status = frame[27]? 'Enabled': 'Disabled';
-				frame_data.auto_raw_interval = frame[32] * frame_data.sampling_interval_number || 'disabled';
-				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
-				frame_data.smart_mode_threshold = frame[34] * 50;
-				if(frame[2] > 5){ // for Firmware v6 and above
-					frame_data.motion_to_delay = frame[41] * 50;
-					return {
-						'firmware': frame[2],
-						'destination_address': toMac(frame.slice(12, 16)),
-						'mode': frame_data.mode,
-						'odr': frame_data.odr_1+'Hz',
-						'sampling_duration': frame_data.sampling_duration_1,
-						'filter_status': frame_data.filter_status,
-						'lpf_coeff': frame_data.lpf_coeff_1,
-						'lpf_freq': frame_data.lpf_freq_1+'Hz',
-						'hpf_coeff': frame_data.hpf_coeff_1,
-						'hpf_freq': frame_data.hpf_freq_1+'Hz',
-						'sampling_interval': frame_data.sampling_interval,
-						'on_request_timeout': frame_data.on_request_timeout,
-						'deadband': frame_data.deadband,
-						'payload_length': frame_data.payload_length,
-						'fsr': frame_data.fsr_text,
-						'rpm_compute_status': frame_data.rpm_status,
-						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
-						'auto_raw_interval': frame_data.auto_raw_interval,
-						'smart_mode_skip_count': frame[33],
-						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
-						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
-						'max_tx_raw_samples': frame.slice(39, 41).reduce(msbLsb),
-						'motion_to_sampling_delay': frame_data.motion_to_delay +'msec',
-						'max_num_of_motion_tx_per_interval': frame[42],
-						'hardware_id': frame.slice(43, 46),
-						'reserved': frame.slice(46, 50),
-						'tx_lifetime_counter': frame.slice(50, 54).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'destination_address': toMac(frame.slice(12, 16), false),
-							'mode': frame[16],
-							'odr': frame[17],
-							'sampling_duration': frame[18],
-							'filter_status': frame[19],
-							'lpf_coeff': frame[20],
-							'hpf_coeff': frame[21],
-							'sampling_interval': frame[22],
-							'on_request_timeout': frame[23],
-							'deadband': frame[24],
-							'payload_length': frame[25],
-							'fsr': frame[26],
-							'rpm_compute_status': frame[27],
-							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
-							'auto_raw_interval': frame[32],
-							'smart_mode_skip_count': frame[33],
-							'smart_mode_acc_threshold':frame[34],
-							'uptime_counter': frame.slice(35, 39),
-							'max_tx_raw_samples': frame.slice(39, 41),
-							'motion_to_sampling_delay': frame[41],
-							'max_num_of_motion_tx_per_interval': frame[42],
-							'hardware_id': frame.slice(43, 46),
-							'reserved': frame.slice(46, 50),
-							'tx_lifetime_counter': frame.slice(50, 54)
-						}
-					}
-				} else if(frame[2] > 4){ // for Firmware v5 and above
-					return {
-						'firmware': frame[2],
-						'destination_address': toMac(frame.slice(12, 16)),
-						'mode': frame_data.mode,
-						'odr': frame_data.odr_1+'Hz',
-						'sampling_duration': frame_data.sampling_duration_1,
-						'filter_status': frame_data.filter_status,
-						'lpf_coeff': frame_data.lpf_coeff_1,
-						'lpf_freq': frame_data.lpf_freq_1+'Hz',
-						'hpf_coeff': frame_data.hpf_coeff_1,
-						'hpf_freq': frame_data.hpf_freq_1+'Hz',
-						'sampling_interval': frame_data.sampling_interval,
-						'on_request_timeout': frame_data.on_request_timeout,
-						'deadband': frame_data.deadband,
-						'payload_length': frame_data.payload_length,
-						'fsr': frame_data.fsr_text,
-						'rpm_compute_status': frame_data.rpm_status,
-						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
-						'auto_raw_interval': frame_data.auto_raw_interval,
-						'smart_mode_skip_count': frame[33],
-						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
-						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
-						'max_tx_raw_samples': frame.slice(39, 41).reduce(msbLsb),
-						'hardware_id': frame.slice(41, 44),
-						'reserved': frame.slice(44, 48),
-						'tx_lifetime_counter': frame.slice(48, 52).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'destination_address': toMac(frame.slice(12, 16), false),
-							'mode': frame[16],
-							'odr': frame[17],
-							'sampling_duration': frame[18],
-							'filter_status': frame[19],
-							'lpf_coeff': frame[20],
-							'hpf_coeff': frame[21],
-							'sampling_interval': frame[22],
-							'on_request_timeout': frame[23],
-							'deadband': frame[24],
-							'payload_length': frame[25],
-							'fsr': frame[26],
-							'rpm_compute_status': frame[27],
-							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
-							'auto_raw_interval': frame[32],
-							'smart_mode_skip_count': frame[33],
-							'smart_mode_acc_threshold':frame[34],
-							'uptime_counter': frame.slice(35, 39),
-							'max_tx_raw_samples': frame.slice(39, 41),
-							'hardware_id': frame.slice(41, 44),
-							'reserved': frame.slice(44, 48),
-							'tx_lifetime_counter': frame.slice(48, 52)
-						}
-					}
-				}else{
-					return {
-						'firmware': frame[2],
-						'destination_address': toMac(frame.slice(12, 16)),
-						'mode': frame_data.mode,
-						'odr': frame_data.odr_1+'Hz',
-						'sampling_duration': frame_data.sampling_duration_1,
-						'filter_status': frame_data.filter_status,
-						'lpf_coeff': frame_data.lpf_coeff_1,
-						'lpf_freq': frame_data.lpf_freq_1+'Hz',
-						'hpf_coeff': frame_data.hpf_coeff_1,
-						'hpf_freq': frame_data.hpf_freq_1+'Hz',
-						'sampling_interval': frame_data.sampling_interval,
-						'on_request_timeout': frame_data.on_request_timeout,
-						'deadband': frame_data.deadband,
-						'payload_length': frame_data.payload_length,
-						'fsr': frame_data.fsr_text,
-						'rpm_compute_status': frame_data.rpm_status,
-						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
-						'auto_raw_interval': frame_data.auto_raw_interval,
-						'smart_mode_skip_count': frame[33],
-						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
-						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
-						'hardware_id': frame.slice(39, 42),
-						'reserved': frame.slice(42, 46),
-						'tx_lifetime_counter': frame.slice(46, 50).reduce(msbLsb),
-						'machine_values': {
-							'firmware': frame[2],
-							'destination_address': toMac(frame.slice(12, 16), false),
-							'mode': frame[16],
-							'odr': frame[17],
-							'sampling_duration': frame[18],
-							'filter_status': frame[19],
-							'lpf_coeff': frame[20],
-							'hpf_coeff': frame[21],
-							'sampling_interval': frame[22],
-							'on_request_timeout': frame[23],
-							'deadband': frame[24],
-							'payload_length': frame[25],
-							'fsr': frame[26],
-							'rpm_compute_status': frame[27],
-							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
-							'auto_raw_interval': frame[32],
-							'smart_mode_skip_count': frame[33],
-							'smart_mode_acc_threshold':frame[34],
-							'uptime_counter': frame.slice(35, 39),
-							'hardware_id': frame.slice(39, 42),
-							'reserved': frame.slice(42, 46),
-							'tx_lifetime_counter': frame.slice(46, 50)
-						}
-					}
-				}
-			}
-		},
-		'117': {
-			name: 'Custom Vibration Sensor PPV',
-			parse: (payload, parsed, mac) => {
-				if(payload[7] & 2){
-					console.log('Error found');
-					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
-					return parsed;
-				}
-				if(payload[8] === 1){
-					let mode = payload[8];
-					let msg_type = '';
-					switch(payload[9]){
-						case 0:
-							msg_type = 'Regular';
-							break;
-						case 1:
-							msg_type = 'Cautionay';
-							break;
-						case 2:
-							msg_type = 'Artwork';
-							break;
-						case 3:
-							msg_type = 'Transient';
+						case 3:
+							msg_type = 'Transient';
 							break;
 					}
 					var deviceAddr = mac;
@@ -13677,15 +12187,6 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'128': {
-			name: 'Wireless Water Detect Sensor',
-			parse: (payload, parsed, mac) => {
-				return {
-					water_detect: payload[8],
-					raw_value: payload.slice(9, 11).reduce(msbLsb)
-				};
-			}
-		},
 		'180': {
 			name: 'C1D2 One Channel Vibration Plus',
 			parse: (payload, parsed, mac) => {
@@ -17276,40 +15777,6 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'554': {
-			name: 'Custom 400-50,000 PPM CO2 Sensor',
-			parse: (payload, parsed, mac) => {
-				let status = [];
-				if(payload[8] & 1) status.push('fatal');
-				if(payload[8] & 2) status.push('offset_reg');
-				if(payload[8] & 4) status.push('algorithm');
-				if(payload[8] & 8) status.push('output');
-				if(payload[8] & 16) status.push('self_diagnostic');
-				if(payload[8] & 32) status.push('out_of_range');
-				if(payload[8] & 64) status.push('memory');
-				if(payload[8] == 0) status = 'valid_data'
-				let res = {
-					status: status,
-					co2_ppm: signInt(payload.slice(9, 13).reduce(msbLsb), 32)
-				};
-				if(payload[7] == 1) res.co2_ppm = 'invalid_data';
-				return res;
-			},
-			'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)
-					}
-				}
-			}
-		},
 		'1010': {
 			name: 'RS232 Wireless Converter',
 			parse: (d) => {