diff --git a/checher_slave.uvoptx b/checher_slave.uvoptx index 78c0778..e6a6e8b 100644 --- a/checher_slave.uvoptx +++ b/checher_slave.uvoptx @@ -299,7 +299,7 @@ 1 0 - 1 + 0 18 @@ -540,7 +540,7 @@ 1 0 - 0 + 1 18 diff --git a/source/ReadMe.txt b/source/ReadMe.txt index 78dc287..741c9d9 100644 --- a/source/ReadMe.txt +++ b/source/ReadMe.txt @@ -320,4 +320,5 @@ 适配Ew开头的协议 注释iic相关命令,添加命令jwtcrc用于验证jwt程序是否正常 EW_Updata 添加错误12表示小板中无jwt程序 - +2024.01.03 + V2.11 读流水号时如果目标值为0则不报错 diff --git a/source/elec_det/interface/EWChecker.c b/source/elec_det/interface/EWChecker.c index 85cd8e3..035ece7 100644 --- a/source/elec_det/interface/EWChecker.c +++ b/source/elec_det/interface/EWChecker.c @@ -1045,7 +1045,7 @@ void EW_Test_ReadSN(void) } // 流水号域如果不为要设置的流水号则失败 temp.data>>=5; - if((temp.data)!=sn){ + if((sn!=0)&&(temp.data!=sn)){ uc_rtv=3; } end: diff --git a/source/elec_det/interface/JQChecker.c b/source/elec_det/interface/JQChecker.c index d6673fd..8fc25fd 100644 --- a/source/elec_det/interface/JQChecker.c +++ b/source/elec_det/interface/JQChecker.c @@ -1324,7 +1324,7 @@ void JQ_Test_ReadSN(void) } // 流水号域如果不为要设置的流水号则失败 temp.data>>=5; - if((temp.data)!=sn){ + if((sn!=0)&&(temp.data!=sn)){ uc_rtv=3; } diff --git a/source/interface/if_uart.c b/source/interface/if_uart.c index 7e33f02..da616b1 100644 --- a/source/interface/if_uart.c +++ b/source/interface/if_uart.c @@ -87,7 +87,7 @@ static const uart_dtb g_uartdtb[]={ .uart=USART1, .uart_clock_fun=RCC_APB2PeriphClockCmd, .uart_rcc=RCC_APB2Periph_USART1, - .baudrate=9600, + .baudrate=38400, .irq_channel=USART1_IRQn, .gpio_tx_clock_fun=RCC_APB2PeriphClockCmd, diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h index 4544093..ebed374 100644 --- a/source/main/compiler_info.h +++ b/source/main/compiler_info.h @@ -6,8 +6,8 @@ -#define BUILD_DATE "2023-12-29 15:21:35" -#define SOFT_VERSION "2.10" +#define BUILD_DATE "2024-01-03 15:32:33" +#define SOFT_VERSION "2.11" diff --git a/source/prebuild.py b/source/prebuild.py index 6827ad5..9ffad8b 100644 --- a/source/prebuild.py +++ b/source/prebuild.py @@ -7,7 +7,7 @@ import mycopy # 定义软件版本号 -SOFT_VERION = "2.10" +SOFT_VERION = "2.11"