Commit 67e3471a authored by hu's avatar hu

增加界面

parent c25b3e33
No preview for this file type
This diff is collapsed.
project .intvect 1536 project .intvect 1536
project .text 309372 project .text 309356
project .rodata 410815 project .rodata 410815
project .secinfo 120 project .secinfo 120
project .syscall 6 project .syscall 6
......
...@@ -740,21 +740,21 @@ void Gui_ADAS_Display(uint8_t Mode) ...@@ -740,21 +740,21 @@ void Gui_ADAS_Display(uint8_t Mode)
/*左车道线*/ /*左车道线*/
if (FLASH_SYNC_1Hz == 1u) if (FLASH_SYNC_1Hz == 1u)
{ {
GUI_General_Display(ADAS_Sprite, CN_LeftRoad_shanshuo, GUI_BLENDMODE_SRC_OVER); /*虚*/ GUI_General_Display(ADAS_Sprite, CN_LeftRoad_shanshuo, GUI_BLENDMODE_CUSTOM); /*虚*/
} }
else else
{ {
GUI_General_Display(ADAS_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(ADAS_Sprite, SpriteSize, GUI_BLENDMODE_CUSTOM);
} }
/*右车道线*/ /*右车道线*/
if (FLASH_SYNC_1Hz == 1u) if (FLASH_SYNC_1Hz == 1u)
{ {
GUI_General_Display(ADAS_Sprite, CN_RightRoad_shanshuo, GUI_BLENDMODE_SRC_OVER); /*虚*/ GUI_General_Display(ADAS_Sprite, CN_RightRoad_shanshuo, GUI_BLENDMODE_CUSTOM); /*虚*/
} }
else else
{ {
GUI_General_Display(ADAS_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(ADAS_Sprite, SpriteSize, GUI_BLENDMODE_CUSTOM);
} }
} }
else else
...@@ -762,18 +762,19 @@ void Gui_ADAS_Display(uint8_t Mode) ...@@ -762,18 +762,19 @@ void Gui_ADAS_Display(uint8_t Mode)
/*左车道线*/ /*左车道线*/
if ((LDW_Sys_Sta == 3u) && (LLDW_Sta == 0u)) if ((LDW_Sys_Sta == 3u) && (LLDW_Sta == 0u))
{ {
GUI_General_Display(ADAS_Sprite, CN_LeftRoad_shanshuo, GUI_BLENDMODE_SRC_OVER); /*虚*/ GUI_General_Display(ADAS_Sprite, CN_LeftRoad_shanshuo, GUI_BLENDMODE_CUSTOM); /*虚*/
} }
else if ((LDW_Sys_Sta == 3u) && (LLDW_Sta == 1u)) else if ((LDW_Sys_Sta == 3u) && (LLDW_Sta == 1u))
{ {
GUI_General_Display(ADAS_Sprite, CN_LeftRoad, GUI_BLENDMODE_SRC_OVER); /*绿*/ GUI_General_Display(ADAS_Sprite, CN_LeftRoad, GUI_BLENDMODE_CUSTOM); /*绿*/
} }
else if ((LDW_Sys_Sta == 5u) && (LLDI_Sta == 1u)) else if ((LDW_Sys_Sta == 5u) && (LLDI_Sta == 1u))
{ {
GUI_General_Display(ADAS_Sprite, CN_LeftRoad_1, GUI_BLENDMODE_CUSTOM); /*黄*/
if (FLASH_SYNC_2_5_Hz == 1u) if (FLASH_SYNC_2_5_Hz == 1u)
{ {
GUI_General_Display(ADAS_Sprite, CN_LeftRoad_1, GUI_BLENDMODE_SRC_OVER); /*黄*/ GUI_Translate_Display(ADAS_Sprite, CN_tanhao1, 125u, 257u, GUI_BLENDMODE_CUSTOM);/*左叹号*/
GUI_Translate_Display(ADAS_Sprite, CN_tanhao1, 125u, 257u, GUI_BLENDMODE_SRC_OVER);/*左叹号*/
} }
else else
{ {
...@@ -788,18 +789,19 @@ void Gui_ADAS_Display(uint8_t Mode) ...@@ -788,18 +789,19 @@ void Gui_ADAS_Display(uint8_t Mode)
/*右车道线*/ /*右车道线*/
if ((LDW_Sys_Sta == 3u) && (RLDW_Sta == 0u)) if ((LDW_Sys_Sta == 3u) && (RLDW_Sta == 0u))
{ {
GUI_General_Display(ADAS_Sprite, CN_RightRoad_shanshuo, GUI_BLENDMODE_SRC_OVER); /*虚*/ GUI_General_Display(ADAS_Sprite, CN_RightRoad_shanshuo, GUI_BLENDMODE_CUSTOM); /*虚*/
} }
else if ((LDW_Sys_Sta == 3u) && (RLDW_Sta == 1u)) else if ((LDW_Sys_Sta == 3u) && (RLDW_Sta == 1u))
{ {
GUI_General_Display(ADAS_Sprite, CN_RightRoad, GUI_BLENDMODE_SRC_OVER); /*绿*/ GUI_General_Display(ADAS_Sprite, CN_RightRoad, GUI_BLENDMODE_CUSTOM); /*绿*/
} }
else if ((LDW_Sys_Sta == 5u) && (RLDI_Sta == 1u)) else if ((LDW_Sys_Sta == 5u) && (RLDI_Sta == 1u))
{ {
GUI_General_Display(ADAS_Sprite, CN_RightRoad_1, GUI_BLENDMODE_CUSTOM); /*黄*/
if (FLASH_SYNC_2_5_Hz == 1u) if (FLASH_SYNC_2_5_Hz == 1u)
{ {
GUI_General_Display(ADAS_Sprite, CN_RightRoad_1, GUI_BLENDMODE_SRC_OVER); /*黄*/ GUI_Translate_Display(ADAS_Sprite, CN_tanhao1, 339u, 257u, GUI_BLENDMODE_CUSTOM); /*右叹号*/
GUI_Translate_Display(ADAS_Sprite, CN_tanhao1, 339u, 257u, GUI_BLENDMODE_SRC_OVER); /*右叹号*/
} }
else else
{ {
...@@ -1612,7 +1614,8 @@ void GUI_block_NULL_Display(uint8_t Mode) ...@@ -1612,7 +1614,8 @@ void GUI_block_NULL_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_Translate_Display(MultiPurpose_Sprite, Nb_12_dian, 801u, 481u, GUI_BLENDMODE_CUSTOM); //GUI_Translate_Display(MultiPurpose_Sprite, Nb_12_dian, 801u, 481u, GUI_BLENDMODE_CUSTOM);
GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_CUSTOM);
} }
else else
{ {
......
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