@ncd-io/node-red-enterprise-sensors 1.4.5 → 1.4.7

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,103,105,106,107,108,109,110,111,112,114,117,118,119,120,121,122,123,124,180,181,202,217,211,270,519,520,521,531,535,536,537,538,539,540,541,542,543,1010,1011];
+			var otf_devices = [4,12,21,23,26,29,32,33,39,44,45,48,52,53,54,55,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,119,120,121,122,123,124,180,181,202,217,211,270,519,520,521,531,535,536,537,538,539,540,541,542,543,1010,1011];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -361,7 +361,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,103,105,106,107,108,109,110,111,112,114,117,118,119,120,121,122,123,124,180,181,202,211,217,270,519,520,521,531,535,536,537,538,539,540,541,542,543,1010,1011];
+		var otf_devices = [4,12,21,23,26,29,32,33,39,44,45,48,52,53,54,55,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,119,120,121,122,123,124,180,181,202,211,217,270,519,520,521,531,535,536,537,538,539,540,541,542,543,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) {
@@ -783,7 +783,7 @@ module.exports = class WirelessSensor{
 					data: payload.slice(8)
 				};
 				// #OTF
-			}else if(parsed.sensor_type == 21 || 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_type == 543){
+			}else if(parsed.sensor_type == 21 || parsed.sensor_type == 33 || parsed.sensor_type == 39 || parsed.sensor_type == 29 || parsed.sensor_type == 54 || parsed.sensor_type == 55 || 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 == 118 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 202 || parsed.sensor_type == 217 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538 || parsed.sensor_type == 543){
 				parsed.sensor_data = this.sensor_types[parsed.sensor_type].parse(payload, parsed, frame.mac);
 				if(!parsed.sensor_data){
 					return;
@@ -2109,6 +2109,14 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_tare_value_217(sensor_mac, value){
+		console.log('config_set_tare_value_217');
+		var packet = [244, 34, 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];
@@ -2477,6 +2485,38 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_sensor_length_29(sensor_mac, value){
+		console.log('config_set_sensor_length_29');
+		var packet = [244, 63, 0, 0, 29];
+		let value_ = int2Bytes(value, 2);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_rtd_wire_type_ch2_54(sensor_mac, value){
+		console.log('config_set_rtd_wire_type_ch2_54');
+		var packet = [244, 68, 0, 0, 39, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_rtd_range_ch2_54(sensor_mac, value){
+		console.log('config_set_rtd_range_ch2_54');
+		var packet = [244, 70, 0, 0, 39, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_rtd_wire_type_ch3_55(sensor_mac, value){
+		console.log('config_set_rtd_wire_type_ch3_55');
+		var packet = [244, 72, 0, 0, 39, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_rtd_range_ch3_55(sensor_mac, value){
+		console.log('config_set_rtd_range_ch3_55');
+		var packet = [244, 74, 0, 0, 39, 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) => {
@@ -3929,12 +3969,42 @@ function sensor_types(parent){
 		},
 		'29': {
 			'name': 'Linear Displacement Sensor',
-			parse: (d) => {
-				var adc = d.slice(0, 2).reduce(msbLsb);
-				return {
-					adc: adc,
-					position: adc/1023*100,
-				};
+			parse: (payload, parsed, mac) => {
+				if(payload[7] >> 1 != 0){
+					console.log('Error found');
+					parsed.data = {error: 'Error found, invalid data'};
+					return parsed;
+				}
+				if(parsed.firmware > 4){
+					return {
+						position: (payload.slice(8, 10).reduce(msbLsb))/100
+					};
+				}else{
+					var adc = payload.slice(8, 10).reduce(msbLsb);
+					return {
+						adc: adc,
+						position: adc/1023*100,
+					};
+				}
+			},
+			'parse_fly': (frame) => {
+				let firmware = frame[2];
+				if(firmware > 4){
+					return {
+						'firmware': frame[2],
+						'sensor_length': (frame.slice(12, 14).reduce(msbLsb))+"mm",
+						'hardware_id': frame.slice(14, 17),
+						'report_rate': frame.slice(17, 21).reduce(msbLsb)+"sec",
+						'tx_life_counter': frame.slice(21, 25).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'sensor_length': frame.slice(12, 14),
+							'hardware_id': frame.slice(14, 17),
+							'report_rate': frame.slice(17, 21),
+							'tx_life_counter': frame.slice(21, 25)
+						}
+					}
+				}
 			}
 		},
 		'30': {
@@ -4036,10 +4106,62 @@ function sensor_types(parent){
 		},
 		'39': {
 			name: 'RTD Temperature Sensor',
-			parse: (d) => {
-				return {
-					temperature: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100
-				};
+			parse: (payload, parsed, mac) => {
+				if(parsed.firmware > 5){
+					let fault_status = '';
+					if (payload[7] === 0) {
+						fault_status = 'data_valid';
+					} else if (payload[7] === 15) {
+						fault_status = 'data_invalid';
+					} else {
+						const faultTypeBits = payload[7] & 0b00111100;
+						switch (faultTypeBits) {
+							case 32: 
+								fault_status = 'ref_in_vbias'; 
+								break;
+							case 16: 
+								fault_status = 'ref_in_force_close'; 
+								break;
+							case 8: 
+								fault_status = 'rtd_in_force_open'; 
+								break;
+							case 4: 
+								fault_status = 'over_under_voltage'; 
+								break;
+						}
+					}
+					return {
+						fault_status: fault_status,
+						temperature: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100
+					};
+				} else {
+					return {
+						temperature: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100
+					};
+				}
+			},
+			'parse_fly': (frame) => {
+				let firmware = frame[2];
+				if(firmware > 5){
+					const interface_types = ["rtd_2_wire", "rtd_3_wire", "rtd_4_wire"];
+					const rtd_types = ["rtd_pt_100", "rtd_pt_1000"];
+					return {
+						'firmware': frame[2],
+						'sensor_interface': interface_types[frame[12]],
+						'sensor_type': rtd_types[frame[13]],
+						'hardware_id': frame.slice(14, 17),
+						'report_rate': frame.slice(17, 21).reduce(msbLsb) + " sec",
+						'tx_life_counter': frame.slice(21, 25).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'sensor_interface': frame[12],
+							'sensor_type': frame[13],
+							'hardware_id': frame.slice(14, 17),
+							'report_rate': frame.slice(17, 21),
+							'tx_life_counter': frame.slice(21, 25)
+						}
+					}
+				}
 			}
 		},
 		'40': {
@@ -4490,13 +4612,151 @@ function sensor_types(parent){
 			}
 		},
 		'54': {
-			name: '3 Channel RTD',
-			parse: (d) => {
+			name: '2-Channel RTD Temperature Sensor',
+			parse: (payload, parsed, mac) => {
+				if(parsed.firmware > 5){
+					let fault_status = '';
+					if (payload[7] === 0) {
+						fault_status = 'data_valid';
+					} else if (payload[7] === 15) {
+						fault_status = 'data_invalid';
+					} else {
+						const fault_bits = (payload[7] >> 2) & 0b00001111;
+						switch (fault_bits) {
+							case 8: 
+								fault_status = 'ref_in_vbias'; 
+								break;
+							case 4: 
+								fault_status = 'ref_in_force_close'; 
+								break;
+							case 2: 
+								fault_status = 'rtd_in_force_open'; 
+								break;
+							case 1: 
+								fault_status = 'over_under_voltage'; 
+								break;
+						}
+						const channel_bits = payload[7] & 0b00000011;
+						switch (channel_bits) {
+							case 1:
+								fault_status = fault_status + '_ch1';
+								break;
+							case 2:
+								fault_status = fault_status + '_ch2';
+								break;
+						}
+					}
+					return {
+						fault_status: fault_status,
+						temperature_1: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
+						temperature_2: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100
+					};
+				} else {
+					return {
+						temperature_1: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
+						temperature_2: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100
+					};
+				}
+			},
+			'parse_fly': (frame) => {
+				let firmware = frame[2];
+				if(firmware > 5){
+					const interface_types = ["rtd_2_wire", "rtd_3_wire", "rtd_4_wire"];
+					const rtd_types = ["rtd_pt_100", "rtd_pt_1000"];
+					return {
+						'firmware': frame[2],
+						'sensor_interface_ch1': interface_types[frame[12]],
+						'sensor_type_ch1': rtd_types[frame[13]],
+						'sensor_interface_ch2': interface_types[frame[14]],
+						'sensor_type_ch2': rtd_types[frame[15]],
+						'hardware_id': frame.slice(16, 19),
+						'report_rate': frame.slice(19, 23).reduce(msbLsb) + " sec",
+						'tx_life_counter': frame.slice(23, 27).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'sensor_interface_ch1': frame[12],
+							'sensor_type_ch1': frame[13],
+							'sensor_interface_ch2': frame[14],
+							'sensor_type_ch2': frame[15],
+							'hardware_id': frame.slice(16, 19),
+							'report_rate': frame.slice(19, 23),
+							'tx_life_counter': frame.slice(23, 27)
+						}
+					}
+				}
+			}
+		},
+		'55': {
+			name: '3-Channel RTD Temperature Sensor',
+			parse: (payload, parsed, mac) => {
+				let fault_status = '';
+				if (payload[7] === 0) {
+					fault_status = 'data_valid';
+				} else if (payload[7] === 15) {
+					fault_status = 'data_invalid';
+				} else {
+					const fault_bits = (payload[7] >> 2) & 0b00001111;
+					switch (fault_bits) {
+						case 8: 
+							fault_status = 'ref_in_vbias'; 
+							break;
+						case 4: 
+							fault_status = 'ref_in_force_close'; 
+							break;
+						case 2: 
+							fault_status = 'rtd_in_force_open'; 
+							break;
+						case 1: 
+							fault_status = 'over_under_voltage'; 
+							break;
+					}
+					const channel_bits = payload[7] & 0b00000011;
+					switch (channel_bits) {
+						case 1:
+							fault_status = fault_status + '_ch1';
+							break;
+						case 2:
+							fault_status = fault_status + '_ch2';
+							break;
+						case 3:
+							fault_status = fault_status + '_ch3';
+							break;
+					}
+				}
 				return {
-					temperature_1: signInt(d.slice(0, 4).reduce(msbLsb), 32) / 100,
-					temperature_2: signInt(d.slice(4, 8).reduce(msbLsb), 32) / 100,
-					temperature_3: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100
+					fault_status: fault_status,
+					temperature_1: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
+					temperature_2: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100,
+					temperature_3: signInt(payload.slice(16, 20).reduce(msbLsb), 32) / 100
 				};
+			},
+			'parse_fly': (frame) => {
+				const interface_types = ["rtd_2_wire", "rtd_3_wire", "rtd_4_wire"];
+				const rtd_types = ["rtd_pt_100", "rtd_pt_1000"];
+				return {
+					'firmware': frame[2],
+					'sensor_interface_ch1': interface_types[frame[12]],
+					'sensor_type_ch1': rtd_types[frame[13]],
+					'sensor_interface_ch2': interface_types[frame[14]],
+					'sensor_type_ch2': rtd_types[frame[15]],
+					'sensor_interface_ch3': interface_types[frame[16]],
+					'sensor_type_ch3': rtd_types[frame[17]],
+					'hardware_id': frame.slice(18, 21),
+					'report_rate': frame.slice(21, 25).reduce(msbLsb) + " sec",
+					'tx_life_counter': frame.slice(25, 29).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'sensor_interface_ch1': frame[12],
+						'sensor_type_ch1': frame[13],
+						'sensor_interface_ch2': frame[14],
+						'sensor_type_ch2': frame[15],
+						'sensor_interface_ch3': frame[16],
+						'sensor_type_ch3': frame[17],
+						'hardware_id': frame.slice(18, 21),
+						'report_rate': frame.slice(21, 25),
+						'tx_life_counter': frame.slice(25, 29)
+					}
+				}
 			}
 		},
 		'56': {
@@ -8414,13 +8674,13 @@ function sensor_types(parent){
 							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)*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(5)));
 							}
 							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)*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(5)));
 							}
 							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)*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(5)));
 							}
 						}
 						var fft_concat_obj = {
@@ -8831,12 +9091,12 @@ function sensor_types(parent){
 			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((payload[7] & 2) != 0){
+				// 	console.log('Error found');
+				// 	// parsed.data = {error: 'Error found, Accelerometer Probe may be unattached'};
+				// 	let error = {error: 'Error found, Accelerometer Probe may be unattached'};
+				// 	return error;
+				// }
 				if(firmware > 4){
 					let report_type = "Regular";
 					switch(d[41]){
@@ -8853,7 +9113,7 @@ function sensor_types(parent){
 							report_type = "Threshold";
 							break;
 					}
-					return {
+					let res = {
 						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),
@@ -8876,8 +9136,14 @@ function sensor_types(parent){
 							String(d[44]).padStart(2, '0')
 						].join(':')
 					};
+					if((payload[7] & 2) != 0){
+						res.accelerometer_counter = "No probe detected";
+						res.accelerometer_uptime = "No probe detected";
+						res.input_acc = "No probe detected";
+					};
+					return res;
 				}else{
-					return {
+					let res = {
 						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),
@@ -8894,6 +9160,12 @@ function sensor_types(parent){
 						input_acc: d[40] & 8 ? 1 : 0,
 						input_mag: d[40] & 16 ? 1 : 0
 					};
+					if((payload[7] & 2) != 0){
+						res.accelerometer_counter = "No probe detected";
+						res.accelerometer_uptime = "No probe detected";
+						res.input_acc = "No probe detected";
+					};
+					return res;
 				}
 			},
 			'parse_fly': (frame) => {
@@ -9207,6 +9479,140 @@ function sensor_types(parent){
 							'tx_life_counter': frame.slice(50, 54)
 						}
 					}
+				} else if(frame[2] == 14){ // 14 
+					let reset_mode = "Disabled";
+					switch(frame[38]){
+						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[40]){
+						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[39]){
+						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.slice(17, 19).reduce(msbLsb) + "msec",
+						'accelero_state': frame[19]? "Enabled": "Disabled",
+						'input_1_active_edge': frame[20]? "Rising": "Falling",
+						'input_2_active_edge': frame[21]? "Rising": "Falling",
+						'input_3_active_edge': frame[22]? "Rising": "Falling",
+						'counter_threshold': frame.slice(23, 27).reduce(msbLsb),
+						'trasnmit_on_change_status': frame[27]? "Enabled": "Disabled",
+						'Shift_end_1': [
+							String(frame[28]).padStart(2, '0'),
+							String(frame[29]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_2': [
+							String(frame[30]).padStart(2, '0'),
+							String(frame[31]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_3': [
+							String(frame[32]).padStart(2, '0'),
+							String(frame[33]).padStart(2, '0')
+						].join(':'),
+						'Shift_end_4': [
+							String(frame[34]).padStart(2, '0'),
+							String(frame[35]).padStart(2, '0')
+						].join(':'),
+						'reset_timeout': frame.slice(36, 38).reduce(msbLsb) + "min",
+						'counter_reset_mode': reset_mode,
+						'sampling_interval': rtc_sampling_interval,
+						'acc_odr': acc_odr,
+						'counter_ignore_timeout': frame.slice(41, 43).reduce(msbLsb) + "sec",
+						'hardware_id': frame.slice(43, 46),
+						'report_rate': frame.slice(46, 50).reduce(msbLsb) + "sec",
+						'tx_life_counter': frame.slice(50, 54).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'accelerometer_threshold': frame[16],
+							'debouncing_timeout': frame.slice(17, 19),
+							'accelero_state': frame[19],
+							'input_1_active_edge': frame[20],
+							'input_2_active_edge': frame[21],
+							'input_3_active_edge': frame[22],
+							'counter_threshold': frame.slice(23, 27),
+							'trasnmit_on_change_status': frame[27],
+							'Shift_end_1': frame.slice(28, 30),
+							'Shift_end_2': frame.slice(30, 32),
+							'Shift_end_3': frame.slice(32, 34),
+							'Shift_end_4': frame.slice(34, 36),
+							'reset_timeout': frame.slice(36, 38),
+							'counter_reset_mode': frame[38],
+							'sampling_interval': frame[39],
+							'acc_odr': frame[40],
+							'counter_ignore_timeout': frame.slice(41, 43),
+							'hardware_id': frame.slice(43, 46),
+							'report_rate': frame.slice(46, 50),
+							'tx_life_counter': frame.slice(50, 54)
+						}
+					}
 				} else if(frame[2] > 9){ // firmware 10 11 12 13 14 15
 					let reset_mode = "Disabled";
 					switch(frame[38]){
@@ -12253,7 +12659,7 @@ 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;
-				if(frame[2] > 5){ // for Firmware v6 and above
+				if(frame[2] > 6){ // for Firmware v7 and above
 					frame_data.motion_to_delay = frame[41] * 50;
 					return {
 						'firmware': frame[2],
@@ -12311,6 +12717,54 @@ function sensor_types(parent){
 							'tx_lifetime_counter': frame.slice(50, 54)
 						}
 					}
+				} else if(frame[2] > 5){ // for Firmware v6
+					frame_data.motion_to_delay = frame[41] * 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)+'sec',
+						'max_tx_raw_samples': frame.slice(39, 41).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)
+						}
+					}
 				} else if(frame[2] > 4){ // for Firmware v5 and above
 					return {
 						'firmware': frame[2],
@@ -12665,13 +13119,21 @@ function sensor_types(parent){
 		},
 		'118': {
 			name: 'Dual Pressure and Temperature Sensor',
-			parse: (d) => {
-				return{
-					pressure_s1: signInt(d.slice(0, 4).reduce(msbLsb),16)/100,
-					temperature_s1: signInt(d.slice(4, 6).reduce(msbLsb),16)/100,
-					pressure_s2: signInt(d.slice(6, 10).reduce(msbLsb),16)/100,
-					temperature_s2: signInt(d.slice(10, 12).reduce(msbLsb),16)/100
+			parse: (payload, parsed, mac) => {
+				let res = {
+					pressure_s1: signInt(payload.slice(8, 12).reduce(msbLsb),16)/100,
+					temperature_s1: signInt(payload.slice(12, 14).reduce(msbLsb),16)/100,
+					pressure_s2: signInt(payload.slice(14, 18).reduce(msbLsb),16)/100,
+					temperature_s2: signInt(payload.slice(18, 20).reduce(msbLsb),16)/100
 				};
+				if(payload[7] & 2 && payload[7] & 4){
+					res.error = 'Error: Sensor Probe 1 and 2 communication error';
+				} else if(payload[7] & 2){
+					res.error = 'Error: Sensor Probe 1 communication error';
+				} else if(payload[7] & 4){
+					res.error = 'Error: Sensor Probe 2 communication error';
+				}
+				return res;
 			},
 			'parse_fly': (frame) => {
 				let psi_1;
@@ -12747,13 +13209,13 @@ function sensor_types(parent){
 			}
 		},
 		'119': {
-			name: 'Wireless Machine Run Time Hour Meter',
+			name: 'Machine Runtime Hour Meter',
 			parse: (d, payload) => {
 				let firmware = payload[1];
-				if(payload[7] & 2 != 0){
+				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'};
+					// parsed.data = {error: 'Error found, Accelerometer Probe may be unattached'};
+					let error = {error: 'Error found, Accelerometer'};
 					return error;
 				}
 				let report_type = "Regular";
@@ -12771,15 +13233,15 @@ function sensor_types(parent){
 						report_type = "Threshold";
 						break;
 				}
-				if ((payload[7] & 4) != 0) {
-					return {
+				if ((payload[7] & 4)) {
+					let res = {
 						raw_data: "Enabled",
 						accelerometer_counter: d.slice(0, 4).reduce(msbLsb),
 						accelerometer_uptime: d.slice(4, 8).reduce(msbLsb),
 						magnetometer_counter: d.slice(8, 12).reduce(msbLsb),
 						magnetometer_uptime: d.slice(12, 16).reduce(msbLsb),
-						input_acc: d[16] & 8 ? 1 : 0,
-						input_mag: d[16] & 16 ? 1 : 0,
+						input_acc: d[16] & 1 ? 1 : 0,
+						input_mag: d[16] & 2 ? 1 : 0,
 						report_type: report_type,
 						rtc: [
 							String(d[18]).padStart(2, '0'),
@@ -12787,66 +13249,58 @@ function sensor_types(parent){
 							String(d[20]).padStart(2, '0')
 						].join(':'),
 						'temperature': d.slice(21, 23).reduce(msbLsb)/100,
-						'accelero_sample_1':{
-							x:[signInt(d.slice(23, 25).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(25, 27).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(27, 29).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_2':{
-							x:[signInt(d.slice(29, 31).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(31, 33).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(33, 35).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_3':{
-							x:[signInt(d.slice(35, 37).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(37, 39).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(39, 41).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_4':{
-							x:[signInt(d.slice(41, 43).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(43, 45).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(45, 47).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_5':{
-							x:[signInt(d.slice(47, 49).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(49, 51).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(51, 53).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_6':{
-							x:[signInt(d.slice(53, 55).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(55, 57).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(57, 59).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_7':{
-							x:[signInt(d.slice(59, 61).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(61, 63).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(63, 65).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_8':{
-							x:[signInt(d.slice(65, 67).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(67, 69).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(69, 71).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_9':{
-							x:[signInt(d.slice(71, 73).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(73, 75).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(75, 77).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_10':{
-							x:[signInt(d.slice(77, 79).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(79, 81).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(81, 83).reduce(msbLsb),16)/100]
+						'data':{
+							'x':[
+								signInt(d.slice(23, 25).reduce(msbLsb),16)/100,
+								signInt(d.slice(29, 31).reduce(msbLsb),16)/100,
+								signInt(d.slice(35, 37).reduce(msbLsb),16)/100,
+								signInt(d.slice(41, 43).reduce(msbLsb),16)/100,
+								signInt(d.slice(47, 49).reduce(msbLsb),16)/100,
+								signInt(d.slice(53, 55).reduce(msbLsb),16)/100,
+								signInt(d.slice(59, 61).reduce(msbLsb),16)/100,
+								signInt(d.slice(65, 67).reduce(msbLsb),16)/100,
+								signInt(d.slice(71, 73).reduce(msbLsb),16)/100,
+								signInt(d.slice(77, 79).reduce(msbLsb),16)/100
+							],
+							'y':[
+								signInt(d.slice(25, 27).reduce(msbLsb),16)/100,
+								signInt(d.slice(29, 31).reduce(msbLsb),16)/100,
+								signInt(d.slice(37, 39).reduce(msbLsb),16)/100,
+								signInt(d.slice(43, 45).reduce(msbLsb),16)/100,
+								signInt(d.slice(49, 51).reduce(msbLsb),16)/100,
+								signInt(d.slice(55, 57).reduce(msbLsb),16)/100,
+								signInt(d.slice(61, 63).reduce(msbLsb),16)/100,
+								signInt(d.slice(67, 69).reduce(msbLsb),16)/100,
+								signInt(d.slice(73, 75).reduce(msbLsb),16)/100,
+								signInt(d.slice(79, 81).reduce(msbLsb),16)/100
+							],
+							'z':[
+								signInt(d.slice(27, 29).reduce(msbLsb),16)/100,
+								signInt(d.slice(31, 33).reduce(msbLsb),16)/100,
+								signInt(d.slice(37, 39).reduce(msbLsb),16)/100,
+								signInt(d.slice(43, 45).reduce(msbLsb),16)/100,
+								signInt(d.slice(51, 53).reduce(msbLsb),16)/100,
+								signInt(d.slice(57, 59).reduce(msbLsb),16)/100,
+								signInt(d.slice(63, 65).reduce(msbLsb),16)/100,
+								signInt(d.slice(69, 71).reduce(msbLsb),16)/100,
+								signInt(d.slice(75, 77).reduce(msbLsb),16)/100,
+								signInt(d.slice(81, 83).reduce(msbLsb),16)/100
+							]
 						}
 					};
+					if((payload[7] & 2) != 0){
+						res.error = 'Error: Accelerometer communication failure';
+					}
+					return res;
 				}else{
-					return {
+					let res = {
 						raw_data: "Disabled",
 						accelerometer_counter: d.slice(0, 4).reduce(msbLsb),
 						accelerometer_uptime: d.slice(4, 8).reduce(msbLsb),
 						magnetometer_counter: d.slice(8, 12).reduce(msbLsb),
 						magnetometer_uptime: d.slice(12, 16).reduce(msbLsb),
-						input_acc: d[16] & 8 ? 1 : 0,
-						input_mag: d[16] & 16 ? 1 : 0,
+						input_acc: d[16] & 1 ? 1 : 0,
+						input_mag: d[16] & 2 ? 1 : 0,
 						report_type: report_type,
 						rtc: [
 							String(d[18]).padStart(2, '0'),
@@ -12855,6 +13309,10 @@ function sensor_types(parent){
 						].join(':'),
 						'temperature': d.slice(21, 23).reduce(msbLsb)/100
 					};
+					if((payload[7] & 2) != 0){
+						res.error = 'Error: Accelerometer communication failure';
+					}
+					return res;
 				}
 			},
 			'parse_fly': (frame) => {
@@ -12951,6 +13409,7 @@ function sensor_types(parent){
 						acc_enabled_axis = 'all axis';
 						break;
 				}
+				let raw_acc_data = frame[41]?'Enabled':'Disabled';
 				return {
 					'firmware': frame[2],
 					'accelerometer_threshold': (frame[16]* 32) + " mg",
@@ -12958,19 +13417,19 @@ function sensor_types(parent){
 					'accelero_state': frame[19]? "Enabled": "Disabled",
 					'counter_threshold': frame.slice(20, 24).reduce(msbLsb),
 					'trasnmit_on_change_status': frame[24]? "Enabled": "Disabled",
-					'Shift_end_1': [
+					'shift_end_1': [
 						String(frame[25]).padStart(2, '0'),
 						String(frame[26]).padStart(2, '0')
 					].join(':'),
-					'Shift_end_2': [
+					'shift_end_2': [
 						String(frame[27]).padStart(2, '0'),
 						String(frame[28]).padStart(2, '0')
 					].join(':'),
-					'Shift_end_3': [
+					'shift_end_3': [
 						String(frame[29]).padStart(2, '0'),
 						String(frame[30]).padStart(2, '0')
 					].join(':'),
-					'Shift_end_4': [
+					'shift_end_4': [
 						String(frame[31]).padStart(2, '0'),
 						String(frame[32]).padStart(2, '0')
 					].join(':'),
@@ -12980,9 +13439,10 @@ function sensor_types(parent){
 					'acc_odr': acc_odr,
 					'interrupt_timeout': frame.slice(38, 40).reduce(msbLsb) + ' msec',
 					'acc_enabled_axis': acc_enabled_axis,
-					'hardware_id': frame.slice(41, 44),
-					'report_rate': frame.slice(44, 48).reduce(msbLsb) + " sec",
-					'tx_life_counter': frame.slice(48, 52).reduce(msbLsb),
+					'raw_acc_data': raw_acc_data,
+					'hardware_id': frame.slice(42, 45),
+					'report_rate': frame.slice(45, 49).reduce(msbLsb) + " sec",
+					'tx_life_counter': frame.slice(49, 53).reduce(msbLsb),
 					'machine_values': {
 						'firmware': frame[2],
 						'accelerometer_threshold': (frame[16]* 32),
@@ -12990,19 +13450,19 @@ function sensor_types(parent){
 						'accelero_state': frame[19],
 						'counter_threshold': frame.slice(20, 24),
 						'trasnmit_on_change_status': frame[24],
-						'Shift_end_1': [
+						'shift_end_1': [
 							frame[25],
 							frame[26]
 						],
-						'Shift_end_2': [
+						'shift_end_2': [
 							frame[27],
 							frame[28]
 						],
-						'Shift_end_3': [
+						'shift_end_3': [
 							frame[29],
 							frame[30]
 						],
-						'Shift_end_4': [
+						'shift_end_4': [
 							frame[31],
 							frame[32]
 						],
@@ -13012,9 +13472,10 @@ function sensor_types(parent){
 						'acc_odr': frame[37],
 						'interrupt_timeout': frame.slice(38, 40),
 						'acc_enabled_axis': frame[40],
-						'hardware_id': frame.slice(41, 44),
-						'report_rate': frame.slice(44, 48),
-						'tx_life_counter': frame.slice(48, 52)
+						'raw_acc_data': frame[41],
+						'hardware_id': frame.slice(42, 45),
+						'report_rate': frame.slice(45, 49),
+						'tx_life_counter': frame.slice(49, 53)
 					}
 				}
 			}
@@ -13179,12 +13640,6 @@ function sensor_types(parent){
 		'123': {
 			name: '3 Channel Production Counter',
 			parse: (d, payload) => {
-				if(payload[7] & 2 != 0){
-					console.log('Error found');
-					// parsed.data = {error: 'Error found, Acclerometer Probe may be unattached'};
-					let error = {error: 'Error found, Acclerometer Probe may be unattached'};
-					return error;
-				}
 				let report_type = "Regular";
 				switch(d[25]){
 					case 0:
@@ -13882,10 +14337,47 @@ function sensor_types(parent){
 		},
 		'217': {
 			name: 'Wireless Weight Scale',
-			parse: (d) => {
+			parse: (d, parsed, mac) => {
+				if(d[7] == 254){
+					console.log('Error found');
+					parsed.data = {error: 'Error found, Load cell comm error'};
+					return parsed;
+				}
 				return {
-					weight: signInt(d.slice(0, 4).reduce(msbLsb)) / 100
+					weight: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100
 				};
+			},
+			'parse_fly': (frame) => {
+				if(frame[2] > 2){
+					let date = [
+						String(frame.slice(20, 22).reduce(msbLsb)),
+						String(frame[22]).padStart(2, '0'),
+						String(frame[23]).padStart(2, '0')
+					].join('-');
+					let time = [
+						String(frame[24]).padStart(2, '0'),
+						String(frame[25]).padStart(2, '0'),
+						String(frame[26]).padStart(2, '0')
+					].join(':');
+					return {
+						'firmware': frame[2],
+						'calibration_tare': frame.slice(12, 16).reduce(msbLsb),
+						'tare_counter': frame.slice(16, 20).reduce(msbLsb),
+						'timestamp': date + 'T' + time,
+						'hardware_id': frame.slice(27, 30),
+						'report_rate': frame.slice(30, 34).reduce(msbLsb) + "Sec",
+						'tx_life_counter': frame.slice(34, 38).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'calibration_tare': frame.slice(12, 16),
+							'tare_counter': frame.slice(16, 20),
+							'date': frame.slice(20, 27),
+							'hardware_id': frame.slice(27, 30),
+							'report_rate': frame.slice(30, 34),
+							'tx_life_counter': frame.slice(34, 38)
+						}
+					}
+				}
 			}
 		},
 		'270': {
@@ -16555,7 +17047,7 @@ function sensor_types(parent){
 					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
 					return parsed;
 				}
-				let msg_type = 'regular'; // (payload[7] & 16)? 'motion' : 'regular';
+				let msg_type = 'regular';
 				if(payload[8] === 1){
 					var deviceAddr = mac;
 					var firmware = payload[1];
@@ -16769,25 +17261,25 @@ function sensor_types(parent){
 						x_max_ACC_G: payload.slice(14, 16).reduce(msbLsb)/1000,
 						x_velocity_mm_sec: payload.slice(16, 18).reduce(msbLsb) / 100,
 						x_displacement_mm: payload.slice(18, 20).reduce(msbLsb) / 100,
-						x_peak_one_Hz: payload.slice(20, 22).reduce(msbLsb),
-						x_peak_two_Hz: payload.slice(22, 24).reduce(msbLsb),
-						x_peak_three_Hz: payload.slice(24, 26).reduce(msbLsb),
+						x_peak_one_Hz: payload.slice(20, 22).reduce(msbLsb)/100,
+						x_peak_two_Hz: payload.slice(22, 24).reduce(msbLsb)/100,
+						x_peak_three_Hz: payload.slice(24, 26).reduce(msbLsb)/100,
 
 						y_rms_ACC_G: payload.slice(26, 28).reduce(msbLsb)/1000,
 						y_max_ACC_G: payload.slice(28, 30).reduce(msbLsb)/1000,
 						y_velocity_mm_sec: payload.slice(30, 32).reduce(msbLsb) / 100,
 						y_displacement_mm: payload.slice(32, 34).reduce(msbLsb) / 100,
-						y_peak_one_Hz: payload.slice(34, 36).reduce(msbLsb),
-						y_peak_two_Hz: payload.slice(36, 38).reduce(msbLsb),
-						y_peak_three_Hz: payload.slice(38, 40).reduce(msbLsb),
+						y_peak_one_Hz: payload.slice(34, 36).reduce(msbLsb)/100,
+						y_peak_two_Hz: payload.slice(36, 38).reduce(msbLsb)/100,
+						y_peak_three_Hz: payload.slice(38, 40).reduce(msbLsb)/100,
 
 						z_rms_ACC_G: payload.slice(40, 42).reduce(msbLsb)/1000,
 						z_max_ACC_G: payload.slice(42, 44).reduce(msbLsb)/1000,
 						z_velocity_mm_sec: payload.slice(44, 46).reduce(msbLsb) / 100,
 						z_displacement_mm: payload.slice(46, 48).reduce(msbLsb) / 100,
-						z_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
-						z_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
-						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb)
+						z_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb)/100,
+						z_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb)/100,
+						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb)/100
 					};
 				}
 				// else{
@@ -16828,7 +17320,7 @@ function sensor_types(parent){
 						frame_data.odr_1 = 500;
 						break;
 				}
-				frame_data.sampling_duration_1 = frame[18]*50 + "ms";
+				frame_data.sampling_duration_1 = frame[18] + "sec";
 				switch(frame[19]){
 					case 0:
 						frame_data.filter_status = "Disabled";