@ncd-io/node-red-enterprise-sensors 1.4.0 → 1.4.1

package/package.json

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

package/wireless.html

@@ -714,7 +714,12 @@
 			fsr_420ma_active: {value: ""},
 			fsr_420ma: {value: 0},
 			always_on_420ma_active: {value: ""},
-			always_on_420ma: {value: 0}
+			always_on_420ma: {value: 0},
+
+			pressure_sensor_range_AMS5812_21_active: {value: ""},
+			pressure_sensor_range_AMS5812_21: {value: 0},
+			pressure_sensor_range_AMS5915_21_active: {value: ""},
+			pressure_sensor_range_AMS5915_21: {value: 0}
 		},
 		inputs: 0,
 		outputs: 1,
@@ -3262,9 +3267,6 @@
 						<label for="node-input-motion_detect_threshold_p1_110"><i class="icon-tag"></i>  Value</label>
 						<input type="text" id="node-input-motion_detect_threshold_p1_110" placeholder="10" value="10">
 					</div>
-					<p class="caption">
-						<i>Note: Only applies to sensor with firmware version 24 and above.</i>
-					</p>
 				</div>
 			</div>
 			<div class="ncd-dependent" data-sensor-111>
@@ -3285,9 +3287,6 @@
 						<label for="node-input-motion_detect_threshold_p2_110"><i class="icon-tag"></i>  Value</label>
 						<input type="text" id="node-input-motion_detect_threshold_p2_110" placeholder="10" value="10">
 					</div>
-					<p class="caption">
-						<i>Note: Only applies to sensor with firmware version 24 and above.</i>
-					</p>
 				</div>
 			</div>
 			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114 data-sensor-180 data-sensor-181 data-sensor-519 data-sensor-537 data-sensor-538>
@@ -4488,7 +4487,21 @@
 			</div>
 			<div class="ncd-dependent" data-sensor-21>
 				<div class="form-row ncd-active-check">
-					<strong>Set Pressure Sensor Type (code)</strong>
+					<strong>Set Pressure Sensor Type</strong>
+					<div>
+						<label for="node-input-pressure_sensor_type_21_active">Active:</label>
+						<input type="checkbox" id="node-input-pressure_sensor_type_21_active" class="ncd-config-toggle" data-target-id="node-input-pressure_sensor_type_21" value="1">
+					</div>
+					<div>
+						<label for="node-input-pressure_sensor_type_21"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-pressure_sensor_type_21">
+							<option value="0">AMS5812</option>
+							<option value="1">AMS5915</option>
+						</select>
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Set Pressure Sensor Range (for AMS5812)</strong>
 					<p>
 						D: Differential/relative.<br>
 						D-B: Bidirectional Differential.<br>
@@ -4496,12 +4509,12 @@
 						B: Absolute (barometric).<br>
 					</p>
 					<div>
-						<label for="node-input-pressure_sensor_type_21_active">Active:</label>
-						<input type="checkbox" id="node-input-pressure_sensor_type_21_active" class="ncd-config-toggle" data-target-id="node-input-pressure_sensor_type_21" value="1">
+						<label for="node-input-pressure_sensor_range_AMS5812_21_active">Active:</label>
+						<input type="checkbox" id="node-input-pressure_sensor_range_AMS5812_21_active" class="ncd-config-toggle" data-target-id="node-input-pressure_sensor_range_AMS5812_21" value="1">
 					</div>
 					<div>
-						<label for="node-input-pressure_sensor_type_21"><i class="icon-tag"></i>Value:</label>
-						<select id="node-input-pressure_sensor_type_21">
+						<label for="node-input-pressure_sensor_range_AMS5812_21"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-pressure_sensor_range_AMS5812_21">
 							<option value="0">Type 0000-D</option>
 							<option value="1">Type 0001-D</option>
 							<option value="2">Type 0000-D-B</option>
@@ -4527,6 +4540,49 @@
 						</select>
 					</div>
 				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Set Pressure Sensor Range (for AMS5915)</strong>
