Commit f49b1414 authored by 姜凯文's avatar 姜凯文 🤒

Merge branch 'dev' into 'master'

变更TYW-2024-0706

See merge request !11
parents 682bf2f5 27181f6d
...@@ -5029,7 +5029,7 @@ void GUI_ACCM_Popup_Display(uint8_t PopupMsg, uint8_t typ) ...@@ -5029,7 +5029,7 @@ void GUI_ACCM_Popup_Display(uint8_t PopupMsg, uint8_t typ)
{ {
uint16_t image = 0u; uint16_t image = 0u;
uint16_t AdressX = 577u; uint16_t AdressX = 577u;
uint8_t popId = PopupMsg - 32u; uint8_t popId = PopupMsg - POPUP_ACCM_CmprErrCode0;
uint8_t temp = LanguageTyp_Get(); uint8_t temp = LanguageTyp_Get();
if (typ == 0u) if (typ == 0u)
......
...@@ -115,6 +115,8 @@ ...@@ -115,6 +115,8 @@
//20240724 20240723变更,变更点二,1.锁车提醒(纠错);2.离座报警(纠错);3.水位低报警(纠错); //20240724 20240723变更,变更点二,1.锁车提醒(纠错);2.离座报警(纠错);3.水位低报警(纠错);
// 变更点一.新增:红-黑-白-黑-蓝-黑-彩-黑 各显2S纯色界面 // 变更点一.新增:红-黑-白-黑-蓝-黑-彩-黑 各显2S纯色界面
//20241009 241009变更:修改压缩机故障码-过流(0x1)时仪表复位BUG
#include "r_typedefs.h" #include "r_typedefs.h"
#include "sys_scheduler.h" #include "sys_scheduler.h"
#include "Watchdog.h" #include "Watchdog.h"
......
1、SQ_0037_BootApp_S1.3.1_F1.1.2_240730.srec,完整版,适用于新生产的无程序仪表 1、SQ_0037_BootApp_S1.3.1_F1.1.2_241009.srec,完整版,适用于新生产的无程序仪表
2、SQ_0037_UpdateApp_S1.3.1_F1.1.2_240730.bin,APP版,适用于烧过完整版程序仪表,需配合诊断工具使用 2、SQ_0037_UpdateApp_S1.3.1_F1.1.2_241009.bin,APP版,适用于烧过完整版程序仪表,需配合诊断工具使用
3、SQ_0037.bin,APP版,适用于烧过完整版程序仪表,一键升级小白盒用 3、SQ_0037.bin,APP版,适用于烧过完整版程序仪表,一键升级小白盒用
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment