@ncd-io/node-red-enterprise-sensors 1.6.2 → 1.6.4

package/lib/WirelessGateway.js

@@ -2622,6 +2622,14 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_calibration_factor_217(sensor_mac, value){
+		console.log('config_set_calibration_factor_217');
+		var packet = [244, 48, 0, 0, 0];
+		let value_ = int2Bytes(value, 4);
+		packet.push(...value_);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_get_delay(sensor_mac){
 		return new Promise((fulfill, reject) => {
 			this.config_send(sensor_mac, [247, 21, 0, 0, 0]).then((res) => {
@@ -10892,7 +10900,7 @@ function sensor_types(parent){
 		'111': {
 			name: 'Two Channel Vibration Plus v4',
 			parse: (payload, parsed, mac) => {
-				// parsed.data = {};
+				parsed.data = {};
 				if(payload[7] & 2){
 					parsed.data['probe_1_error'] = true;
 				}
@@ -14511,16 +14519,17 @@ function sensor_types(parent){
 					let unit = 'Lb';
 					switch(d[12]){
 						case 1:
-							unit = 'Lb';
+							unit = 'Kg';
 						break;
 						case 2:
-							unit = 'Kg';
+							unit = 'Lb';
 						break;
 					}
 					return{
 						weight: signInt(d.slice(8, 12).reduce(msbLsb), 32) / 100,
 						unit: unit,
-						raw_adc: signInt(d.slice(13, 17).reduce(msbLsb), 32)
+						raw_adc: signInt(d.slice(13, 17).reduce(msbLsb), 32),
+						weight_factor_mult: signInt(d.slice(17, 21).reduce(msbLsb), 32)
 					}
 				}
 				else {
@@ -14530,7 +14539,63 @@ function sensor_types(parent){
 				}
 			},
 			'parse_fly': (frame) => {
-				if(frame[2] > 4){
+				if(frame[2] > 5){
+					let date = [
+						String(frame.slice(20, 22).reduce(msbLsb)),
+						String(frame[22]).padStart(2, '0'),
+						String(frame[23]).padStart(2, '0')
+					].join('-');
+					let time = [
+						String(frame[24]).padStart(2, '0'),
+						String(frame[25]).padStart(2, '0'),
+						String(frame[26]).padStart(2, '0')
+					].join(':');
+					let screen_on_time = "always_off";
+					switch(frame[27]){
+						case 0:
+							screen_on_time = "always_off";
+						break;
+						case 255:
+							screen_on_time = "always_on";
+						break;
+						default:
+							screen_on_time = frame[27] + "Sec";
+						break;
+					}
+					let unit = "Lb";
+					switch(frame[28]){
+						case 1:
+							unit = "Lb";
+						break;
+						case 2:
+							unit = "Kg";
+						break;
+					}
+					return {
+						'firmware': frame[2],
+						'calibration_tare': frame.slice(12, 16).reduce(msbLsb),
+						'tare_counter': frame.slice(16, 20).reduce(msbLsb),
+						'timestamp': date + "T" + time,
+						'screen_on_time': screen_on_time,
+						'weight_unit': unit,
+						'calibration_factor': frame.slice(29, 33).reduce(msbLsb),
+						'hardware_id': frame.slice(33, 36),
+						'report_rate': frame.slice(36, 40).reduce(msbLsb) + "Sec",
+						'tx_life_counter': frame.slice(40, 44).reduce(msbLsb),
+						'machine_values': {
+							'firmware': frame[2],
+							'calibration_tare': frame.slice(12, 16),
+							'tare_counter': frame.slice(16, 20),
+							'timestamp': date + "T" + time,
+							'screen_on_time': screen_on_time,
+							'weight_unit': unit,
+							'calibration_factor': frame.slice(29, 33),
+							'hardware_id': frame.slice(33, 36),
+							'report_rate': frame.slice(36, 40),
+							'tx_life_counter': frame.slice(40, 44)
+						}
+					}
+				} else if(frame[2] > 4){
 					let date = [
 						String(frame.slice(20, 22).reduce(msbLsb)),
 						String(frame[22]).padStart(2, '0'),
@@ -14574,14 +14639,14 @@ function sensor_types(parent){
 						'tx_life_counter': frame.slice(36, 40).reduce(msbLsb),
 						'machine_values': {
 							'firmware': frame[2],
-							'calibration_tare': frame.slice(12, 16).reduce(msbLsb),
-							'tare_counter': frame.slice(16, 20).reduce(msbLsb),
+							'calibration_tare': frame.slice(12, 16),
+							'tare_counter': frame.slice(16, 20),
 							'timestamp': date + "T" + time,
 							'screen_on_time': screen_on_time,
 							'weight_unit': unit,
 							'hardware_id': frame.slice(29, 32),
-							'report_rate': frame.slice(32, 36).reduce(msbLsb),
-							'tx_life_counter': frame.slice(36, 40).reduce(msbLsb)
+							'report_rate': frame.slice(32, 36),
+							'tx_life_counter': frame.slice(36, 40)
 						}
 					}
 				}else if(frame[2] == 4){

package/package.json

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

package/wireless.html

@@ -967,7 +967,10 @@
 			threshold_under_strength_99: {value: 1, validate: NCD_validators.number_range(0, 65535)},
 			clean_sensor_99_active: {value:""},
 			reset_sensor_99_active: {value:""},
-			factory_reset_sensor_99_active: {value:""}
+			factory_reset_sensor_99_active: {value:""},
+
+			calibration_factor_217_active: {value:""},
+			calibration_factor_217: {value: 135, validate: NCD_validators.number_range(0, 500000)}
 		},
 		inputs: 0,
 		outputs: 1,
@@ -5526,6 +5529,22 @@
 						Default value: 5 seconds.
 					</p>
 				</div>
+				<div class="form-row ncd-active-check">
+					<div>
+						<strong>Set Calibration Factor</strong>
+					</div>
+					<div>
+						<label for="node-input-calibration_factor_217_active"><i class="icon-tag"></i>Active:</label>
+						<input type="checkbox" id="node-input-calibration_factor_217_active" class="ncd-config-toggle" data-target-id="node-input-calibration_factor_217" value="1">
+					</div>
+					<div>
+						<label for="node-input-calibration_factor_217"><i class="icon-tag"></i>  Value</label>
+						<input type="text" id="node-input-calibration_factor_217" placeholder="255" value="255">
+					</div>
+					<p class="caption">
+						Default value: 135.
+					</p>
+				</div>
 			</div>
 			<div class="ncd-dependent" data-sensor-26>
 				<div class="form-row ncd-active-check">

package/wireless.js

@@ -3523,6 +3523,9 @@ module.exports = function(RED) {
 								if(config.weight_unit_217_active){
 									promises.weight_unit_217 = node.config_gateway.config_set_weight_unit_217(mac, parseInt(config.weight_unit_217));
 								}
+								if(config.calibration_factor_217_active){
+									promises.calibration_factor_217 = node.config_gateway.config_set_calibration_factor_217(mac, parseInt(config.calibration_factor_217));
+								}
 								break;
 							case 270:
 								// if(config.do_read_rate_270_active){