@ncd-io/node-red-enterprise-sensors 0.1.8 → 0.1.10

package/lib/WirelessGateway.js

@@ -367,17 +367,17 @@ module.exports = class WirelessSensor{
 						default:
 							en_axis_data.increment = 0;
 					}
-					var fsr_mult = .00006;
+					var fsr_mult = .000019;
 					var fsr_text = "";
 					switch(globalDevices[deviceAddr].fsr){
 						case 0:
-							fsr_mult = 0.00003;
+							fsr_mult = 0.000019;
 							break;
 						case 1:
-							fsr_mult = 0.0006;
+							fsr_mult = 0.000038;
 							break;
 						case 2:
-							fsr_mult = 0.00012;
+							fsr_mult = 0.000076;
 							break;
 					}
 					switch(globalDevices[deviceAddr].fsr){
@@ -405,13 +405,13 @@ module.exports = class WirelessSensor{
 						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)*.00006).toFixed(5));
+							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(5));
 						}
 						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)*.00006).toFixed(5));
+							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(5));
 						}
 						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)*.00006).toFixed(5));
+							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(5));
 						}
 
 
@@ -432,6 +432,7 @@ module.exports = class WirelessSensor{
 						en_axis: globalDevices[deviceAddr].en_axis,
 						odr: globalDevices[deviceAddr].odr,
 						device_temp: globalDevices[deviceAddr].device_temp,
+						fsr: globalDevices[deviceAddr].fsr,
 						data: fft_concat
 					};
 					if(firmware > 0){
@@ -1034,6 +1035,24 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_clear_stored_calibration_65(sensor_mac){
+		console.log('config_clear_stored_calibration_65');
+		var packet = [244, 88, 0, 0, 65, 1];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_atmospheric_calibration_command_65(sensor_mac){
+		console.log('config_send_atmospheric_calibration_command_65');
+		var packet = [244, 88, 0, 0, 65, 2];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_calibrate_zero_point_65(sensor_mac){
+		console.log('config_calibrate_zero_point_65');
+		var packet = [244, 88, 0, 0, 65, 3];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_payload_length_80(sensor_mac, value){
 		console.log('config_set_payload_length_80');
 		var packet = [244, 79, 0, 0, 80, 68, value];
@@ -2257,25 +2276,42 @@ function sensor_types(parent){
 		},
 		'78': {
 			name: 'Oil Particulate Counter Sensor',
-			parse: (d) => {
-				return {
-
-					ferro_particles_lt_50_um: d.slice(0, 2).reduce(msbLsb),
-					ferro_particles_50_100_um: d.slice(2, 4).reduce(msbLsb),
-					ferro_particles_100_200_um: d.slice(4, 6).reduce(msbLsb),
-					ferro_particles_200_400_um: d.slice(6, 8).reduce(msbLsb),
-					ferro_particles_400_800_um: d.slice(8, 10).reduce(msbLsb),
-					ferro_particles_gt_800_um: d.slice(10, 12).reduce(msbLsb),
-					ferro_particles_total: d.slice(12, 14).reduce(msbLsb),
-					non_ferro_particles_150_200_um: d.slice(14, 16).reduce(msbLsb),
-					non_ferro_particles_200_400_um: d.slice(16, 18).reduce(msbLsb),
-					non_ferro_particles_400_800_um: d.slice(18, 20).reduce(msbLsb),
-					non_ferro_particles_800_1600_um: d.slice(20, 22).reduce(msbLsb),
-					non_ferro_particles_gt_1600_um: d.slice(22, 24).reduce(msbLsb),
-					non_ferro_particles_total: d.slice(24, 26).reduce(msbLsb),
-					ferro_particles_total_24h: d.slice(26, 28).reduce(msbLsb),
-					non_ferro_particles_total_24h: d.slice(28, 30).reduce(msbLsb)
-				};
+			parse: (d, original_payload) => {
+				if(original_payload[1] <= 3){
+					return {
+						ferro_particles_30_50_um: d.slice(0, 4).reduce(msbLsb)/100,
+						ferro_particles_50_100_um: d.slice(4, 8).reduce(msbLsb)/100,
+						ferro_particles_100_200_um: d.slice(8, 12).reduce(msbLsb)/100,
+						ferro_particles_200_400_um: d.slice(12, 16).reduce(msbLsb)/100,
+						ferro_particles_400_800_um: d.slice(16, 20).reduce(msbLsb)/100,
+						ferro_particles_gt_800_um: d.slice(20, 24).reduce(msbLsb)/100,
+						ferro_particles_total: d.slice(24, 28).reduce(msbLsb)/100,
+						non_ferro_particles_120_200_um: d.slice(28, 32).reduce(msbLsb)/100,
+						non_ferro_particles_200_400_um: d.slice(32, 36).reduce(msbLsb)/100,
+						non_ferro_particles_400_800_um: d.slice(36, 40).reduce(msbLsb)/100
+					};
+				}else{
+					return {
+						ferro_particles_30_50_um: d.slice(0, 4).reduce(msbLsb)/100,
+						ferro_particles_50_100_um: d.slice(4, 8).reduce(msbLsb)/100,
+						ferro_particles_100_200_um: d.slice(8, 12).reduce(msbLsb)/100,
+						ferro_particles_200_400_um: d.slice(12, 16).reduce(msbLsb)/100,
+						ferro_particles_400_800_um: d.slice(16, 20).reduce(msbLsb)/100,
+						ferro_particles_gt_800_um: d.slice(20, 24).reduce(msbLsb)/100,
+						ferro_particles_total: d.slice(24, 28).reduce(msbLsb)/100,
+						non_ferro_particles_120_200_um: d.slice(28, 32).reduce(msbLsb)/100,
+						non_ferro_particles_200_400_um: d.slice(32, 36).reduce(msbLsb)/100,
+						non_ferro_particles_400_800_um: d.slice(36, 40).reduce(msbLsb)/100,
+						non_ferro_particles_800_1600_um: d.slice(40, 44).reduce(msbLsb)/100,
+						non_ferro_particles_gt_1600_um: d.slice(44, 48).reduce(msbLsb)/100,
+						non_ferro_particles_total: d.slice(48, 52).reduce(msbLsb)/100,
+						ferro_particles_total_24h: d.slice(52, 56).reduce(msbLsb)/100,
+						non_ferro_particles_total_24h: d.slice(56, 60).reduce(msbLsb)/100,
+						ferro_concentration: d.slice(60, 64).reduce(msbLsb)/100,
+						non_ferro_concentration: d.slice(64, 68).reduce(msbLsb)/100,
+						flow: d.slice(68, 72).reduce(msbLsb)/100,
+					};
+				}
 			}
 		},
 		'79': {
@@ -2287,8 +2323,8 @@ function sensor_types(parent){
 					dialectric_constant: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100,
 					temperature: signInt(d.slice(12, 16).reduce(msbLsb), 32) / 100,
 					saturability: signInt(d.slice(16, 20).reduce(msbLsb), 32) / 100,
-					water_content: signInt(d.slice(20, 24).reduce(msbLsb), 32) / 100,
-					moisture_content: signInt(d.slice(24, 28).reduce(msbLsb), 32) / 100,
+					moisture_content: signInt(d.slice(20, 24).reduce(msbLsb), 32) / 100,
+					water_content: signInt(d.slice(24, 28).reduce(msbLsb), 32) / 100,
 					kinematic_viscosity_40c: signInt(d.slice(28, 32).reduce(msbLsb), 32) / 100,
 					kinematic_viscosity_100c: signInt(d.slice(32, 36).reduce(msbLsb), 32) / 100
 				};
@@ -5890,12 +5926,18 @@ function sensor_types(parent){
 			}
 		},
 		'521': {
-			name: 'Type 520 - 6 Channel Current Temperature and Humidity',
+			name: 'Type 521 - 3 Channel Light Sensor',
 			parse: (payload, parsed) => {
 				return {
 					lux_1: payload.slice(0, 2).reduce(msbLsb)/100,
-					lux_2: payload.slice(2, 4).reduce(msbLsb)/100,
-					lux_3: payload.slice(4, 6).reduce(msbLsb)/100
+					temp_1: payload.slice(2, 4).reduce(msbLsb)/100,
+					ext_temp_1: payload.slice(4, 6).reduce(msbLsb)/100,
+					lux_2: payload.slice(6, 8).reduce(msbLsb)/100,
+					temp_2: payload.slice(8, 10).reduce(msbLsb)/100,
+					ext_temp_2: payload.slice(10, 12).reduce(msbLsb)/100,
+					lux_3: payload.slice(12, 14).reduce(msbLsb)/100,
+					temp_3: payload.slice(14, 16).reduce(msbLsb)/100,
+					ext_temp_3: payload.slice(16, 18).reduce(msbLsb)/100
 				}
 			}
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ncd-io/node-red-enterprise-sensors",
-    "version": "0.1.8",
+    "version": "0.1.10",
     "description": "",
     "main": "index.js",
     "scripts": {