@ncd-io/node-red-enterprise-sensors 1.1.5 → 1.2.0

package/lib/WirelessGateway.js

@@ -122,6 +122,25 @@ module.exports = class WirelessSensor{
 		this._emitter.emit("link_info",msg_obj);
 	}
 	parse(frame){
+		// NOTE this must be above the type selection to prevent rs-485 data from triggering other functionality.
+		if(globalDevices.hasOwnProperty(frame.mac) && globalDevices[frame.mac].hasOwnProperty('bridge') && globalDevices[frame.mac].bridge){
+			// if(type === undefined && globalDevices.hasOwnProperty(frame.mac) && globalDevices[frame.mac].hasOwnProperty('bridge') && globalDevices[frame.mac].bridge){
+			let query_data = {
+				addr: frame.mac,
+				payload: frame.data,
+			}
+			if(globalDevices[frame.mac].hasOwnProperty('command_queue') && globalDevices[frame.mac].command_queue.length != 0){
+				if(globalDevices[frame.mac].command_queue[0].hasOwnProperty('command')){
+					query_data.command = globalDevices[frame.mac].command_queue[0].command;
+				}
+				if(globalDevices[frame.mac].command_queue[0].hasOwnProperty('meta')){
+					query_data.meta = globalDevices[frame.mac].command_queue[0].meta;
+				}
+			};
+			this._emitter.emit('converter_ack-'+frame.mac, query_data);
+			return;
+			// }
+		}
 		var type = this.payloadType[frame.data[0]];
 		if(typeof this[type] == 'function'){
 			var data = this[type](frame.data.slice(1), frame);
@@ -141,7 +160,7 @@ module.exports = class WirelessSensor{
 				}
 			}
 			// #OTF
-			var otf_devices = [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,180,181,202,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,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 device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -303,7 +322,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [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,180,181,202,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,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];
 		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) {
@@ -1288,6 +1307,12 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_quality_of_service_108(sensor_mac, value){
+		console.log('config_set_quality_of_service_108');
+		var packet = [244, 52, 0, 0, 0, value]
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_rtc_108(sensor_mac){
 		console.log('config_set_rtc_108');
 		var date = new Date();
@@ -1295,8 +1320,8 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_rtc_interval_108(sensor_mac, value){
-		console.log('config_set_rtc_interval_108');
+	config_set_transmission_interval_108(sensor_mac, value){
+		console.log('config_set_transmission_interval_108');
 		var packet = [244, 55, 0, 0, 0, value];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
@@ -1631,6 +1656,14 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_max_raw_sample_110(sensor_mac, value){
+		console.log('config_set_max_raw_sample_110');
+		var packet = [244, 79, 0, 0, 101, 87];
+		var val = int2Bytes(value, 2);
+		packet.push(...val);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_acceleration_interrupt_threshold_84(sensor_mac, value){
 		console.log('config_set_acceleration_interrupt_threshold_84');
 		var packet = [244, 79, 0, 0, 0, 60, value];
@@ -1928,6 +1961,30 @@ module.exports = class WirelessSensor{
 		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];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_sensor_reset_120(sensor_mac){
+		console.log('config_set_sensor_reset_120');
+		let packet = [244, 12, 0, 0, 26];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_sensor_calib_120(sensor_mac){
+		console.log('config_set_sensor_calib_120');
+		let packet = [244, 13, 0, 0, 74];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_alert_threshold_120(sensor_mac, value){
+		console.log('config_set_alert_threshold_120');
+		let packet = [244, 14, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_get_delay(sensor_mac){
 		return new Promise((fulfill, reject) => {
 			this.config_send(sensor_mac, [247, 21, 0, 0, 0]).then((res) => {
@@ -2193,6 +2250,101 @@ module.exports = class WirelessSensor{
 			});
 		});
 	}
+	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);
+			}
+		});
+	}
 	build_102_data(payload, deviceAddr, hour, minute, sdata_start, current_packet, firmware){
 		if(current_packet != 1){
 			console.log('bad packet cleanup');
@@ -2400,7 +2552,54 @@ module.exports = class WirelessSensor{
 				});
 			});
 		});
-	}
+	};
+	local_at_send(parameter, value, ctrl_timeout = 1000){
+		var that = this;
+		return new Promise((fulfill, reject) => {
+			that.queue.add(() => {
+				return new Promise((f, r) => {
+					var failed = false;
+					var retries = 0;
+					var tO;
+					function fail(packet){
+						failed = true;
+						clearTimeout(tO);
+						// that._emitter.removeListener('receive_packet-'+sensor_mac, pass);
+						// that._emitter.removeListener('transmit_status-'+sensor_mac, pass);
+						reject({
+							err: packet,
+							sent: ['Local Module', parameter, value]
+						});
+						r();
+					}
+					function pass(packet){
+						if(failed) return;
+						clearTimeout(tO);
+						fulfill(packet);
+						f();
+					};
+
+					function send(){
+						that.send.at_command(parameter, value).then(function(frame){
+							if(frame.status == 'OK'){
+								pass(frame);
+							}else{
+								tO = setTimeout(() => {
+									if(retries < 0){
+										retries++;
+										send();
+									}else{
+										fail('AT response timeout');
+									}
+								}, ctrl_timeout);
+							}
+						}).catch(fail);
+					};
+					send();
+				});
+			});
+		});
+	};
 	route_discover(sensor_mac, opts){
 		var data = [85];
 		var that = this;
@@ -2725,7 +2924,7 @@ function sensor_types(parent){
 			}
 		},
 		'21': {
-			name: 'AMS Pressure & Temperature',
+			name: 'Differential Bidirectional Pressure Sensor',
 			parse: (d) => {
 				return {
 					pressure: signInt(d.slice(0, 2).reduce(msbLsb), 16) / 100,
@@ -6442,7 +6641,7 @@ function sensor_types(parent){
 					return {
 						mode: payload[8],
 						sampling_frequency: payload.slice(9, 13).reduce(msbLsb),
-						rms_mv: payload.slice(13, 17).reduce(msbLsb) / 1000,
+						rms_mv: signInt(payload.slice(13, 17).reduce(msbLsb), 32) / 1000,
 						freq_1: payload.slice(17, 19).reduce(msbLsb),
 						freq_2: payload.slice(19, 21).reduce(msbLsb),
 						freq_3: payload.slice(21, 23).reduce(msbLsb),
@@ -6475,10 +6674,10 @@ function sensor_types(parent){
 					'fly_rate': frame.slice(15, 17).reduce(msbLsb) + " min",
 					'sensor_gain_db': frame[17] + " dB",
 					'sensor_boot_time': frame[18] + " sec",
-					'sampling_frequency': (frame.slice(19, 23).reverse()).reduce(msbLsb) + " Hz",
-					'hardware_id': frame.slice(23, 26),
-					'report_rate': frame.slice(26, 30).reduce(msbLsb),
-					'tx_life_count': frame.slice(30, 34).reduce(msbLsb),
+					'sampling_frequency': frame.slice(19, 23).reduce(msbLsb) + " Hz",
+					// 'hardware_id': frame.slice(23, 26),
+					// 'report_rate': frame.slice(26, 30).reduce(msbLsb),
+					// 'tx_life_count': frame.slice(30, 34).reduce(msbLsb),
 					'machine_values': {
 						'firmware': frame[2],
 						'mode':frame[12],
@@ -6487,10 +6686,10 @@ function sensor_types(parent){
 						'fly_rate': frame.slice(15, 17),
 						'sensor_gain_db': frame[17],
 						'sensor_boot_time': frame[18],
-						'sampling_frequency': frame.slice(19, 23),
-						'hardware_id': frame.slice(23, 26),
-						'report_rate': frame.slice(26, 30),
-						'tx_life_count': frame.slice(30, 34)
+						'sampling_frequency': frame.slice(19, 23)
+						// 'hardware_id': frame.slice(23, 26),
+						// 'report_rate': frame.slice(26, 30),
+						// 'tx_life_count': frame.slice(30, 34)
 					}
 				}
 			}
@@ -6619,14 +6818,14 @@ function sensor_types(parent){
 					return {
 						mode: payload[8],
 						sampling_frequency: payload.slice(9, 13).reduce(msbLsb),
-						c1_rms_mv: payload.slice(13, 15).reduce(msbLsb) / 1000,
-						c1_freq_1: payload.slice(15, 17).reduce(msbLsb),
-						c1_freq_2: payload.slice(17, 19).reduce(msbLsb),
-						c1_freq_3: payload.slice(19, 23).reduce(msbLsb),
-						c2_rms_mv: payload.slice(23, 25).reduce(msbLsb) / 1000,
-						c2_freq_1: payload.slice(25, 27).reduce(msbLsb),
-						c2_freq_2: payload.slice(27, 30).reduce(msbLsb),
-						c2_freq_3: payload.slice(30, 34).reduce(msbLsb)
+						c1_rms_mv: signInt(payload.slice(13, 17).reduce(msbLsb), 32) / 1000,
+						c1_freq_1: payload.slice(17, 19).reduce(msbLsb),
+						c1_freq_2: payload.slice(19, 21).reduce(msbLsb),
+						c1_freq_3: payload.slice(21, 23).reduce(msbLsb),
+						c2_rms_mv: signInt(payload.slice(23, 27).reduce(msbLsb), 32) / 1000,
+						c2_freq_1: payload.slice(27, 29).reduce(msbLsb),
+						c2_freq_2: payload.slice(29, 31).reduce(msbLsb),
+						c2_freq_3: payload.slice(31, 33).reduce(msbLsb)
 					};
 				}
 			},
@@ -6657,10 +6856,10 @@ function sensor_types(parent){
 					'c1_sensor_boot_time': frame[18] + " sec",
 					'c2_sensor_gain_db': frame[19] + " dB",
 					'c2_sensor_boot_time': frame[20] + " sec",
-					'sampling_frequency': (frame.slice(21, 25).reverse()).reduce(msbLsb) + " Hz",
-					'hardware_id': frame.slice(25, 28),
-					'report_rate': frame.slice(28, 32).reduce(msbLsb),
-					'tx_life_count': frame.slice(32, 36).reduce(msbLsb),
+					'sampling_frequency': frame.slice(21, 25).reduce(msbLsb) + " Hz",
+					// 'hardware_id': frame.slice(25, 28),
+					// 'report_rate': frame.slice(28, 32).reduce(msbLsb),
+					// 'tx_life_count': frame.slice(32, 36).reduce(msbLsb),
 					'machine_values': {
 						'firmware': frame[2],
 						'mode': frame[12],
@@ -6671,10 +6870,10 @@ function sensor_types(parent){
 						'c1_sensor_boot_time': frame[18],
 						'c2_sensor_gain_db': frame[19],
 						'c2_sensor_boot_time': frame[20],
-						'sampling_frequency': frame.slice(21, 25),
-						'hardware_id': frame.slice(25, 28),
-						'report_rate': frame.slice(28, 32),
-						'tx_life_count': frame.slice(32, 36)
+						'sampling_frequency': frame.slice(21, 25)
+						// 'hardware_id': frame.slice(25, 28),
+						// 'report_rate': frame.slice(28, 32),
+						// 'tx_life_count': frame.slice(32, 36)
 					}
 				}
 			}
@@ -6811,23 +7010,47 @@ function sensor_types(parent){
 				}
 			}
 		},
+		'109': {
+			name: 'Wireless Custom Solar Sensor',
+			parse: (d) => {
+				return {
+					illuminance: d.slice(0, 4).reduce(msbLsb),
+					total_solar_radiation: d.slice(4, 6).reduce(msbLsb),
+					ultraviolet_radiation: d.slice(6, 8).reduce(msbLsb)
+				};
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'hardware_id': frame.slice(12, 15),
+					'sample_rate': frame.slice(15, 19).reduce(msbLsb) + " Sec.",
+					'tx_life_counter': frame.slice(19, 23).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'hardware_id': frame.slice(12, 15),
+						'sample_rate': frame.slice(15, 19).reduce(msbLsb),
+						'tx_life_counter': frame.slice(19, 23).reduce(msbLsb)
+					}
+				}
+			}
+		},
 		'110': {
 			name: 'One Channel Vibration Plus v4',
 			parse: (payload, parsed, mac) => {
-				if(payload[7] >> 1 != 0){
+				if(payload[7] & 2){
 					console.log('Error found');
 					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
 					return parsed;
 				}
-
+				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
 					var hour = payload[12];
 					var minute = payload[13];
-					var expected_packets = payload[16];
-					var current_packet = payload[17];
-					var sdata_start = 18;
+					var expected_packets = msbLsb(payload[16], payload[17]);
+					var current_packet = msbLsb(payload[18], payload[19]);
+					var sdata_start = 20;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -6998,12 +7221,15 @@ function sensor_types(parent){
 								}
 							}
 							var fft_concat_obj = {
+								mode: payload[8],
+								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,
 								data: fft_concat
 							};
 							sensor_data = fft_concat_obj;
@@ -7079,6 +7305,7 @@ function sensor_types(parent){
 					}
 					return {
 						mode: payload[8],
+						msg_type: msg_type,
 
 						odr: odr,
 						temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
@@ -7126,6 +7353,9 @@ function sensor_types(parent){
 					case 2:
 						frame_data.mode = "Processed + Raw on demand";
 						break;
+					case 3:
+						frame_data.mode = "Smart";
+						break;
 				}
 				switch(frame[17]){
 					case 6:
@@ -7237,30 +7467,39 @@ function sensor_types(parent){
 				switch(frame[22]){
 					case 0:
 						frame_data.sampling_interval = "5 Minutes";
+						frame_data.sampling_interval_number = 5;
 						break;
 					case 1:
 						frame_data.sampling_interval = "10 Minutes";
+						frame_data.sampling_interval_number = 10;
 						break;
 					case 2:
 						frame_data.sampling_interval = "15 Minutes";
+						frame_data.sampling_interval_number = 15;
 						break;
 					case 2:
 						frame_data.sampling_interval = "20 Minutes";
+						frame_data.sampling_interval_number = 20;
 						break;
 					case 4:
 						frame_data.sampling_interval = "30 Minutes";
+						frame_data.sampling_interval_number = 30;
 						break;
 					case 5:
 						frame_data.sampling_interval = "60 Minutes";
+						frame_data.sampling_interval_number = 60;
 						break;
 					case 6:
 						frame_data.sampling_interval = "120 Minutes";
+						frame_data.sampling_interval_number = 120;
 						break;
 					case 7:
 						frame_data.sampling_interval = "180 Minutes";
+						frame_data.sampling_interval_number = 180;
 						break;
 					case 8:
 						frame_data.sampling_interval = "1 Minute";
+						frame_data.sampling_interval_number = 1;
 						break;
 				}
 				frame_data.on_request_timeout = frame[23] + " Seconds";
@@ -7295,6 +7534,9 @@ function sensor_types(parent){
 						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;
 				return {
 					'firmware': frame[2],
 					'destination_address': toMac(frame.slice(12, 16)),
@@ -7312,6 +7554,14 @@ function sensor_types(parent){
 					'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': {
 						'firmware': frame[2],
 						'destination_address': toMac(frame.slice(12, 16), false),
@@ -7326,7 +7576,15 @@ function sensor_types(parent){
 						'deadband': frame[24],
 						'payload_length': frame[25],
 						'fsr': frame[26],
-						'rpm_compute_status': frame[27]
+						'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)
 					}
 				}
 			}
@@ -7344,15 +7602,15 @@ function sensor_types(parent){
 				if(payload[7] & 2 && payload[7] & 4){
 					return parsed;
 				}
-
+				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
 					var hour = payload[12];
 					var minute = payload[13];
-					var expected_packets = payload[16];
-					var current_packet = payload[17];
-					var sdata_start = 18;
+					var expected_packets = msbLsb(payload[16], payload[17]);
+					var current_packet = msbLsb(payload[18], payload[19]);
+					var sdata_start = 20;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -7532,6 +7790,8 @@ function sensor_types(parent){
 							}
 
 							var fft_concat_obj = {
+								mode: payload[8],
+								msg_type: msg_type,
 								probe: probe,
 								time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
 								probe: probe,
@@ -7540,6 +7800,7 @@ function sensor_types(parent){
 								fsr: fsr_text,
 								odr: globalDevices[deviceAddr].odr,
 								device_temp: globalDevices[deviceAddr].device_temp,
+								total_samples: label,
 								data: fft_concat
 							};
 							sensor_data = fft_concat_obj;
@@ -7654,9 +7915,9 @@ function sensor_types(parent){
 					// else{
 					// 	probe = '1';
 					// }
-
 					return {
 						mode: payload[8],
+						msg_type: msg_type,
 
 						s1_odr: odr1,
 						s1_temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
@@ -7732,6 +7993,9 @@ function sensor_types(parent){
 					case 2:
 						frame_data.mode = "Processed + Raw on demand";
 						break;
+					case 3:
+						frame_data.mode = "Smart";
+						break;
 				}
 				switch(frame[17]){
 					case 6:
@@ -7942,30 +8206,39 @@ function sensor_types(parent){
 				switch(frame[26]){
 					case 0:
 						frame_data.sampling_interval = "5 Minutes";
+						frame_data.sampling_interval_number = 5;
 						break;
 					case 1:
 						frame_data.sampling_interval = "10 Minutes";
+						frame_data.sampling_interval_number = 10;
 						break;
 					case 2:
 						frame_data.sampling_interval = "15 Minutes";
+						frame_data.sampling_interval_number = 15;
 						break;
 					case 2:
 						frame_data.sampling_interval = "20 Minutes";
+						frame_data.sampling_interval_number = 20;
 						break;
 					case 4:
 						frame_data.sampling_interval = "30 Minutes";
+						frame_data.sampling_interval_number = 30;
 						break;
 					case 5:
 						frame_data.sampling_interval = "60 Minutes";
+						frame_data.sampling_interval_number = 60;
 						break;
 					case 6:
 						frame_data.sampling_interval = "120 Minutes";
+						frame_data.sampling_interval_number = 120;
 						break;
 					case 7:
 						frame_data.sampling_interval = "180 Minutes";
+						frame_data.sampling_interval_number = 180;
 						break;
 					case 8:
 						frame_data.sampling_interval = "1 Minute";
+						frame_data.sampling_interval_number = 1;
 						break;
 				}
 				frame_data.on_request_timeout = frame[27] + " Seconds";
@@ -7985,7 +8258,7 @@ function sensor_types(parent){
 						frame_data.payload_length = "180 Bytes";
 						break;
 				}
-				switch(frame[20]){
+				switch(frame[30]){
 					case 0:
 						frame_data.fsr_text = "2g";
 						break;
@@ -8000,6 +8273,10 @@ function sensor_types(parent){
 						break;
 				}
 				frame_data.rpm_status = frame[31]? 'Enabled': 'Disabled';
+				frame_data.auto_raw_interval = frame[36] * frame_data.sampling_interval_number || 'disabled';
+				frame_data.auto_raw_interval = typeof frame_data.auto_raw_interval === 'number' ? frame_data.auto_raw_interval+'min' : frame_data.auto_raw_interval;
+				frame_data.p1_smart_mode_threshold = frame[38] * 50;
+				frame_data.p2_smart_mode_threshold = frame[39] * 50;
 				return {
 					'firmware': frame[2],
 					'destination_address': toMac(frame.slice(12, 16)),
@@ -8021,8 +8298,18 @@ function sensor_types(parent){
 					'on_request_timeout': frame_data.on_request_timeout,
 					'deadband': frame_data.deadband,
 					'payload_length': frame_data.payload_length,
-					'fsm': frame_data.fsr_text,
+					'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': {
 						'firmware': frame[2],
 						'destination_address': toMac(frame.slice(12, 16), false),
@@ -8042,6 +8329,16 @@ function sensor_types(parent){
 						'payload_length': frame[29],
 						'fsm': frame[30],
 						'rpm_compute_status': frame[31],
+						'auto_raw_destination_address': toMac(frame.slice(32 , 36)),
+						'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).reduce(msbLsb)
 					}
 				}
 			}
@@ -8049,21 +8346,21 @@ function sensor_types(parent){
 		'112': {
 			name: 'Condition Based/Predictive Maintenance Sensor v4',
 			parse: (payload, parsed, mac) => {
-				if(payload[7] >> 1 != 0){
+				if(payload[7] & 2){
 					console.log('Error found');
 					console.log(payload[7]);
 					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
 					return parsed;
 				}
-
+				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
 					var hour = payload[12];
 					var minute = payload[13];
-					var expected_packets = payload[16];
-					var current_packet = payload[17];
-					var sdata_start = 18;
+					var expected_packets = msbLsb(payload[16], payload[17]);
+					var current_packet = msbLsb(payload[18], payload[19]);
+					var sdata_start = 20;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
@@ -8233,12 +8530,15 @@ function sensor_types(parent){
 								}
 							}
 							var fft_concat_obj = {
+								mode: payload[8],
+								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,
 								data: fft_concat
 							};
 							// console.log(globalDevices[deviceAddr].data);
@@ -8318,6 +8618,7 @@ function sensor_types(parent){
 					}
 					return {
 						mode: payload[8],
+						msg_type: msg_type,
 
 						odr: odr,
 						temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
@@ -8366,6 +8667,9 @@ function sensor_types(parent){
 					case 2:
 						frame_data.mode = "Processed + Raw on demand";
 						break;
+					case 3:
+						frame_data.mode = "Smart";
+						break;
 				}
 				switch(frame[17]){
 					case 6:
@@ -8477,30 +8781,39 @@ function sensor_types(parent){
 				switch(frame[22]){
 					case 0:
 						frame_data.sampling_interval = "5 Minutes";
+						frame_data.sampling_interval_number = 5;
 						break;
 					case 1:
 						frame_data.sampling_interval = "10 Minutes";
+						frame_data.sampling_interval_number = 10;
 						break;
 					case 2:
 						frame_data.sampling_interval = "15 Minutes";
+						frame_data.sampling_interval_number = 15;
 						break;
 					case 2:
 						frame_data.sampling_interval = "20 Minutes";
+						frame_data.sampling_interval_number = 20;
 						break;
 					case 4:
 						frame_data.sampling_interval = "30 Minutes";
+						frame_data.sampling_interval_number = 30;
 						break;
 					case 5:
 						frame_data.sampling_interval = "60 Minutes";
+						frame_data.sampling_interval_number = 60;
 						break;
 					case 6:
 						frame_data.sampling_interval = "120 Minutes";
+						frame_data.sampling_interval_number = 120;
 						break;
 					case 7:
 						frame_data.sampling_interval = "180 Minutes";
+						frame_data.sampling_interval_number = 180;
 						break;
 					case 8:
 						frame_data.sampling_interval = "1 Minute";
+						frame_data.sampling_interval_number = 1;
 						break;
 				}
 				frame_data.on_request_timeout = frame[23] + " Seconds";
@@ -8535,6 +8848,9 @@ function sensor_types(parent){
 						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;
 				return {
 					'firmware': frame[2],
 					'destination_address': toMac(frame.slice(12, 16)),
@@ -8550,8 +8866,16 @@ function sensor_types(parent){
 					'on_request_timeout': frame_data.on_request_timeout,
 					'deadband': frame_data.deadband,
 					'payload_length': frame_data.payload_length,
-					'fsm': frame_data.fsr_text,
+					'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': {
 						'firmware': frame[2],
 						'destination_address': toMac(frame.slice(12, 16), false),
@@ -8566,7 +8890,15 @@ function sensor_types(parent){
 						'deadband': frame[24],
 						'payload_length': frame[25],
 						'fsm': frame[26],
-					'rpm_compute_status': frame[27],
+					    '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)
 					}
 				}
 			}
@@ -8574,72 +8906,57 @@ function sensor_types(parent){
 		'114': {
 			name: 'Standalone Smart Vibration Sensor v4',
 			parse: (payload, parsed, mac) => {
-				if(payload[7] >> 1 != 0){
+				if(payload[7] & 2){
 					console.log('Error found');
 					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
 					return parsed;
 				}
-
+				let msg_type = (payload[7] & 16)? 'motion' : 'regular';
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
 					var hour = payload[12];
 					var minute = payload[13];
-					var expected_packets = payload[16];
-					var current_packet = payload[17];
-					var sdata_start = 18;
+					var expected_packets = msbLsb(payload[16], payload[17]);
+					var current_packet = msbLsb(payload[18], payload[19]);
+					var sdata_start = 20;
 
 					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
 						if(expected_packets != 1){
-							// if a packet is already stored with the same packet ID, or if packet ID is 1, or if current packet ID is not one more than last packet ID
-							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !((current_packet-1) in globalDevices[deviceAddr].data)) {
-								console.log('-----');
-								console.log('bad packet breakdown deleting stream');
-								console.log(current_packet);
-								console.log(expected_packets);
-								console.log(current_packet in globalDevices[deviceAddr].data);
-								console.log(current_packet == 1);
-								console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
-								if(this.hasOwnProperty('failure_no')){
-									this.failure_no = this.failure_no + 1;
-								}
-								else{
-									this.failure_no = 1;
-								}
-								if(this.hasOwnProperty('failure_no')){
-									console.log('####falure no');
-									console.log(this.failure_no);
-								}
-								// console.log(globalDevices[deviceAddr].data);
+							// if current packet is equal to last one (duplicated data). This does not apply to the last package
+							if (globalDevices[deviceAddr].last_packet_counter == current_packet){
+								console.log('Duplicated message')
+								return;
+							}
+							// if current packet is equal to 1 or last packet counter is higher thant current packet
+							if(current_packet == 1 || (globalDevices[deviceAddr].last_packet_counter > current_packet)){
+								// clear stream
 								delete globalDevices[deviceAddr];
-								if(current_packet != 1){
-									return;
-								} else{
-
-									var mode = payload[8];
-									var odr = msbLsb(payload[9], payload[10])
-									var en_axis = payload[11] & 7;
-									var fsr = payload[11] >> 5;
-									var device_temp = msbLsb(payload[14], payload[15])/100;
-
-									globalDevices[deviceAddr] = {
-										// stream_size: expected_packets,
-										data: {},
-										odr: odr,
-										mo: mode,
-										en_axis: en_axis,
-										fsr: fsr,
-										hour: hour,
-										minute: minute,
-										device_temp: device_temp,
-									}
-									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
-									return;
+								// create new stream
+								var mode = payload[8];
+								var odr = msbLsb(payload[9], payload[10])
+								var en_axis = payload[11] & 7;
+								var fsr = payload[11] >> 5;
+								var device_temp = msbLsb(payload[14], payload[15])/100;
+
+								globalDevices[deviceAddr] = {
+									data: {},
+									odr: odr,
+									mo: mode,
+									en_axis: en_axis,
+									fsr: fsr,
+									hour: hour,
+									minute: minute,
+									device_temp: device_temp,
 								}
-							}
-							else{
+								globalDevices[deviceAddr].last_packet_counter = current_packet;
 								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+								return;
 							}
+							else{
+								globalDevices[deviceAddr].last_packet_counter = current_packet;
+							 	globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						 	}
 						}
 						else{
 							var mode = payload[8];
@@ -8649,7 +8966,6 @@ function sensor_types(parent){
 							var device_temp = msbLsb(payload[14], payload[15])/100;
 
 							globalDevices[deviceAddr] = {
-								// stream_size: expected_packets,
 								data: {},
 								odr: odr,
 								mo: mode,
@@ -8659,126 +8975,11 @@ function sensor_types(parent){
 								minute: minute,
 								device_temp: device_temp,
 							}
+							globalDevices[deviceAddr].last_packet_counter = current_packet;
 							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 						}
-						if(Object.keys(globalDevices[deviceAddr].data).length == expected_packets){
-							var raw_data = new Array();
-							for(const packet in globalDevices[deviceAddr].data){
-								raw_data = raw_data.concat(globalDevices[deviceAddr].data[packet]);
-							}
-							var label = 0;
-
-							var fft = new Array();
-							var fft_concat = {};
-
-							var en_axis_data = {};
-							switch (globalDevices[deviceAddr].en_axis){
-								case 1:
-									en_axis_data.x_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 2:
-									en_axis_data.y_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 3:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 4:
-									en_axis_data.z_offset = 0;
-									en_axis_data.increment = 2;
-									break;
-								case 5:
-									en_axis_data.x_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 6:
-									en_axis_data.y_offset = 0;
-									en_axis_data.z_offset = 2;
-									en_axis_data.increment = 4;
-									break;
-								case 7:
-									en_axis_data.x_offset = 0;
-									en_axis_data.y_offset = 2;
-									en_axis_data.z_offset = 4;
-									en_axis_data.increment = 6;
-									break;
-								default:
-									en_axis_data.increment = 0;
-							}
-
-							var fsr_mult = .00006;
-							var fsr_text = "";
-							switch(globalDevices[deviceAddr].fsr){
-								case 0:
-									fsr_mult = 0.00006;
-									break;
-								case 1:
-									fsr_mult = 0.00012;
-									break;
-								case 2:
-									fsr_mult = 0.00024;
-									break;
-								case 3:
-									fsr_mult = 0.00049;
-									break;
-							}
-							switch(globalDevices[deviceAddr].fsr){
-								case 0:
-									fsr_text = "2g";
-									break;
-								case 1:
-									fsr_text = "4g";
-									break;
-								case 2:
-									fsr_text = "8g";
-									break;
-								case 3:
-									fsr_text = "16g";
-									break;
-							}
-
-							for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
-								label++;
-
-								fft_concat[label] = {};
-
-								if('x_offset' in en_axis_data){
-									fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
-								}
-								if('y_offset' in en_axis_data){
-									fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
-								}
-								if('z_offset' in en_axis_data){
-									fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
-								}
-							}
-							var fft_concat_obj = {
-								time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
-								mac_address: deviceAddr,
-								en_axis: globalDevices[deviceAddr].en_axis,
-								fsr: fsr_text,
-								odr: globalDevices[deviceAddr].odr,
-								device_temp: globalDevices[deviceAddr].device_temp,
-								data: fft_concat
-							};
-							sensor_data = fft_concat_obj;
-							delete globalDevices[deviceAddr];
-							if(this.hasOwnProperty('failure_no')){
-								console.log('####falure no');
-								console.log(this.failure_no);
-							}
-
-							return sensor_data;
-						}
-						else{
-							return;
-						}
-					}else{
-
+					}
+					else{
 						var mode = payload[8];
 						var odr = msbLsb(payload[9], payload[10])
 						var en_axis = payload[11] & 7;
@@ -8786,7 +8987,6 @@ function sensor_types(parent){
 						var device_temp = msbLsb(payload[14], payload[15])/100;
 
 						globalDevices[deviceAddr] = {
-							// stream_size: expected_packets,
 							data: {},
 							odr: odr,
 							mo: mode,
@@ -8796,7 +8996,123 @@ function sensor_types(parent){
 							minute: minute,
 							device_temp: device_temp,
 						}
+						globalDevices[deviceAddr].last_packet_counter = current_packet;
 						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+					}
+					if(current_packet == expected_packets){
+						var raw_data = new Array();
+						for(const packet in globalDevices[deviceAddr].data){
+							raw_data = raw_data.concat(globalDevices[deviceAddr].data[packet]);
+						}
+						var label = 0;
+
+						var fft = new Array();
+						var fft_concat = {};
+
+						var en_axis_data = {};
+						switch (globalDevices[deviceAddr].en_axis){
+							case 1:
+								en_axis_data.x_offset = 0;
+								en_axis_data.increment = 2;
+								break;
+							case 2:
+								en_axis_data.y_offset = 0;
+								en_axis_data.increment = 2;
+								break;
+							case 3:
+								en_axis_data.x_offset = 0;
+								en_axis_data.y_offset = 2;
+								en_axis_data.increment = 4;
+								break;
+							case 4:
+								en_axis_data.z_offset = 0;
+								en_axis_data.increment = 2;
+								break;
+							case 5:
+								en_axis_data.x_offset = 0;
+								en_axis_data.z_offset = 2;
+								en_axis_data.increment = 4;
+								break;
+							case 6:
+								en_axis_data.y_offset = 0;
+								en_axis_data.z_offset = 2;
+								en_axis_data.increment = 4;
+								break;
+							case 7:
+								en_axis_data.x_offset = 0;
+								en_axis_data.y_offset = 2;
+								en_axis_data.z_offset = 4;
+								en_axis_data.increment = 6;
+								break;
+							default:
+								en_axis_data.increment = 0;
+						}
+
+						var fsr_mult = .00006;
+						var fsr_text = "";
+
+						switch(globalDevices[deviceAddr].fsr){
+							case 0:
+								fsr_mult = 0.00006;
+								break;
+							case 1:
+								fsr_mult = 0.00012;
+								break;
+							case 2:
+								fsr_mult = 0.00024;
+								break;
+							case 3:
+								fsr_mult = 0.00049;
+								break;
+						}
+						switch(globalDevices[deviceAddr].fsr){
+							case 0:
+								fsr_text = "2g";
+								break;
+							case 1:
+								fsr_text = "4g";
+								break;
+							case 2:
+								fsr_text = "8g";
+								break;
+							case 3:
+								fsr_text = "16g";
+								break;
+						}
+
+						for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
+							label++;
+
+							fft_concat[label] = {};
+
+							if('x_offset' in en_axis_data){
+								fft_concat[label].x = parseFloat((signInt(((raw_data[i+en_axis_data.x_offset]<<8)+(raw_data[i+en_axis_data.x_offset+1])), 16)*fsr_mult).toFixed(2));
+							}
+							if('y_offset' in en_axis_data){
+								fft_concat[label].y = parseFloat((signInt(((raw_data[i+en_axis_data.y_offset]<<8)+(raw_data[i+en_axis_data.y_offset+1])), 16)*fsr_mult).toFixed(2));
+							}
+							if('z_offset' in en_axis_data){
+								fft_concat[label].z = parseFloat((signInt(((raw_data[i+en_axis_data.z_offset]<<8)+(raw_data[i+en_axis_data.z_offset+1])), 16)*fsr_mult).toFixed(2));
+							}
+						}
+						var fft_concat_obj = {
+							mode: payload[8],
+							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) + '%',
+							data: fft_concat
+						};
+						sensor_data = fft_concat_obj;
+						delete globalDevices[deviceAddr];
+						return sensor_data;
+					}
+					else{
 						return;
 					}
 				}
@@ -8838,6 +9154,7 @@ function sensor_types(parent){
 					}
 					return {
 						mode: payload[8],
+						msg_type: msg_type,
 
 						odr: odr,
 						temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
@@ -8885,6 +9202,9 @@ function sensor_types(parent){
 					case 2:
 						frame_data.mode = "Processed + Raw on demand";
 						break;
+					case 3:
+						frame_data.mode = "Smart";
+						break;
 				}
 				switch(frame[17]){
 					case 6:
@@ -8996,30 +9316,39 @@ function sensor_types(parent){
 				switch(frame[22]){
 					case 0:
 						frame_data.sampling_interval = "5 Minutes";
+						frame_data.sampling_interval_number = 5;
 						break;
 					case 1:
 						frame_data.sampling_interval = "10 Minutes";
+						frame_data.sampling_interval_number = 10;
 						break;
 					case 2:
 						frame_data.sampling_interval = "15 Minutes";
+						frame_data.sampling_interval_number = 15;
 						break;
 					case 2:
 						frame_data.sampling_interval = "20 Minutes";
+						frame_data.sampling_interval_number = 20;
 						break;
 					case 4:
 						frame_data.sampling_interval = "30 Minutes";
+						frame_data.sampling_interval_number = 30;
 						break;
 					case 5:
 						frame_data.sampling_interval = "60 Minutes";
+						frame_data.sampling_interval_number = 60;
 						break;
 					case 6:
 						frame_data.sampling_interval = "120 Minutes";
+						frame_data.sampling_interval_number = 120;
 						break;
 					case 7:
 						frame_data.sampling_interval = "180 Minutes";
+						frame_data.sampling_interval_number = 180;
 						break;
 					case 8:
 						frame_data.sampling_interval = "1 Minute";
+						frame_data.sampling_interval_number = 1;
 						break;
 				}
 				frame_data.on_request_timeout = frame[23] + " Seconds";
@@ -9054,6 +9383,9 @@ function sensor_types(parent){
 						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;
 				return {
 					'firmware': frame[2],
 					'destination_address': toMac(frame.slice(12, 16)),
@@ -9071,6 +9403,14 @@ function sensor_types(parent){
 					'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': {
 						'firmware': frame[2],
 						'destination_address': toMac(frame.slice(12, 16), false),
@@ -9085,7 +9425,15 @@ function sensor_types(parent){
 						'deadband': frame[24],
 						'payload_length': frame[25],
 						'fsr': frame[26],
-					'rpm_compute_status': frame[27],
+						'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)
 					}
 				}
 			}
@@ -9173,6 +9521,34 @@ function sensor_types(parent){
 				}
 			}
 		},
+		'120': {
+			name: 'Wireless H2S Sensor',
+			parse: (d) => {
+				return {
+					ppm: d.slice(0, 2).reduce(msbLsb),
+					temperature: signInt(d.slice(2, 4).reduce(msbLsb), 16) / 100,
+					humidity: signInt(d.slice(4, 6).reduce(msbLsb), 16) / 100
+				};
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'h2s_threshold': frame[12],
+					'always_on_status': frame[13],
+					'hardware_id': frame.slice(14, 17),
+					'sample_rate': frame.slice(17, 21).reduce(msbLsb) + " Sec.",
+					'tx_life_counter': frame.slice(21, 25).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'h2s threshold': frame[12],
+						'always_on_status': frame[13],
+						'hardware_id': frame.slice(14, 17),
+						'sample_rate': frame.slice(17, 21).reduce(msbLsb),
+						'tx_life_counter': frame.slice(21, 25).reduce(msbLsb)
+					}
+				}
+			}
+		},
 		'180': {
 			name: 'C1D2 One Channel Vibration Plus',
 			parse: (payload, parsed, mac) => {
@@ -9223,11 +9599,8 @@ function sensor_types(parent){
 		'217': {
 			name: 'Wireless Weight Scale',
 			parse: (d) => {
-				let units;
-				d[0] ? units = "Kg" : units = "Lbs"
 				return {
-					unit: units,
-					weight: signInt(d.slice(1, 4).reduce(msbLsb)) * 100
+					weight: signInt(d.slice(0, 4).reduce(msbLsb)) / 100
 				};
 			}
 		},
@@ -9444,6 +9817,16 @@ function sensor_types(parent){
 				}
 			}
 		},
+		'518': {
+			name: 'Custom Air Velocity',
+			parse: (d) => {
+				return {
+					pressure: signInt(d.slice(0, 4).reduce(msbLsb), 16) / 100,
+					temperature: signInt(d.slice(4, 6).reduce(msbLsb), 16) / 100,
+					velocity: signInt(d.slice(6, 8).reduce(msbLsb), 16) / 1000
+				};
+			}
+		},
 		'519': {
 			name: 'Type 519 - Vibration',
 			parse: (payload, parsed, mac) => {