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

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,105,107,108,110,111,112,114,180,181,519,520,521,531,535,537,540];
+			var otf_devices = [23,26,39,45,48,52,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,519,520,521,531,535,537,538,539,540];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -294,7 +294,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,106,107,108,110,111,112,114,180,181,519,520,521,531,535,537,538,539,540];
 		if(otf_devices.includes(parsed.sensor_type)){
 			// If the message says FLY and there is not FLY timer in progress.
 			if(payload[8] == 70 && payload[9] == 76 && payload[10] == 89) {
@@ -712,7 +712,7 @@ module.exports = class WirelessSensor{
 					data: payload.slice(8)
 				};
 				// #OTF
-			}else if(parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 537){
+			}else if(parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 537 || parsed.sensor_type == 538){
 				parsed.sensor_data = this.sensor_types[parsed.sensor_type].parse(payload, parsed, frame.mac);
 				if(!parsed.sensor_data){
 					return;
@@ -800,11 +800,6 @@ module.exports = class WirelessSensor{
 		var packet = [247, 7, 0, 0, 0, enabled, perc, interval >> 16, (interval >> 8) & 255, interval & 255];
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_cm_calibration(sensor_mac, calib){
-		var cal = parseInt(calib * 100);
-		var packet = [244, 1, 0, 0, 0, cal >> 8, cal & 255];
-		return this.config_send(sensor_mac, packet);
-	}
 	config_set_bp_altitude(sensor_mac, alt){
 		var packet = [244, 1, 0, 0, 0, alt >> 8, alt & 255];
 		return this.config_send(sensor_mac, packet);
@@ -1198,6 +1193,32 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_input_one_108(sensor_mac, value){
+		console.log('config_set_input_one_108');
+		var packet = [244, 41, 0, 0, 0, 1, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_input_two_108(sensor_mac, value){
+		console.log('config_set_input_two_108');
+		var packet = [244, 41, 0, 0, 0, 2, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_input_three_108(sensor_mac, value){
+		console.log('config_set_input_three_108');
+		var packet = [244, 41, 0, 0, 0, 3, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_counter_threshold_108(sensor_mac, value){
+		console.log('config_set_counter_threshold_108');
+		var packet = [244, 43, 0, 0, 0, 0, 0];
+		let threshold = int2Bytes((value), 2);
+		packet.push(...threshold);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_sensor_boot_time_420ma(sensor_mac, value){
 		console.log('sensor_boot_time_420ma');
 		var packet = [244, 68, 0, 0, 45, value];
@@ -1280,6 +1301,12 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_debounce_time_35(sensor_mac, value){
+		console.log('config_set_debounce_time_35');
+		var packet = [244, 3, 0, 0, 35, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_enable_stay_on_mode_539(sensor_mac, value){
 		console.log('config_enable_stay_on_mode_539');
 		var packet = [247, 50, 0, 0, 0, value];
@@ -1312,8 +1339,8 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_rs_node_id_539(sensor_mac, value){
-		console.log('config_set_rs_node_id_539');
+	config_set_sub_device_type_539(sensor_mac, value){
+		console.log('config_set_sub_device_type_539');
 		var packet = [244, 40, 0, 0, 23, value];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
@@ -1326,12 +1353,24 @@ module.exports = class WirelessSensor{
 	}
 	config_set_reg_539(sensor_mac, value, register){
 		console.log('config_set_reg_539');
+		// var packet = [244, 51, 0, 0, 23, ]
 		var packet = [244, 30 + register, 0, 0, 23];
 		let value_reg = int2Bytes((value), 2);
 		packet.push(...value_reg);
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_all_register_data_539(sensor_mac, number_of_registers, registers){
+		console.log('config_set_all_registers_539');
+		// registers is an arbitrary number of 16 bit integers
+		// var packet = [244, 53, 0, 0, 23, number_of_registers, registers.slice(0,2)...]
+		var packet = [244, 53, 0, 0, 23, number_of_registers];
+		for(let ind = 0; ind < number_of_registers; ind++){
+			packet.push(...int2Bytes(registers[ind], 2));
+		}
+		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];
@@ -1366,6 +1405,30 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_current_calibration_13(sensor_mac, calib){
+		console.log('config_set_current_calibration_13');
+		var packet = [244, 1, 0, 0, 0];
+		var cal_val = int2Bytes(calib, 2);
+		packet.push(...cal_val);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_current_calibration_ch2_19(sensor_mac, calib){
+		console.log('config_set_current_calibration_ch2_19');
+		var packet = [244, 3, 0, 0, 0];
+		var cal_val = int2Bytes(calib, 2);
+		packet.push(...cal_val);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_current_calibration_ch3_28(sensor_mac, calib){
+		console.log('cconfig_set_current_calibration_ch3_28');
+		var packet = [244, 5, 0, 0, 0];
+		var cal_val = int2Bytes(calib, 2);
+		packet.push(...cal_val);
+		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) => {
@@ -1547,6 +1610,13 @@ module.exports = class WirelessSensor{
 		packet.push(...key);
 		return this.config_send(sensor_mac, packet);
 	}
+	control_start_luber(sensor_mac, luber = 1, duration){
+		console.log('control_start_luber');
+		let packet = [244, 78, 0, 0, 45, luber, duration];
+		console.log(packet);
+		let cmd_timeout = (duration * 1000) + 1000;
+		return this.config_send(sensor_mac, packet, {}, cmd_timeout);
+	}
 	config_powered_device(sensor_mac, param, ...data){
 		var params = {
 			destination: 0,
@@ -1563,7 +1633,7 @@ module.exports = class WirelessSensor{
 		delete this.queue;
 		this.queue = new Queue(1);
 	}
-	config_send(sensor_mac, data, opts){
+	config_send(sensor_mac, data, opts, cmd_timeout = 1500){
 		var that = this;
 		return new Promise((fulfill, reject) => {
 			that.queue.add(() => {
@@ -1604,7 +1674,7 @@ module.exports = class WirelessSensor{
 						}
 
 						f();
-					}, 1500);
+					}, cmd_timeout);
 					that.send.transmit_request(mac2bytes(sensor_mac), data, opts).then().catch((err) => {
 						that._emitter.removeListener('config_error-'+sensor_mac, fail);
 						that._emitter.removeListener('config_ack-'+sensor_mac, pass);
@@ -1736,7 +1806,7 @@ module.exports = class WirelessSensor{
 
 		return;
 	}
-	control_send(sensor_mac, data, opts){
+	control_send(sensor_mac, data, opts, ctrl_timeout = 1000){
 		var that = this;
 		return new Promise((fulfill, reject) => {
 			that.queue.add(() => {
@@ -1774,7 +1844,7 @@ module.exports = class WirelessSensor{
 									}else{
 										fail('Control response timeout');
 									}
-								}, 1000);
+								}, ctrl_timeout);
 							}
 						}).catch(fail);
 					}
@@ -3322,7 +3392,7 @@ function sensor_types(parent){
 						break;
 				}
 
-				return {
+				let response = {
 					'firmware': frame[2],
 					'destination_address': toMac(frame.slice(12, 16)),
 					'mode': frame_data.mode,
@@ -3337,23 +3407,30 @@ function sensor_types(parent){
 					'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]
-					}
+					'payload_length': frame_data.payload_length
+				}
+				if(response.firmware > 19){
+					response.lifetime_transmissions = frame.slice(30, 34).reduce(msbLsb);
 				}
+				response.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]
+				}
+				if(response.firmware > 19){
+					response.machine_values.lifetime_transmissions = frame.slice(30, 34);
+				}
+				return response;
 			}
 		},
 		'81': {
@@ -4116,46 +4193,45 @@ function sensor_types(parent){
 						break;
 				}
 
-				return {
+				let response = {
 					'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]
-					}
+					'payload_length': frame_data.payload_length
 				}
+				if(response.firmware > 19){
+					response.lifetime_transmissions = frame.slice(30, 34).reduce(msbLsb);
+				}
+				response.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]
+				}
+				if(response.firmware > 19){
+					response.machine_values.lifetime_transmissions = frame.slice(30, 34);
+				}
+				return response;
 			}
 		},
 
@@ -5352,7 +5428,7 @@ function sensor_types(parent){
 						break;
 				}
 
-				return {
+				let response = {
 					'firmware': frame[2],
 					'destination_address': toMac(frame.slice(12, 16)),
 					'mode': frame_data.mode,
@@ -5367,23 +5443,30 @@ function sensor_types(parent){
 					'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]
-					}
+					'payload_length': frame_data.payload_length
+				}
+				if(response.firmware > 19){
+					response.lifetime_transmissions = frame.slice(30, 34).reduce(msbLsb);
 				}
+				response.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]
+				}
+				if(response.firmware > 19){
+					response.machine_values.lifetime_transmissions = frame.slice(30, 34);
+				}
+				return response;
 			}
 		},
 		'88': {
@@ -5461,7 +5544,7 @@ function sensor_types(parent){
 			}
 		},
 		'105': {
-			name: '1 Auto Luber With Ultrasound Vibration Sensor',
+			name: '1 Channel Automatic Luber With Ultrasound Vibration Sensor',
 			parse: (d) => {
 				return {
 					raw_adc: d.slice(0, 2).reduce(msbLsb),
@@ -5470,6 +5553,19 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'106': {
+			name: '2 Channel Automatic Luber With Ultrasound Vibration Sensor',
+			parse: (d) => {
+				return {
+					c1_raw_adc: d.slice(0, 2).reduce(msbLsb),
+					c1_ma: d.slice(2, 4).reduce(msbLsb) / 100,
+					c1_db: d.slice(4, 6).reduce(msbLsb) / 100,
+					c2_raw_adc: d.slice(6, 8).reduce(msbLsb),
+					c2_ma: d.slice(8, 10).reduce(msbLsb) / 100,
+					c2_db: d.slice(10, 12).reduce(msbLsb) / 100
+				};
+			}
+		},
 		'107': {
 			name: '16-Bit 4-Channel 4-20mA',
 			parse: (d) => {
@@ -9766,11 +9862,629 @@ function sensor_types(parent){
 				}
 			}
 		},
+		'538': {
+			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]
+					}
+				}
+			}
+		},
 		'539': {
 			name: 'RS-485 Modbus Wireless Converter',
 			parse: (d) => {
 				return {
-					data: d
+					subdevice_type: d[0],
+					number_of_registers: d[1],
+					// TODO we can automatically determine how many registers are here based on the number_of_registers and create data objects appropriately
+					// r1: d.slice(2,4),
+					// r2: d.slice(4,6),
+					// r3: d.slice(6,8),
+					// r4: d.slice(8,10),
+					data: d.slice(2)
 				};
 			},
 		},