@ncd-io/node-red-enterprise-sensors 1.0.0 → 1.0.1

package/lib/WirelessGateway.js

@@ -142,7 +142,7 @@ module.exports = class WirelessSensor{
 				}
 			}
 			// #OTF
-			var otf_devices = [23,26,39,45,48,52,76,78,79,80,81,82,84,88,89,90,91,101,102,107,108,180,181,519,520,521,531,535,537];
+			var otf_devices = [23,26,39,45,48,52,76,78,79,80,81,82,84,88,89,90,91,101,102,105,107,108,110,111,112,114,180,181,519,520,521,531,535,537,540];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -1332,6 +1332,40 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_auto_raw_interval_110(sensor_mac, value){
+		console.log('config_set_raw_interval_110');
+		var packet = [244, 79, 0, 0, 80, 76, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_auto_raw_destination_110(sensor_mac, value){
+		console.log('config_set_auto_raw_destination_110');
+		var packet = [244, 79, 0, 0, 80, 72];
+		let value_dest = int2Bytes((value), 4);
+		packet.push(...value_dest);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_clear_probe_uptimers_110(sensor_mac, value){
+		console.log('config_set_clear_probe_uptimers_110');
+		var packet = [244, 79, 0, 0, 80, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_smart_interval_110(sensor_mac, value){
+		console.log('config_set_smart_interval_110');
+		var packet = [244, 79, 0, 0, 101, 76, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_smart_threshold_110(sensor_mac, value){
+		console.log('config_set_smart_threshold_110');
+		var packet = [244, 79, 0, 0, 101];
+		let value_th = int2Bytes((value), 2);
+		packet.push(...value_th);
+		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) => {
@@ -2506,7 +2540,7 @@ function sensor_types(parent){
 			name: 'ORP and Temperature Sensor',
 			parse: (d) => {
 				return {
-					ORP: signInt(d.slice(0, 2).reduce(msbLsb), 16) / 100,
+					ORP: signInt(d.slice(0, 2).reduce(msbLsb), 16),
 					Temp: signInt(d.slice(2, 4).reduce(msbLsb),16) / 100
 				};
 			}
@@ -2515,7 +2549,7 @@ function sensor_types(parent){
 			name: 'ORP, pH and Temperature Sensor',
 			parse: (d) => {
 				return {
-					ORP: signInt(d.slice(0, 2).reduce(msbLsb), 16) / 100,
+					ORP: signInt(d.slice(0, 2).reduce(msbLsb), 16),
 					Temp: signInt(d.slice(2, 4).reduce(msbLsb),16) / 100,
 					pH: signInt(d.slice(4, 6).reduce(msbLsb), 16) / 100,
 					Temp: signInt(d.slice(6, 8).reduce(msbLsb),16) / 100
@@ -2623,96 +2657,2867 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'76': {
-			name: 'Wireless CO Sensor',
+		'76': {
+			name: 'Wireless CO Sensor',
+			parse: (d) => {
+				return {
+					humidity: msbLsb(d[0], d[1])/100,
+					temperature: signInt((msbLsb(d[2], d[3])), 16)/100,
+					co_ppm: msbLsb(d[4], d[5])
+				};
+			}
+		},
+		'77': {
+			name: '3 Channel SDI-12 Wireelss',
+			parse: (d) => {
+				return {
+					Temperature_1: signInt(d.slice(0, 2).reduce(msbLsb), 16)/100,
+					Soil_Moisture_1: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100,
+					Bulk_EC_1: signInt(d.slice(4, 6).reduce(msbLsb), 16),
+					Pore_EC_1: signInt(d.slice(6, 8).reduce(msbLsb), 16),
+					Permittivity_1: signInt(d.slice(8, 10).reduce(msbLsb), 16)/100,
+					Temperature_2: signInt(d.slice(10, 12).reduce(msbLsb), 16)/100,
+					Soil_Moisture_2: signInt(d.slice(12, 14).reduce(msbLsb), 16)/100,
+					Bulk_EC_2: signInt(d.slice(14, 16).reduce(msbLsb), 16),
+					Pore_EC_2: signInt(d.slice(16, 18).reduce(msbLsb), 16),
+					Permittivity_2: signInt(d.slice(18, 20).reduce(msbLsb), 16)/100,
+					Temperature_3: signInt(d.slice(20, 22).reduce(msbLsb), 16)/100,
+					Soil_Moisture_3: signInt(d.slice(22, 24).reduce(msbLsb), 16)/100,
+					Bulk_EC_3: signInt(d.slice(24, 26).reduce(msbLsb), 16),
+					Pore_EC_3: signInt(d.slice(26, 28).reduce(msbLsb), 16),
+					Permittivity_3: signInt(d.slice(28, 30).reduce(msbLsb), 16)/100
+				};
+			}
+		},
+		'78': {
+			name: 'Oil Particulate Counter Sensor',
+			parse: (d, original_payload) => {
+				if(original_payload[1] <= 3){
+					return {
+						ferro_particles_30_50_um: d.slice(0, 4).reduce(msbLsb)/100,
+						ferro_particles_50_100_um: d.slice(4, 8).reduce(msbLsb)/100,
+						ferro_particles_100_200_um: d.slice(8, 12).reduce(msbLsb)/100,
+						ferro_particles_200_400_um: d.slice(12, 16).reduce(msbLsb)/100,
+						ferro_particles_400_800_um: d.slice(16, 20).reduce(msbLsb)/100,
+						ferro_particles_gt_800_um: d.slice(20, 24).reduce(msbLsb)/100,
+						ferro_particles_total: d.slice(24, 28).reduce(msbLsb)/100,
+						non_ferro_particles_120_200_um: d.slice(28, 32).reduce(msbLsb)/100,
+						non_ferro_particles_200_400_um: d.slice(32, 36).reduce(msbLsb)/100,
+						non_ferro_particles_400_800_um: d.slice(36, 40).reduce(msbLsb)/100
+					};
+				}else{
+					return {
+						ferro_particles_30_50_um: d.slice(0, 4).reduce(msbLsb)/100,
+						ferro_particles_50_100_um: d.slice(4, 8).reduce(msbLsb)/100,
+						ferro_particles_100_200_um: d.slice(8, 12).reduce(msbLsb)/100,
+						ferro_particles_200_400_um: d.slice(12, 16).reduce(msbLsb)/100,
+						ferro_particles_400_800_um: d.slice(16, 20).reduce(msbLsb)/100,
+						ferro_particles_gt_800_um: d.slice(20, 24).reduce(msbLsb)/100,
+						ferro_particles_total: d.slice(24, 28).reduce(msbLsb)/100,
+						non_ferro_particles_120_200_um: d.slice(28, 32).reduce(msbLsb)/100,
+						non_ferro_particles_200_400_um: d.slice(32, 36).reduce(msbLsb)/100,
+						non_ferro_particles_400_800_um: d.slice(36, 40).reduce(msbLsb)/100,
+						non_ferro_particles_800_1600_um: d.slice(40, 44).reduce(msbLsb)/100,
+						non_ferro_particles_gt_1600_um: d.slice(44, 48).reduce(msbLsb)/100,
+						non_ferro_particles_total: d.slice(48, 52).reduce(msbLsb)/100,
+						ferro_particles_total_24h: d.slice(52, 56).reduce(msbLsb)/100,
+						non_ferro_particles_total_24h: d.slice(56, 60).reduce(msbLsb)/100,
+						ferro_concentration: d.slice(60, 64).reduce(msbLsb)/100,
+						non_ferro_concentration: d.slice(64, 68).reduce(msbLsb)/100,
+						flow: d.slice(68, 72).reduce(msbLsb)/100,
+					};
+				}
+			}
+		},
+		'79': {
+			name: 'Oil Analysis Sensor',
+			parse: (d) => {
+				return {
+					dynamic_viscosity: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100,
+					density: signInt(d.slice(4, 8).reduce(msbLsb), 32) / 100,
+					dialectric_constant: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100,
+					temperature: signInt(d.slice(12, 16).reduce(msbLsb), 32) / 100,
+					saturability: signInt(d.slice(16, 20).reduce(msbLsb), 32) / 100,
+					moisture_content: signInt(d.slice(20, 24).reduce(msbLsb), 32) / 100,
+					water_content: signInt(d.slice(24, 28).reduce(msbLsb), 32) / 100,
+					kinematic_viscosity_40c: signInt(d.slice(28, 32).reduce(msbLsb), 32) / 100,
+					kinematic_viscosity_100c: signInt(d.slice(32, 36).reduce(msbLsb), 32) / 100
+				};
+			}
+		},
+		'80': {
+			name: 'One Channel Vibration Plus',
+			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&127)-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,
+					'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',
+					'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],
+						'sampling_duration_2': frame[20],
+						'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]
+					}
+				}
+			}
+		},
+		'81': {
+			name: 'Two Channel Vibration Plus',
+			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){
+					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));
+								}
+							}
+
+							// 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';
+							}
+
+							var fft_concat_obj = {
+								probe: probe,
+								time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
+								probe: probe,
+								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 odr1;
+					switch(payload[9]){
+						case 6:
+							odr1 = "50Hz"
+							break;
+						case 7:
+							odr1 = "100Hz";
+							break;
+						case 8:
+							odr1 = "200Hz";
+							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[54]){
+						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],
+
+						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),
+
+						s2_odr: odr2,
+						s2_temperature: signInt(payload.slice(55, 57).reduce(msbLsb), 16) / 100,
+
+						x2_rms_ACC_G: payload.slice(57, 59).reduce(msbLsb)/1000,
+						x2_max_ACC_G: payload.slice(59, 61).reduce(msbLsb)/1000,
+						x2_velocity_mm_sec: payload.slice(61, 63).reduce(msbLsb) / 100,
+						x2_displacement_mm: payload.slice(63, 65).reduce(msbLsb) / 100,
+						x2_peak_one_Hz: payload.slice(65, 67).reduce(msbLsb),
+						x2_peak_two_Hz: payload.slice(67, 69).reduce(msbLsb),
+						x2_peak_three_Hz: payload.slice(69, 71).reduce(msbLsb),
+
+						y2_rms_ACC_G: payload.slice(71, 73).reduce(msbLsb)/1000,
+						y2_max_ACC_G: payload.slice(73, 75).reduce(msbLsb)/1000,
+						y2_velocity_mm_sec: payload.slice(75, 77).reduce(msbLsb) / 100,
+						y2_displacement_mm: payload.slice(77, 79).reduce(msbLsb) / 100,
+						y2_peak_one_Hz: payload.slice(79, 81).reduce(msbLsb),
+						y2_peak_two_Hz: payload.slice(81, 83).reduce(msbLsb),
+						y2_peak_three_Hz: payload.slice(83, 85).reduce(msbLsb),
+
+						z2_rms_ACC_G: payload.slice(85, 87).reduce(msbLsb)/1000,
+						z2_max_ACC_G: payload.slice(87, 89).reduce(msbLsb)/1000,
+						z2_velocity_mm_sec: payload.slice(89, 91).reduce(msbLsb) / 100,
+						z2_displacement_mm: payload.slice(91, 93).reduce(msbLsb) / 100,
+						z2_peak_one_Hz: payload.slice(93, 95).reduce(msbLsb),
+						z2_peak_two_Hz: payload.slice(95, 97).reduce(msbLsb),
+						z2_peak_three_Hz: payload.slice(97, 99).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;
+				}
+				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";
+						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',
+					'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,
+					'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]
+					}
+				}
+			}
+		},
+
+		'82': {
+			name: 'Condition Based/Predictive Maintenance Sensor',
+			parse: (payload, parsed, mac) => {
+				if(payload[7] >> 1 != 0){
+					console.log('Error found');
+					console.log(payload[7]);
+					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
+							};
+							// console.log(globalDevices[deviceAddr].data);
+							// console.log(raw_data);
+							sensor_data = fft_concat_obj;
+							// parsed.raw_packets = globalDevices[deviceAddr].data;
+							// parsed.raw_data = raw_data;
+							delete globalDevices[deviceAddr];
+							if(this.hasOwnProperty('failure_no')){
+								console.log('####falure no');
+								console.log(this.failure_no);
+							}
+
+							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,
+						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),
+					};
+				}
+				// 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,
+					'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',
+					'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],
+						'sampling_duration_2': frame[20],
+						'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]
+					}
+				}
+			}
+		},
+
+		'84': {
+			name: 'Type 84 - 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,
+					'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',
+					'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],
+						'sampling_duration_2': frame[20],
+						'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]
+					}
+				}
+			}
+		},
+		'88': {
+			name: '1 Channel Ultrasound Vibration Sensor',
+			parse: (d) => {
+				return {
+					raw_adc: d.slice(0, 2).reduce(msbLsb),
+					ma: d.slice(2, 4).reduce(msbLsb) / 100,
+					db: d.slice(4, 6).reduce(msbLsb) / 100
+				};
+			}
+		},
+		'89': {
+			name: '2 Channel Ultrasound Vibration Sensor',
+			parse: (d) => {
+				return {
+					c1_raw_adc: d.slice(0, 2).reduce(msbLsb),
+					c1_ma: d.slice(2, 4).reduce(msbLsb) / 100,
+					c1_db: d.slice(4, 6).reduce(msbLsb) / 100,
+					c2_raw_adc: d.slice(6, 8).reduce(msbLsb),
+					c2_ma: d.slice(8, 10).reduce(msbLsb) / 100,
+					c2_db: d.slice(10, 12).reduce(msbLsb) / 100
+				};
+			}
+		},
+		'90': {
+			name: 'DC Current Sensor',
+			parse: (d) => {
+				return {
+					raw_adc: d.slice(0, 2).reduce(msbLsb),
+					amps: d.slice(2, 6).reduce(msbLsb) / 10,
+				};
+			}
+		},
+		'91': {
+			name: 'Wireless Air Velocity Sensor HVAC',
+			parse: (d) => {
+				return {
+					velocity_mps: signInt(msbLsb(d[0], d[1]), 16) / 1000
+				};
+			}
+		},
+		'92': {
+			name: 'Sound Sensor',
+			parse: (d) => {
+				return {
+					sound: signInt(d[3], 8)/100
+				};
+			}
+		},
+		'95': {
+			name: '16-Bit 1-Channel 0-24VDC Receiver',
+			parse: (d) => {
+				return {
+					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
+					vdc: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
+				};
+			}
+		},
+		'96': {
+			name: '16-Bit 1-Channel 0-48VDC Receiver',
+			parse: (d) => {
+				return {
+					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
+					vdc: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
+				};
+			}
+		},
+		'101':{
+			name: 'Pro Vibration',
+			parse: (d, full)=>{
+				return{
+					mode: full[7] == 1? "raw" : "normal"
+				};
+			}
+		},
+		'105': {
+			name: '1 Auto Luber With Ultrasound Vibration Sensor',
 			parse: (d) => {
 				return {
-					humidity: msbLsb(d[0], d[1])/100,
-					temperature: signInt((msbLsb(d[2], d[3])), 16)/100,
-					co_ppm: msbLsb(d[4], d[5])
+					raw_adc: d.slice(0, 2).reduce(msbLsb),
+					ma: d.slice(2, 4).reduce(msbLsb) / 100,
+					db: d.slice(4, 6).reduce(msbLsb) / 100
 				};
 			}
 		},