+					<p>
+						D: Differential/relative.<br>
+						D-B: Bidirectional Differential.<br>
+						A: Absolute.<br>
+						B: Absolute (barometric).<br>
+					</p>
+					<div>
+						<label for="node-input-pressure_sensor_range_AMS5915_21_active">Active:</label>
+						<input type="checkbox" id="node-input-pressure_sensor_range_AMS5915_21_active" class="ncd-config-toggle" data-target-id="node-input-pressure_sensor_range_AMS5915_21" value="1">
+					</div>
+					<div>
+						<label for="node-input-pressure_sensor_range_AMS5915_21"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-pressure_sensor_range_AMS5915_21">
+							<option value="0">Type 0005-D</option>
+							<option value="1">Type 0010_D</option>
+							<option value="2">Type 0002_D_B</option>
+							<option value="3">Type 0005_D_B</option>
+							<option value="4">Type 0010_D_B</option>
+							<option value="5">Type 0020_D</option>
+							<option value="6">Type 0035_D</option>
+							<option value="7">Type 0050_D</option>
+							<option value="8">Type 0100_D</option>
+							<option value="9">Type 0020_D_B</option>
+							<option value="10">Type 0035_D_B</option>
+							<option value="11">Type 0050_D_B</option>
+							<option value="12">Type 0100_D_B</option>
+							<option value="13">Type 0200_D</option>
+							<option value="14">Type 0350_D</option>
+							<option value="15">Type 0500_D</option>
+							<option value="16">Type 1000_D</option>
+							<option value="17">Type 2000_D</option>
+							<option value="18">Type 4000_D</option>
+							<option value="19">Type 7000_D</option>
+							<option value="20">Type 10000_D</option>
+							<option value="21">Type 0200_D_B</option>
+							<option value="22">Type 0350_D_B</option>
+							<option value="23">Type 0500_D_B</option>
+							<option value="24">Type 1000_D_B</option>
+						</select>
+					</div>
+				</div>
 			</div>
 			<div class="ncd-dependent" data-sensor-120>
 				<div class="form-row ncd-active-check">

package/wireless.js

@@ -150,15 +150,18 @@ module.exports = function(RED) {
 												// enter ota mode
 												node.gateway.digi.send.at_command("ID", [0x7a, 0xaa]).then().catch().then(() => {
 													console.log(manifest_data);
-													if(manifest_data.enter_ota_fota_version <13){
-														console.log('OLD PROCESSS');
+													if(manifest_data.enter_ota_fota_version > 16){
+														console.log('V17 PROCESS');
 														console.log(manifest_data);
-														// console.log(firmware_data);
-														node.start_firmware_update(manifest_data, firmware_data);
-													}else{
-														console.log('NEW PROCESS');
+														node.start_firmware_update_v17(manifest_data, firmware_data);
+													}else if(manifest_data.enter_ota_fota_version > 12){
+														console.log('V13 PROCESS');
 														console.log(manifest_data);
 														node.start_firmware_update_v13(manifest_data, firmware_data);
+													}else{
+														console.log('OLD PROCESSS');
+														console.log(manifest_data);
+														node.start_firmware_update(manifest_data, firmware_data);
 													}
 												});
 											}
@@ -352,6 +355,119 @@ module.exports = function(RED) {
 				}
 			});
 		};
