@ncd-io/node-red-enterprise-sensors 1.6.0 → 1.6.1

package/lib/WirelessGateway.js

@@ -1342,8 +1342,8 @@ module.exports = class WirelessSensor{
 	}
 	config_set_counter_threshold_108(sensor_mac, value){
 		console.log('config_set_counter_threshold_108');
-		var packet = [244, 43, 0, 0, 0, 0, 0];
-		let threshold = int2Bytes((value), 2);
+		var packet = [244, 43, 0, 0, 0];
+		let threshold = int2Bytes((value), 4);
 		packet.push(...threshold);
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
@@ -4161,13 +4161,14 @@ function sensor_types(parent){
 			name: 'RTD Temperature Sensor',
 			parse: (payload, parsed, mac) => {
 				if(parsed.firmware > 5){
+					let reserved = payload[7] >> 1; // Fault status (1-bit left shifted)
 					let fault_status = '';
-					if (payload[7] === 0) {
+					if (reserved === 0) {
 						fault_status = 'data_valid';
-					} else if (payload[7] === 15) {
+					} else if (reserved === 15) {
 						fault_status = 'data_invalid';
 					} else {
-						const faultTypeBits = payload[7] & 0b00111100;
+						const faultTypeBits = reserved & 0b00111100;
 						switch (faultTypeBits) {
 							case 32: 
 								fault_status = 'ref_in_vbias'; 
@@ -4668,13 +4669,14 @@ function sensor_types(parent){
 			name: '2-Channel RTD Temperature Sensor',
 			parse: (payload, parsed, mac) => {
 				if(parsed.firmware > 5){
+					let reserved = payload[7] >> 1; // Fault status (1-bit left shifted)
 					let fault_status = '';
-					if (payload[7] === 0) {
+					if (reserved === 0) {
 						fault_status = 'data_valid';
-					} else if (payload[7] === 15) {
+					} else if (reserved === 15) {
 						fault_status = 'data_invalid';
 					} else {
-						const fault_bits = (payload[7] >> 2) & 0b00001111;
+						const fault_bits = (reserved >> 2) & 0b00001111;
 						switch (fault_bits) {
 							case 8: 
 								fault_status = 'ref_in_vbias'; 
@@ -4689,7 +4691,7 @@ function sensor_types(parent){
 								fault_status = 'over_under_voltage'; 
 								break;
 						}
-						const channel_bits = payload[7] & 0b00000011;
+						const channel_bits = reserved & 0b00000011;
 						switch (channel_bits) {
 							case 1:
 								fault_status = fault_status + '_ch1';
@@ -4742,13 +4744,14 @@ function sensor_types(parent){
 		'55': {
 			name: '3-Channel RTD Temperature Sensor',
 			parse: (payload, parsed, mac) => {
+				let reserved = payload[7] >> 1; // Fault status (1-bit left shifted)
 				let fault_status = '';
-				if (payload[7] === 0) {
+				if (reserved === 0) {
 					fault_status = 'data_valid';
-				} else if (payload[7] === 15) {
+				} else if (reserved === 15) {
 					fault_status = 'data_invalid';
 				} else {
-					const fault_bits = (payload[7] >> 2) & 0b00001111;
+					const fault_bits = (reserved >> 2) & 0b00001111;
 					switch (fault_bits) {
 						case 8: 
 							fault_status = 'ref_in_vbias'; 
@@ -4763,7 +4766,7 @@ function sensor_types(parent){
 							fault_status = 'over_under_voltage'; 
 							break;
 					}
-					const channel_bits = payload[7] & 0b00000011;
+					const channel_bits = reserved & 0b00000011;
 					switch (channel_bits) {
 						case 1:
 							fault_status = fault_status + '_ch1';
@@ -13334,7 +13337,7 @@ function sensor_types(parent){
 			parse: (payload, parsed, mac) => {
                 let res = {};
                 if(!(payload[7] & 2)){
-                    res.pressure_s1 = signInt(payload.slice(8, 12).reduce(msbLsb),16)/100;
+                    res.pressure_s1 = signInt(payload.slice(8, 12).reduce(msbLsb),32)/100;
                     res.temperature_s1 = signInt(payload.slice(12, 14).reduce(msbLsb),16)/100;
                 }else{
                     res.pressure_s1 = null;
@@ -13342,7 +13345,7 @@ function sensor_types(parent){
                     res.error_s1 = 'Error: Sensor Probe 1 communication error';
                 }
                 if(!(payload[7] & 4)){
-                    res.pressure_s2 = signInt(payload.slice(14, 18).reduce(msbLsb),16)/100;
+                    res.pressure_s2 = signInt(payload.slice(14, 18).reduce(msbLsb),32)/100;
                     res.temperature_s2 = signInt(payload.slice(18, 20).reduce(msbLsb),16)/100;
                 }else{
                     res.pressure_s2 = null;

package/package.json

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

package/wireless.html

@@ -443,7 +443,7 @@
 			input_two_108_active:{value:""},
 			input_three_108:{value:0},
 			input_three_108_active:{value:""},
-			counter_threshold_108:{value:1000, validate: NCD_validators.number_range(0, 65534)},
+			counter_threshold_108:{value:1000, validate: NCD_validators.number_range(0, 4294967295)},
 			counter_threshold_108_active:{value:""},
 			shift_one_108_active:{value:""},
 			shift_one_minutes_108:{value:0, validate: NCD_validators.number_range(0, 59)},