-		'77': {
-			name: '3 Channel SDI-12 Wireelss',
+		'107': {
+			name: '16-Bit 4-Channel 4-20mA',
 			parse: (d) => {
+				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
+				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
+				var adc3 = signInt(d.slice(4, 6).reduce(msbLsb));
+				var adc4 = signInt(d.slice(6, 8).reduce(msbLsb));
+				var ma1 = (signInt(d.slice(8, 10).reduce(msbLsb)))/100.0;
+				var ma2 = (signInt(d.slice(10, 12).reduce(msbLsb)))/100.0;
+				var ma3 = (signInt(d.slice(12, 14).reduce(msbLsb)))/100.0;
+				var ma4 = (signInt(d.slice(14, 16).reduce(msbLsb)))/100.0;
 				return {
-					Temperature_1: signInt(d.slice(0, 2).reduce(msbLsb), 16)/100,
-					Soil_Moisture_1: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100,
-					Bulk_EC_1: signInt(d.slice(4, 6).reduce(msbLsb), 16),
-					Pore_EC_1: signInt(d.slice(6, 8).reduce(msbLsb), 16),
-					Permittivity_1: signInt(d.slice(8, 10).reduce(msbLsb), 16)/100,
-					Temperature_2: signInt(d.slice(10, 12).reduce(msbLsb), 16)/100,
-					Soil_Moisture_2: signInt(d.slice(12, 14).reduce(msbLsb), 16)/100,
-					Bulk_EC_2: signInt(d.slice(14, 16).reduce(msbLsb), 16),
-					Pore_EC_2: signInt(d.slice(16, 18).reduce(msbLsb), 16),
-					Permittivity_2: signInt(d.slice(18, 20).reduce(msbLsb), 16)/100,
-					Temperature_3: signInt(d.slice(20, 22).reduce(msbLsb), 16)/100,
-					Soil_Moisture_3: signInt(d.slice(22, 24).reduce(msbLsb), 16)/100,
-					Bulk_EC_3: signInt(d.slice(24, 26).reduce(msbLsb), 16),
-					Pore_EC_3: signInt(d.slice(26, 28).reduce(msbLsb), 16),
-					Permittivity_3: signInt(d.slice(28, 30).reduce(msbLsb), 16)/100
+					adc1: adc1,
+					adc2: adc2,
+					adc3: adc3,
+					adc4: adc4,
+					ma1: ma1,
+					ma2: ma2,
+					ma3: ma3,
+					ma4: ma4
 				};
 			}
 		},
-		'78': {
-			name: 'Oil Particulate Counter Sensor',
-			parse: (d, original_payload) => {
-				if(original_payload[1] <= 3){
-					return {
-						ferro_particles_30_50_um: d.slice(0, 4).reduce(msbLsb)/100,
-						ferro_particles_50_100_um: d.slice(4, 8).reduce(msbLsb)/100,
-						ferro_particles_100_200_um: d.slice(8, 12).reduce(msbLsb)/100,
-						ferro_particles_200_400_um: d.slice(12, 16).reduce(msbLsb)/100,
-						ferro_particles_400_800_um: d.slice(16, 20).reduce(msbLsb)/100,
-						ferro_particles_gt_800_um: d.slice(20, 24).reduce(msbLsb)/100,
-						ferro_particles_total: d.slice(24, 28).reduce(msbLsb)/100,
-						non_ferro_particles_120_200_um: d.slice(28, 32).reduce(msbLsb)/100,
-						non_ferro_particles_200_400_um: d.slice(32, 36).reduce(msbLsb)/100,
-						non_ferro_particles_400_800_um: d.slice(36, 40).reduce(msbLsb)/100
-					};
-				}else{
-					return {
-						ferro_particles_30_50_um: d.slice(0, 4).reduce(msbLsb)/100,
-						ferro_particles_50_100_um: d.slice(4, 8).reduce(msbLsb)/100,
-						ferro_particles_100_200_um: d.slice(8, 12).reduce(msbLsb)/100,
-						ferro_particles_200_400_um: d.slice(12, 16).reduce(msbLsb)/100,
-						ferro_particles_400_800_um: d.slice(16, 20).reduce(msbLsb)/100,
-						ferro_particles_gt_800_um: d.slice(20, 24).reduce(msbLsb)/100,
-						ferro_particles_total: d.slice(24, 28).reduce(msbLsb)/100,
-						non_ferro_particles_120_200_um: d.slice(28, 32).reduce(msbLsb)/100,
-						non_ferro_particles_200_400_um: d.slice(32, 36).reduce(msbLsb)/100,
-						non_ferro_particles_400_800_um: d.slice(36, 40).reduce(msbLsb)/100,
-						non_ferro_particles_800_1600_um: d.slice(40, 44).reduce(msbLsb)/100,
-						non_ferro_particles_gt_1600_um: d.slice(44, 48).reduce(msbLsb)/100,
-						non_ferro_particles_total: d.slice(48, 52).reduce(msbLsb)/100,
-						ferro_particles_total_24h: d.slice(52, 56).reduce(msbLsb)/100,
-						non_ferro_particles_total_24h: d.slice(56, 60).reduce(msbLsb)/100,
-						ferro_concentration: d.slice(60, 64).reduce(msbLsb)/100,
-						non_ferro_concentration: d.slice(64, 68).reduce(msbLsb)/100,
-						flow: d.slice(68, 72).reduce(msbLsb)/100,
-					};
+		'108': {
+			name: 'Machine Uptime Monitoring Sensor',
+			parse: (d, payload) => {
+				if(payload[7] & 2 != 0){
+					console.log('Error found');
+					// parsed.data = {error: 'Error found, Acclerometer Probe may be unattached'};
+					let error = {error: 'Error found, Acclerometer Probe may be unattached'};
+					return error;
 				}
-			}
-		},
-		'79': {
-			name: 'Oil Analysis Sensor',
-			parse: (d) => {
 				return {
-					dynamic_viscosity: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100,
-					density: signInt(d.slice(4, 8).reduce(msbLsb), 32) / 100,
-					dialectric_constant: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100,
-					temperature: signInt(d.slice(12, 16).reduce(msbLsb), 32) / 100,
-					saturability: signInt(d.slice(16, 20).reduce(msbLsb), 32) / 100,
-					moisture_content: signInt(d.slice(20, 24).reduce(msbLsb), 32) / 100,
-					water_content: signInt(d.slice(24, 28).reduce(msbLsb), 32) / 100,
-					kinematic_viscosity_40c: signInt(d.slice(28, 32).reduce(msbLsb), 32) / 100,
-					kinematic_viscosity_100c: signInt(d.slice(32, 36).reduce(msbLsb), 32) / 100
+					digital_input_1_counter: d.slice(0, 4).reduce(msbLsb),
+					digital_input_1_uptime: d.slice(4, 8).reduce(msbLsb),
+					digital_input_2_counter: d.slice(8, 12).reduce(msbLsb),
+					digital_input_2_uptime: d.slice(12, 16).reduce(msbLsb),
+					digital_input_3_counter: d.slice(16, 20).reduce(msbLsb),
+					digital_input_3_uptime: d.slice(20, 24).reduce(msbLsb),
+					accelerometer_counter: d.slice(24, 28).reduce(msbLsb),
+					accelerometer_uptime: d.slice(28, 32).reduce(msbLsb),
+					magnetometer_counter: d.slice(32, 36).reduce(msbLsb),
+					magnetometer_uptime: d.slice(36, 40).reduce(msbLsb)
 				};
 			}
 		},
-		'80': {
-			name: 'One Channel Vibration Plus',
+		'110': {
+			name: 'One Channel Vibration Plus v4',
 			parse: (payload, parsed, mac) => {
 				if(payload[7] >> 1 != 0){
 					console.log('Error found');
@@ -3322,8 +6127,8 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'81': {
-			name: 'Two Channel Vibration Plus',
+		'111': {
+			name: 'Two Channel Vibration Plus v4',
 			parse: (payload, parsed, mac) => {
 				parsed.data = {};
 				if(payload[7] & 2){
@@ -4124,8 +6929,8 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'82': {
-			name: 'Condition Based/Predictive Maintenance Sensor',
+		'112': {
+			name: 'Condition Based/Predictive Maintenance Sensor v4',
 			parse: (payload, parsed, mac) => {
 				if(payload[7] >> 1 != 0){
 					console.log('Error found');
@@ -4740,9 +7545,8 @@ function sensor_types(parent){
 				}
 			}
 		},
-
-		'84': {
-			name: 'Type 84 - Standalone Smart Vibration Sensor',
+		'114': {
+			name: 'Standalone Smart Vibration Sensor v4',
 			parse: (payload, parsed, mac) => {
 				if(payload[7] >> 1 != 0){
 					console.log('Error found');
@@ -5351,124 +8155,17 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'88': {
-			name: '1 Channel Ultrasound Vibration Sensor',
-			parse: (d) => {
-				return {
-					raw_adc: d.slice(0, 2).reduce(msbLsb),
-					ma: d.slice(2, 4).reduce(msbLsb) / 100,
-					db: d.slice(4, 6).reduce(msbLsb) / 100
-				};
-			}
-		},
-		'89': {
-			name: '2 Channel Ultrasound Vibration Sensor',
-			parse: (d) => {
-				return {
-					c1_raw_adc: d.slice(0, 2).reduce(msbLsb),
-					c1_ma: d.slice(2, 4).reduce(msbLsb) / 100,
-					c1_db: d.slice(4, 6).reduce(msbLsb) / 100,
-					c2_raw_adc: d.slice(6, 8).reduce(msbLsb),
-					c2_ma: d.slice(8, 10).reduce(msbLsb) / 100,
-					c2_db: d.slice(10, 12).reduce(msbLsb) / 100
-				};
-			}
-		},
-		'90': {
-			name: 'DC Current Sensor',
-			parse: (d) => {
-				return {
-					raw_adc: d.slice(0, 2).reduce(msbLsb),
-					amps: d.slice(2, 6).reduce(msbLsb) / 10,
-				};
-			}
-		},
-		'91': {
-			name: 'Wireless Air Velocity Sensor HVAC',
-			parse: (d) => {
-				return {
-					velocity_mps: signInt(msbLsb(d[0], d[1]), 16) / 1000
-				};
-			}
-		},
-		'92': {
-			name: 'Sound Sensor',
-			parse: (d) => {
-				return {
-					sound: signInt(d[3], 8)/100
-				};
-			}
-		},
-		'95': {
-			name: '16-Bit 1-Channel 0-24VDC Receiver',
-			parse: (d) => {
-				return {
-					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					vdc: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
-				};
-			}
-		},
-		'96': {
-			name: '16-Bit 1-Channel 0-48VDC Receiver',
-			parse: (d) => {
-				return {
-					adc: signInt(d.slice(0, 2).reduce(msbLsb), 16),
-					vdc: signInt(d.slice(2, 4).reduce(msbLsb), 16)/100
-				};
-			}
-		},
-		'101':{
-			name: 'Pro Vibration',
-			parse: (d, full)=>{
-				return{
-					mode: full[7] == 1? "raw" : "normal"
-				};
-			}
-		},
-		'107': {
-			name: '16-Bit 4-Channel 4-20mA',
-			parse: (d) => {
-				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
-				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
-				var adc3 = signInt(d.slice(4, 6).reduce(msbLsb));
-				var adc4 = signInt(d.slice(6, 8).reduce(msbLsb));
-				var ma1 = (signInt(d.slice(8, 10).reduce(msbLsb)))/100.0;
-				var ma2 = (signInt(d.slice(10, 12).reduce(msbLsb)))/100.0;
-				var ma3 = (signInt(d.slice(12, 14).reduce(msbLsb)))/100.0;
-				var ma4 = (signInt(d.slice(14, 16).reduce(msbLsb)))/100.0;
-				return {
-					adc1: adc1,
-					adc2: adc2,
-					adc3: adc3,
-					adc4: adc4,
-					ma1: ma1,
-					ma2: ma2,
-					ma3: ma3,
-					ma4: ma4
-				};
+
+		'180': {
+			name: 'C1D2 One Channel Vibration Plus',
+			parse: (payload, parsed, mac) => {
+				return parent.sensor_types[80].parse(payload, parsed, mac);
 			}
 		},
-		'108': {
-			name: 'Machine Uptime Monitoring Sensor',
-			parse: (d, payload) => {
-				if(payload[7] & 2 != 0){
-					console.log('Error found');
-					// parsed.data = {error: 'Error found, Acclerometer Probe may be unattached'};
-					let error = {error: 'Error found, Acclerometer Probe may be unattached'};
-					return error;
-				}
-				return {
-					digital_input_1_counter: d.slice(0, 4).reduce(msbLsb),
-					digital_input_1_uptime: d.slice(4, 8).reduce(msbLsb),
-					digital_input_2_counter: d.slice(8, 12).reduce(msbLsb),
-					digital_input_2_uptime: d.slice(12, 16).reduce(msbLsb),
-					digital_input_3_counter: d.slice(16, 20).reduce(msbLsb),
-					digital_input_3_uptime: d.slice(20, 24).reduce(msbLsb),
-					accelerometer_counter: d.slice(24, 28).reduce(msbLsb),
-					accelerometer_uptime: d.slice(28, 32).reduce(msbLsb),
-					magnetometer_counter: d.slice(32, 36).reduce(msbLsb),
-					magnetometer_uptime: d.slice(36, 40).reduce(msbLsb)
-				};
+		'181': {
+			name: 'C1D2 Two Channel Vibration Plus',
+			parse: (payload, parsed, mac) => {
+				return parent.sensor_types[81].parse(payload, parsed, mac);
 			}
 		},
 		'180': {
@@ -6394,13 +9091,13 @@ function sensor_types(parent){
 			name: 'Type 521 - 3 Channel Light Sensor',
 			parse: (payload, parsed) => {
 				return {
-					lux_1: payload.slice(0, 2).reduce(msbLsb)/100,
+					lux_1: payload.slice(0, 2).reduce(msbLsb),
 					temp_1: payload.slice(2, 4).reduce(msbLsb)/100,
 					ext_temp_1: payload.slice(4, 6).reduce(msbLsb)/100,
-					lux_2: payload.slice(6, 8).reduce(msbLsb)/100,
+					lux_2: payload.slice(6, 8).reduce(msbLsb),
 					temp_2: payload.slice(8, 10).reduce(msbLsb)/100,
 					ext_temp_2: payload.slice(10, 12).reduce(msbLsb)/100,
-					lux_3: payload.slice(12, 14).reduce(msbLsb)/100,
+					lux_3: payload.slice(12, 14).reduce(msbLsb),
 					temp_3: payload.slice(14, 16).reduce(msbLsb)/100,
 					ext_temp_3: payload.slice(16, 18).reduce(msbLsb)/100
 				}
@@ -7077,6 +9774,16 @@ function sensor_types(parent){
 				};
 			},
 		},
+		'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
+				};
+			}
+		},
 		'10000': {
 			name: '4-Relay',
 			parse: (d) => {