From cb2a256dc5e6d075dbe25383b2f05b7033871765 Mon Sep 17 00:00:00 2001
From: sunbeam <fcb1995@163.com>
Date: Sat, 15 Apr 2023 10:42:37 +0800
Subject: [PATCH] v0.5

---
 dlg/about.aardio         |  9 +++++----
 main.aardio              |  2 +-
 user/DiagBootcode.aardio | 22 ++++++++++++++++++----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/dlg/about.aardio b/dlg/about.aardio
index 83f2026..f419d2e 100644
--- a/dlg/about.aardio
+++ b/dlg/about.aardio
@@ -8,10 +8,11 @@ static={cls="static";text="Static";left=21;top=17;right=458;bottom=340;transpare
 /*}}*/
 
 更新履历 = /*
-V0.1_20230220:	初版
-V0.2_20230221:	修复右板无法刷写，增加点亮功能，增加更改履历
-V0.3_20230221:	修复关闭界面后程序没有完全关闭的问题
-V0.4_20230222:	修复偶发刷写卡在请求下载的问题
+V0.1_20230320:	初版
+V0.2_20230321:	修复右板无法刷写，增加点亮功能，增加更改履历
+V0.3_20230321:	修复关闭界面后程序没有完全关闭的问题
+V0.4_20230322:	修复偶发刷写卡在请求下载的问题
+V0.5_20230401:	兼容0331程序无法读DID
 */
 
 winform.button.oncommand = function(id,event){
diff --git a/main.aardio b/main.aardio
index c8f905b..3dd6f1c 100644
--- a/main.aardio
+++ b/main.aardio
@@ -27,7 +27,7 @@ static={cls="static";text="设备";left=1;top=28;right=61;bottom=52;align="cente
 static2={cls="static";text="通道";left=1;top=66;right=61;bottom=90;align="center";center=1;transparent=1;z=7};
 static3={cls="static";text="刷写进度";left=389;top=408;right=442;bottom=428;transparent=1;z=16};
 static4={cls="static";text="烧录APP";left=13;top=108;right=85;bottom=132;center=1;transparent=1;z=17};
-static5={cls="static";text="V0.4_20230322";left=545;top=1;right=689;bottom=17;align="right";center=1;notify=1;transparent=1;z=18}
+static5={cls="static";text="V0.5_20230401";left=545;top=1;right=689;bottom=17;align="right";center=1;notify=1;transparent=1;z=18}
 )
 /*}}*/
 
diff --git a/user/DiagBootcode.aardio b/user/DiagBootcode.aardio
index 937bacd..6fc2c2c 100644
--- a/user/DiagBootcode.aardio
+++ b/user/DiagBootcode.aardio
@@ -193,6 +193,7 @@ FuncBootSeq = function(){
 		case 0 {
 			boottime = 1;
 			nextstate(0);
+			delaycount = 0;
 			/*
 			if(sendstate == 0){
 				//FuncSendBlockInit(0);
@@ -213,8 +214,13 @@ FuncBootSeq = function(){
 				FuncClearState();
 			}
 			else {
-				var ret = FuncWait(0x22);
-				nextstate(0);
+				//var ret = FuncWait(0x22);
+				//nextstate(0);
+				delaycount++;
+				if(delaycount > 5){
+					nextstate(0);
+					delaycount = 0;
+				}
 			}
 		}
 		case 2 {
@@ -223,11 +229,18 @@ FuncBootSeq = function(){
 				FuncClearState();
 			}
 			else {
-				var ret = FuncWait(0x22);
-				nextstate(0);
+				//var ret = FuncWait(0x22);
+				//nextstate(0);
+				delaycount++;
+				if(delaycount > 5){
+					nextstate(0);
+					delaycount = 0;
+				}
 			}
 		}
 		case 3 {
+			nextstate(0);
+			/*
 			if(sendstate == 0){
 				FuncDisplay("进入扩展会话");
 				FuncReq10(false,0x03);//进入扩展会话
@@ -237,6 +250,7 @@ FuncBootSeq = function(){
 				var ret = FuncWait(0x10);
 				nextstate(0);
 			}
+			*/
 		}
 		case 4 {
 			nextstate(0);