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

package/lib/WirelessGateway.js

@@ -2257,25 +2257,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': {

package/package.json

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