@ncd-io/node-red-enterprise-sensors 1.0.11 → 1.1.1

package/lib/WirelessGateway.js

@@ -121,7 +121,6 @@ module.exports = class WirelessSensor{
 
 		this._emitter.emit("link_info",msg_obj);
 	}
-
 	parse(frame){
 		var type = this.payloadType[frame.data[0]];
 		if(typeof this[type] == 'function'){
@@ -142,7 +141,7 @@ module.exports = class WirelessSensor{
 				}
 			}
 			// #OTF
-			var otf_devices = [23,26,32,33,39,44,45,48,52,53,58,74,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,202,519,520,521,531,535,537,538,539,540,1010,1011];
+			var otf_devices = [23,26,32,33,39,44,45,48,52,53,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 device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -151,6 +150,9 @@ module.exports = class WirelessSensor{
 					var broadcast_otf_devices = [101,102,202];
 					mode = "FLY";
 				}
+				if(frame.data[9] == 85 && frame.data[10] == 80 && frame.data[11] == 84 && frame.data[12] == 72 && frame.data[13] == 87 && frame.data[14] == 82 && frame.data[15] == 78) {
+					mode = "UPTHWRN";
+				}
 			}
 			if(mode == 'ACK'){
 				data.firmware_version = frame.data[5];
@@ -188,6 +190,7 @@ module.exports = class WirelessSensor{
 				type: data.sensor_type,
 				nodeId: data.nodeId,
 				mode: mode,
+				// data: data,
 				lastHeard: data.received
 			};
 
@@ -198,6 +201,8 @@ module.exports = class WirelessSensor{
 				// 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);
+			}else if(mode === 'ACK'){
+				this.sensor_pool[frame.mac].result = data.result;
 			}
 			var that = this;
 
@@ -219,7 +224,7 @@ module.exports = class WirelessSensor{
 					}).catch(console.log);
 				}
 			}