+		node.start_firmware_update_v17 = function(manifest_data, firmware_data){
+			console.log('V17 Update Start');
+			var start_offset = 0;
+			setTimeout(() => {
+				if(Object.hasOwn(node.sensor_list[manifest_data.addr], 'last_chunk_success')){
+					node.gateway.firmware_read_last_chunk_segment(manifest_data.addr).then((status_frame) => {
+						console.log('Last Chunk Segment Read');
+						console.log(status_frame);
+						start_offset = status_frame.data.slice(4,8).reduce(msbLsb);
+						node.queue_firmware_update_v17(manifest_data, firmware_data, start_offset);
+					}).catch((err) => {
+						// TODO FOTA EMIT ERROR FOTA
+						console.log('Error reading last chunk segment');
+						node.resume_normal_operation();
+					});
+				}else{
+					node.queue_firmware_update_v17(manifest_data, firmware_data, start_offset);
+				};
+			}, 1000);
+		};
+		node.queue_firmware_update_v17 = function(manifest_data, firmware_data, start_offset){
+			console.log('V17 Queue Update Start');
+			console.log('Start Offset: '+start_offset);
+			return new Promise((top_fulfill, top_reject) => {
+				var success = {successes:{}, failures:{}};
+
+				let chunk_size = 128;
+				let image_start = firmware_data.firmware.slice(1, 5).reduce(msbLsb)+6;
+				var promises = {};
+				if(start_offset == 0){
+					promises.manifest = node.gateway.firmware_send_manifest(manifest_data.addr, firmware_data.firmware.slice(5, image_start-1));
+				};
+				// promises.manifest = node.gateway.firmware_send_manifest(manifest_data.addr, firmware_data.firmware.slice(5, image_start-1));
+				firmware_data.firmware = firmware_data.firmware.slice(image_start+4);
+
+				// if(Object.hasOwn(node.sensor_list[manifest_data.addr], 'last_chunk_success')){
+				// 	index = node.sensor_list[manifest_data.addr].last_chunk_success;
+				// }
+
+				// reverse calculate index based on start_offset.
+				var index = parseInt(start_offset / chunk_size);
+				console.log('Index: '+index);
+				while(index*chunk_size < firmware_data.manifest.image_size){
+					let offset = index*chunk_size;
+					let offset_bytes = int2Bytes(offset, 4);
+					let firmware_chunk = firmware_data.firmware.slice(index*chunk_size, index*chunk_size+chunk_size);
+					promises[index] = node.gateway.firmware_send_chunk_v13(manifest_data.addr, offset_bytes, firmware_chunk);
+					if(((index + 1) % 50) == 0 || (index+1)*chunk_size >= firmware_data.manifest.image_size){
+						promises[index+'_check'] = node.gateway.firmware_read_last_chunk_segment(manifest_data.addr);
+					};
+					index++;
+				}
+				console.log('Update Started');
+				console.log(Object.keys(promises).length);
+				console.log(Date.now());
+				promises.reboot = node.gateway.config_reboot_sensor(manifest_data.addr);
+				var firmware_continue = true;
+				for(var i in promises){
+					(function(name){
+						let retryCount = 0;
+						const maxRetries = 3; // Set the maximum number of retries
+
+						function attemptPromise() {
+							console.log(name);
+							promises[name].then((status_frame) => {
+								if(name == 'manifest'){
+									console.log('MANIFEST SUCCESFULLY SENT');
+									node.sensor_list[manifest_data.addr].test_check = {name: true};
+									node.sensor_list[manifest_data.addr].update_in_progress = true;
+								}
+								else if(name.includes('_check')){
+									console.log(name);
+									console.log(parseInt(name.split('_')[0]) * chunk_size);
+									let last_chunk = status_frame.data.slice(0,4).reduce(msbLsb);
+									console.log(last_chunk);
+									if(last_chunk != (parseInt(name.split('_')[0]) * chunk_size)){
+										console.log('ERROR DETECTED IN OTA UPDATE');
+										success.failures[name] = {chunk: last_chunk, last_transmit: (parseInt(name.split('_')[0]) * chunk_size), last_report: last_chunk};
+										// node.gateway.clear_queue_except_last();
+										node.gateway.clear_queue();
+										node.resume_normal_operation();
+									} else {
+										success.successes[name] = {chunk: last_chunk};
+									}
+								}
+								else {
+									success[name] = true;
+									node.sensor_list[manifest_data.addr].test_check[name] = true;
+									node.sensor_list[manifest_data.addr].last_chunk_success = name;
+								}
+							}).catch((err) => {
+								console.log(name);
+								console.log(err);
+								if(name != 'reboot'){
+									node.gateway.clear_queue();
+									success[name] = err;
+								} else {
+									delete node.sensor_list[manifest_data.addr].last_chunk_success;
+									delete node.sensor_list[manifest_data.addr].update_request;
+									node._emitter.emit('send_firmware_stats', {state: success, addr: manifest_data.addr});
+									top_fulfill(success);
+								}
+								console.log('Update Finished')
+								console.log(Date.now());
+								node._emitter.emit('send_firmware_stats', {state: success, addr: manifest_data.addr});
+								node.resume_normal_operation();
+							});
+						}
+						attemptPromise(); // Start the initial attempt
+					})(i);
+				}
+			});
+		}
 		node.resume_normal_operation = function(){
 			let pan_id = parseInt(config.pan_id, 16);
 			node.gateway.digi.send.at_command("ID", [pan_id >> 8, pan_id & 255]).then().catch().then(() => {
@@ -450,6 +566,18 @@ module.exports = function(RED) {
 
 		node.on('close', function(){
 			this._gateway_node.close_comms();
+			this._gateway_node._emitter.removeAllListeners('send_manifest');
+			this._gateway_node._emitter.removeAllListeners('send_firmware_stats');
+			this._gateway_node._emitter.removeAllListeners('mode_change');
+			this.gateway._emitter.removeAllListeners('ncd_error');
+			this.gateway._emitter.removeAllListeners('sensor_data');
+			this.gateway._emitter.removeAllListeners('sensor_mode');
+			this.gateway._emitter.removeAllListeners('receive_packet-unknown_device');
+			this.gateway._emitter.removeAllListeners('route_info');
+			this.gateway._emitter.removeAllListeners('link_info');
+			this.gateway._emitter.removeAllListeners('converter_response');
+			this.gateway._emitter.removeAllListeners('manifest_received');
+			console.log(this.gateway._emitter.eventNames());
 		});
 
 		node.is_config = false;
@@ -555,10 +683,13 @@ module.exports = function(RED) {
 					// 	'description': 'Query water levels in mm/cm',
 					// 	'target_parser': 'parse_water_levels'
 					// }
+					if(!Object.hasOwn(msg.payload, 'timeout')){
+						msg.payload.timeout = 1500;
+					}
 					if(msg.payload.hasOwnProperty('meta')){
-						node.gateway.queue_bridge_query(msg.payload.address, msg.payload.command, msg.payload.meta);
+						node.gateway.queue_bridge_query(msg.payload.address, msg.payload.command, msg.payload.meta, msg.payload.timeout);
 					}else{
-						node.gateway.queue_bridge_query(msg.payload.address, msg.payload.command);
+						node.gateway.queue_bridge_query(msg.payload.address, msg.payload.command, null, msg.payload.timeout);
 					}
 					break;
 				case "converter_send_multiple":
@@ -583,7 +714,10 @@ module.exports = function(RED) {
 					// 		}
 					// 	}
 					// ];
-					node.gateway.prepare_bridge_query(msg.payload.address, msg.payload.commands);
+					if(!Object.hasOwn(msg.payload, 'timeout')){
+						msg.payload.timeout = 1500;
+					}
+					node.gateway.prepare_bridge_query(msg.payload.address, msg.payload.commands, msg.payload.timeout);
 					break;
 				case "start_luber":
 					// msg = {
@@ -739,10 +873,10 @@ module.exports = function(RED) {
 					// }
 					// TODO unfinished
 					msg.payload.addresses.forEach((address) => {
-						if(!Object.hasOwn(node._gateway_node.sensor_list, msg.payload.address)){
+						if(!Object.hasOwn(node._gateway_node.sensor_list, address)){
 							node._gateway_node.sensor_list[address] = {};
 						};
-						if(!Object.hasOwn(node._gateway_node.sensor_list[msg.payload.address], 'update_request')){
+						if(!Object.hasOwn(node._gateway_node.sensor_list[address], 'update_request')){
 							node._gateway_node.sensor_list[address].update_request = true;
 						};
 					});
@@ -1251,6 +1385,12 @@ module.exports = function(RED) {
 								if(config.pressure_sensor_type_21_active){
 									promises.pressure_sensor_type_21 = node.config_gateway.config_set_pressure_sensor_type_21(mac, parseInt(config.pressure_sensor_type_21));
 								}
+								if(config.pressure_sensor_range_AMS5812_21_active){
+									promises.pressure_sensor_range_AMS5812_21 = node.config_gateway.config_set_pressure_sensor_range_21(mac, parseInt(config.pressure_sensor_range_AMS5812_21));
+								}
+								if(config.pressure_sensor_range_AMS5915_21_active){
+									promises.pressure_sensor_range_AMS5915_21 = node.config_gateway.config_set_pressure_sensor_range_21(mac, parseInt(config.pressure_sensor_range_AMS5915_21));
+								}
 								break;
 							case 23:
 								if(config.thermocouple_type_23_active){
@@ -3344,9 +3484,10 @@ module.exports = function(RED) {
 			for(var p in pgm_events){
 				node.config_gateway._emitter.removeAllListeners(p);
 			}
+
 			node.gateway_node.close_comms();
 			if(typeof node.config_gateway_node != 'undefined'){
-				node.config_gateway_node.close_comms();
+				console.log(node.config_gateway_node.close_comms());
 			}
 		});
 	}