@ncd-io/node-red-enterprise-sensors 1.2.2 → 1.4.0

package/lib/WirelessGateway.js

@@ -160,7 +160,7 @@ module.exports = class WirelessSensor{
 				}
 			}
 			// #OTF
-			var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,101,102,105,106,107,108,110,111,112,114,118,120,180,181,202,217,519,520,521,531,535,537,538,539,540,1010,1011];
+			var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,101,102,103,105,106,107,108,109,110,111,112,114,117,118,120,121,122,180,181,202,217,519,520,521,531,535,537,538,539,540,1010,1011];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -214,12 +214,24 @@ module.exports = class WirelessSensor{
 			};
 
 			if(mode === 'FLY' && frame.data.length > 12 && typeof this.sensor_types[data.sensor_type].parse_fly == 'function'){
-				this.sensor_pool[frame.mac].reported_config = this.sensor_types[data.sensor_type].parse_fly(frame.data);
+				try{
+					this.sensor_pool[frame.mac].reported_config = this.sensor_types[data.sensor_type].parse_fly(frame.data);
+				} catch(error) {
+					console.log('Error detect in parse_fly initiated by FLY message');
+					console.log(error);
+					this.sensor_pool[frame.mac].reported_config = "Error parsing reported config. See log for details."
+				}
 			}else if(mode === 'OTF' && frame.data.length > 12 && typeof this.sensor_types[data.sensor_type].parse_fly == 'function'){
 				// restructure and add dead bytes to match FLY message so we only need one parser.
 				// If we ever need to add any of the additional information of this packet we will need to rebuild to match
-				frame.data.splice(2,0,frame.data[5],0);
-				this.sensor_pool[frame.mac].reported_config = this.sensor_types[data.sensor_type].parse_fly(frame.data);
+				try{
+					frame.data.splice(2,0,frame.data[5],0);
+					this.sensor_pool[frame.mac].reported_config = this.sensor_types[data.sensor_type].parse_fly(frame.data);
+				} catch(error){
+					console.log('Error detect in parse_fly initiated by OTF message');
+					console.log(error);
+					this.sensor_pool[frame.mac].reported_config = "Error parsing reported config. See log for details."
+				}
 			}else if(mode === 'ACK'){
 				this.sensor_pool[frame.mac].status = data.result;
 				if(data.data.length){
@@ -322,7 +334,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,101,102,105,106,107,108,110,111,112,114,118,120,180,181,202,217,519,520,521,531,535,537,538,539,540,1010,1011];
+		var otf_devices = [4,12,21,23,26,32,33,39,44,45,48,52,53,56,58,74,76,78,79,80,81,82,84,88,89,90,91,97,98,101,102,103,105,106,107,108,109,110,111,112,114,117,118,120,121,122,180,181,202,217,519,520,521,531,535,537,538,539,540,1010,1011];
 		if(otf_devices.includes(parsed.sensor_type)){
 			// If the message says FLY and there is not FLY timer in progress.
 			if(payload[8] == 70 && payload[9] == 76 && payload[10] == 89) {
@@ -744,7 +756,7 @@ module.exports = class WirelessSensor{
 					data: payload.slice(8)
 				};
 				// #OTF
-			}else if(parsed.sensor_type == 33 || parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 97 || parsed.sensor_type == 98 || parsed.sensor_type == 110 || parsed.sensor_type == 111 || parsed.sensor_type == 112 || parsed.sensor_type == 114 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 202 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538){
+			}else if(parsed.sensor_type == 33 || parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 97 || parsed.sensor_type == 98 || parsed.sensor_type == 103 || parsed.sensor_type == 110 || parsed.sensor_type == 111 || parsed.sensor_type == 112 || parsed.sensor_type == 114 || parsed.sensor_type == 117 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 202 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538){
 				parsed.sensor_data = this.sensor_types[parsed.sensor_type].parse(payload, parsed, frame.mac);
 				if(!parsed.sensor_data){
 					return;
@@ -780,6 +792,12 @@ module.exports = class WirelessSensor{
 		let packet = [245, 58, 0, 0, 0].concat(Array.prototype.slice.call(manifest));
 		return this.config_send(sensor_mac, packet);
 	}
+	firmware_send_manifest_v13(sensor_mac, manifest){
+		console.log('firmware_send_manifest_v13');
+		// sensor_mac = "00:00:00:00:00:00:ff:ff";
+		let packet = [245, 58, 0, 0, 0].concat(Array.prototype.slice.call(manifest));
+		return this.firmware_send_v13(sensor_mac, packet, {}, 7000, 70, true);
+	}
 	firmware_send_chunk(sensor_mac, offset, chunk){
 		console.log('firmware_send_chunk');
 		// sensor_mac = "00:00:00:00:00:00:ff:ff";
@@ -1351,11 +1369,19 @@ module.exports = class WirelessSensor{
 		return this.config_send(sensor_mac, packet);
 	}
 	config_set_fly_interval_108(sensor_mac, value){
- 		console.log('config_set_fly_interval_108');
- 		var packet = [247, 56, 0, 0, 0, 0, value];
- 		console.log(packet);
- 		return this.config_send(sensor_mac, packet);
- 	}
+		console.log('config_set_fly_interval_108');
+		var packet = [247, 56, 0, 0, 0];
+		let val = int2Bytes((value), 2);
+		packet.push(...val);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_sample_rate_108(sensor_mac, value){
+		console.log('config_set_sample_rate_108');
+		var packet = [244, 57, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_sample_rate_108(sensor_mac, value){
  		console.log('config_set_sample_rate_108');
  		var packet = [244, 57, 0, 0, 0, value];
@@ -1973,6 +1999,12 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_enable_filtering_110(sensor_mac, value){
+		console.log('config_set_enable_filtering_110');
+		let packet = [244, 79, 0, 0, 101, 13, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_to_always_on_120(sensor_mac){
 		console.log('config_set_to_always_on_120');
 		let packet = [244, 10, 0, 0, 0, 1];
@@ -1997,20 +2029,58 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_wood_type_121(sensor_mac, value){
+		console.log('config_set_wood_type_121');
+		let packet = [244, 10, 0, 0, 121, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_quality_of_service_121(sensor_mac, value){
+		console.log('config_set_quality_of_service_121');
+		var packet = [247, 52, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_tare_the_scale_217(sensor_mac){
- 		console.log('config_set_tare_the_scale_217');
- 		var packet = [244, 32, 0, 0, 26];
- 		console.log(packet);
- 		return this.config_send(sensor_mac, packet);
- 	}
- 	config_set_weight_calib_217(sensor_mac, value){
- 		console.log('config_set_weight_calib_217');
- 		var packet = [244, 33, 0, 0, 26];
- 		let value_ = int2Bytes((value*100), 4);
- 		packet.push(...value_);
- 		console.log(packet);
- 		return this.config_send(sensor_mac, packet);
- 	}
+		console.log('config_set_tare_the_scale_217');
+		var packet = [244, 32, 0, 0, 26];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_weight_calib_217(sensor_mac, value){
+		console.log('config_set_weight_calib_217');
+		var packet = [244, 33, 0, 0, 26];
+		let value_ = int2Bytes((value*100), 4);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_pressure_limit_26(sensor_mac, value){
+		console.log('config_set_pressure_limit_26');
+		var packet = [244, 82, 0, 0, 26];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_auto_pressure_check_26(sensor_mac, value){
+		console.log('config_set_auto_pressure_check_26');
+		var packet = [244, 80, 0, 0, 26, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_fsr_420ma(sensor_mac, value){
+		console.log('config_set_fsr_420ma');
+		var packet = [244, 64, 0, 0, 45, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_always_on_420ma(sensor_mac, value){
+		console.log('config_set_always_on_420ma');
+		var packet = [244, 81, 0, 0, 88, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_get_delay(sensor_mac){
 		return new Promise((fulfill, reject) => {
 			this.config_send(sensor_mac, [247, 21, 0, 0, 0]).then((res) => {
@@ -2215,9 +2285,148 @@ module.exports = class WirelessSensor{
 		delete this.queue;
 		this.queue = new Queue(1);
 	}
+	firmware_send_chunk_v13(sensor_mac, offset, chunk){
+		console.log('firmware_send_chunk');
+		// sensor_mac = "00:00:00:00:00:00:ff:ff";
+		let packet = [245, 59, 0, 0, 0].concat(offset, Array.prototype.slice.call(chunk));
+		// console.log(packet);
+		return this.firmware_send_v13(sensor_mac, packet);
+	}
+	firmware_read_last_chunk_segment(sensor_mac){
+		console.log('firmware_read_last_chunk_segment');
+		let packet = [245, 61, 0, 0, 0];
+		return this.config_send(sensor_mac, packet);
+	}
+	clear_queue_except_last(){
+		const pending = this.queue.pendingPromises;
+		const temp_queue = this.queue.queue;
+		const last_promise = [temp_queue.pop()];
+
+		console.log('MARK 1');
+		console.log(last_promise);
+
+		// this.queue.queue = last_promise;
+		// this.queue.pendingPromises = [];
+		// this.queue.activeCount = 0;
+
+		console.log('MARK 2');
+		console.log(pending);
+
+		// console.log(temp_queue);
+		// console.log(temp_queue[0]);
+		// while(this.queue.queue.length > 1){
+		// 	let clear_promise = this.queue.queue.shift();
+		// 	clear_promise.reject({
+		// 		res: 'Promise rejected by queue clearing',
+		// 		error: 'Promise rejected by queue clearing'
+		// 	});
+		// };
+		// temp_queue.forEach(promise => {
+		// 	// promise.reject(new Error('Promise rejected by queue clearing'));
+		// 	promise.reject({
+		// 		res: 'Promise rejected by queue clearing',
+		// 		error: 'Promise rejected by queue clearing'
+		// 	});
+		// });
+	}
+	firmware_send_v13(sensor_mac, data, opts, cmd_timeout = 7000, cmd_delay = 140, manifest = false){
+		var that = this;
+		return new Promise((fulfill, reject) => {
+			if(manifest){
+				that.queue.add(() => {
+					return new Promise((f, r) => {
+						setTimeout(f, 500);
+					});
+				});
+			};
+			that.queue.add(() => {
+				return new Promise((f, r) => {
+					var tout;
+					function fail(error){
+						console.log('In Fail');
+						// that._emitter.removeListener('config_ack-'+sensor_mac, pass);
+						clearTimeout(tout);
+						reject({
+							error: error,
+							sent: [mac2bytes(sensor_mac), data, opts]
+						});
+						f();
+					}
+					function pass(packet){
+						clearTimeout(tout);
+						// that._emitter.removeListener('config_error-'+sensor_mac, fail);
+						packet.sent = data;
+						fulfill(packet);
+						f();
+					};
+					let retry_count = 0;
+					const max_retries = 3;
+					function attempt_transmission(){
+						that.send.transmit_request(mac2bytes(sensor_mac), data, opts).then(function(frame){
+							if(frame.hasError){
+								console.log('FRAME FAILED DUE TO FAIL FLAG');
+								if(retry_count < max_retries) {
+									retry_count++;
+									console.log(`Retrying (attempt ${retry_count}) due to failed status`);
+									clearTimeout(tout);
+									startTimeout();
+									attempt_transmission();
+								}else{
+									fail('Transmit Status indicated error');
+									// reject({
+									// 	error: 'Transmit Status indicated error',
+									// 	sent: [mac2bytes(sensor_mac), data, opts]
+									// });
+								};
+							}else{
+								pass(frame);
+							}
+						}).catch((err) => {
+							if(retry_count < max_retries) {
+								retry_count++;
+								console.log(`Retrying (attempt ${retry_count}) due to failed status`);
+								attempt_transmission();
+							}else{
+								console.log('In CATCH');
+								// reject({
+								// 	error: err,
+								// 	sent: [mac2bytes(sensor_mac), data, opts]
+								// });
+								fail(err);
+							}
+						}).then();
+					}
+					// that._emitter.once('config_ack-'+sensor_mac, pass);
+					// that._emitter.once('config_error-'+sensor_mac, fail);
+					function startTimeout(){
+						tout = setTimeout(() => {
+							console.log('In Timeout');
+							fail('Transmit Request Timed Out');
+						}, cmd_timeout);
+					}
+					attempt_transmission();
+					startTimeout();
+				});
+			});
+			this.queue.add(() => {
+				return new Promise((f, r) => {
+					// NOTE: This timeout is required to allow the sensor to process and write to memory before a new chunk is transmitted.
+					setTimeout(f, cmd_delay);
+				});
+			});
+		});
+	};
 	config_send(sensor_mac, data, opts, cmd_timeout = 1500){
 		var that = this;
 		return new Promise((fulfill, reject) => {
+			// Note: This code adds a delay before sending any communications. This is not generally required, but has shown increased reliability
+			// in some cases when used directly after changing modem module settings such as entering FON network ID. Leaving it here for future reference or quick add during support.
+			// consider adding a pre-time command parameter to allow this as in the v13 firmware send function.
+			// that.queue.add(() => {
+			// 	return new Promise((f, r) => {
+			// 		setTimeout(f, 500);
+			// 	});
+			// });
 			that.queue.add(() => {
 				return new Promise((f, r) => {
 					var tout;
@@ -2269,12 +2478,107 @@ module.exports = class WirelessSensor{
 					}).then();
 				});
 			});
+			this.queue.add(() => {
+				return new Promise((f, r) => {
+					setTimeout(f, 250);
+				});
+			});
+		});
+	}
+	queue_bridge_query(sensor_mac, data, meta = null, opts){
+		var that = this;
+		if(!globalDevices.hasOwnProperty(sensor_mac)){
+			globalDevices[sensor_mac] = {bridge: true, command_queue: []};
+		}
+		// if(!Object.hasOwn(node._gateway_node.sensor_list[msg.payload.address], 'command_queue')){
+		// if(!globalDevices[sensor_mac].hasOwnProperty('command_queue')){
+		// 	globalDevices[sensor_mac].command_queue = [{'command': data, 'meta': meta}];
+		// }else{
+		globalDevices[sensor_mac].command_queue.push({'command': data, 'meta': meta});
+		// }
+
+		return new Promise((fulfill, reject) => {
+			that.queue.add(() => {
+				return new Promise((f, r) => {
+					var tout;
+					function fail(response){
+						that._emitter.removeListener('converter_ack-'+sensor_mac, pass);
+						clearTimeout(tout);
+
+						if(globalDevices[sensor_mac].hasOwnProperty('command_queue')){
+							globalDevices[sensor_mac].command_queue.shift();
+						}
+						reject({
+							err: response,
+							sent: [mac2bytes(sensor_mac), data, opts]
+						});
+						f();
+					}
+					function pass(response){
+						clearTimeout(tout);
+
+						that._emitter.emit('converter_response', response);
+						that._emitter.emit('converter_response-'+sensor_mac, response);
+
+
+						if(globalDevices[sensor_mac].hasOwnProperty('command_queue')){
+							globalDevices[sensor_mac].command_queue.shift();
+						}
+						that._emitter.removeListener('converter_error-'+sensor_mac, fail);
+						fulfill(response);
+						f();
+						// that._emitter.
+					};
+
+					that._emitter.once('converter_ack-'+sensor_mac, pass);
+					that._emitter.once('converter_error-'+sensor_mac, fail);
+					tout = setTimeout(() => {
+						that._emitter.removeListener('converter_error-'+sensor_mac, fail);
+						that._emitter.removeListener('converter_ack-'+sensor_mac, pass);
+
+						if(globalDevices[sensor_mac].hasOwnProperty('command_queue')){
+							globalDevices[sensor_mac].command_queue.shift();
+						};
+						if(sensor_mac == '00:00:00:00:00:00:FF:FF'){
+							reject({
+								res: 'Broadcast mode, no target device',
+								sent: [mac2bytes(sensor_mac), data, opts]
+							});
+						}else{
+							reject({
+								err: 'Wireless Converter did not respond',
+								sent: [mac2bytes(sensor_mac), data, opts]
+							});
+						};
+
+						f();
+					}, 1500);
+					that.send.transmit_request(mac2bytes(sensor_mac), data, opts).then().catch((err) => {
+						that._emitter.removeListener('converter_error-'+sensor_mac, fail);
+						that._emitter.removeListener('converter_ack-'+sensor_mac, pass);
+						reject({
+							err: err,
+							sent: [mac2bytes(sensor_mac), data, opts]
+						});
+						f();
+					}).then();
+				});
+			});
 			this.queue.add(() => {
 				return new Promise((f, r) => {
 					setTimeout(f, 500);
 				});
 			});
 		});
+	};
+	prepare_bridge_query(sensor_mac, commands){
+		commands.forEach((command) => {
+			if(command.hasOwnProperty('meta')){
+				this.queue_bridge_query(sensor_mac, command.command, command.meta);
+			}else{
+				this.queue_bridge_query(sensor_mac, command.command);
+			}
+		});
 	}
 	queue_bridge_query(sensor_mac, data, meta = null, opts){
 		var that = this;
@@ -3310,8 +3614,8 @@ function sensor_types(parent){
 				return {
 					adc1: adc1,
 					adc2: adc2,
-					mA1: parseFloat((adc1 * 0.0006863).toFixed(2)),
-					mA2: parseFloat((adc2 * 0.0006863).toFixed(2))
+					mA1: signInt(d.slice(4, 6).reduce(msbLsb))/100,
+					mA2: signInt(d.slice(6, 8).reduce(msbLsb))/100
 				};
 			},
 			'parse_fly': (frame) => {
@@ -3746,11 +4050,66 @@ function sensor_types(parent){
 				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(firmware > 25){
+						var mode = payload[8];
+						var odr = msbLsb(payload[9], payload[10]);
+						var en_axis = payload[11] & 7;
+						var fsr = payload[11] >> 5;
+						var hour = payload[12];
+						var minute = payload[13];
+						var device_temp = msbLsb(payload[14], payload[15])/100;
+						var expected_packets = payload[16];
+						var current_packet = payload[17];
+						var sdata_start = 18;
+
+					} else{
+						var mode = payload[8];
+						var odr = payload[9];
+						var en_axis = payload[10] & 7;
+						var fsr = payload[10] >> 5;
+						var hour = payload[11];
+						var minute = payload[12];
+						var device_temp = msbLsb(payload[13], payload[14])/100;
+						var expected_packets = payload[15];
+						var current_packet = payload[16];
+						var sdata_start = 17;
+
+						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;
+						}
+					}
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -3779,48 +4138,6 @@ function sensor_types(parent){
 									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: {},
@@ -3841,47 +4158,6 @@ function sensor_types(parent){
 							}
 						}
 						else{
-							var mode = payload[8];
-							var odr = payload[9];
-							var en_axis = payload[10] & 7;
-							var fsr = payload[10] >> 5;
-							var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-							switch(odr){
-								case 6:
-									odr = 50;
-									break;
-								case 7:
-									odr = 100;
-									break;
-								case 8:
-									odr = 200;
-									break;
-								case 9:
-									odr = 400;
-									break;
-								case 10:
-									odr = 800;
-									break;
-								case 11:
-									odr = 1600;
-									break;
-								case 12:
-									odr = 3200;
-									break;
-								case 13:
-									odr = 6400;
-									break;
-								case 14:
-									odr = 12800;
-									break;
-								case 15:
-									odr = 25600;
-									break;
-								default:
-									odr = 0;
-							}
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
@@ -4015,48 +4291,6 @@ function sensor_types(parent){
 						}
 					}else{
 
-						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
-
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
 							data: {},
@@ -4367,11 +4601,66 @@ function sensor_types(parent){
 				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(firmware > 25){
+						var mode = payload[8];
+						var odr = msbLsb(payload[9], payload[10]);
+						var en_axis = payload[11] & 7;
+						var fsr = payload[11] >> 5;
+						var hour = payload[12];
+						var minute = payload[13];
+						var device_temp = msbLsb(payload[14], payload[15])/100;
+						var expected_packets = payload[16];
+						var current_packet = payload[17];
+						var sdata_start = 18;
+
+					}else{
+						var mode = payload[8];
+						var odr = payload[9];
+						var en_axis = payload[10] & 7;
+						var fsr = payload[10] >> 5;
+						var hour = payload[11];
+						var minute = payload[12];
+						var device_temp = msbLsb(payload[13], payload[14])/100;
+						var expected_packets = payload[15];
+						var current_packet = payload[16];
+						var sdata_start = 17;
+
+						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;
+						}
+					}
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -4399,46 +4688,6 @@ function sensor_types(parent){
 								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,
@@ -4460,47 +4709,6 @@ function sensor_types(parent){
 							}
 						}
 						else{
-							var mode = payload[8];
-							var odr = payload[9];
-							var en_axis = payload[10] & 7;
-							var fsr = payload[10] >> 5;
-							var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-							switch(odr){
-								case 6:
-									odr = 50;
-									break;
-								case 7:
-									odr = 100;
-									break;
-								case 8:
-									odr = 200;
-									break;
-								case 9:
-									odr = 400;
-									break;
-								case 10:
-									odr = 800;
-									break;
-								case 11:
-									odr = 1600;
-									break;
-								case 12:
-									odr = 3200;
-									break;
-								case 13:
-									odr = 6400;
-									break;
-								case 14:
-									odr = 12800;
-									break;
-								case 15:
-									odr = 25600;
-									break;
-								default:
-									odr = 0;
-							}
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
@@ -4624,7 +4832,6 @@ function sensor_types(parent){
 							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,
@@ -4645,47 +4852,6 @@ function sensor_types(parent){
 							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,
@@ -5173,11 +5339,66 @@ function sensor_types(parent){
 				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(firmware > 25){
+						var mode = payload[8];
+						var odr = msbLsb(payload[9], payload[10]);
+						var en_axis = payload[11] & 7;
+						var fsr = payload[11] >> 5;
+						var hour = payload[12];
+						var minute = payload[13];
+						var device_temp = msbLsb(payload[14], payload[15])/100;
+						var expected_packets = payload[16];
+						var current_packet = payload[17];
+						var sdata_start = 18;
+
+					} else{
+						var mode = payload[8];
+						var odr = payload[9];
+						var en_axis = payload[10] & 7;
+						var fsr = payload[10] >> 5;
+						var hour = payload[11];
+						var minute = payload[12];
+						var device_temp = msbLsb(payload[13], payload[14])/100;
+						var expected_packets = payload[15];
+						var current_packet = payload[16];
+						var sdata_start = 17;
+
+						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;
+						}
+					}
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -5206,48 +5427,6 @@ function sensor_types(parent){
 									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: {},
@@ -5268,47 +5447,6 @@ function sensor_types(parent){
 							}
 						}
 						else{
-							var mode = payload[8];
-							var odr = payload[9];
-							var en_axis = payload[10] & 7;
-							var fsr = payload[10] >> 5;
-							var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-							switch(odr){
-								case 6:
-									odr = 50;
-									break;
-								case 7:
-									odr = 100;
-									break;
-								case 8:
-									odr = 200;
-									break;
-								case 9:
-									odr = 400;
-									break;
-								case 10:
-									odr = 800;
-									break;
-								case 11:
-									odr = 1600;
-									break;
-								case 12:
-									odr = 3200;
-									break;
-								case 13:
-									odr = 6400;
-									break;
-								case 14:
-									odr = 12800;
-									break;
-								case 15:
-									odr = 25600;
-									break;
-								default:
-									odr = 0;
-							}
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
@@ -5445,48 +5583,6 @@ function sensor_types(parent){
 						}
 					}else{
 
-						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
-
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
 							data: {},
@@ -5787,11 +5883,66 @@ function sensor_types(parent){
 				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(firmware > 25){
+						var mode = payload[8];
+						var odr = msbLsb(payload[9], payload[10]);
+						var en_axis = payload[11] & 7;
+						var fsr = payload[11] >> 5;
+						var hour = payload[12];
+						var minute = payload[13];
+						var device_temp = msbLsb(payload[14], payload[15])/100;
+						var expected_packets = payload[16];
+						var current_packet = payload[17];
+						var sdata_start = 18;
+
+					} else{
+						var mode = payload[8];
+						var odr = payload[9];
+						var en_axis = payload[10] & 7;
+						var fsr = payload[10] >> 5;
+						var hour = payload[11];
+						var minute = payload[12];
+						var device_temp = msbLsb(payload[13], payload[14])/100;
+						var expected_packets = payload[15];
+						var current_packet = payload[16];
+						var sdata_start = 17;
+
+						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;
+						}
+					}
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -5820,48 +5971,6 @@ function sensor_types(parent){
 									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: {},
@@ -5882,47 +5991,6 @@ function sensor_types(parent){
 							}
 						}
 						else{
-							var mode = payload[8];
-							var odr = payload[9];
-							var en_axis = payload[10] & 7;
-							var fsr = payload[10] >> 5;
-							var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-							switch(odr){
-								case 6:
-									odr = 50;
-									break;
-								case 7:
-									odr = 100;
-									break;
-								case 8:
-									odr = 200;
-									break;
-								case 9:
-									odr = 400;
-									break;
-								case 10:
-									odr = 800;
-									break;
-								case 11:
-									odr = 1600;
-									break;
-								case 12:
-									odr = 3200;
-									break;
-								case 13:
-									odr = 6400;
-									break;
-								case 14:
-									odr = 12800;
-									break;
-								case 15:
-									odr = 25600;
-									break;
-								default:
-									odr = 0;
-							}
 
 							globalDevices[deviceAddr] = {
 								// stream_size: expected_packets,
@@ -6055,48 +6123,6 @@ function sensor_types(parent){
 						}
 					}else{
 
-						var mode = payload[8];
-						var odr = payload[9];
-						var en_axis = payload[10] & 7;
-						var fsr = payload[10] >> 5;
-						var device_temp = msbLsb(payload[13], payload[14])/100;
-
-
-						switch(odr){
-							case 6:
-								odr = 50;
-								break;
-							case 7:
-								odr = 100;
-								break;
-							case 8:
-								odr = 200;
-								break;
-							case 9:
-								odr = 400;
-								break;
-							case 10:
-								odr = 800;
-								break;
-							case 11:
-								odr = 1600;
-								break;
-							case 12:
-								odr = 3200;
-								break;
-							case 13:
-								odr = 6400;
-								break;
-							case 14:
-								odr = 12800;
-								break;
-							case 15:
-								odr = 25600;
-								break;
-							default:
-								odr = 0;
-						}
-
 						globalDevices[deviceAddr] = {
 							// stream_size: expected_packets,
 							data: {},
@@ -6912,147 +6938,602 @@ function sensor_types(parent){
 				};
 			}
 		},
-		'105': {
-			name: '1 Channel Automatic Luber With 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
-				};
-			}
-		},
-		'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) => {
-				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
-				};
-			}
-		},
-		'108': {
-			name: 'Machine Uptime Monitoring Sensor',
-			parse: (d, payload) => {
-				let firmware = payload[1];
-				if(payload[7] & 2 != 0){
-					console.log('Error found');
-					// parsed.data = {error: 'Error found, Acclerometer Probe may be unattached'};
-					let error = {error: 'Error found, Acclerometer Probe may be unattached'};
-					return error;
-				}
-				if(firmware > 4){
-					let report_type = d[41]? "Shift": "Regular";
-					return {
-						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
-						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
-						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
-						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
-						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
-						opto_input_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),
-						input_di: d[40] & 1 ? 1 : 0,
-						input_ct: d[40] & 2 ? 1 : 0,
-						input_opto: d[40] & 4 ? 1 : 0,
-						input_acc: d[40] & 8 ? 1 : 0,
-						input_mag: d[40] & 16 ? 1 : 0,
-						report_type: report_type,
-						rtc: [
-							String(d[42]).padStart(2, '0'),
-							String(d[43]).padStart(2, '0'),
-							String(d[44]).padStart(2, '0')
-						].join(':')
-					};
-				}else{
-					return {
-						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
-						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
-						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
-						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
-						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
-						opto_input_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),
-						input_di: d[40] & 1 ? 1 : 0,
-						input_ct: d[40] & 2 ? 1 : 0,
-						input_opto: d[40] & 4 ? 1 : 0,
-						input_acc: d[40] & 8 ? 1 : 0,
-						input_mag: d[40] & 16 ? 1 : 0
-					};
-				}
-			},
-			'parse_fly': (frame) => {
-				return {
-					'firmware': frame[2],
-					'report_rate': frame.slice(12, 16).reduce(msbLsb).toString() + "sec.",
-					'accelerometer_threshold': (frame[16]* 32).toString() + "mg.",
-					'debouncing_timeout': frame[17].toString() + "sec.",
-					'accelero_active_state': frame[18],
-					'digital_inputs_active_edge': frame.slice(19, 22).reduce(msbLsb),
-					'counter_threshold': frame.slice(22, 26).reduce(msbLsb).toString() + "sec.",
-					'trasnmit_on_change_status': frame[26],
-					'machine_values': {
-						'firmware': frame[2],
-						'report_rate': frame.slice(12, 16),
-						'accelerometer_threshold': frame[16],
-						'debouncing_timeout': frame[17],
-						'accelero_active_state': frame[18],
-						'digital_inputs_active_edge': frame.slice(19, 22),
-						'counter_threshold': frame.slice(22, 26),
-						'trasnmit_on_change_status': frame[26]
+		'103': {
+			name: 'Custom Wireless Accelerometer Sensor',
+			parse: (payload, parsed, mac) => {
+				if(payload[9] === 0){ // mode raw
+					var deviceAddr = mac;
+					var data = {};
+					switch(payload[8]){
+						case 1:
+							data.sensor_type = 'adxl';
+						break;
+						case 2:
+							data.sensor_type = 'gyro';
+						break;
 					}
-				}
-			}
-		},
-		'109': {
-			name: 'Wireless Custom Solar Sensor',
-			parse: (d) => {
-				return {
-					illuminance: d.slice(0, 4).reduce(msbLsb),
-					total_solar_radiation: d.slice(4, 6).reduce(msbLsb),
-					ultraviolet_radiation: d.slice(6, 8).reduce(msbLsb)
-				};
-			},
-			'parse_fly': (frame) => {
-				return {
-					'firmware': frame[2],
-					'hardware_id': frame.slice(12, 15),
-					'sample_rate': frame.slice(15, 19).reduce(msbLsb) + " Sec.",
-					'tx_life_counter': frame.slice(19, 23).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
+					switch(payload[10]){
+						case 1:
+							data.event_type = 'report';
+							break;
+						case 2:
+							data.event_type = 'motion';
+							break;
+					}
+					var hour = payload[13];
+					var minute = payload[14];
+					var expected_packets =  payload.slice(19, 21).reduce(msbLsb);
+					var current_packet = payload.slice(21, 23).reduce(msbLsb);
+					var data_start = 23;
+
+					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[9];
+									var odr = payload[11];
+									var en_axis = payload[12] & 7;
+									var fsr = payload[12] >> 5;
+									var device_temp = payload.slice(15, 17).reduce(msbLsb) / 100;
+									var external_temperature = payload.slice(17, 19).reduce(msbLsb) / 100;
+
+									globalDevices[deviceAddr] = {
+										// stream_size: expected_packets,
+										data: {},
+										odr: odr,
+										mo: mode,
+										en_axis: en_axis,
+										fsr: fsr,
+										hour: hour,
+										minute: minute,
+										device_temp: device_temp,
+										external_temp: external_temperature
+									}
+									globalDevices[deviceAddr].data[current_packet] = payload.slice(data_start);
+									return;
+								}
+							}
+							else{
+								globalDevices[deviceAddr].data[current_packet] = payload.slice(data_start);
+							}
+						}
+						else{
+							var mode = payload[9];
+							var odr = payload[11];
+							var en_axis = payload[12] & 7;
+							var fsr = payload[12] >> 5;
+							var device_temp = payload.slice(15, 17).reduce(msbLsb) / 100;
+							var external_temperature = payload.slice(17, 19).reduce(msbLsb) / 100;
+
+							globalDevices[deviceAddr] = {
+								// stream_size: expected_packets,
+								data: {},
+								odr: odr,
+								mo: mode,
+								en_axis: en_axis,
+								fsr: fsr,
+								hour: hour,
+								minute: minute,
+								device_temp: device_temp,
+								external_temp: external_temperature
+							}
+							globalDevices[deviceAddr].data[current_packet] = payload.slice(data_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;
+							}
+							/* Evaluate sensor type */
+							if(payload[0] == 1){ // adxl
+								var fsr_mult = .00030;
+								var fsr_text = "";
+								switch(globalDevices[deviceAddr].fsr){
+									case 0:
+										fsr_mult = 0.00030;
+										break;
+									case 1:
+										fsr_mult = 0.00061;
+										break;
+									case 2:
+										fsr_mult = 0.00122;
+										break;
+								}
+								switch(globalDevices[deviceAddr].fsr){
+									case 0:
+										fsr_text = "10g";
+										break;
+									case 1:
+										fsr_text = "20g";
+										break;
+									case 2:
+										fsr_text = "40g";
+										break;
+								}
+							}else{ // gyro
+								var fsr_mult = 0.00047;
+								var fsr_text = "";
+								switch(globalDevices[deviceAddr].fsr){
+									case 0:
+										fsr_mult = 0.00047;
+										break;
+									case 1:
+										fsr_mult = 0.00095;
+										break;
+									case 2:
+										fsr_mult = 0.00190;
+										break;
+									case 3:
+										fsr_mult = 0.00381;
+										break;
+								}
+								switch(globalDevices[deviceAddr].fsr){
+									case 0:
+										fsr_text = "250dps";
+										break;
+									case 1:
+										fsr_text = "500dps";
+										break;
+									case 2:
+										fsr_text = "1000dps";
+										break;
+									case 3:
+										fsr_text = "2000dps";
+										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 = {
+								mode: payload[9],
+								sensor_type: data.sensor_type,
+								msg_type: data.event_type,
+								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,
+								external_temp: globalDevices[deviceAddr].external_temp,
+								total_samples: label,
+								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[9];
+						var odr = payload[11];
+						var en_axis = payload[12] & 7;
+						var fsr = payload[12] >> 5;
+						var device_temp = payload.slice(15, 17).reduce(msbLsb) / 100;
+						var external_temperature = payload.slice(17, 19).reduce(msbLsb) / 100;
+
+						globalDevices[deviceAddr] = {
+							// stream_size: expected_packets,
+							data: {},
+							odr: odr,
+							mo: mode,
+							en_axis: en_axis,
+							fsr: fsr,
+							hour: hour,
+							minute: minute,
+							device_temp: device_temp,
+							external_temp: external_temperature
+						}
+						globalDevices[deviceAddr].data[current_packet] = payload.slice(data_start);
+						return;
+					}
+				}
+			}
+		},
+		'105': {
+			name: '1 Channel Automatic Luber With 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
+				};
+			}
+		},
+		'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) => {
+				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
+				};
+			}
+		},
+		'108': {
+			name: 'Machine Uptime Monitoring Sensor',
+			parse: (d, payload) => {
+				let firmware = payload[1];
+				if(payload[7] & 2 != 0){
+					console.log('Error found');
+					// parsed.data = {error: 'Error found, Acclerometer Probe may be unattached'};
+					let error = {error: 'Error found, Acclerometer Probe may be unattached'};
+					return error;
+				}
+				if(firmware > 4){
+					let report_type = "Regular";
+					switch(d[41]){
+						case 0:
+							report_type = "Regular";
+							break;
+						case 1:
+							report_type = "Shift end";
+							break;
+						case 2:
+							report_type = "Interrupt";
+							break;
+						case 3:
+							report_type = "Threshold";
+							break;
+					}
+					return {
+						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
+						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
+						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
+						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
+						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
+						opto_input_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),
+						input_di: d[40] & 1 ? 1 : 0,
+						input_ct: d[40] & 2 ? 1 : 0,
+						input_opto: d[40] & 4 ? 1 : 0,
+						input_acc: d[40] & 8 ? 1 : 0,
+						input_mag: d[40] & 16 ? 1 : 0,
+						report_type: report_type,
+						rtc: [
+							String(d[42]).padStart(2, '0'),
+							String(d[43]).padStart(2, '0'),
+							String(d[44]).padStart(2, '0')
+						].join(':')
+					};
+				}else{
+					return {
+						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
+						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
+						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
+						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
+						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
+						opto_input_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),
+						input_di: d[40] & 1 ? 1 : 0,
+						input_ct: d[40] & 2 ? 1 : 0,
+						input_opto: d[40] & 4 ? 1 : 0,
+						input_acc: d[40] & 8 ? 1 : 0,
+						input_mag: d[40] & 16 ? 1 : 0
+					};
+				}
+			},
+			'parse_fly': (frame) => {
+				if(frame[2] > 8){
+					let reset_mode = "Disabled";
+					switch(frame[37]){
+						case 0:
+							reset_mode = "Disabled";
+							break;
+						case 1:
+							reset_mode = "Shift Ends";
+							break;
+						case 2:
+							reset_mode = "Timeout";
+							break;
+					}
+					let acc_odr = "10Hz";
+					switch(frame[39]){
+						case 0:
+							acc_odr = "10Hz";
+							break;
+						case 1:
+							acc_odr = "20Hz";
+							break;
+						case 2:
+							acc_odr = "50Hz";
+							break;
+						case 3:
+							acc_odr = "100Hz";
+							break;
+						case 4:
+							acc_odr = "200Hz";
+							break;
+						case 5:
+							acc_odr = "400Hz";
+							break;
+					}
+					let rtc_sampling_interval = "5 seconds";
+					switch(frame[38]){
+						case 0:
+							rtc_sampling_interval = "1 minute";
+							break;
+						case 1:
+							rtc_sampling_interval = "5 minutes";
+							break;
+						case 2:
+							rtc_sampling_interval = "15 minutes";
+							break;
+						case 3:
+							rtc_sampling_interval = "30 minutes";
+							break;
+						case 4:
+							rtc_sampling_interval = "1 hour";
+							break;
+						case 5:
+							rtc_sampling_interval = "2 hours";
+							break;
+						case 6:
+							rtc_sampling_interval = "3 hours";
+							break;
+						case 7:
+							rtc_sampling_interval = "6 hours";
+							break;
+						case 8:
+							rtc_sampling_interval = "12 hours";
+							break;
+						case 9:
+							rtc_sampling_interval = "5 seconds";
+							break;
+						case 10:
+							rtc_sampling_interval = "10 seconds";
+							break;
+						case 11:
+							rtc_sampling_interval = "15 seconds";
+							break;
+						case 12:
+							rtc_sampling_interval = "30 seconds";
+							break;
+					}
+					return {
+						'firmware': frame[2],
+						'accelerometer_threshold': (frame[16]* 32) + "mg",
+						'debouncing_timeout': frame[17] + "sec",
+						'accelero_state': frame[18]? "Enabled": "Disabled",
+						'input_1_active_edge': frame[19]? "Rising": "Falling",
+						'input_2_active_edge': frame[20]? "Rising": "Falling",
+						'input_3_active_edge': frame[21]? "Rising": "Falling",
+						'counter_threshold': frame.slice(22, 26).reduce(msbLsb) + "sec",
+						'trasnmit_on_change_status': frame[26]? "Enabled": "Disabled",
+						'Shift_end_1': [
+							String(frame[27]).padStart(2, '0'),
+							String(frame[28]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_2': [
+							String(frame[29]).padStart(2, '0'),
+							String(frame[30]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_3': [
+							String(frame[31]).padStart(2, '0'),
+							String(frame[32]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_4': [
+							String(frame[33]).padStart(2, '0'),
+							String(frame[34]).padStart(2, '0')
+						].join(':'),
+						'reset_timeout': frame.slice(35, 37).reduce(msbLsb) + "min",
+						'counter_reset_mode': reset_mode,
+						'sampling_interval': rtc_sampling_interval,
+						'acc_odr': acc_odr,
+						'hardware_id': frame.slice(40, 43),
+						'report_rate': frame.slice(43, 47).reduce(msbLsb) + "sec",
+						'tx_life_counter': frame.slice(47, 51).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'accelerometer_threshold': frame[16],
+							'debouncing_timeout': frame[17],
+							'accelero_state': frame[18],
+							'input_1_active_edge': frame[19],
+							'input_2_active_edge': frame[20],
+							'input_3_active_edge': frame[21],
+							'counter_threshold': frame.slice(22, 26),
+							'trasnmit_on_change_status': frame[26],
+							'Shift_end_1': frame.slice(27, 29),
+							'Shift_end_2': frame.slice(29, 31),
+							'Shift_end_3': frame.slice(31, 33),
+							'Shift_end_4': frame.slice(33, 35),
+							'reset_timeout': frame.slice(35, 37),
+							'counter_reset_mode': frame[37],
+							'sampling_interval': frame[38],
+							'acc_odr': frame[39],
+							'hardware_id': frame.slice(40, 43),
+							'report_rate': frame.slice(43, 47),
+							'tx_life_counter': frame.slice(47, 51)
+						}
+					}
+				} else{
+					return {
+						'firmware': frame[2],
+						'report_rate': frame.slice(12, 16).reduce(msbLsb).toString() + "sec.",
+						'accelerometer_threshold': (frame[16]* 32).toString() + "mg.",
+						'debouncing_timeout': frame[17].toString() + "sec.",
+						'accelero_state': frame[18],
+						'digital_inputs_active_edge': frame.slice(19, 22).reduce(msbLsb),
+						'counter_threshold': frame.slice(22, 26).reduce(msbLsb).toString() + "sec.",
+						'trasnmit_on_change_status': frame[26],
+						'machine_values': {
+							'firmware': frame[2],
+							'report_rate': frame.slice(12, 16),
+							'accelerometer_threshold': frame[16],
+							'debouncing_timeout': frame[17],
+							'accelero_active_state': frame[18],
+							'digital_inputs_active_edge': frame.slice(19, 22),
+							'counter_threshold': frame.slice(22, 26),
+							'trasnmit_on_change_status': frame[26]
+						}
+					}
+				}
+			}
+		},
+		'109': {
+			name: 'Wireless Custom Solar Sensor',
+			parse: (d) => {
+				return {
+					illuminance: d.slice(0, 4).reduce(msbLsb),
+					total_solar_radiation: d.slice(4, 6).reduce(msbLsb),
+					ultraviolet_radiation: d.slice(6, 8).reduce(msbLsb)
+				};
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'hardware_id': frame.slice(12, 15),
+					'sample_rate': frame.slice(15, 19).reduce(msbLsb) + " Sec.",
+					'tx_life_counter': frame.slice(19, 23).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'hardware_id': frame.slice(12, 15),
+						'sample_rate': frame.slice(15, 19),
+						'tx_life_counter': frame.slice(19, 23)
+					}
+				}
+			}
+		},
+		'109': {
+			name: 'Wireless Custom Solar Sensor',
+			parse: (d) => {
+				return {
+					illuminance: d.slice(0, 4).reduce(msbLsb),
+					total_solar_radiation: d.slice(4, 6).reduce(msbLsb),
+					ultraviolet_radiation: d.slice(6, 8).reduce(msbLsb)
+				};
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'hardware_id': frame.slice(12, 15),
+					'sample_rate': frame.slice(15, 19).reduce(msbLsb) + " Sec.",
+					'tx_life_counter': frame.slice(19, 23).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
 						'hardware_id': frame.slice(12, 15),
 						'sample_rate': frame.slice(15, 19).reduce(msbLsb),
 						'tx_life_counter': frame.slice(19, 23).reduce(msbLsb)
@@ -7081,7 +7562,7 @@ function sensor_types(parent){
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
 							// if a packet is already stored with the same packet ID, or if packet ID is 1, or if current packet ID is not one more than last packet ID
-							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
+							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !(((current_packet)-1) in globalDevices[deviceAddr].data)) {
 								console.log('-----');
 								console.log('bad packet breakdown deleting stream');
 								console.log(current_packet);
@@ -7106,8 +7587,7 @@ function sensor_types(parent){
 								} else{
 
 									var mode = payload[8];
-									var odr = msbLsb(payload[9], payload[10])
-									var en_axis = payload[11] & 7;
+									var odr = msbLsb(payload[9], payload[10]);
 									var fsr = payload[11] >> 5;
 									var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -7116,7 +7596,6 @@ function sensor_types(parent){
 										data: {},
 										odr: odr,
 										mo: mode,
-										en_axis: en_axis,
 										fsr: fsr,
 										hour: hour,
 										minute: minute,
@@ -7132,8 +7611,7 @@ function sensor_types(parent){
 						}
 						else{
 							var mode = payload[8];
-							var odr = msbLsb(payload[9], payload[10])
-							var en_axis = payload[11] & 7;
+							var odr = msbLsb(payload[9], payload[10]);
 							var fsr = payload[11] >> 5;
 							var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -7142,7 +7620,6 @@ function sensor_types(parent){
 								data: {},
 								odr: odr,
 								mo: mode,
-								en_axis: en_axis,
 								fsr: fsr,
 								hour: hour,
 								minute: minute,
@@ -7162,43 +7639,11 @@ function sensor_types(parent){
 							var fft_concat = {};
 
 							var en_axis_data = {};
-							switch (globalDevices[deviceAddr].en_axis){
-								case 1:
-									en_axis_data.x_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 2:
-									en_axis_data.y_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 3:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 4:
-									en_axis_data.z_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 5:
-									en_axis_data.x_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 6:
-									en_axis_data.y_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 7:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.z_offset = 4;
-									en_axis_data.increment = 6;
-									break;
-								default:
-									en_axis_data.increment = 0;
-							}
+							en_axis_data.x_offset = 0;
+							en_axis_data.y_offset = 2;
+							en_axis_data.z_offset = 4;
+							en_axis_data.increment = 6;
+							fft_concat = {x: [], y: [], z: []};
 
 							var fsr_mult = .00006;
 							var fsr_text = "";
@@ -7231,19 +7676,18 @@ function sensor_types(parent){
 									break;
 							}
 
+
 							for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
 								label++;
 
-								fft_concat[label] = {};
-
 								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 							}
 							var fft_concat_obj = {
@@ -7251,7 +7695,6 @@ function sensor_types(parent){
 								msg_type: msg_type,
 								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,
@@ -7273,8 +7716,7 @@ function sensor_types(parent){
 					}else{
 
 						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10])
-						var en_axis = payload[11] & 7;
+						var odr = msbLsb(payload[9], payload[10]);
 						var fsr = payload[11] >> 5;
 						var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -7283,7 +7725,6 @@ function sensor_types(parent){
 							data: {},
 							odr: odr,
 							mo: mode,
-							en_axis: en_axis,
 							fsr: fsr,
 							hour: hour,
 							minute: minute,
@@ -7563,54 +8004,109 @@ function sensor_types(parent){
 				frame_data.auto_raw_interval = frame[32] * frame_data.sampling_interval_number || 'disabled';
 				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
 				frame_data.smart_mode_threshold = frame[34] * 50;
-				return {
-					'firmware': frame[2],
-					'destination_address': toMac(frame.slice(12, 16)),
-					'mode': frame_data.mode,
-					'odr': frame_data.odr_1+'Hz',
-					'sampling_duration': frame_data.sampling_duration_1,
-					'filter_status': frame_data.filter_status,
-					'lpf_coeff': frame_data.lpf_coeff_1,
-					'lpf_freq': frame_data.lpf_freq_1+'Hz',
-					'hpf_coeff': frame_data.hpf_coeff_1,
-					'hpf_freq': frame_data.hpf_freq_1+'Hz',
-					'sampling_interval': frame_data.sampling_interval,
-					'on_request_timeout': frame_data.on_request_timeout,
-					'deadband': frame_data.deadband,
-					'payload_length': frame_data.payload_length,
-					'fsr': frame_data.fsr_text,
-					'rpm_compute_status': frame_data.rpm_status,
-					'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
-					'auto_raw_interval': frame_data.auto_raw_interval,
-					'smart_mode_skip_count': frame[33],
-					'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
-					'uptime_counter': frame.slice(35, 39).reduce(msbLsb),
-					'hardware_id': frame.slice(39, 42),
-					'reserved': frame.slice(42, 46),
-					'tx_lifetime_counter': frame.slice(46, 50).reduce(msbLsb),
-					'machine_values': {
+				if(frame[2] > 4){ // for Firmware v5 and above
+					return {
 						'firmware': frame[2],
-						'destination_address': toMac(frame.slice(12, 16), false),
-						'mode': frame[16],
-						'odr': frame[17],
-						'sampling_duration': frame[18],
-						'filter_status': frame[19],
-						'lpf_coeff': frame[20],
-						'hpf_coeff': frame[21],
-						'sampling_interval': frame[22],
-						'on_request_timeout': frame[23],
-						'deadband': frame[24],
-						'payload_length': frame[25],
-						'fsr': frame[26],
-						'rpm_compute_status': frame[27],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr': frame_data.odr_1+'Hz',
+						'sampling_duration': frame_data.sampling_duration_1,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff': frame_data.lpf_coeff_1,
+						'lpf_freq': frame_data.lpf_freq_1+'Hz',
+						'hpf_coeff': frame_data.hpf_coeff_1,
+						'hpf_freq': frame_data.hpf_freq_1+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
+						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
+						'auto_raw_interval': frame_data.auto_raw_interval,
+						'smart_mode_skip_count': frame[33],
+						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
+						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
+						'max_tx_raw_samples': frame.slice(39, 41).reduce(msbLsb),
+						'hardware_id': frame.slice(41, 44),
+						'reserved': frame.slice(44, 48),
+						'tx_lifetime_counter': frame.slice(48, 52).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr': frame[17],
+							'sampling_duration': frame[18],
+							'filter_status': frame[19],
+							'lpf_coeff': frame[20],
+							'hpf_coeff': frame[21],
+							'sampling_interval': frame[22],
+							'on_request_timeout': frame[23],
+							'deadband': frame[24],
+							'payload_length': frame[25],
+							'fsr': frame[26],
+							'rpm_compute_status': frame[27],
+							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
+							'auto_raw_interval': frame[32],
+							'smart_mode_skip_count': frame[33],
+							'smart_mode_acc_threshold':frame[34],
+							'uptime_counter': frame.slice(35, 39),
+							'max_tx_raw_samples': frame.slice(39, 41),
+							'hardware_id': frame.slice(41, 44),
+							'reserved': frame.slice(44, 48),
+							'tx_lifetime_counter': frame.slice(48, 52)
+						}
+					}
+				}else{
+					return {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr': frame_data.odr_1+'Hz',
+						'sampling_duration': frame_data.sampling_duration_1,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff': frame_data.lpf_coeff_1,
+						'lpf_freq': frame_data.lpf_freq_1+'Hz',
+						'hpf_coeff': frame_data.hpf_coeff_1,
+						'hpf_freq': frame_data.hpf_freq_1+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
 						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
-						'auto_raw_interval': frame[32],
+						'auto_raw_interval': frame_data.auto_raw_interval,
 						'smart_mode_skip_count': frame[33],
-						'smart_mode_acc_threshold':frame[34],
-						'uptime_counter': frame.slice(35, 39),
+						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
+						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
 						'hardware_id': frame.slice(39, 42),
 						'reserved': frame.slice(42, 46),
-						'tx_lifetime_counter': frame.slice(46, 50)
+						'tx_lifetime_counter': frame.slice(46, 50).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr': frame[17],
+							'sampling_duration': frame[18],
+							'filter_status': frame[19],
+							'lpf_coeff': frame[20],
+							'hpf_coeff': frame[21],
+							'sampling_interval': frame[22],
+							'on_request_timeout': frame[23],
+							'deadband': frame[24],
+							'payload_length': frame[25],
+							'fsr': frame[26],
+							'rpm_compute_status': frame[27],
+							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
+							'auto_raw_interval': frame[32],
+							'smart_mode_skip_count': frame[33],
+							'smart_mode_acc_threshold':frame[34],
+							'uptime_counter': frame.slice(35, 39),
+							'hardware_id': frame.slice(39, 42),
+							'reserved': frame.slice(42, 46),
+							'tx_lifetime_counter': frame.slice(46, 50)
+						}
 					}
 				}
 			}
@@ -7665,8 +8161,7 @@ function sensor_types(parent){
 									return;
 								} else{
 									var mode = payload[8];
-									var odr = msbLsb(payload[9], payload[10])
-									var en_axis = payload[11] & 7;
+									var odr = msbLsb(payload[9], payload[10]);
 									var fsr = payload[11] >> 5;
 									var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -7675,7 +8170,6 @@ function sensor_types(parent){
 										data: {},
 										odr: odr,
 										mo: mode,
-										en_axis: en_axis,
 										fsr: fsr,
 										hour: hour,
 										minute: minute,
@@ -7691,8 +8185,7 @@ function sensor_types(parent){
 						}
 						else{
 							var mode = payload[8];
-							var odr = msbLsb(payload[9], payload[10])
-							var en_axis = payload[11] & 7;
+							var odr = msbLsb(payload[9], payload[10]);
 							var fsr = payload[11] >> 5;
 							var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -7701,7 +8194,6 @@ function sensor_types(parent){
 								data: {},
 								odr: odr,
 								mo: mode,
-								en_axis: en_axis,
 								fsr: fsr,
 								hour: hour,
 								minute: minute,
@@ -7721,43 +8213,11 @@ function sensor_types(parent){
 							var fft_concat = {};
 
 							var en_axis_data = {};
-							switch (globalDevices[deviceAddr].en_axis){
-								case 1:
-									en_axis_data.x_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 2:
-									en_axis_data.y_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 3:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 4:
-									en_axis_data.z_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 5:
-									en_axis_data.x_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 6:
-									en_axis_data.y_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 7:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.z_offset = 4;
-									en_axis_data.increment = 6;
-									break;
-								default:
-									en_axis_data.increment = 0;
-							}
+							en_axis_data.x_offset = 0;
+							en_axis_data.y_offset = 2;
+							en_axis_data.z_offset = 4;
+							en_axis_data.increment = 6;
+							fft_concat = {x: [], y: [], z: []};
 
 							var fsr_mult = .00006;
 							var fsr_text = "";
@@ -7793,16 +8253,14 @@ function sensor_types(parent){
 							for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
 								label++;
 
-								fft_concat[label] = {};
-
 								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 							}
 
@@ -7822,7 +8280,6 @@ function sensor_types(parent){
 								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,
@@ -7843,8 +8300,7 @@ function sensor_types(parent){
 						}
 					}else{
 						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10])
-						var en_axis = payload[11] & 7;
+						var odr = msbLsb(payload[9], payload[10]);
 						var fsr = payload[11] >> 5;
 						var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -7853,7 +8309,6 @@ function sensor_types(parent){
 							data: {},
 							odr: odr,
 							mo: mode,
-							en_axis: en_axis,
 							fsr: fsr,
 							hour: hour,
 							minute: minute,
@@ -7900,7 +8355,7 @@ function sensor_types(parent){
 							break;
 					}
 					var odr2;
-					switch(payload[54]){
+					switch(payload[56]){
 						case 6:
 							odr2 = "50Hz"
 							break;
@@ -7964,42 +8419,42 @@ function sensor_types(parent){
 						y1_peak_two_Hz: payload.slice(36, 38).reduce(msbLsb),
 						y1_peak_three_Hz: payload.slice(38, 40).reduce(msbLsb),
 
-						z1_rms_ACC_G: payload.slice(40, 42).reduce(msbLsb)/1000,
-						z1_max_ACC_G: payload.slice(42, 44).reduce(msbLsb)/1000,
-						z1_velocity_mm_sec: payload.slice(44, 46).reduce(msbLsb) / 100,
-						z1_displacement_mm: payload.slice(46, 48).reduce(msbLsb) / 100,
-						z1_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
-						z1_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
-						z1_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
-						rpm_1: payload.slice(54, 56).reduce(msbLsb),
-
-						s2_odr: odr2,
-						s2_temperature: signInt(payload.slice(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),
+						z1_rms_ACC_G: payload.slice(40, 42).reduce(msbLsb)/1000,
+						z1_max_ACC_G: payload.slice(42, 44).reduce(msbLsb)/1000,
+						z1_velocity_mm_sec: payload.slice(44, 46).reduce(msbLsb) / 100,
+						z1_displacement_mm: payload.slice(46, 48).reduce(msbLsb) / 100,
+						z1_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
+						z1_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
+						z1_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
+						rpm_1: payload.slice(54, 56).reduce(msbLsb),
 
-						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),
-						rpm_2: payload.slice(99, 101).reduce(msbLsb)
+						s2_odr: odr2,
+						s2_temperature: signInt(payload.slice(57, 59).reduce(msbLsb), 16) / 100,
+
+						x2_rms_ACC_G: payload.slice(59, 61).reduce(msbLsb)/1000,
+						x2_max_ACC_G: payload.slice(61, 63).reduce(msbLsb)/1000,
+						x2_velocity_mm_sec: payload.slice(63, 65).reduce(msbLsb) / 100,
+						x2_displacement_mm: payload.slice(65, 67).reduce(msbLsb) / 100,
+						x2_peak_one_Hz: payload.slice(67, 69).reduce(msbLsb),
+						x2_peak_two_Hz: payload.slice(69, 71).reduce(msbLsb),
+						x2_peak_three_Hz: payload.slice(71, 73).reduce(msbLsb),
+
+						y2_rms_ACC_G: payload.slice(73, 75).reduce(msbLsb)/1000,
+						y2_max_ACC_G: payload.slice(75, 77).reduce(msbLsb)/1000,
+						y2_velocity_mm_sec: payload.slice(77, 79).reduce(msbLsb) / 100,
+						y2_displacement_mm: payload.slice(79, 81).reduce(msbLsb) / 100,
+						y2_peak_one_Hz: payload.slice(81, 83).reduce(msbLsb),
+						y2_peak_two_Hz: payload.slice(83, 85).reduce(msbLsb),
+						y2_peak_three_Hz: payload.slice(85, 87).reduce(msbLsb),
+
+						z2_rms_ACC_G: payload.slice(87, 89).reduce(msbLsb)/1000,
+						z2_max_ACC_G: payload.slice(89, 91).reduce(msbLsb)/1000,
+						z2_velocity_mm_sec: payload.slice(91, 93).reduce(msbLsb) / 100,
+						z2_displacement_mm: payload.slice(93, 95).reduce(msbLsb) / 100,
+						z2_peak_one_Hz: payload.slice(95, 97).reduce(msbLsb),
+						z2_peak_two_Hz: payload.slice(97, 99).reduce(msbLsb),
+						z2_peak_three_Hz: payload.slice(99, 101).reduce(msbLsb),
+						rpm_2: payload.slice(101, 103).reduce(msbLsb)
 					};
 				}
 				// else{
@@ -8303,68 +8758,137 @@ function sensor_types(parent){
 				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
 				frame_data.p1_smart_mode_threshold = frame[38] * 50;
 				frame_data.p2_smart_mode_threshold = frame[39] * 50;
-				return {
-					'firmware': frame[2],
-					'destination_address': toMac(frame.slice(12, 16)),
-					'mode': frame_data.mode,
-					'odr_1': frame_data.odr_1+'Hz',
-					'odr_2': frame_data.odr_2+'Hz',
-					'sampling_duration_1': frame_data.sampling_duration_1,
-					'sampling_duration_2': frame_data.sampling_duration_2,
-					'filter_status': frame_data.filter_status,
-					'lpf_coeff_1': frame_data.lpf_coeff_1,
-					'lpf_freq_1': frame_data.lpf_freq_1+'Hz',
-					'lpf_coeff_2': frame_data.lpf_coeff_2,
-					'lpf_freq_2': frame_data.lpf_freq_2+'Hz',
-					'hpf_coeff_1': frame_data.hpf_coeff_1,
-					'hpf_freq_1': frame_data.hpf_freq_1+'Hz',
-					'hpf_coeff_2': frame_data.hpf_coeff_2,
-					'hpf_freq_2': frame_data.hpf_freq_2+'Hz',
-					'sampling_interval': frame_data.sampling_interval,
-					'on_request_timeout': frame_data.on_request_timeout,
-					'deadband': frame_data.deadband,
-					'payload_length': frame_data.payload_length,
-					'fsr': frame_data.fsr_text,
-					'rpm_compute_status': frame_data.rpm_status,
-					'auto_raw_destination_address': toMac(frame.slice(32 , 36)),
-					'auto_raw_interval': frame_data.auto_raw_interval,
-					'smart_mode_skip_count': frame[37],
-					'smart_mode_acc_threshold_probe_1': frame_data.p1_smart_mode_threshold+'mg',
-					'smart_mode_acc_threshold_probe_2': frame_data.p2_smart_mode_threshold+'mg',
-					'uptime_counter_probe_1': frame.slice(40, 44).reduce(msbLsb),
-					'uptime_counter_probe_2': frame.slice(44, 48).reduce(msbLsb),
-					'hardware_id': frame.slice(48, 51),
-					'reserved': frame.slice(51, 55),
-					'tx_lifetime_counter': frame.slice(55, 59).reduce(msbLsb),
-					'machine_values': {
+				if(frame[2] > 4){ // for Firmware v5 and above
+					return {
 						'firmware': frame[2],
-						'destination_address': toMac(frame.slice(12, 16), false),
-						'mode': frame[16],
-						'odr_1': frame[17],
-						'odr_2': frame[18],
-						'sampling_duration_1': frame[19],
-						'sampling_duration_2': frame[20],
-						'filter_status': frame[21],
-						'lpf_coeff_1': frame[22],
-						'lpf_coeff_2': frame[23],
-						'hpf_coeff_1': frame[24],
-						'hpf_coeff_2': frame[25],
-						'sampling_interval': frame[26],
-						'on_request_timeout': frame[27],
-						'deadband': frame[28],
-						'payload_length': frame[29],
-						'fsm': frame[30],
-						'rpm_compute_status': frame[31],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr_1': frame_data.odr_1+'Hz',
+						'odr_2': frame_data.odr_2+'Hz',
+						'sampling_duration_1': frame_data.sampling_duration_1,
+						'sampling_duration_2': frame_data.sampling_duration_2,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff_1': frame_data.lpf_coeff_1,
+						'lpf_freq_1': frame_data.lpf_freq_1+'Hz',
+						'lpf_coeff_2': frame_data.lpf_coeff_2,
+						'lpf_freq_2': frame_data.lpf_freq_2+'Hz',
+						'hpf_coeff_1': frame_data.hpf_coeff_1,
+						'hpf_freq_1': frame_data.hpf_freq_1+'Hz',
+						'hpf_coeff_2': frame_data.hpf_coeff_2,
+						'hpf_freq_2': frame_data.hpf_freq_2+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
 						'auto_raw_destination_address': toMac(frame.slice(32 , 36)),
-						'auto_raw_interval': frame[36],
+						'auto_raw_interval': frame_data.auto_raw_interval,
 						'smart_mode_skip_count': frame[37],
-						'smart_mode_acc_threshold_probe_1':frame[38],
-						'smart_mode_acc_threshold_probe_2':frame[39],
-						'uptime_counter_probe_1': frame.slice(40, 44),
-						'uptime_counter_probe_2': frame.slice(44, 48),
+						'smart_mode_acc_threshold_probe_1': frame_data.p1_smart_mode_threshold+'mg',
+						'smart_mode_acc_threshold_probe_2': frame_data.p2_smart_mode_threshold+'mg',
+						'uptime_counter_probe_1': frame.slice(40, 44).reduce(msbLsb)+'sec',
+						'uptime_counter_probe_2': frame.slice(44, 48).reduce(msbLsb)+'sec',
+						'max_tx_raw_samples': frame.slice(48, 50).reduce(msbLsb),
+						'hardware_id': frame.slice(50, 53),
+						'reserved': frame.slice(53, 57),
+						'tx_lifetime_counter': frame.slice(57, 61).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr_1': frame[17],
+							'odr_2': frame[18],
+							'sampling_duration_1': frame[19],
+							'sampling_duration_2': frame[20],
+							'filter_status': frame[21],
+							'lpf_coeff_1': frame[22],
+							'lpf_coeff_2': frame[23],
+							'hpf_coeff_1': frame[24],
+							'hpf_coeff_2': frame[25],
+							'sampling_interval': frame[26],
+							'on_request_timeout': frame[27],
+							'deadband': frame[28],
+							'payload_length': frame[29],
+							'fsm': frame[30],
+							'rpm_compute_status': frame[31],
+							'auto_raw_destination_address': toMac(frame.slice(32 , 36), false),
+							'auto_raw_interval': frame[36],
+							'smart_mode_skip_count': frame[37],
+							'smart_mode_acc_threshold_probe_1':frame[38],
+							'smart_mode_acc_threshold_probe_2':frame[39],
+							'uptime_counter_probe_1': frame.slice(40, 44),
+							'uptime_counter_probe_2': frame.slice(44, 48),
+							'max_tx_raw_samples': frame.slice(48, 50),
+							'hardware_id': frame.slice(50, 53),
+							'reserved': frame.slice(53, 57),
+							'tx_lifetime_counter': frame.slice(57, 61)
+						}
+					}
+				}else{
+					return {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr_1': frame_data.odr_1+'Hz',
+						'odr_2': frame_data.odr_2+'Hz',
+						'sampling_duration_1': frame_data.sampling_duration_1,
+						'sampling_duration_2': frame_data.sampling_duration_2,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff_1': frame_data.lpf_coeff_1,
+						'lpf_freq_1': frame_data.lpf_freq_1+'Hz',
+						'lpf_coeff_2': frame_data.lpf_coeff_2,
+						'lpf_freq_2': frame_data.lpf_freq_2+'Hz',
+						'hpf_coeff_1': frame_data.hpf_coeff_1,
+						'hpf_freq_1': frame_data.hpf_freq_1+'Hz',
+						'hpf_coeff_2': frame_data.hpf_coeff_2,
+						'hpf_freq_2': frame_data.hpf_freq_2+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
+						'auto_raw_destination_address': toMac(frame.slice(32 , 36)),
+						'auto_raw_interval': frame_data.auto_raw_interval,
+						'smart_mode_skip_count': frame[37],
+						'smart_mode_acc_threshold_probe_1': frame_data.p1_smart_mode_threshold+'mg',
+						'smart_mode_acc_threshold_probe_2': frame_data.p2_smart_mode_threshold+'mg',
+						'uptime_counter_probe_1': frame.slice(40, 44).reduce(msbLsb)+'sec',
+						'uptime_counter_probe_2': frame.slice(44, 48).reduce(msbLsb)+'sec',
 						'hardware_id': frame.slice(48, 51),
 						'reserved': frame.slice(51, 55),
-						'tx_lifetime_counter': frame.slice(55, 59).reduce(msbLsb)
+						'tx_lifetime_counter': frame.slice(55, 59).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr_1': frame[17],
+							'odr_2': frame[18],
+							'sampling_duration_1': frame[19],
+							'sampling_duration_2': frame[20],
+							'filter_status': frame[21],
+							'lpf_coeff_1': frame[22],
+							'lpf_coeff_2': frame[23],
+							'hpf_coeff_1': frame[24],
+							'hpf_coeff_2': frame[25],
+							'sampling_interval': frame[26],
+							'on_request_timeout': frame[27],
+							'deadband': frame[28],
+							'payload_length': frame[29],
+							'fsm': frame[30],
+							'rpm_compute_status': frame[31],
+							'auto_raw_destination_address': toMac(frame.slice(32 , 36), false),
+							'auto_raw_interval': frame[36],
+							'smart_mode_skip_count': frame[37],
+							'smart_mode_acc_threshold_probe_1':frame[38],
+							'smart_mode_acc_threshold_probe_2':frame[39],
+							'uptime_counter_probe_1': frame.slice(40, 44),
+							'uptime_counter_probe_2': frame.slice(44, 48),
+							'hardware_id': frame.slice(48, 51),
+							'reserved': frame.slice(51, 55),
+							'tx_lifetime_counter': frame.slice(55, 59)
+						}
 					}
 				}
 			}
@@ -8416,8 +8940,7 @@ function sensor_types(parent){
 								} else{
 
 									var mode = payload[8];
-									var odr = msbLsb(payload[9], payload[10])
-									var en_axis = payload[11] & 7;
+									var odr = msbLsb(payload[9], payload[10]);
 									var fsr = payload[11] >> 5;
 									var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -8426,7 +8949,6 @@ function sensor_types(parent){
 										data: {},
 										odr: odr,
 										mo: mode,
-										en_axis: en_axis,
 										fsr: fsr,
 										hour: hour,
 										minute: minute,
@@ -8442,8 +8964,7 @@ function sensor_types(parent){
 						}
 						else{
 							var mode = payload[8];
-							var odr = msbLsb(payload[9], payload[10])
-							var en_axis = payload[11] & 7;
+							var odr = msbLsb(payload[9], payload[10]);
 							var fsr = payload[11] >> 5;
 							var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -8452,7 +8973,6 @@ function sensor_types(parent){
 								data: {},
 								odr: odr,
 								mo: mode,
-								en_axis: en_axis,
 								fsr: fsr,
 								hour: hour,
 								minute: minute,
@@ -8471,43 +8991,11 @@ function sensor_types(parent){
 							var fft_concat = {};
 
 							var en_axis_data = {};
-							switch (globalDevices[deviceAddr].en_axis){
-								case 1:
-									en_axis_data.x_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 2:
-									en_axis_data.y_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 3:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 4:
-									en_axis_data.z_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 5:
-									en_axis_data.x_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 6:
-									en_axis_data.y_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 7:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.z_offset = 4;
-									en_axis_data.increment = 6;
-									break;
-								default:
-									en_axis_data.increment = 0;
-							}
+							en_axis_data.x_offset = 0;
+							en_axis_data.y_offset = 2;
+							en_axis_data.z_offset = 4;
+							en_axis_data.increment = 6;
+							fft_concat = {x: [], y: [], z: []};
 
 							var fsr_mult = .00006;
 							var fsr_text = "";
@@ -8543,16 +9031,14 @@ function sensor_types(parent){
 							for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
 								label++;
 
-								fft_concat[label] = {};
-
 								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
+									fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
 								}
 							}
 							var fft_concat_obj = {
@@ -8560,7 +9046,6 @@ function sensor_types(parent){
 								msg_type: msg_type,
 								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,
@@ -8586,8 +9071,7 @@ function sensor_types(parent){
 					}else{
 
 						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10])
-						var en_axis = payload[11] & 7;
+						var odr = msbLsb(payload[9], payload[10]);
 						var fsr = payload[11] >> 5;
 						var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -8596,7 +9080,6 @@ function sensor_types(parent){
 							data: {},
 							odr: odr,
 							mo: mode,
-							en_axis: en_axis,
 							fsr: fsr,
 							hour: hour,
 							minute: minute,
@@ -8877,54 +9360,109 @@ function sensor_types(parent){
 				frame_data.auto_raw_interval = frame[32] * frame_data.sampling_interval_number || 'disabled';
 				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
 				frame_data.smart_mode_threshold = frame[34] * 50;
-				return {
-					'firmware': frame[2],
-					'destination_address': toMac(frame.slice(12, 16)),
-					'mode': frame_data.mode,
-					'odr': frame_data.odr_1+'Hz',
-					'sampling_duration': frame_data.sampling_duration_1,
-					'filter_status': frame_data.filter_status,
-					'lpf_coeff': frame_data.lpf_coeff_1,
-					'lpf_freq': frame_data.lpf_freq_1+'Hz',
-					'hpf_coeff': frame_data.hpf_coeff_1,
-					'hpf_freq': frame_data.hpf_freq_1+'Hz',
-					'sampling_interval': frame_data.sampling_interval,
-					'on_request_timeout': frame_data.on_request_timeout,
-					'deadband': frame_data.deadband,
-					'payload_length': frame_data.payload_length,
-					'fsr': frame_data.fsr_text,
-					'rpm_compute_status': frame_data.rpm_status,
-					'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
-					'auto_raw_interval': frame_data.auto_raw_interval,
-					'smart_mode_skip_count': frame[33],
-					'smart_mode_acc_threshold': frame_data.smart_mode_threshold+'mg',
-					'uptime_counter': frame.slice(35, 39).reduce(msbLsb),
-					'hardware_id': frame.slice(39, 42),
-					'reserved': frame.slice(42, 46),
-					'tx_lifetime_counter': frame.slice(46, 50).reduce(msbLsb),
-					'machine_values': {
+				if(frame[2] > 4){ // for Firmware v5 and above
+					return {
 						'firmware': frame[2],
-						'destination_address': toMac(frame.slice(12, 16), false),
-						'mode': frame[16],
-						'odr': frame[17],
-						'sampling_duration_1': frame[18],
-						'filter_status': frame[19],
-						'lpf_coeff': frame[20],
-						'hpf_coeff': frame[21],
-						'sampling_interval': frame[22],
-						'on_request_timeout': frame[23],
-						'deadband': frame[24],
-						'payload_length': frame[25],
-						'fsm': frame[26],
-					    'rpm_compute_status': frame[27],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr': frame_data.odr_1+'Hz',
+						'sampling_duration': frame_data.sampling_duration_1,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff': frame_data.lpf_coeff_1,
+						'lpf_freq': frame_data.lpf_freq_1+'Hz',
+						'hpf_coeff': frame_data.hpf_coeff_1,
+						'hpf_freq': frame_data.hpf_freq_1+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
+						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
+						'auto_raw_interval': frame_data.auto_raw_interval,
+						'smart_mode_skip_count': frame[33],
+						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
+						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
+						'max_tx_raw_samples': frame.slice(39, 41).reduce(msbLsb),
+						'hardware_id': frame.slice(41, 44),
+						'reserved': frame.slice(44, 48),
+						'tx_lifetime_counter': frame.slice(48, 52).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr': frame[17],
+							'sampling_duration': frame[18],
+							'filter_status': frame[19],
+							'lpf_coeff': frame[20],
+							'hpf_coeff': frame[21],
+							'sampling_interval': frame[22],
+							'on_request_timeout': frame[23],
+							'deadband': frame[24],
+							'payload_length': frame[25],
+							'fsr': frame[26],
+							'rpm_compute_status': frame[27],
+							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
+							'auto_raw_interval': frame[32],
+							'smart_mode_skip_count': frame[33],
+							'smart_mode_acc_threshold':frame[34],
+							'uptime_counter': frame.slice(35, 39),
+							'max_tx_raw_samples': frame.slice(39, 41),
+							'hardware_id': frame.slice(41, 44),
+							'reserved': frame.slice(44, 48),
+							'tx_lifetime_counter': frame.slice(48, 52)
+						}
+					}
+				}else{
+					return {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr': frame_data.odr_1+'Hz',
+						'sampling_duration': frame_data.sampling_duration_1,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff': frame_data.lpf_coeff_1,
+						'lpf_freq': frame_data.lpf_freq_1+'Hz',
+						'hpf_coeff': frame_data.hpf_coeff_1,
+						'hpf_freq': frame_data.hpf_freq_1+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
 						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
-						'auto_raw_interval': frame[32],
+						'auto_raw_interval': frame_data.auto_raw_interval,
 						'smart_mode_skip_count': frame[33],
-						'smart_mode_acc_threshold':frame[34],
-						'uptime_counter': frame.slice(35, 39),
+						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
+						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
 						'hardware_id': frame.slice(39, 42),
 						'reserved': frame.slice(42, 46),
-						'tx_lifetime_counter': frame.slice(46, 50)
+						'tx_lifetime_counter': frame.slice(46, 50).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr': frame[17],
+							'sampling_duration': frame[18],
+							'filter_status': frame[19],
+							'lpf_coeff': frame[20],
+							'hpf_coeff': frame[21],
+							'sampling_interval': frame[22],
+							'on_request_timeout': frame[23],
+							'deadband': frame[24],
+							'payload_length': frame[25],
+							'fsr': frame[26],
+							'rpm_compute_status': frame[27],
+							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
+							'auto_raw_interval': frame[32],
+							'smart_mode_skip_count': frame[33],
+							'smart_mode_acc_threshold':frame[34],
+							'uptime_counter': frame.slice(35, 39),
+							'hardware_id': frame.slice(39, 42),
+							'reserved': frame.slice(42, 46),
+							'tx_lifetime_counter': frame.slice(46, 50)
+						}
 					}
 				}
 			}
@@ -8960,8 +9498,7 @@ function sensor_types(parent){
 								delete globalDevices[deviceAddr];
 								// create new stream
 								var mode = payload[8];
-								var odr = msbLsb(payload[9], payload[10])
-								var en_axis = payload[11] & 7;
+								var odr = msbLsb(payload[9], payload[10]);
 								var fsr = payload[11] >> 5;
 								var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -8969,7 +9506,6 @@ function sensor_types(parent){
 									data: {},
 									odr: odr,
 									mo: mode,
-									en_axis: en_axis,
 									fsr: fsr,
 									hour: hour,
 									minute: minute,
@@ -8986,8 +9522,7 @@ function sensor_types(parent){
 						}
 						else{
 							var mode = payload[8];
-							var odr = msbLsb(payload[9], payload[10])
-							var en_axis = payload[11] & 7;
+							var odr = msbLsb(payload[9], payload[10]);
 							var fsr = payload[11] >> 5;
 							var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -8995,7 +9530,6 @@ function sensor_types(parent){
 								data: {},
 								odr: odr,
 								mo: mode,
-								en_axis: en_axis,
 								fsr: fsr,
 								hour: hour,
 								minute: minute,
@@ -9007,8 +9541,7 @@ function sensor_types(parent){
 					}
 					else{
 						var mode = payload[8];
-						var odr = msbLsb(payload[9], payload[10])
-						var en_axis = payload[11] & 7;
+						var odr = msbLsb(payload[9], payload[10]);
 						var fsr = payload[11] >> 5;
 						var device_temp = msbLsb(payload[14], payload[15])/100;
 
@@ -9016,7 +9549,6 @@ function sensor_types(parent){
 							data: {},
 							odr: odr,
 							mo: mode,
-							en_axis: en_axis,
 							fsr: fsr,
 							hour: hour,
 							minute: minute,
@@ -9036,44 +9568,12 @@ function sensor_types(parent){
 						var fft_concat = {};
 
 						var en_axis_data = {};
-						switch (globalDevices[deviceAddr].en_axis){
-							case 1:
-								en_axis_data.x_offset = 0;
-								en_axis_data.increment = 2;
-								break;
-							case 2:
-								en_axis_data.y_offset = 0;
-								en_axis_data.increment = 2;
-								break;
-							case 3:
-								en_axis_data.x_offset = 0;
-								en_axis_data.y_offset = 2;
-								en_axis_data.increment = 4;
-								break;
-							case 4:
-								en_axis_data.z_offset = 0;
-								en_axis_data.increment = 2;
-								break;
-							case 5:
-								en_axis_data.x_offset = 0;
-								en_axis_data.z_offset = 2;
-								en_axis_data.increment = 4;
-								break;
-							case 6:
-								en_axis_data.y_offset = 0;
-								en_axis_data.z_offset = 2;
-								en_axis_data.increment = 4;
-								break;
-							case 7:
-								en_axis_data.x_offset = 0;
-								en_axis_data.y_offset = 2;
-								en_axis_data.z_offset = 4;
-								en_axis_data.increment = 6;
-								break;
-							default:
-								en_axis_data.increment = 0;
-						}
-
+						en_axis_data.x_offset = 0;
+						en_axis_data.y_offset = 2;
+						en_axis_data.z_offset = 4;
+						en_axis_data.increment = 6;
+						fft_concat = {x: [], y: [], z: []};
+						
 						var fsr_mult = .00006;
 						var fsr_text = "";
 
@@ -9109,16 +9609,14 @@ function sensor_types(parent){
 						for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
 							label++;
 
-							fft_concat[label] = {};
-
 							if('x_offset' in en_axis_data){
-								fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
+								fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2)));
 							}
 							if('y_offset' in en_axis_data){
-								fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
+								fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2)));
 							}
 							if('z_offset' in en_axis_data){
-								fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
+								fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2)));
 							}
 						}
 						var fft_concat_obj = {
@@ -9126,12 +9624,11 @@ function sensor_types(parent){
 							msg_type: msg_type,
 							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,
 							total_samples: label,
-							ft_confidence : ((globalDevices[deviceAddr].counter / expected_packets) * 100).toFixed(2) + '%',
+							fft_confidence : ((Object.keys(globalDevices[deviceAddr].data).length / expected_packets) * 100).toFixed(2) + '%',
 							data: fft_concat
 						};
 						sensor_data = fft_concat_obj;
@@ -9380,86 +9877,375 @@ function sensor_types(parent){
 				frame_data.on_request_timeout = frame[23] + " Seconds";
 				frame_data.deadband = frame[24] + "mg";
 
-				switch(frame[25]){
-					case 0:
-						frame_data.payload_length = "50 Bytes";
-						break;
-					case 1:
-						frame_data.payload_length = "100 Bytes";
-						break;
-					case 2:
-						frame_data.payload_length = "150 Bytes";
-						break;
-					case 3:
-						frame_data.payload_length = "180 Bytes";
-						break;
+				switch(frame[25]){
+					case 0:
+						frame_data.payload_length = "50 Bytes";
+						break;
+					case 1:
+						frame_data.payload_length = "100 Bytes";
+						break;
+					case 2:
+						frame_data.payload_length = "150 Bytes";
+						break;
+					case 3:
+						frame_data.payload_length = "180 Bytes";
+						break;
+				}
+				switch(frame[26]){
+					case 0:
+						frame_data.fsr_text = "2g";
+						break;
+					case 1:
+						frame_data.fsr_text = "4g";
+						break;
+					case 2:
+						frame_data.fsr_text = "8g";
+						break;
+					case 3:
+						frame_data.fsr_text = "16g";
+						break;
+				}
+				frame_data.rpm_status = frame[27]? 'Enabled': 'Disabled';
+				frame_data.auto_raw_interval = frame[32] * frame_data.sampling_interval_number || 'disabled';
+				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
+				frame_data.smart_mode_threshold = frame[34] * 50;
+				if(frame[2] > 4){ // for Firmware v5 and above
+					return {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr': frame_data.odr_1+'Hz',
+						'sampling_duration': frame_data.sampling_duration_1,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff': frame_data.lpf_coeff_1,
+						'lpf_freq': frame_data.lpf_freq_1+'Hz',
+						'hpf_coeff': frame_data.hpf_coeff_1,
+						'hpf_freq': frame_data.hpf_freq_1+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
+						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
+						'auto_raw_interval': frame_data.auto_raw_interval,
+						'smart_mode_skip_count': frame[33],
+						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
+						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
+						'max_tx_raw_samples': frame.slice(39, 41).reduce(msbLsb),
+						'hardware_id': frame.slice(41, 44),
+						'reserved': frame.slice(44, 48),
+						'tx_lifetime_counter': frame.slice(48, 52).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr': frame[17],
+							'sampling_duration': frame[18],
+							'filter_status': frame[19],
+							'lpf_coeff': frame[20],
+							'hpf_coeff': frame[21],
+							'sampling_interval': frame[22],
+							'on_request_timeout': frame[23],
+							'deadband': frame[24],
+							'payload_length': frame[25],
+							'fsr': frame[26],
+							'rpm_compute_status': frame[27],
+							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
+							'auto_raw_interval': frame[32],
+							'smart_mode_skip_count': frame[33],
+							'smart_mode_acc_threshold':frame[34],
+							'uptime_counter': frame.slice(35, 39),
+							'max_tx_raw_samples': frame.slice(39, 41),
+							'hardware_id': frame.slice(41, 44),
+							'reserved': frame.slice(44, 48),
+							'tx_lifetime_counter': frame.slice(48, 52)
+						}
+					}
+				}else{
+					return {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16)),
+						'mode': frame_data.mode,
+						'odr': frame_data.odr_1+'Hz',
+						'sampling_duration': frame_data.sampling_duration_1,
+						'filter_status': frame_data.filter_status,
+						'lpf_coeff': frame_data.lpf_coeff_1,
+						'lpf_freq': frame_data.lpf_freq_1+'Hz',
+						'hpf_coeff': frame_data.hpf_coeff_1,
+						'hpf_freq': frame_data.hpf_freq_1+'Hz',
+						'sampling_interval': frame_data.sampling_interval,
+						'on_request_timeout': frame_data.on_request_timeout,
+						'deadband': frame_data.deadband,
+						'payload_length': frame_data.payload_length,
+						'fsr': frame_data.fsr_text,
+						'rpm_compute_status': frame_data.rpm_status,
+						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
+						'auto_raw_interval': frame_data.auto_raw_interval,
+						'smart_mode_skip_count': frame[33],
+						'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
+						'uptime_counter': frame.slice(35, 39).reduce(msbLsb)+'sec',
+						'hardware_id': frame.slice(39, 42),
+						'reserved': frame.slice(42, 46),
+						'tx_lifetime_counter': frame.slice(46, 50).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'destination_address': toMac(frame.slice(12, 16), false),
+							'mode': frame[16],
+							'odr': frame[17],
+							'sampling_duration': frame[18],
+							'filter_status': frame[19],
+							'lpf_coeff': frame[20],
+							'hpf_coeff': frame[21],
+							'sampling_interval': frame[22],
+							'on_request_timeout': frame[23],
+							'deadband': frame[24],
+							'payload_length': frame[25],
+							'fsr': frame[26],
+							'rpm_compute_status': frame[27],
+							'auto_raw_destination_address': toMac(frame.slice(28 , 32), false),
+							'auto_raw_interval': frame[32],
+							'smart_mode_skip_count': frame[33],
+							'smart_mode_acc_threshold':frame[34],
+							'uptime_counter': frame.slice(35, 39),
+							'hardware_id': frame.slice(39, 42),
+							'reserved': frame.slice(42, 46),
+							'tx_lifetime_counter': frame.slice(46, 50)
+						}
+					}
+				}
+			}
+		},
+		'117': {
+			name: 'Custom Vibration Sensor PPV',
+			parse: (payload, parsed, mac) => {
+				if(payload[7] & 2){
+					console.log('Error found');
+					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
+					return parsed;
+				}
+				if(payload[8] === 1){
+					let mode = payload[8];
+					let msg_type = '';
+					switch(payload[9]){
+						case 0:
+							msg_type = 'Regular';
+							break;
+						case 1:
+							msg_type = 'Cautionay';
+							break;
+						case 2:
+							msg_type = 'Artwork';
+							break;
+						case 3:
+							msg_type = 'Transient';
+							break;
+					}
+					var deviceAddr = mac;
+					var firmware = payload[1];
+					var odr = msbLsb(payload[10], payload[11]);
+					var fsr = payload[12];
+					var device_temp = msbLsb(payload[13], payload[14])/100;
+					var expected_packets = msbLsb(payload[15], payload[16]);
+					var current_packet = msbLsb(payload[17], payload[18]);
+					var sdata_start = 19;
+
+					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{
+
+									globalDevices[deviceAddr] = {
+										// stream_size: expected_packets,
+										data: {},
+										odr: odr,
+										mo: mode,
+										fsr: fsr,
+										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{
+
+							globalDevices[deviceAddr] = {
+								// stream_size: expected_packets,
+								data: {},
+								odr: odr,
+								mo: mode,
+								fsr: fsr,
+								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 = {};
+							en_axis_data.x_offset = 0;
+							en_axis_data.y_offset = 2;
+							en_axis_data.z_offset = 4;
+							en_axis_data.increment = 6;
+							fft_concat = {x: [], y: [], z: []};
+
+							switch(globalDevices[deviceAddr].fsr){
+								case 0:
+									fsr_text = "2g";
+									break;
+								case 1:
+									fsr_text = "4g";
+									break;
+								case 2:
+									fsr_text = "8g";
+									break;
+								case 3:
+									fsr_text = "16g";
+									break;
+							}
+
+							for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
+								label++;
+
+								if('x_offset' in en_axis_data){
+									fft_concat.x.push(parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16) / 100).toFixed(2)));
+								}
+								if('y_offset' in en_axis_data){
+									fft_concat.y.push(parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16) / 100).toFixed(2)));
+								}
+								if('z_offset' in en_axis_data){
+									fft_concat.z.push(parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16) / 100).toFixed(2)));
+								}
+							}
+							var fft_concat_obj = {
+								mode: mode,
+								msg_type: msg_type,
+								mac_address: deviceAddr,
+								fsr: fsr_text,
+								odr: globalDevices[deviceAddr].odr,
+								device_temp: globalDevices[deviceAddr].device_temp,
+								total_samples: label,
+								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{
+
+						globalDevices[deviceAddr] = {
+							// stream_size: expected_packets,
+							data: {},
+							odr: odr,
+							mo: mode,
+							fsr: fsr,
+							device_temp: device_temp,
+						}
+						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						return;
+					}
 				}
-				switch(frame[26]){
-					case 0:
-						frame_data.fsr_text = "2g";
-						break;
-					case 1:
-						frame_data.fsr_text = "4g";
-						break;
-					case 2:
-						frame_data.fsr_text = "8g";
-						break;
-					case 3:
-						frame_data.fsr_text = "16g";
-						break;
+				else if(payload[8] === 0){
+					// mode byte most significant bit will indicate fft data.
+					// console.log(d);
+					let msg_type = '';
+					switch(payload[9]){
+						case 0:
+							msg_type = 'Regular'
+							break;
+						case 1:
+							msg_type = 'Cautionay';
+							break;
+						case 2:
+							msg_type = 'Artwork';
+							break;
+						case 3:
+							msg_type = 'Transient';
+							break;
+					}
+					return {
+						mode: payload[8],
+						msg_type: msg_type,
+
+						odr: payload.slice(10, 12).reduce(msbLsb),
+						temperature: signInt(payload.slice(12, 14).reduce(msbLsb), 16) / 100,
+
+						x_ppv_velocity: payload.slice(14, 16).reduce(msbLsb) / 100,
+						x_peak_one_Hz: payload.slice(16, 18).reduce(msbLsb),
+						x_peak_two_Hz: payload.slice(18, 20).reduce(msbLsb),
+						x_peak_three_Hz: payload.slice(20, 22).reduce(msbLsb),
+
+						y_ppv_velocity: payload.slice(22, 24).reduce(msbLsb) / 100,
+						y_peak_one_Hz: payload.slice(24, 26).reduce(msbLsb),
+						y_peak_two_Hz: payload.slice(26, 28).reduce(msbLsb),
+						y_peak_three_Hz: payload.slice(28, 30).reduce(msbLsb),
+
+						z_ppv_velocity: payload.slice(30, 32).reduce(msbLsb) / 100,
+						z_peak_one_Hz: payload.slice(32, 34).reduce(msbLsb),
+						z_peak_two_Hz: payload.slice(34, 36).reduce(msbLsb),
+						z_peak_three_Hz: payload.slice(36, 38).reduce(msbLsb)
+					};
 				}
-				frame_data.rpm_status = frame[27]? 'Enabled': 'Disabled';
-				frame_data.auto_raw_interval = frame[32] * frame_data.sampling_interval_number || 'disabled';
-				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
-				frame_data.smart_mode_threshold = frame[34] * 50;
+				// else{
+				// 	parsed.data = {'error': 'Vibration mode error'}
+				// 	return parsed;
+				// }
+			},
+			'parse_fly': (frame) => {
 				return {
-					'firmware': frame[2],
-					'destination_address': toMac(frame.slice(12, 16)),
-					'mode': frame_data.mode,
-					'odr': frame_data.odr_1+'Hz',
-					'sampling_duration': frame_data.sampling_duration_1,
-					'filter_status': frame_data.filter_status,
-					'lpf_coeff': frame_data.lpf_coeff_1,
-					'lpf_freq': frame_data.lpf_freq_1+'Hz',
-					'hpf_coeff': frame_data.hpf_coeff_1,
-					'hpf_freq': frame_data.hpf_freq_1+'Hz',
-					'sampling_interval': frame_data.sampling_interval,
-					'on_request_timeout': frame_data.on_request_timeout,
-					'deadband': frame_data.deadband,
-					'payload_length': frame_data.payload_length,
-					'fsr': frame_data.fsr_text,
-					'rpm_compute_status': frame_data.rpm_status,
-					'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
-					'auto_raw_interval': frame_data.auto_raw_interval,
-					'smart_mode_skip_count': frame[33],
-					'smart_mode_acc_threshold':frame_data.smart_mode_threshold+'mg',
-					'uptime_counter': frame.slice(35, 39).reduce(msbLsb),
-					'hardware_id': frame.slice(39, 42),
-					'reserved': frame.slice(42, 46),
-					'tx_lifetime_counter': frame.slice(46, 50).reduce(msbLsb),
+					'fly_rate': frame.slice(12, 13).reduce(msbLsb) + " Min.",
+					'fsr': frame[14],
+					'hardware_id': frame.slice(15, 18),
+					'report_rate': frame.slice(18, 22).reduce(msbLsb) + " Sec.",
+					'tx_lifetime_counter': frame.slice(22, 26).reduce(msbLsb),
 					'machine_values': {
-						'firmware': frame[2],
-						'destination_address': toMac(frame.slice(12, 16), false),
-						'mode': frame[16],
-						'odr': frame[17],
-						'sampling_duration': frame[18],
-						'filter_status': frame[19],
-						'lpf_coeff': frame[20],
-						'hpf_coeff': frame[21],
-						'sampling_interval': frame[22],
-						'on_request_timeout': frame[23],
-						'deadband': frame[24],
-						'payload_length': frame[25],
-						'fsr': frame[26],
-						'rpm_compute_status': frame[27],
-						'auto_raw_destination_address': toMac(frame.slice(28 , 32)),
-						'auto_raw_interval': frame[32],
-						'smart_mode_skip_count': frame[33],
-						'smart_mode_acc_threshold':frame[34],
-						'uptime_counter': frame.slice(35, 39),
-						'hardware_id': frame.slice(39, 42),
-						'reserved': frame.slice(42, 46),
-						'tx_lifetime_counter': frame.slice(46, 50)
+						'fly_rate': frame.slice(12, 13).reduce(msbLsb),
+						'fsr':frame[14],
+						'hardware_id': frame.slice(15, 18),
+						'report_rate': frame.slice(18, 22),
+						'tx_lifetime_counter': frame.slice(22, 26)
 					}
 				}
 			}
@@ -9575,6 +10361,98 @@ function sensor_types(parent){
 				}
 			}
 		},
+		'121':{
+			name: 'Wireless Wood Moisture Sensor',
+			parse: (d) => {
+				return {
+					wood_type: d[0],
+					temperature: signInt(d.slice(1, 3).reduce(msbLsb), 16) / 100,
+					humidity: d.slice(3, 5).reduce(msbLsb) / 100,
+					wood_moisture: d.slice(5, 7).reduce(msbLsb) / 100,
+					wood_resistance: (d.slice(7, 15)).reduce(msbLsb) / 100
+				};
+			},
+			'parse_fly': (frame) => {
+				return {
+					'hardware_id': frame.slice(12, 15),
+					'sample_rate': frame.slice(15, 19).reduce(msbLsb) + " Sec.",
+					'tx_life_counter': frame.slice(19, 23).reduce(msbLsb),
+					'machine_values': {
+						'hardware_id': frame.slice(12, 15),
+						'sample_rate': frame.slice(15, 19),
+						'tx_life_counter': frame.slice(19, 23)
+					}
+				}
+			}
+		},
+		'122': {
+			name: 'Wireless 4-20mA Current Splitter',
+			parse: (d) => {
+				// This parser may be outdated if a customer has an issue check with Engineering
+				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
+				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
+				return {
+					adc1: adc1,
+					adc2: adc2,
+					mA1: signInt(d.slice(4, 6).reduce(msbLsb))/100,
+					mA2: signInt(d.slice(6, 8).reduce(msbLsb))/100
+				};
+			},
+			'parse_fly': (frame) => {
+				let frame_data = {};
+				switch(frame[16]){
+					case 0:
+						frame_data.fsr = "+-0.256 V";
+					break;
+					case 1:
+						frame_data.fsr = "+-0.512 V";
+					break;
+					case 2:
+						frame_data.fsr = "+-1.024 V";
+					break;
+					case 3:
+						frame_data.fsr = "+-2.048 V";
+					break;
+					case 4:
+						frame_data.fsr = "+-4.096 V";
+					break;
+					case 5:
+						frame_data.fsr = "+-6.144 V";
+					break;
+				}
+				if(frame[2]>12){
+					return {
+						'firmware': frame[2],
+						'report_rate': frame.slice(12, 16).reduce(msbLsb),
+						'fsr':frame_data.fsr,
+						'boot_up_time': frame[17],
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'report_rate': frame.slice(12, 16),
+							'fsr':frame[16],
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
+							'frame': frame
+						}
+					}
+				}else{
+					return {
+						'firmware': frame[2],
+						'report_rate': frame.slice(12, 16).reduce(msbLsb),
+						'fsr':frame_data.fsr,
+						'boot_up_time': frame[17],
+						'machine_values': {
+							'firmware': frame[2],
+							'report_rate': frame.slice(12, 16),
+							'fsr':frame[16],
+							'boot_up_time': frame[17],
+							'frame': frame
+						}
+					}
+				}
+			}
+		},
 		'180': {
 			name: 'C1D2 One Channel Vibration Plus',
 			parse: (payload, parsed, mac) => {
@@ -10013,7 +10891,6 @@ function sensor_types(parent){
 								data: {},
 								odr: odr,
 								mo: mode,
-								en_axis: en_axis,
 								fsr: fsr,
 								hour: hour,
 								minute: minute,