-			if(mode != 'FLY'){
+			if(mode != 'FLY' && mode !='UPTHWRN'){
 				var send_events = function(){
 					that._emitter.emit(type, data);
 					that._emitter.emit(type+'-'+data.sensor_type, data);
@@ -252,9 +257,10 @@ module.exports = class WirelessSensor{
 			nodeId: payload[0],
 			counter: payload[1],
 			sensor_type: msbLsb(payload[2], payload[3]),
+			result: payload[5],
 			data: payload.slice(6)
 		};
-	}
+	};
 	config_error(payload){
 		var errors = [
 			'Unknown',
@@ -294,7 +300,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [23,26,32,33,39,44,45,48,52,53,58,74,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,202,519,520,521,531,535,537,538,539,540,1010,1011];
+		var otf_devices = [23,26,32,33,39,44,45,48,52,53,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];
 		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) {
@@ -302,6 +308,10 @@ module.exports = class WirelessSensor{
 				return parsed;
 			}
 		}
+		if(frame.data[9] == 85 && frame.data[10] == 80 && frame.data[11] == 84 && frame.data[12] == 72 && frame.data[13] == 87 && frame.data[14] == 82 && frame.data[15] == 78) {
+			parsed.payload = "Upthwrn command";
+			return parsed;
+		}
 
 		// Sensor type 515 has a unique OTF that is indicated by a reserve byte value with MSb of 1
 		if(parsed.sensor_type == 515){
@@ -712,7 +722,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 == 110 || parsed.sensor_type == 111 || parsed.sensor_type == 112 || parsed.sensor_type == 114 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || 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 == 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){
 				parsed.sensor_data = this.sensor_types[parsed.sensor_type].parse(payload, parsed, frame.mac);
 				if(!parsed.sensor_data){
 					return;
@@ -1037,6 +1047,12 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_probe_boot_time_202(sensor_mac, value){
+		console.log('config_set_probe_boot_time_202');
+		var packet = [244, 83, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_get_sampling_interval_101(sensor_mac, sampling_interval){
 		console.log('config_get_sampling_interval_101');
 		var packet = [244, 79, 0, 0, 101, 7];
@@ -1255,12 +1271,6 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_qos_108(sensor_mac, value){
-		console.log('config_set_qos_108');
-		var packet = [247, 52, 0, 0, 0, value];
-		console.log(packet);
-		return this.config_send(sensor_mac, packet);
-	}
 	config_set_deactivate_activate_accelero_108(sensor_mac, value){
 		console.log('config_set_deactivate_activate_accelero_108');
 		var packet = [244, 37, 0, 0, 0, value];
@@ -1394,6 +1404,36 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_filter_thermocouple(sensor_mac, value){
+		console.log('config_set_filter_thermocouple');
+		let packet = [244, 85, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_cold_junction_thermocouple(sensor_mac, value){
+		console.log('config_set_cold_junction_thermocouple');
+		let packet = [244, 87, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_sample_resolution_thermocouple(sensor_mac, value){
+		console.log('config_set_sample_resolution_thermocouple');
+		let packet = [244, 89, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_number_of_samples_thermocouple(sensor_mac, value){
+		console.log('config_set_number_of_samples_thermocouple');
+		let packet = [244, 91, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_measurement_type_thermocouple(sensor_mac, value){
+		console.log('config_set_number_of_samples_thermocouple');
+		let packet = [244, 95, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_debounce_time_2(sensor_mac, value){
 		console.log('config_set_debounce_time_2');
 		var packet = [244, 66, 0, 0, 2, value];
@@ -1406,14 +1446,20 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_auto_check_interval_check_88(sensor_mac, value){
-		console.log('config_set_disable_auto_check_88');
+	config_set_auto_check_interval_88(sensor_mac, value){
+		console.log('config_set_auto_check_interval_88');
 		let packet = [244, 70, 0, 0, 88];
 		let interval = int2Bytes((value), 2);
 		packet.push(...interval);
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_auto_check_threshold_88(sensor_mac, value){
+		console.log('config_set_auto_check_threshold_88');
+		let packet = [244, 72, 0, 0, 88, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_stay_on_mode_539(sensor_mac, value){
 		console.log('config_set_stay_on_mode_539');
 		var packet = [247, 50, 0, 0, 0, value];
@@ -1492,7 +1538,7 @@ module.exports = class WirelessSensor{
 	}
 	config_set_auto_raw_interval_110(sensor_mac, value){
 		console.log('config_set_raw_interval_110');
-		var packet = [244, 79, 0, 0, 80, 76, value];
+		var packet = [244, 79, 0, 0, 80, 70, value];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
@@ -1504,9 +1550,9 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_clear_probe_uptimers_110(sensor_mac, value){
+	config_set_clear_probe_uptimers_110(sensor_mac){
 		console.log('config_set_clear_probe_uptimers_110');
-		var packet = [244, 79, 0, 0, 80, value];
+		var packet = [244, 79, 0, 0, 80, 75];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
@@ -1518,9 +1564,13 @@ module.exports = class WirelessSensor{
 	}
 	config_set_smart_threshold_110(sensor_mac, value){
 		console.log('config_set_smart_threshold_110');
-		var packet = [244, 79, 0, 0, 101];
-		let value_th = int2Bytes((value), 2);
-		packet.push(...value_th);
+		var packet = [244, 79, 0, 0, 101, 78, 1, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_smart_threshold_p2_110(sensor_mac, value){
+		console.log('config_set_smart_threshold_p2_110');
+		var packet = [244, 79, 0, 0, 101, 78, 2, value];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
@@ -1649,24 +1699,6 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_stop_sampling(sensor_mac){
-		console.log('config_set_stop_sampling');
-		var packet = [244, 37, 0, 2, 5];
-		console.log(packet);
-		return this.config_send(sensor_mac, packet);
-	}
-	config_set_extend_otf_timeout(sensor_mac){
-		console.log('config_set_extend_otf_timeout');
-		var packet = [244, 38, 0, 2, 5];
-		console.log(packet);
-		return this.config_send(sensor_mac, packet);
-	}
-	config_set_end_cfg(sensor_mac){
-		console.log('config_set_end_cfg');
-		var packet = [244, 39, 0, 2, 5];
-		console.log(packet);
-		return this.config_send(sensor_mac, packet);
-	}
 	config_set_change_otf_interval(sensor_mac, value){
 		console.log('config_set_change_otf_interval');
 		var packet = [244, 40, 0, 2, 5];
@@ -1701,6 +1733,78 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_rtd_type_39(sensor_mac, value){
+		console.log('config_set_rtd_type_39');
+		var packet = [244, 64, 0, 0, 39, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_rtd_range_39(sensor_mac, value){
+		console.log('config_set_rtd_range_39');
+		var packet = [244, 66, 0, 0, 39, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_pressure_sensor_fs_ch1_118(sensor_mac, value){
+		console.log('config_set_pressure_sensor_fs_ch1_118');
+		var packet = [244, 64, 0, 0, 26, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_pressure_sensor_fs_ch2_118(sensor_mac, value){
+		console.log('config_set_pressure_sensor_fs_ch2_118');
+		var packet = [244, 64, 0, 0, 118, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_auto_check_interval_118(sensor_mac, value){
+		console.log('config_set_auto_check_interval_118');
+		var packet = [244, 66, 0, 0, 26];
+		let value_ = int2Bytes((value), 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_press_auto_check_percent_118(sensor_mac, value){
+		console.log('config_set_press_auto_check_percent_118');
+		var packet = [244, 68, 0, 0, 26, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_temp_auto_check_percent_118(sensor_mac, value){
+		console.log('config_set_temp_auto_check_percent_118');
+		var packet = [244, 70, 0, 0, 26, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_raw_length_97(sensor_mac, value){
+		console.log('config_set_raw_length_97');
+		var packet = [244, 67, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_raw_timeout_97(sensor_mac, value){
+		console.log('config_set_raw_timeout_97');
+		var packet = [244, 71, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_fly_rate_97(sensor_mac, value){
+		console.log('config_set_fly_rate_97');
+		var packet = [244, 73, 0, 0, 0];
+		let value_ = int2Bytes((value), 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_boot_up_time_97(sensor_mac, value){
+		console.log('config_set_boot_up_time_97');
+		var packet = [244, 51, 0, 0, 0];
+		let value_ = int2Bytes((value), 2);
+		packet.push(...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) => {
@@ -1923,6 +2027,7 @@ module.exports = class WirelessSensor{
 					function pass(packet){
 						clearTimeout(tout);
 						that._emitter.removeListener('config_error-'+sensor_mac, fail);
+						packet.sent = data;
 						fulfill(packet);
 						f();
 					};
@@ -1972,8 +2077,8 @@ module.exports = class WirelessSensor{
 		}
 		// var odr;
 		var odr = payload[8];
-		var device_temp = msbLsb(payload[11], payload[12])/100;
-		var probe_temp = msbLsb(payload[13], payload[14])/100;
+		var device_temp = signInt((msbLsb(payload[11], payload[12])), 16)/100;
+		var probe_temp = signInt((msbLsb(payload[13], payload[14])), 16)/100;
 
 		switch(odr){
 			case 6:
@@ -2021,7 +2126,8 @@ module.exports = class WirelessSensor{
 		var odr = payload[9];
 		var en_axis = payload[10] & 7;
 		var fsr = payload[10] >> 5;
-		var device_temp = msbLsb(payload[13], payload[14])/100;
+
+		var device_temp = signInt((msbLsb(payload[13], payload[14])), 16)/100;
 		switch(odr){
 			case 0:
 				odr = 4000;
@@ -2071,7 +2177,7 @@ module.exports = class WirelessSensor{
 			device_temp: device_temp,
 		}
 		if(firmware > 0){
-			var probe_temp = msbLsb(payload[15], payload[16])/100;
+			var probe_temp = signInt((msbLsb(payload[15], payload[16])), 16)/100;
 			globalDevices[deviceAddr].probe_temp = probe_temp;
 		}
 		globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
@@ -2125,6 +2231,53 @@ module.exports = class WirelessSensor{
 			});
 		});
 	}
+	remote_at_send(sensor_mac, parameter, value, opts, 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: [sensor_mac, parameter, value]
+						});
+						r();
+					}
+					function pass(packet){
+						if(failed) return;
+						clearTimeout(tO);
+						fulfill(packet);
+						f();
+					};
+
+					function send(){
+						that.send.remote_at_command(mac2bytes(sensor_mac), parameter, value, true).then(function(frame){
+							if(frame.status == 'OK'){
+								pass(frame);
+							}else{
+								tO = setTimeout(() => {
+									if(retries < 0){
+										retries++;
+										send();
+									}else{
+										fail('Remote AT response timeout');
+									}
+								}, ctrl_timeout);
+							}
+						}).catch(fail);
+					}
+					send();
+				});
+			});
+		});
+	}
 	route_discover(sensor_mac, opts){
 		var data = [85];
 		var that = this;
@@ -2583,10 +2736,9 @@ function sensor_types(parent){
 			parse: (payload, parsed, mac) => {
 				if(parsed.firmware > 3){
 					return {
-						input_1: payload[8],
-						current_detect: payload[9],
-						total_uptime: payload.slice(10, 14).reduce(msbLsb),
-						total_cycle_count: payload.slice(14, 18).reduce(msbLsb)
+						current_detect: payload[8],
+						total_uptime: payload.slice(9, 13).reduce(msbLsb),
+						total_cycle_count: payload.slice(13, 17).reduce(msbLsb)
 					};
 				}else{
 					return {
@@ -2836,19 +2988,35 @@ function sensor_types(parent){
 						frame_data.fsr = "+-6.144 V";
 					break;
 				}
-				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': {
+				if(frame[2]>12){
+					return {
 						'firmware': frame[2],
-						'report_rate': frame.slice(12, 16),
-						'fsr':frame[16],
+						'report_rate': frame.slice(12, 16).reduce(msbLsb),
+						'fsr':frame_data.fsr,
 						'boot_up_time': frame[17],
-						'adc_pin_reading': frame.slice(18, 20),
-						'frame': frame
+						'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
+						}
 					}
 				}
 			}
@@ -3046,19 +3214,55 @@ function sensor_types(parent){
 			}
 		},
 		'74': {
-			name: 'Wireless Temp Humidity Pressure Air quality Sensor',
-			parse: (d) => {
+			name: 'Wireless Temp Humidity Pressure Air quality Sensor V2',
+			parse: (d, parsed) => {
+				if(parsed[1] > 1){ // Firmware version
+					return {
+						temperature: signInt(d.slice(0, 2).reduce(msbLsb), 16) / 100,
+						pressure: d.slice(2, 6).reduce(msbLsb) / 100,
+						humidity: d.slice(6, 10).reduce(msbLsb) / 1000,
+						resistance: d.slice(10, 14).reduce(msbLsb),
+						iaq: d.slice(14, 16).reduce(msbLsb),
+						co2_eqv: d.slice(16, 18).reduce(msbLsb),
+						breath_voc: d.slice(18, 22).reduce(msbLsb) / 100,
+						static_iaq:  d.slice(22, 26).reduce(msbLsb) / 100,
+						iaq_accuracy: d[26]
+					};
+				}
+				else{
+					return {
+						temperature: signInt(d.slice(0, 2).reduce(msbLsb), 16) / 100,
+						pressure: d.slice(2, 6).reduce(msbLsb) / 100,
+						humidity: d.slice(6, 10).reduce(msbLsb) / 1000,
+						resistance: d.slice(10, 14).reduce(msbLsb),
+						iaq: d.slice(14, 16).reduce(msbLsb),
+						co2_eqv: d.slice(16, 18).reduce(msbLsb),
+						breath_voc: d.slice(18, 22).reduce(msbLsb)/ 100,
+						static_iaq:  (d.slice(22, 26).reverse()).reduce(msbLsb)/ 100,
+						// TODO Check if the iaq_accuracy should still be d[27]
+						iaq_accuracy: d[26]
+					};
+				}
+			},
+			'parse_fly': (frame) => {
 				return {
-					temperature: signInt(d.slice(0, 2).reduce(msbLsb), 16) *100,
-					pressure: d.slice(2, 6).reduce(msbLsb) * 100,
-					humidity: d.slice(6, 10).reduce(msbLsb) * 1000,
-					resistance: d.slice(10, 14).reduce(msbLsb),
-					iaq: d.slice(14, 16).reduce(msbLsb),
-					co2_eqv: d.slice(16, 18).reduce(msbLsb),
-					breath_voc: d.slice(18, 22).reduce(msbLsb)* 100,
-					static_iaq: d.slice(22, 26).reduce(msbLsb)* 100,
-					iaq_accuracy: d[27]
-				};
+					'firmware': frame[2],
+					'calibration_days': frame[12],
+					'sensor_update_rate':frame.slice(13, 15).reduce(msbLsb),
+					'hardware_id_1': frame[15],
+					'hardware_id_2': frame[16],
+					'hardware_id_3': frame[17],
+					'report_rate': frame.slice(18, 22).reduce(msbLsb),
+					'tx_counter': frame.slice(22, 26).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'calibration_days': frame[12],
+						'sensor_update_rate':frame.slice(13, 15),
+						'hardware_id': frame.slice(15, 18),
+						'report_rate': frame.slice(18, 22),
+						'tx_counter': frame.slice(22, 26),
+					}
+				}
 			}
 		},
 		'75': {
@@ -5968,6 +6172,333 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'97': {
+			name: 'One channel Dynamic Ultrasound vibration Sensor',
+			parse: (payload, parsed, mac) => {
+				if (payload[8] === 1) { // raw
+					var mode = payload[8];
+					var sampling_frequency = payload.slice(9, 13).reduce(msbLsb);
+					var sensor_index = payload[13];
+					var gain_db = payload[14];
+					var deviceAddr = mac;
+					var expected_packets = payload.slice(15, 17).reduce(msbLsb);
+					var current_packet = payload.slice(17, 19).reduce(msbLsb);
+					var sdata_start = 19;
+
+					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
+						// if(expected_packets == 1){
+						// 	this.build_102_data(payload, deviceAddr, hour, minute, sdata_start, current_packet, firmware);
+						// }
+
+						// 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 == 1 && expected_packets != 1) {
+							if(current_packet in globalDevices[deviceAddr].data || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
+								console.log('bad packet breakdown, deleting stream. Current packet:');
+								console.log(current_packet);
+								console.log('Total Expected Packets:');
+								console.log(expected_packets);
+								// console.log(current_packet in globalDevices[deviceAddr].data && current_packet == 1 && expected_packets != 1);
+								// 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);
+								}
+								delete globalDevices[deviceAddr];
+								if(current_packet != 1){
+									return;
+								} else{
+									if(current_packet != 1){
+										console.log('bad packet cleanup');
+										return;
+									}
+									globalDevices[deviceAddr] = {
+										// stream_size: expected_packets,
+										data: {},
+									}
+									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+									return;
+								}
+							}
+						}
+						if(expected_packets == 1){
+							if(current_packet != 1){
+								console.log('bad packet cleanup');
+								return;
+							}
+							globalDevices[deviceAddr] = {
+								// stream_size: expected_packets,
+								data: {},
+							}
+							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+							//return;
+						} else{
+							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 = {
+							// 	data: new Array()
+							// 	// test: new Array()
+							// };
+							var fft = new Array();
+							var adc = {};
+
+							for(var i = 0; i < raw_data.length; i+=2){
+								label++;
+								adc[label] = (raw_data[i]<<8)+(raw_data[i+1]);
+							}
+							// var data = globalDevices[deviceAddr];
+							delete globalDevices[deviceAddr];
+							if(this.hasOwnProperty('failure_no')){
+								console.log('####falure no');
+								console.log(this.failure_no);
+							}
+							return{
+								'mode': mode,
+								'sampling_frequency': sampling_frequency,
+								'sensor_index': sensor_index,
+								'gain_db':gain_db,
+								'adc':adc,
+								'raw_data':raw_data
+							}
+						}
+						else{
+							return;
+						}
+
+					}else{
+						if(current_packet != 1){
+							console.log('bad packet cleanup');
+							return;
+						}
+						globalDevices[deviceAddr] = {
+							// stream_size: expected_packets,
+							data: {},
+						}
+						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						return;
+					}
+				}
+				else if(payload[8] === 0){ // processed mode
+					return {
+						mode: payload[8],
+						rms_mv: payload.slice(9, 13).reduce(msbLsb) / 1000,
+						freq_1: payload.slice(13, 15).reduce(msbLsb),
+						freq_2: payload.slice(15, 17).reduce(msbLsb),
+						freq_3: payload.slice(17, 19).reduce(msbLsb),
+					};
+				}
+
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'raw_length': frame[12],
+					'raw_on_request_timeout': frame[13] + " Sec",
+					'fly_rate': frame.slice(14, 16).reduce(msbLsb) + " min",
+					'sensor_gain_db': frame[16] + " dB",
+					'sensor_boot_time': frame[17] + " Sec",
+					'hardware_id_1': frame[18],
+					'hardware_id_2': frame[19],
+					'hardware_id_3': frame[20],
+					'rate': frame.slice(21, 25).reduce(msbLsb),
+					'tx_life_count': frame.slice(25, 29).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'raw_lenght': frame[12],
+						'raw_on_request_timeout': frame[13],
+						'fly_rate': frame.slice(14, 16),
+						'sensor_gain_db': frame[16],
+						'sensor_boot_time': frame[17],
+						'hardware_id_1': frame[18],
+						'hardware_id_2': frame[19],
+						'hardware_id_3': frame[20],
+						'rate': frame.slice(21, 25),
+						'tx_life_count': frame.slice(25, 29)
+					}
+				}
+			}
+		},
+		'98': {
+			name: 'Two channel Dynamic Ultrasound vibration Sensor',
+			parse: (payload, parsed, mac) => {
+				if (payload[8] === 1) { // raw
+					var mode = payload[8];
+					var sampling_frequency = payload.slice(9, 13).reduce(msbLsb);
+					var sensor_index = payload[13];
+					var gain_db = payload[14];
+					var deviceAddr = mac;
+					var expected_packets = payload.slice(15, 17).reduce(msbLsb);
+					var current_packet = payload.slice(17, 19).reduce(msbLsb);
+					var sdata_start = 19;
+
+					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
+						// if(expected_packets == 1){
+						// 	this.build_102_data(payload, deviceAddr, hour, minute, sdata_start, current_packet, firmware);
+						// }
+
+						// 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 == 1 && expected_packets != 1) {
+							if(current_packet in globalDevices[deviceAddr].data || !(((current_packet&127)-1) in globalDevices[deviceAddr].data)) {
+								console.log('bad packet breakdown, deleting stream. Current packet:');
+								console.log(current_packet);
+								console.log('Total Expected Packets:');
+								console.log(expected_packets);
+								// console.log(current_packet in globalDevices[deviceAddr].data && current_packet == 1 && expected_packets != 1);
+								// 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);
+								}
+								delete globalDevices[deviceAddr];
+								if(current_packet != 1){
+									return;
+								} else{
+									if(current_packet != 1){
+										console.log('bad packet cleanup');
+										return;
+									}
+									globalDevices[deviceAddr] = {
+										// stream_size: expected_packets,
+										data: {},
+									}
+									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+									return;
+								}
+							}
+						}
+						if(expected_packets == 1){
+							if(current_packet != 1){
+								console.log('bad packet cleanup');
+								return;
+							}
+							globalDevices[deviceAddr] = {
+								// stream_size: expected_packets,
+								data: {},
+							}
+							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+							//return;
+						} else{
+							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 = {
+							// 	data: new Array()
+							// 	// test: new Array()
+							// };
+							var fft = new Array();
+							var adc = {};
+
+							for(var i = 0; i < raw_data.length; i+=2){
+								label++;
+								adc[label] = (raw_data[i]<<8)+(raw_data[i+1]);
+							}
+							// var data = globalDevices[deviceAddr];
+							delete globalDevices[deviceAddr];
+							if(this.hasOwnProperty('failure_no')){
+								console.log('####falure no');
+								console.log(this.failure_no);
+							}
+							return{
+								'mode': mode,
+								'sampling_frequency': sampling_frequency,
+								'sensor_index': sensor_index,
+								'gain_db':gain_db,
+								'adc':adc,
+								'raw_data':raw_data
+							}
+						}
+						else{
+							return;
+						}
+
+					}else{
+						if(current_packet != 1){
+							console.log('bad packet cleanup');
+							return;
+						}
+						globalDevices[deviceAddr] = {
+							// stream_size: expected_packets,
+							data: {},
+						}
+						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						return;
+					}
+				}
+				else if(payload[8] === 0){ // processed mode
+					return {
+						mode: payload[8],
+						c1_rms_mv: payload.slice(9, 13).reduce(msbLsb) / 1000,
+						c1_freq_1: payload.slice(13, 15).reduce(msbLsb),
+						c1_freq_2: payload.slice(15, 17).reduce(msbLsb),
+						c1_freq_3: payload.slice(17, 19).reduce(msbLsb),
+						c2_rms_mv: payload.slice(19, 23).reduce(msbLsb) / 1000,
+						c2_freq_1: payload.slice(23, 25).reduce(msbLsb),
+						c2_freq_2: payload.slice(25, 27).reduce(msbLsb),
+						c2_freq_3: payload.slice(27, 30).reduce(msbLsb)
+					};
+				}
+			},
+			'parse_fly': (frame) => {
+				return {
+					'firmware': frame[2],
+					'raw_length': frame[12],
+					'raw_on_request_timeout': frame[13] + " Sec",
+					'fly_rate': frame.slice(14, 16).reduce(msbLsb) + " min",
+					'c1_sensor_gain_db': frame[16] + " dB",
+					'c1_sensor_boot_time': frame[17] + " Sec",
+					'c2_sensor_gain_db': frame[18] + " dB",
+					'c2_sensor_boot_time': frame[19] + " Sec",
+					'hardware_id_1': frame[20],
+					'hardware_id_2': frame[21],
+					'hardware_id_3': frame[22],
+					'rate': frame.slice(23, 27).reduce(msbLsb),
+					'tx_life_count': frame.slice(27, 31).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'raw_lenght': frame[12],
+						'raw_on_request_timeout': frame[13],
+						'fly_rate': frame.slice(14, 16),
+						'c1_sensor_gain_db': frame[16],
+						'c1_sensor_boot_time': frame[17],
+						'c2_sensor_gain_db': frame[18],
+						'c2_sensor_boot_time': frame[19],
+						'hardware_id_1': frame[20],
+						'hardware_id_2': frame[21],
+						'hardware_id_3': frame[22],
+						'rate': frame.slice(23, 27),
+						'tx_life_count': frame.slice(27, 31)
+					}
+				}
+			}
+		},
 		'101':{
 			name: 'Pro Vibration',
 			parse: (d, full)=>{
@@ -6503,6 +7034,7 @@ function sensor_types(parent){
 						z_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
 						z_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
 						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
+						rpm: payload.slice(54, 56).reduce(msbLsb) / 10
 					};
 				}
 				// else{
@@ -7169,6 +7701,7 @@ function sensor_types(parent){
 						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) / 10,
 
 						s2_odr: odr2,
 						s2_temperature: signInt(payload.slice(55, 57).reduce(msbLsb), 16) / 100,
@@ -7195,7 +7728,8 @@ function sensor_types(parent){
 						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)
+						z2_peak_three_Hz: payload.slice(97, 99).reduce(msbLsb),
+						rpm_2: payload.slice(99, 101).reduce(msbLsb) / 10
 					};
 				}
 				// else{
@@ -7919,6 +8453,7 @@ function sensor_types(parent){
 						z_peak_one_Hz: payload.slice(56, 58).reduce(msbLsb),
 						z_peak_two_Hz: payload.slice(58, 60).reduce(msbLsb),
 						z_peak_three_Hz: payload.slice(60, 62).reduce(msbLsb),
+						rpm: payload.slice(62, 64).reduce(msbLsb) / 10
 					};
 				}
 				// else{
@@ -8527,6 +9062,7 @@ function sensor_types(parent){
 						z_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
 						z_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
 						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
+						rpm: payload.slice(54, 56).reduce(msbLsb) / 10
 					};
 				}
 				// else{
@@ -8733,7 +9269,93 @@ function sensor_types(parent){
 				}
 			}
 		},
-
+		'118': {
+			name: 'Dual Pressure and Temperature Sensor',
+			parse: (d) => {
+				return{
+					pressure_s1: signInt(d.slice(0, 4).reduce(msbLsb)),
+					temperature_s1: signInt(d.slice(4, 6).reduce(msbLsb))/100,
+					pressure_s2: signInt(d.slice(6, 10).reduce(msbLsb)),
+					temperature_s2: signInt(d.slice(10, 12).reduce(msbLsb))/100
+				};
+			},
+			'parse_fly': (frame) => {
+				let psi_1;
+				let psi_2;
+				switch(frame[12]){
+					case 0:
+						psi_1 = "10 PSI"
+						break;
+					case 1:
+						psi_1 = "20 PSI"
+						break;
+					case 2:
+						psi_1 = "100 PSI"
+						break;
+					case 3:
+						psi_1 = "500 PSI"
+						break;
+					case 4:
+						psi_1 = "1000 PSI"
+						break;
+					case 5:
+						psi_1 = "5000 PSI"
+						break;
+					case 6:
+						psi_1 = "10000 PSI"
+						break;
+				}
+				switch(frame[13]){
+					case 0:
+						psi_2 = "10 PSI"
+						break;
+					case 1:
+						psi_2 = "20 PSI"
+						break;
+					case 2:
+						psi_2 = "100 PSI"
+						break;
+					case 3:
+						psi_2 = "500 PSI"
+						break;
+					case 4:
+						psi_2 = "1000 PSI"
+						break;
+					case 5:
+						psi_2 = "5000 PSI"
+						break;
+					case 6:
+						psi_2 = "10000 PSI"
+						break;
+				}
+				return {
+					'firmware': frame[2],
+					'sensor_1_fs': psi_1,
+					'sensor_2_fs': psi_2,
+					'auto_check_interval': frame.slice(14, 16).reduce(msbLsb) + " Sec.",
+					'press_auto_check_percent': frame[17] + " %",
+					'temp_auto_check_percent': frame[17] + " %",
+					'hardware_id_1': frame[18],
+					'hardware_id_2': frame[19],
+					'hardware_id_3': frame[20],
+					'sample_rate': frame.slice(21, 25).reduce(msbLsb) + " Sec.",
+					'tx_life_counter': frame.slice(25, 29).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'sensor_1_fs': frame[12],
+						'sensor_2_fs': frame[13],
+						'auto_check_interval': frame.slice(14, 16),
+						'press_auto_check_percent': frame[16],
+						'temp_auto_check_percent': frame[17],
+						'hardware_id_1': frame[18],
+						'hardware_id_2': frame[19],
+						'hardware_id_3': frame[20],
+						'sample_rate': frame.slice(21, 25),
+						'tx_life_counter': frame.slice(25, 29),
+					}
+				}
+			}
+		},
 		'180': {
 			name: 'C1D2 One Channel Vibration Plus',
 			parse: (payload, parsed, mac) => {
@@ -8770,14 +9392,14 @@ function sensor_types(parent){
 		},
 		'202': {
 			name: 'Wireless Weather Station',
-			parse: (d) => {
+			parse: (payload, parsed, mac) => {
 				return {
-					Temp: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100,
-					Humid: signInt(d.slice(4, 8).reduce(msbLsb), 32) / 100,
-					Pressure: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100,
-					WindSpd: signInt(d.slice(12, 16).reduce(msbLsb),32) / 100,
-					WindDir: signInt(d.slice(16, 20).reduce(msbLsb),32) / 100
-
+					Temp: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
+					Humid: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100,
+					Pressure: signInt(payload.slice(16, 20).reduce(msbLsb), 32) / 100,
+					WindSpd: signInt(payload.slice(20, 24).reduce(msbLsb),32) / 100,
+					WindDir: signInt(payload.slice(24, 28).reduce(msbLsb),32) / 100,
+					reserve: payload[7]
 				};
 			}
 		},
@@ -11120,7 +11742,7 @@ function sensor_types(parent){
 			}
 		},
 		'539': {
-			name: 'RS-485 Modbus Wireless Converter',
+			name: 'RS485 Modbus Wireless Converter',
 			parse: (d) => {
 				return {
 					subdevice_type: d[0],
@@ -11148,6 +11770,22 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'1010': {
+			name: 'RS232 Wireless Converter',
+			parse: (d) => {
+				return {
+					data: d
+				};
+			},
+		},
+		'1011': {
+			name: 'RS485 Wireless Converter',
+			parse: (d) => {
+				return {
+					data: d
+				};
+			},
+		},
 		'10000': {
 			name: '4-Relay',
 			parse: (d) => {