From ccbd63868e3579b4439f9b492a5dfc0e42ae6731 Mon Sep 17 00:00:00 2001
From: ranchuan <rd05cqmcloud.com>
Date: Tue, 20 Jun 2023 17:58:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=8B=E7=A0=81=E6=A3=80=E6=B5=8B=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=B0=8F=E6=9D=BF=E7=9A=84=E9=94=99=E8=AF=AF=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 checker_gen1.uvoptx              | 4 ++--
 source/ReadMe.txt                | 2 ++
 source/main/compiler_info.h      | 2 +-
 source/task/handle_for_checker.c | 2 +-
 source/task/handle_for_coder.c   | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/checker_gen1.uvoptx b/checker_gen1.uvoptx
index 911a197..cb09555 100644
--- a/checker_gen1.uvoptx
+++ b/checker_gen1.uvoptx
@@ -145,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U69656177 -O78 -S6 -ZTIFSpeedSel500 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
+          <Name>-U69656177 -O78 -S4 -ZTIFSpeedSel2000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -1124,7 +1124,7 @@
 
   <Group>
     <GroupName>rt_thread</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
diff --git a/source/ReadMe.txt b/source/ReadMe.txt
index f429524..22061be 100644
--- a/source/ReadMe.txt
+++ b/source/ReadMe.txt
@@ -113,6 +113,8 @@
     编译app自动生成boot.bin程序,可以用jlink或离线下载器下载到单片机
 2023.6.16
     赋码仪读写参数命令添加读写位，解决写参数时少偏移了一位导致的写参数失败的问题
+2023.6.20
+    赋码失败返回时返回小板的错误码
 
 
     
\ No newline at end of file
diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h
index 80ccb6e..b0d28e1 100644
--- a/source/main/compiler_info.h
+++ b/source/main/compiler_info.h
@@ -6,7 +6,7 @@
 
 
 
-#define BUILD_DATE  "2023-06-19 09:41:22"
+#define BUILD_DATE  "2023-06-20 17:40:53"
 #define SOFT_VERSION  "0.01"
 
 
diff --git a/source/task/handle_for_checker.c b/source/task/handle_for_checker.c
index 684900b..6f96ae8 100644
--- a/source/task/handle_for_checker.c
+++ b/source/task/handle_for_checker.c
@@ -164,7 +164,7 @@ static void check_dolater(handle_def *h,uint8_t src,uint8_t cmd,array_def *data,
       port_set_busy(h->p,0);
       port_timer_stop(h->p);
       DBG_WARN("slave:%d,get check_result err,%s",src,str_temp(arr_string(data)));
-      emit port_end_signal(h->p,h->p,0,-1,"get check_result err");
+      emit port_end_signal(h->p,h->p,0,arr_get(data,0),"get check_result err");
     }
   }
   else if(cmd==0x0c)
diff --git a/source/task/handle_for_coder.c b/source/task/handle_for_coder.c
index 2bc151f..59da2a9 100644
--- a/source/task/handle_for_coder.c
+++ b/source/task/handle_for_coder.c
@@ -69,7 +69,7 @@ static void code_dolater(handle_def *h,uint8_t src,uint8_t cmd,array_def *data,c
     }
     else{
       DBG_LOG("slave:%d, code failed.%s",port_get_addr(h->p),str_temp(arr_string(data)));
-      emit port_end_signal(h->p,h->p,0,-1,"code failed");
+      emit port_end_signal(h->p,h->p,0,arr_get(data,0),"code failed");
     }
   }
 }