Merge branch 'zhengping' into 'dev'

Zhengping See merge request !11

Merge branch 'zhengping' into 'dev'
Zhengping See merge request !11
96ee6f9d · 郑萍 · f90683e6 · 0f25fbcb · 96ee6f9d · 96ee6f9d
Commit 96ee6f9d authored Jul 31, 2024 by 郑萍
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 162 additions and 58 deletions

AMT630H_Datas.c Firmware/Source/Component/AMT630H/AMT630H_Datas.c +158 -49

AMT630H_Datas.h Firmware/Source/Component/AMT630H/AMT630H_Datas.h +4 -9

No files found.
--- a/Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+++ b/Firmware/Source/Component/AMT630H/AMT630H_Datas.c
--- a/Firmware/Source/Component/AMT630H/AMT630H_Datas.h
+++ b/Firmware/Source/Component/AMT630H/AMT630H_Datas.h
@@ -3,15 +3,10 @@

 typedef enum
 {
-   PIC_DAYTIME_Main_CH =0 ,//日间中文主界面
-   PIC_NIGHTTIME_Main_CH ,//夜间中文主界面
-   PIC_DAYTIME_Main_EN ,//日间英文主界面
-   PIC_NIGHTTIME_Main_EN ,//夜间英文主界面
-
-   PIC_DAYTIME_CH ,//日间中文
-   PIC_NIGHTTIME_CH , //夜间中文
-   PIC_DAYTIME_EN,    //日间英文
-   PIC_NIGHTTIME_EN,  //夜间英文
+   PIC_DAYTIME_CH =0 ,//日间中文
+   PIC_NIGHTTIME_CH ,//夜间中文
+   PIC_DAYTIME_EN ,//日间英文
+   PIC_NIGHTTIME_EN ,//夜间英文
   
   PIC_Max,
 }_Picture_Mode;