Merge branch 'zhengping' into 'dev'

Zhengping See merge request !16

Merge branch 'zhengping' into 'dev'
Zhengping See merge request !16
f21f75e9 · 时昊 · 69e151d5 · 61abed1e · f21f75e9 · 69e151d5
Commit f21f75e9 authored Jul 24, 2024 by 时昊
6 changed files
--- a/Firmware/Source/Application/GUI_Display/GUI_Display.c
+++ b/Firmware/Source/Application/GUI_Display/GUI_Display.c
@@ -22,7 +22,7 @@ void TYW_Clear_Eeprom_Service(void)
            u8MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
            u16MMCU_AccumulatedWorkHours = Get_CAN_CH0_ID_339_Sig_MMCU_AccumulatedWorkHours();
            u8BMCU_BladeSpeedGear = Get_CAN_CH0_ID_157_Sig_BMCU_BladeSpeedGear();
-            if ((u8MBMS_StatBattChargeState == 0x7) && (u8MBMS_StatBattWorkState == 0xf) && (u8BMCU_BladeSpeedGear == 0x7) && (u16MMCU_AccumulatedWorkHours >= 60000))
+            if ((u8MBMS_StatBattChargeState == 0x7U) && (u8MBMS_StatBattWorkState == 0xfU) && (u8BMCU_BladeSpeedGear == 0x7U) && (u16MMCU_AccumulatedWorkHours >= 60000UL))
            {
                g_u8TYWClearEepromFlag = 1;
            }

--- a/Firmware/utility/程序释放/RT_RMRE42-60-20240722/RT_RMRE42-60_UpdateApp_S1.03_240722.srec
+++ b/Firmware/utility/程序释放/RT_RMRE42-60-20240722/RT_RMRE42-60_UpdateApp_S1.03_240722.srec
--- a/Firmware/utility/程序释放/RT_RMRE42-60-20240722/RT_RMRE42-60_BootApp_S1.03_240722.srec
+++ b/Firmware/utility/程序释放/RT_RMRE42-60-20240722/RT_RMRE42-60_BootApp_S1.03_240722.srec
--- a/Firmware/utility/程序释放/RT_RMRE42-60-20240724/RT_RMRE42-60_UpdateApp_S1.03_240724.srec
+++ b/Firmware/utility/程序释放/RT_RMRE42-60-20240724/RT_RMRE42-60_UpdateApp_S1.03_240724.srec
--- a/Firmware/utility/程序释放/RT_RMRE42-60-20240722/软件变更记录_润通草地车RMRE42-60.xlsx
+++ b/Firmware/utility/程序释放/RT_RMRE42-60-20240722/软件变更记录_润通草地车RMRE42-60.xlsx
--- a/Firmware/utility/诊断工具/Option/Option.properties
+++ b/Firmware/utility/诊断工具/Option/Option.properties
 #new Option
-#Mon Jul 22 11:48:10 CST 2024
+#Wed Jul 24 11:13:11 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -26,7 +26,7 @@ MergeLineInOutPutPath=
 Leave2ID=1
 PHYID=781
 BaudRate=250K
-AppUpdateFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240722\\APP_20240722114621583037.srec
+AppUpdateFilePath=C\:\\Users\\Administrator\\Desktop\\RT_RMRE42-60-20240722\\APP_20240724110408367358.srec
 FUNID=7DF
 IsMergeCreateBin=false
 IsOverWrite=false