diff --git a/checher_slave.uvoptx b/checher_slave.uvoptx
index b1dd4f5..a7883c3 100644
--- a/checher_slave.uvoptx
+++ b/checher_slave.uvoptx
@@ -125,7 +125,7 @@
0
ST-LINKIII-KEIL_SWO
- -U52FF6E065266545441081687 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)
+ -U52FF6E065266545441081687 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)
0
@@ -299,7 +299,7 @@
1
0
- 1
+ 0
18
@@ -523,7 +523,7 @@
1
0
- 0
+ 1
18
@@ -601,19 +601,41 @@
-
+
+
+ 0
+ 0
+ 44
+ 1
+ 134325998
+ 0
+ 0
+ 0
+ 0
+ 0
+ 1
+ .\source\main\main.c
+
+ \\checker_slave_app\source/main/main.c\44
+
+
0
1
g_tempptr
+
+ 1
+ 1
+ g_self
+
1
- 8
- 0x0801d000
+ 1
+ 0x20000000
0
diff --git a/checher_slave.uvprojx b/checher_slave.uvprojx
index ccad291..c63eddb 100644
--- a/checher_slave.uvprojx
+++ b/checher_slave.uvprojx
@@ -10,7 +10,7 @@
boot
0x4
ARM-ADS
- 5060960::V5.06 update 7 (build 960)::.\ARMCC
+ 5060750::V5.06 update 6 (build 750)::ARMCC
0
@@ -185,7 +185,6 @@
0
0
0
- 0
0
0
8
@@ -352,7 +351,7 @@
0
0
0
- 4
+ 0
@@ -799,7 +798,7 @@
2
2
2
- 0
+ 2
@@ -1888,7 +1887,7 @@
2
2
2
- 0
+ 2
@@ -2379,7 +2378,7 @@
2
2
2
- 0
+ 2
@@ -2478,7 +2477,7 @@
2
2
2
- 0
+ 2
@@ -2557,7 +2556,7 @@
2
2
2
- 0
+ 2
@@ -2631,7 +2630,7 @@
app
0x4
ARM-ADS
- 5060960::V5.06 update 7 (build 960)::.\ARMCC
+ 5060750::V5.06 update 6 (build 750)::ARMCC
0
@@ -2806,7 +2805,6 @@
0
0
0
- 0
0
0
8
@@ -2973,7 +2971,7 @@
0
0
0
- 4
+ 0
@@ -3867,7 +3865,7 @@
app_debug
0x4
ARM-ADS
- 5060960::V5.06 update 7 (build 960)::.\ARMCC
+ 5060750::V5.06 update 6 (build 750)::ARMCC
0
@@ -4042,7 +4040,6 @@
0
0
0
- 0
0
0
8
@@ -4209,7 +4206,7 @@
0
0
0
- 4
+ 0
@@ -5107,13 +5104,4 @@
-
-
-
- checher_slave
- 1
-
-
-
-
diff --git a/source/ReadMe.txt b/source/ReadMe.txt
index 79db817..15bc99f 100644
--- a/source/ReadMe.txt
+++ b/source/ReadMe.txt
@@ -212,4 +212,7 @@
app启动时如果boot魔数校验错误则自动升级bootloader
2023.10.15
添加单独注码命令,实现检测时注码
+2023.10.16
+ 解决自动更新bootloader死机的问题
+ 软件版本2.00
diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h
index 16eabac..618b584 100644
--- a/source/main/compiler_info.h
+++ b/source/main/compiler_info.h
@@ -6,7 +6,7 @@
-#define BUILD_DATE "2023-10-15 20:45:20"
+#define BUILD_DATE "2023-10-16 09:54:53"
#define SOFT_VERSION "2.00"
diff --git a/source/main/main.c b/source/main/main.c
index d8ea926..09a85d9 100644
--- a/source/main/main.c
+++ b/source/main/main.c
@@ -21,18 +21,18 @@
#include "compiler_info.h"
#include "elec_det.h"
+static const uint8_t ALIGN(4) g_bootcode[]={
+ #include "bootcode.txt"
+};
// 升级bootloader
static void boot_updata(void)
{
- const uint8_t ALIGN(4) bootcode[]={
- #include "bootcode.txt"
- };
- if(sizeof(bootcode)==0)
+ if(sizeof(g_bootcode)==0)
return;
if(bk_check_magic_num())
{
- flash_updata_boot((uint8_t *)bootcode,sizeof(bootcode));
+ flash_updata_boot((uint8_t *)g_bootcode,sizeof(g_bootcode));
bk_reboot_app();
}
}
@@ -194,6 +194,11 @@ static int sysinfo(list_def *argv)
cmd_print("watch dog: %s",bk_wdog_fun()?"on":"off");
cmd_print("reboot times: %d",bk_reboot_times());
cmd_print("bootloader: %s",(bk_check_magic_num()==0)?"ok":"err");
+ #ifdef DEBUG
+ cmd_print("debug: %s","yes");
+ #else
+ cmd_print("debug: %s","no");
+ #endif
print_sys_param(par);
return 0;
}