Updated zuno detection method to support new mac axis curvature

Z-Wave-Me · Oct 22, 2024 · 658ba86 · 658ba86
1 parent 49480c1
commit 658ba86
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 54 deletions.
diff --git a/changelog.md b/changelog.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
 * To compile the sketch, support for EU_LR was added and ported to the common sapi library.
 * Additional log output has been added for the beta version.
 * For updating ZUNO, an additional attempt to write data has been added.
+* Updated zuno detection method to support new mac axis curvature
 
 ## Version 00.00.11
 - *Release date:* 21.08.2024

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serial-api-web-tools",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "This set tools allows to configure Z-Wave.Me hardware",
   "main": "src/main.ts",
   "scripts": {

diff --git a/src/sapi/sapi.ts b/src/sapi/sapi.ts
@@ -793,35 +793,49 @@ class SapiClass {
 		return ;
 	}
 
-	private async _detect_rcv(res:SapiClassRet, out:SapiClassDetectWait): Promise<void> {
-		out.status = SapiClassStatus.OK;
+	private async _detect_rcv_timout_async(out:SapiClassDetectWait, timout:number): Promise<boolean> {
+		const res:SapiClassRet = await this._recvIncomingRequest(timout);
+		if (res.status != SapiClassStatus.OK)
+			return (false)
 		if (res.status == SapiClassStatus.OK && res.cmd == SapiClassFuncId.FUNC_ID_SERIAL_API_SOFT_RESET) {
 			if (res.data.length < 0x2) {
 				out.status = SapiClassStatus.ZUNO_START_WRONG_LENG;
-				return ;
+				return (true);
 			}
 			if (res.data[0x0] != 0xFF) {
 				out.status = SapiClassStatus.ZUNO_START_WRONG_FRAME;
-				return ;
+				return (true);
 			}
 			await this._detect_rcv_freeze_zuno(out);
-			return ;
+			return (true);
 		}
 		if (res.cmd == SapiClassFuncId.FUNC_ID_SERIAL_API_STARTED) {
 			out.type = SapiClassDetectType.RAZBERRY;
-			return ;
+			return (true);
 		}
-		const capabilities_info:SapiClassRet = await this._sendCommandUnSz(SapiClassFuncId.FUNC_ID_SERIAL_API_GET_CAPABILITIES, [], 300);
-		if (capabilities_info.status == SapiClassStatus.OK) {
-			//VendorID = 0x0115 and ProductTypeID = 0x0210
-			if (capabilities_info.data.length >= 0x6 && capabilities_info.data[0x2] == 0x1 && capabilities_info.data[0x3] == 0x15 && capabilities_info.data[0x4] == 0x2 && capabilities_info.data[0x5] == 0x10) {
-				await this._detect_rcv_freeze_zuno(out);
+		return (false);
+	}
+
+	private async _detect_rcv_timout(out:SapiClassDetectWait, timout:number): Promise<void> {
+		const wait_timeout:number = Date.now() + timout;
+		while (wait_timeout > Date.now()) {
+			out.status = SapiClassStatus.OK;
+			if (await this._detect_rcv_timout_async(out, 200) == true)
+				return ;
+			const capabilities_info:SapiClassRet = await this._sendCommandUnSz(SapiClassFuncId.FUNC_ID_SERIAL_API_GET_CAPABILITIES, [], 300);
+			if (capabilities_info.status == SapiClassStatus.OK) {
+				//VendorID = 0x0115 and ProductTypeID = 0x0210
+				if (capabilities_info.data.length >= 0x6 && capabilities_info.data[0x2] == 0x1 && capabilities_info.data[0x3] == 0x15 && capabilities_info.data[0x4] == 0x2 && capabilities_info.data[0x5] == 0x10) {
+					await this._detect_rcv_freeze_zuno(out);
+					return ;
+				}
+				out.type = SapiClassDetectType.RAZBERRY;
 				return ;
 			}
-			out.type = SapiClassDetectType.RAZBERRY;
-			return ;
+			if (await this._detect_rcv_timout_async(out, 200) == true)//for old zuno
+				return ;
 		}
-		out.status = SapiClassStatus.UPDATE_PROCESS;
+		out.status = SapiClassStatus.UPDATE_TIMEOUT;
 	}
 
 	private async _detect_update(res:SapiClassRet): Promise<SapiClassStatus> {
@@ -864,25 +878,33 @@ class SapiClass {
 			out.status = await this._open(baudrate_array[i]);
 			if (out.status != SapiClassStatus.OK)
 				return ;
-			res = await this._recvIncomingRequest(1000);
-			if (res.status != SapiClassStatus.OK && func != null) {
-				await this._clear();
-				if (await func() == false) {
-					out.status = SapiClassStatus.DETECTED_CANCEL;
-					return ;
-				}
-				res = await this._recvIncomingRequest(2000);
-			}
 			const wait:SapiClassDetectWait = {status: SapiClassStatus.OK, type: SapiClassDetectType.UNKNOWN};
-			await this._detect_rcv(res, wait);
+			await this._detect_rcv_timout(wait, 1000);
 			if (wait.status == SapiClassStatus.OK) {
 				out.type = wait.type;
 				return ;
 			}
-			if (wait.status != SapiClassStatus.UPDATE_PROCESS) {
+			if (wait.status != SapiClassStatus.UPDATE_TIMEOUT) {
 				out.status = wait.status;
 				return ;
 			}
+			if (func != null) {
+				await this._clear();
+				if (await func() == false) {
+					out.status = SapiClassStatus.DETECTED_CANCEL;
+					return ;
+				}
+				const wait:SapiClassDetectWait = {status: SapiClassStatus.OK, type: SapiClassDetectType.UNKNOWN};
+				await this._detect_rcv_timout(wait, 2000);
+				if (wait.status == SapiClassStatus.OK) {
+					out.type = wait.type;
+					return ;
+				}
+				if (wait.status != SapiClassStatus.UPDATE_TIMEOUT) {
+					out.status = wait.status;
+					return ;
+				}
+			}
 			out.status = await this._close();
 			if (out.status != SapiClassStatus.OK)
 				return ;
@@ -921,7 +943,7 @@ class SapiClass {
 		while (wait_timeout > Date.now()) {
 			const res:SapiClassRet = await this._recvIncomingRequest(1000);
 			out.status = await this._detect_update(res);
-			if (out.status == SapiClassStatus.UPDATE_PROCESS)
+			if (out.status == SapiClassStatus.UPDATE_TIMEOUT)
 				continue ;
 			break ;
 		}
@@ -933,28 +955,16 @@ class SapiClass {
 			out.status = out_detect.status;
 			return ;
 		}
-		while (wait_timeout > Date.now()) {
-			const res:SapiClassRet = await this._recvIncomingRequest(1000);
-			await this._detect_rcv(res, out);
-			if (out.status == SapiClassStatus.UPDATE_PROCESS)
-				continue ;
+		if (wait_timeout > Date.now()) {
+			await this._detect_rcv_timout(out, wait_timeout - Date.now());
 			return ;
 		}
 		out.status = SapiClassStatus.UPDATE_TIMEOUT;
 	}
 
 	private async _update_wait_razberry(target_type:SapiClassDetectType, out:SapiClassDetectWait): Promise<void> {
-		const wait_timeout:number = Date.now() + 30000;
-
 		if (target_type == SapiClassDetectType.RAZBERRY) {
-			while (wait_timeout > Date.now()) {
-				const res:SapiClassRet = await this._recvIncomingRequest(1000);
-				await this._detect_rcv(res, out);
-				if (out.status == SapiClassStatus.UPDATE_PROCESS)
-					continue ;
-				return ;
-			}
-			out.status = SapiClassStatus.UPDATE_TIMEOUT;
+			await this._detect_rcv_timout(out, 30000);
 			return ;
 		}
 		await sleep(20000);
@@ -1002,17 +1012,6 @@ class SapiClass {
 		return (out);
 	}
 
-	public async _detect_rcv_add(out:SapiClassDetectWait): Promise<void> {
-		const wait_timeout:number = Date.now() + 3000;
-		while (wait_timeout > Date.now()) {
-			const res:SapiClassRet = await this._recvIncomingRequest(1000);
-			await this._detect_rcv(res, out);
-			if (out.status == SapiClassStatus.UPDATE_PROCESS)
-				continue ;
-			return ;
-		}
-	}
-
 	public async detect_rcv(): Promise<SapiClassDetectWait> {
 		const out:SapiClassDetectWait = {status: SapiClassStatus.OK, type: SapiClassDetectType.UNKNOWN};
 		if (this.busy() == true) {
@@ -1025,7 +1024,7 @@ class SapiClass {
 		}
 		this.b_busy = true;
 		const detect_type:SapiClassDetectType = this.detect_type;
-		await this._detect_rcv_add(out);
+		await this._detect_rcv_timout(out, 3000);
 		this.detect_type = out.type;
 		this.b_busy = false;
 		if (out.type != detect_type) {