@ncd-io/node-red-enterprise-sensors 0.1.1 → 0.1.3

package/lib/WirelessGateway.js

@@ -741,6 +741,14 @@ module.exports = class WirelessSensor{
 		var packet = [244, 4, 0, 0, 0, reading_type];
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_motion_threshold_46(sensor_mac, value){
+		console.log('config_set_motion_threshold_46');
+		let packet = [244, 1, 0, 0, 0];
+		let threshold = int2Bytes((value), 4);
+		packet.push(...threshold);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 
 	config_set_sensor_forced_calibration(sensor_mac, value){
 		var packet = [244, 31, 0, 0, 0];
@@ -2467,7 +2475,7 @@ function sensor_types(parent){
 						return;
 					}
 				}
-				else{
+				else if(payload[8] === 0 || payload[8] === 2){
 					// mode byte most significant bit will indicate fft data.
 					// console.log(d);
 					var odr;
@@ -2534,6 +2542,10 @@ function sensor_types(parent){
 						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
 					};
 				}
+				else{
+					parsed.data = {'error': 'Vibration mode error'}
+					return parsed;
+				}
 			},
 			'parse_fly': (frame) => {
 				let frame_data = {};
@@ -3034,7 +3046,7 @@ function sensor_types(parent){
 						return;
 					}
 				}
-				else{
+				else if(payload[8] === 0 || payload[8] === 2){
 					// mode byte most significant bit will indicate fft data.
 					// console.log(d);
 					var odr1;
@@ -3171,6 +3183,10 @@ function sensor_types(parent){
 						z2_peak_three_Hz: payload.slice(97, 99).reduce(msbLsb)
 					};
 				}
+				else{
+					parsed.data = {'error': 'Vibration mode error'}
+					return parsed;
+				}
 			},
 			'parse_fly': (frame) => {
 				let frame_data = {};
@@ -3766,7 +3782,7 @@ function sensor_types(parent){
 						return;
 					}
 				}
-				else{
+				else if(payload[8] === 0 || payload[8] === 2){
 					// mode byte most significant bit will indicate fft data.
 					// console.log(d);
 					var odr;
@@ -3834,6 +3850,10 @@ function sensor_types(parent){
 						z_peak_three_Hz: payload.slice(60, 62).reduce(msbLsb),
 					};
 				}
+				else{
+					parsed.data = {'error': 'Vibration mode error'}
+					return parsed;
+				}
 			},
 			'parse_fly': (frame) => {
 				let frame_data = {};
@@ -4320,7 +4340,7 @@ function sensor_types(parent){
 						return;
 					}
 				}
-				else{
+				else if(payload[8] === 0 || payload[8] === 2){
 					// mode byte most significant bit will indicate fft data.
 					// console.log(d);
 					var odr;
@@ -4387,6 +4407,10 @@ function sensor_types(parent){
 						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
 					};
 				}
+				else{
+					parsed.data = {'error': 'Vibration mode error'}
+					return parsed;
+				}
 			},
 			'parse_fly': (frame) => {
 				let frame_data = {};
@@ -5138,7 +5162,7 @@ function sensor_types(parent){
 						return;
 					}
 				}
-				else{
+				else if(payload[8] === 0 || payload[8] === 2){
 					// mode byte most significant bit will indicate fft data.
 					// console.log(d);
 					var odr;
@@ -5208,6 +5232,10 @@ function sensor_types(parent){
 						z_peak_three_Hz: payload.slice(56, 58).reduce(msbLsb),
 					};
 				}
+				else{
+					parsed.data = {'error': 'Vibration mode error'}
+					return parsed;
+				}
 			},
 			'parse_fly': (frame) => {
 				let frame_data = {};

package/package.json

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

package/wireless.html

@@ -320,6 +320,9 @@
 
 			payload_length_80_active:{value:""},
 			payload_length_80:{value:3, validate: NCD_validators.number_range(0, 3)},
+
+			motion_threshold_46_active:{value:""},
+			motion_threshold_46:{value: 100, validate: NCD_validators.number_range(0, 4294967295)},
 		},
 		inputs: 0,
 		outputs: 1,
@@ -1574,6 +1577,20 @@
 					</div>
 				</div>
 			</div>
+			<div class="ncd-dependent" data-sensor-46>
+				<hr>
+				<div class="form-row ncd-active-check">
+					<strong>Motion Threshold</strong>
+					<div>
+						<label for="node-input-motion_threshold_46_active">Active:</label>
+						<input type="checkbox" id="node-input-motion_threshold_46_active" class="ncd-config-toggle" data-target-id="node-input-motion_threshold_46" value="1">
+					</div>
+					<div>
+						<label for="node-input-motion_threshold_46"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-motion_threshold_46" placeholder="0-4294967295" value="100">
+					</div>
+				</div>
+			</div>
 			<div class="ncd-dependent" data-sensor-10000 data-sensor-10012>
 				<div class="form-row">
 					<button id="config_sensor">Configure Now</button>

package/wireless.js

@@ -430,6 +430,11 @@ module.exports = function(RED) {
 	                                promises.sensor_boot_time_420ma = node.config_gateway.config_set_sensor_boot_time_420ma(mac, parseInt(config.sensor_boot_time_420ma));
 	                            }
 	                            break;
+							case 46:
+								if(config.motion_threshold_46_active){
+									promises.motion_threshold_46 = node.config_gateway.config_set_motion_threshold_46(mac, parseInt(config.motion_threshold_46));
+								}
+								break;
 	                        case 47:
 	                            if(config.roll_angle_threshold_47_active){
 	                                promises.roll_angle_threshold_47 = node.config_gateway.config_set_roll_threshold_47(mac, parseInt(config.roll_angle_threshold_47));