@ncd-io/node-red-enterprise-sensors 2.0.0 → 2.0.2

package/lib/sensors/114.js

@@ -30,7 +30,7 @@ module.exports = (globalDevices, emitter) => {
 			emitter.emit('sensor_data', parsed);
 			emitter.emit('sensor_data-114', parsed);
 			emitter.emit('sensor_data' + '-' + deviceAddr, parsed);
-		}, 6000);
+		}, 60000);
 	};
 
 	const concat_fft_data = (deviceAddr, mode, msg_type) => {
@@ -123,7 +123,8 @@ module.exports = (globalDevices, emitter) => {
 				},
 				"tags": [
 					"system"
-				]
+				],
+				"old_fly_id": "firmware"
 			},
 			"sensor_type": {
 				"read_index": 5,
@@ -227,7 +228,7 @@ module.exports = (globalDevices, emitter) => {
 				"read_index": 21,
 				"write_index": 10,
 				"descriptions": {
-					"title": "Probe 1: Output Data Rate",
+					"title": "Output Data Rate",
 					"main_caption": "<p>This would determine how many samples the output data has...</p>"
 				},
 				"default_value": 0,
@@ -267,6 +268,10 @@ module.exports = (globalDevices, emitter) => {
 					"max": 100,
 					"generated": true
 				},
+				"converter": {
+					'multiplier': 50,
+					'units': 'ms'
+				},
 				"tags": [
 					"Vibration Sampling"
 				],
@@ -287,6 +292,7 @@ module.exports = (globalDevices, emitter) => {
 					"generated": true
 				},
 				"options": {
+					"10": "2",
 					"0": "4",
 					"1": "8",
 					"2": "16",
@@ -298,7 +304,8 @@ module.exports = (globalDevices, emitter) => {
 					"8": "1024",
 					"9": "2048"
 				},
-				"html_id": "low_pass_filter_p1_110"
+				"html_id": "low_pass_filter_p1_110",
+				"old_fly_id": "lpf_coeff"
 			},
 			"hpf_coefficient": {
 				"read_index": 24,
@@ -326,7 +333,8 @@ module.exports = (globalDevices, emitter) => {
 					"8": "1024",
 					"9": "2048"
 				},
-				"html_id": "high_pass_filter_p1_110"
+				"html_id": "high_pass_filter_p1_110",
+				"old_fly_id": "hpf_coeff"
 			},
 			"full_scale_range": {
 				"read_index": 25,
@@ -353,7 +361,8 @@ module.exports = (globalDevices, emitter) => {
 				"tags": [
 					"Vibration Sampling"
 				],
-				"html_id": "full_scale_range_101"
+				"html_id": "full_scale_range_101",
+				"old_fly_id": "fsr"
 			},
 			"axes_enabled": {
 				"read_index": 26,
@@ -412,8 +421,8 @@ module.exports = (globalDevices, emitter) => {
 					"generated": true
 				},
 				"options": {
-					"0": "Enabled",
-					"1": "Disabled"
+					"0": "Disabled",
+					"1": "Enabled"
 				},
 				"html_id": "enable_filtering_110"
 			},
@@ -437,7 +446,8 @@ module.exports = (globalDevices, emitter) => {
 					"2": "Processed + Raw on demand",
 					"3": "Smart"
 				},
-				"html_id": "mode_110"
+				"html_id": "mode_110",
+				"old_fly_id": "mode"
 			},
 			"measurement_mode": {
 				"read_index": 30,
@@ -465,6 +475,9 @@ module.exports = (globalDevices, emitter) => {
 					"max": 10,
 					"generated": true
 				},
+				"converter": {
+					"units": " Seconds"
+				},
 				"depends_on": {
 					"operation_mode": [
 						2,
@@ -487,6 +500,9 @@ module.exports = (globalDevices, emitter) => {
 					"max": 255,
 					"generated": true
 				},
+				"converter": {
+					"units": "mg"
+				},
 				"html_id": "deadband_80"
 			},
 			"motion_detection_threshold": {
@@ -556,10 +572,15 @@ module.exports = (globalDevices, emitter) => {
 					"min": 1,
 					"max": 40
 				},
+				"converter": {
+					"multiplier": 50,
+					"units": "mg"
+				},
 				"depends_on": {
 					"operation_mode": 3
 				},
-				"html_id": "smart_threshold_110"
+				"html_id": "smart_threshold_110",
+				"old_fly_id": "smart_mode_acc_threshold"
 			},
 			"led_alert_mode": {
 				"read_index": 37,
@@ -605,7 +626,8 @@ module.exports = (globalDevices, emitter) => {
 				"tags": [
 					"Communications"
 				],
-				"html_id": "payload_length_80"
+				"html_id": "payload_length_80",
+				"old_fly_id": "payload_length"
 			},
 			"auto_raw_interval": {
 				"read_index": 39,
@@ -730,6 +752,9 @@ module.exports = (globalDevices, emitter) => {
 					"min": 1024,
 					"max": 8100
 				},
+				"converter": {
+					"units": " Samples"
+				},
 				"options": {
 					"1024": "1024 Samples",
 					"2048": "2048 Samples",
@@ -737,7 +762,8 @@ module.exports = (globalDevices, emitter) => {
 					"6400": "6400 Samples",
 					"8100": "8100 Samples"
 				},
-				"html_id": "max_raw_sample_110"
+				"html_id": "max_raw_sample_110",
+				"old_fly_id": "max_tx_raw_samples"
 			},
 			"motion_to_sampling_delay": {
 				"read_index": 50,
@@ -753,6 +779,10 @@ module.exports = (globalDevices, emitter) => {
 					"max": 255,
 					"generated": true
 				},
+				"converter": {
+					"multiplier": 50,
+					"units": "msec",
+				},
 				"html_id": "motion_to_sampling_delay_110"
 			},
 			"max_motion_tx_per_interval": {
@@ -769,46 +799,62 @@ module.exports = (globalDevices, emitter) => {
 					"max": 255,
 					"generated": true
 				},
-				"html_id": "max_num_motion_tx_delay_110"
+				"html_id": "max_num_motion_tx_delay_110",
+				"old_fly_id": "max_num_of_motion_tx_per_interval"
 			}
 		};
 	};
 
 	const sync_parse = (rep_buffer) => {
-		let response = {};
+		let response = {
+			'human_readable': {},
+			'machine_values': {}
+		};
 
 		// Get the map based on the sensor type byte
 		const sync_map = get_config_map(rep_buffer[4]);
 
 		for (const [key, config] of Object.entries(sync_map)) {
 			// Destructure 'type' from inside 'validator' and rename 'read_index' to 'idx'
-			const { read_index: idx, length, validator: { type } = {} } = config;
+			const { read_index: idx, length, validator: { type } = {}, converter, options } = config;
 
 			// If for some reason a config doesn't have a validator/type, skip it
 			if (!type) continue;
 
 			switch (type) {
 				case 'uint8':
-					response[key] = rep_buffer[idx];
+					response.machine_values[key] = rep_buffer[idx];
 					break;
 				case 'uint16be':
-					response[key] = rep_buffer.readUInt16BE(idx);
+					response.machine_values[key] = rep_buffer.readUInt16BE(idx);
 					break;
 				case 'uint32be':
-					response[key] = rep_buffer.readUInt32BE(idx);
+					response.machine_values[key] = rep_buffer.readUInt32BE(idx);
 					break;
 				case 'buffer':
-					response[key] = rep_buffer.subarray(idx, idx + length);
+					response.machine_values[key] = rep_buffer.subarray(idx, idx + length);
 					break;
 				case 'hex':
-					response[key] = rep_buffer.subarray(idx, idx + length).toString('hex');
+					response.machine_values[key] = rep_buffer.subarray(idx, idx + length).toString('hex');
 					break;
 				case 'mac':
-					response[key] = rep_buffer.subarray(idx, idx + length).toString('hex');
+					response.machine_values[key] = rep_buffer.subarray(idx, idx + length).toString('hex');
 					break;
 			}
+			let human_value = response.machine_values[key];
+			if(options && options[response.machine_values[key]]){
+				human_value = options[response.machine_values[key]];
+			}else{
+				if(converter && converter.multiplier){
+					human_value = human_value * converter.multiplier;
+				}
+				if(converter && converter.units){
+					human_value = human_value + converter.units;
+				}
+			}
+			response.human_readable[key] = human_value;
 		}
-		if (Object.hasOwn(response, 'destination_address') && response.destination_address.toLowerCase() === '00000000') {
+		if (Object.hasOwn(response.machine_values, 'destination_address') && response.machine_values.destination_address.toLowerCase() === '00000000') {
 			console.log('##############################');
 			console.log('#########Dest Override########');
 			console.log('##############################');

package/lib/sensors/125.js

@@ -217,18 +217,15 @@ module.exports = (globalDevices) => {
 				"validator": {
 					"type": "uint8",
 					"min": 0,
-					"max": 7,
+					"max": 4,
 					"generated": true
 				},
 				"options": {
 					"0": "Disabled",
 					"1": "Enable on IO1",
 					"2": "Enable on IO2",
-					"3": "Enable on IO3",
-					"4": "Enable on IO1 and IO2",
-					"5": "Enable on IO1 and IO3",
-					"6": "Enable on IO2 and IO3",
-					"7": "Enable All"
+					"3": "Enable on IO1 and IO2",
+					"4": "Enable All"
 				},
 				"html_id": "push_notification_123"
 			},
@@ -532,46 +529,61 @@ module.exports = (globalDevices) => {
 	};
 
 	const sync_parse = (rep_buffer) => {
-		let response = {};
-		
+		let response = {
+			'human_readable': {},
+			'machine_values': {}
+		};
+
 		// Get the map based on the sensor type byte
 		const sync_map = get_config_map(rep_buffer[4]);
 
 		for (const [key, config] of Object.entries(sync_map)) {
 			// Destructure 'type' from inside 'validator' and rename 'read_index' to 'idx'
-			const { read_index: idx, length, validator: { type } = {} } = config;
+			const { read_index: idx, length, validator: { type } = {}, converter, options } = config;
 
 			// If for some reason a config doesn't have a validator/type, skip it
 			if (!type) continue;
 
 			switch (type) {
-				case 'uint8': 
-					response[key] = rep_buffer[idx]; 
+				case 'uint8':
+					response.machine_values[key] = rep_buffer[idx];
 					break;
-				case 'uint16be': 
-					response[key] = rep_buffer.readUInt16BE(idx); 
+				case 'uint16be':
+					response.machine_values[key] = rep_buffer.readUInt16BE(idx);
 					break;
-				case 'uint32be': 
-					response[key] = rep_buffer.readUInt32BE(idx); 
+				case 'uint32be':
+					response.machine_values[key] = rep_buffer.readUInt32BE(idx);
 					break;
-				case 'buffer': 
-					response[key] = rep_buffer.subarray(idx, idx + length); 
+				case 'buffer':
+					response.machine_values[key] = rep_buffer.subarray(idx, idx + length);
 					break;
-				case 'hex': 
-					response[key] = rep_buffer.subarray(idx, idx + length).toString('hex'); 
+				case 'hex':
+					response.machine_values[key] = rep_buffer.subarray(idx, idx + length).toString('hex');
 					break;
-				case 'mac': 
-					response[key] = rep_buffer.subarray(idx, idx + length).toString('hex'); 
+				case 'mac':
+					response.machine_values[key] = rep_buffer.subarray(idx, idx + length).toString('hex');
 					break;
 			}
+			let human_value = response.machine_values[key];
+			if(options && options[response.machine_values[key]]){
+				human_value = options[response.machine_values[key]];
+			}else{
+				if(converter && converter.multiplier){
+					human_value = human_value * converter.multiplier;
+				}
+				if(converter && converter.units){
+					human_value = human_value + converter.units;
+				}
+			}
+			response.human_readable[key] = human_value;
 		}
-		// if(Object.hasOwn(response, 'destination_address') && response.destination_address.toLowerCase() === '00000000') {
-		//     console.log('##############################');
-		//     console.log('#########Dest Override########');
-		//     console.log('##############################');
-		//     response.destination_address = "0000ffff";
-		//     response.auto_raw_destination_address = "0000ffff";
-		// };
+		if (Object.hasOwn(response.machine_values, 'destination_address') && response.machine_values.destination_address.toLowerCase() === '00000000') {
+			console.log('##############################');
+			console.log('#########Dest Override########');
+			console.log('##############################');
+			response.destination_address = "0000ffff";
+			response.auto_raw_destination_address = "0000ffff";
+		};
 		return response;
 	};
 

package/lib/sensors/126.js

@@ -590,46 +590,61 @@ module.exports = (globalDevices) => {
 	};
 
 	const sync_parse = (rep_buffer) => {
-		let response = {};
-		
+		let response = {
+			'human_readable': {},
+			'machine_values': {}
+		};
+
 		// Get the map based on the sensor type byte
 		const sync_map = get_config_map(rep_buffer[4]);
 
 		for (const [key, config] of Object.entries(sync_map)) {
 			// Destructure 'type' from inside 'validator' and rename 'read_index' to 'idx'
-			const { read_index: idx, length, validator: { type } = {} } = config;
+			const { read_index: idx, length, validator: { type } = {}, converter, options } = config;
 
 			// If for some reason a config doesn't have a validator/type, skip it
 			if (!type) continue;
 
 			switch (type) {
-				case 'uint8': 
-					response[key] = rep_buffer[idx]; 
+				case 'uint8':
+					response.machine_values[key] = rep_buffer[idx];
 					break;
-				case 'uint16be': 
-					response[key] = rep_buffer.readUInt16BE(idx); 
+				case 'uint16be':
+					response.machine_values[key] = rep_buffer.readUInt16BE(idx);
 					break;
-				case 'uint32be': 
-					response[key] = rep_buffer.readUInt32BE(idx); 
+				case 'uint32be':
+					response.machine_values[key] = rep_buffer.readUInt32BE(idx);
 					break;
-				case 'buffer': 
-					response[key] = rep_buffer.subarray(idx, idx + length); 
+				case 'buffer':
+					response.machine_values[key] = rep_buffer.subarray(idx, idx + length);
 					break;
-				case 'hex': 
-					response[key] = rep_buffer.subarray(idx, idx + length).toString('hex'); 
+				case 'hex':
+					response.machine_values[key] = rep_buffer.subarray(idx, idx + length).toString('hex');
 					break;
-				case 'mac': 
-					response[key] = rep_buffer.subarray(idx, idx + length).toString('hex'); 
+				case 'mac':
+					response.machine_values[key] = rep_buffer.subarray(idx, idx + length).toString('hex');
 					break;
 			}
+			let human_value = response.machine_values[key];
+			if(options && options[response.machine_values[key]]){
+				human_value = options[response.machine_values[key]];
+			}else{
+				if(converter && converter.multiplier){
+					human_value = human_value * converter.multiplier;
+				}
+				if(converter && converter.units){
+					human_value = human_value + converter.units;
+				}
+			}
+			response.human_readable[key] = human_value;
 		}
-		// if(Object.hasOwn(response, 'destination_address') && response.destination_address.toLowerCase() === '00000000') {
-		//     console.log('##############################');
-		//     console.log('#########Dest Override########');
-		//     console.log('##############################');
-		//     response.destination_address = "0000ffff";
-		//     response.auto_raw_destination_address = "0000ffff";
-		// };
+		if (Object.hasOwn(response.machine_values, 'destination_address') && response.machine_values.destination_address.toLowerCase() === '00000000') {
+			console.log('##############################');
+			console.log('#########Dest Override########');
+			console.log('##############################');
+			response.destination_address = "0000ffff";
+			response.auto_raw_destination_address = "0000ffff";
+		};
 		return response;
 	};