@ncd-io/node-red-enterprise-sensors 1.4.2 → 1.4.3

package/lib/WirelessGateway.js

@@ -4112,25 +4112,62 @@ function sensor_types(parent){
 				switch(frame[16]){
 					case 0:
 						frame_data.fsr = "+-6.114 V";
-					break;
+						break;
 					case 1:
 						frame_data.fsr = "+-4.096 V";
-					break;
+						break;
 					case 2:
 						frame_data.fsr = "+-2.048 V";
-					break;
+						break;
 					case 3:
 						frame_data.fsr = "+-1.024 V";
-					break;
+						break;
 					case 4:
 						frame_data.fsr = "+-0.512 V";
-					break;
+						break;
 					case 5:
 						frame_data.fsr = "+-0.256 V";
-					break;
+						break;
 				}
-				if(firmware > 13){ // firmware 14 and above
-					let frame_data = {};
+				if(firmware > 18){ // firmware 14 and above
+					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
+					if(!auto_check_interval){
+						frame_data.auto_check_interval = 'Disabled';
+					}else{
+						frame_data.auto_check_interval = auto_check_interval + " sec";
+					}
+					frame_data.always_on = frame[24]?"Enabled":"Disabled";
+					return {
+						'firmware': frame[2],
+						'fsr': frame_data.fsr,
+						'boot_up_time': frame[17] + " sec",
+						'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
+						'auto_check_interval': frame_data.auto_check_interval,
+						'auto_check_threshold': frame.slice(22, 24).reduce(msbLsb),
+						'always_on': frame_data.always_on,
+						'calibration_one': frame.slice(25, 29).reduce(msbLsb),
+						'calibration_two':frame.slice(29, 33).reduce(msbLsb),
+						'calibration_three':frame.slice(33, 37).reduce(msbLsb),
+						'hardware_id': frame.slice(37, 40),
+						'report_rate': frame.slice(40, 44).reduce(msbLsb) + " sec",
+						'tx_life_counter': frame.slice(44, 48).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'fsr': frame[16],
+							'boot_up_time': frame[17],
+							'adc_pin_reading': frame.slice(18, 20),
+							'auto_check_interval': frame.slice(20, 22),
+							'auto_check_percentage': frame.slice(22, 24),
+							'always_on': frame[24],
+							'calibration_one': frame.slice(25, 29),
+							'calibration_two':frame.slice(29, 33),
+							'calibration_three':frame.slice(33, 37),
+							'hardware_id': frame.slice(37, 40),
+							'report_rate': frame.slice(40, 44),
+							'tx_life_counter': frame.slice(44, 48)
+						}
+					}
+				}else if(firmware > 13){ // firmware 14 and above
 					let auto_check_interval = frame.slice(20, 22).reduce(msbLsb);
 					if(!auto_check_interval){
 						frame_data.auto_check_interval = 'Disabled';
@@ -8087,17 +8124,17 @@ function sensor_types(parent){
 
 						/* Evaluate sensor type */
 						if(payload[8] == 1){ // accelerometer
-							var fsr_mult = 0.000019;
+							var fsr_mult = 0.00030;
 							var fsr_text = "";
 							switch(globalDevices[deviceAddr].fsr){
 								case 0:
-									fsr_mult = 0.000019;
+									fsr_mult = 0.00030;
 									break;
 								case 1:
-									fsr_mult = 0.000038;
+									fsr_mult = 0.00061;
 									break;
 								case 2:
-									fsr_mult = 0.000076;
+									fsr_mult = 0.00122;
 									break;
 							}
 							switch(globalDevices[deviceAddr].fsr){
@@ -8112,20 +8149,20 @@ function sensor_types(parent){
 									break;
 							}
 						}else{ // gyro
-							var fsr_mult = 0.0305;
+							var fsr_mult = 0.0076;
 							var fsr_text = "";
 							switch(globalDevices[deviceAddr].fsr){
 								case 0:
-									fsr_mult = 0.0305;
+									fsr_mult = 0.0076;
 									break;
 								case 1:
-									fsr_mult = 0.061;
+									fsr_mult = 0.015;
 									break;
 								case 2:
-									fsr_mult = 0.122;
+									fsr_mult = 0.0305;
 									break;
 								case 3:
-									fsr_mult = 0.244;
+									fsr_mult = 0.061;
 									break;
 							}
 							switch(globalDevices[deviceAddr].fsr){
@@ -9261,7 +9298,10 @@ function sensor_types(parent){
 							var fft_concat_obj = {
 								mode: payload[8],
 								msg_type: msg_type,
-								time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
+								time_id: [
+									String(globalDevices[deviceAddr].hour).padStart(2, '0'),
+									String(globalDevices[deviceAddr].minute).padStart(2, '0'),
+								].join(':'),
 								mac_address: deviceAddr,
 								fsr: fsr_text,
 								odr: globalDevices[deviceAddr].odr,
@@ -9903,7 +9943,10 @@ function sensor_types(parent){
 								mode: payload[8],
 								msg_type: msg_type,
 								probe: probe,
-								time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
+								time_id: [
+									String(globalDevices[deviceAddr].hour).padStart(2, '0'),
+									String(globalDevices[deviceAddr].minute).padStart(2, '0'),
+								].join(':'),
 								probe: probe,
 								mac_address: deviceAddr,
 								fsr: fsr_text,
@@ -10742,7 +10785,10 @@ function sensor_types(parent){
 							var fft_concat_obj = {
 								mode: payload[8],
 								msg_type: msg_type,
-								time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
+								time_id: [
+									String(globalDevices[deviceAddr].hour).padStart(2, '0'),
+									String(globalDevices[deviceAddr].minute).padStart(2, '0'),
+								].join(':'),
 								mac_address: deviceAddr,
 								fsr: fsr_text,
 								odr: globalDevices[deviceAddr].odr,
@@ -11378,7 +11424,10 @@ function sensor_types(parent){
 						var fft_concat_obj = {
 							mode: payload[8],
 							msg_type: msg_type,
-							time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
+							time_id: [
+								String(globalDevices[deviceAddr].hour).padStart(2, '0'),
+								String(globalDevices[deviceAddr].minute).padStart(2, '0'),
+							].join(':'),
 							mac_address: deviceAddr,
 							fsr: fsr_text,
 							odr: globalDevices[deviceAddr].odr,

package/package.json

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

package/wireless.html

@@ -5150,8 +5150,8 @@
 					<div>
 						<label for="node-input-enable_sensor_103"><i class="icon-tag"></i>Value:</label>
 						<select id="node-input-enable_sensor_103">
-							<option value="1">Gyro</option>
-							<option value="2">Adxl</option>
+							<option value="1">Gyroscope only</option>
+							<option value="2">Accelerometer only</option>
 							<option value="3"selected>All enabled</option>
 						</select>
 					</div>
@@ -5168,17 +5168,18 @@
 					<div>
 						<label for="node-input-enable_hp_filter_cutoff_103"><i class="icon-tag"></i>Value:</label>
 						<select id="node-input-enable_hp_filter_cutoff_103">
-							<option value="0">0.00247</option>
-							<option value="1">0.00062084</option>
-							<option value="2">0.00015545</option>
-							<option value="3">0.00003862</option>
-							<option value="4">0.00000954</option>
-							<option value="5">0.00000238</option>
+							<option value="0">Disabled</option>
+							<option value="1">0.00247</option>
+							<option value="2">0.00062084</option>
+							<option value="3">0.00015545</option>
+							<option value="4">0.00003862</option>
+							<option value="5">0.00000954</option>
+							<option value="6">0.00000238</option>
 						</select>
 					</div>
 				</div>
 				<div class="form-row ncd-active-check">
-					<strong>Set Gyro FSR</strong>
+					<strong>Set Gyroscope FSR</strong>
 					<div>
 						<label for="node-input-gyro_fsr_103_active"><i class="icon-tag"></i>Active:</label>
 						<input type="checkbox" id="node-input-gyro_fsr_103_active" class="ncd-config-toggle" data-target-id="node-input-gyro_fsr_103" value="1">
@@ -5189,7 +5190,7 @@
 							<option value="0" selected>250dps</option>
 							<option value="1">500dps</option>
 							<option value="2">1000dps</option>
-							<option value="3">2000dps</option>
+							<option value="3">3000dps</option>
 						</select>
 					</div>
 				</div>