Skip to content

S
SQ_0037
Commit 8252ffd5 authored by 崔立宝's avatar 崔立宝
Browse files
Options

变更禅道问题修改

parent 4fd8278a
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 97 deletions
source/Application/APP/FlashCheckSum/FlashCheckSum.h
View file @ 8252ffd5
#ifndef __FLASHCHECKSUM_H_ #ifndef __FLASHCHECKSUM_H_
#define __FLASHCHECKSUM_H_ #define __FLASHCHECKSUM_H_
#define REAL_FLASHCHECKSUM 0x89E555F4ul #define REAL_FLASHCHECKSUM 0x2FA125C6ul
#define SPI_START_ADDR 0x10000000ul #define SPI_START_ADDR 0x10000000ul
#define SPI_ADDR_RANGE 0x02308170ul #define SPI_ADDR_RANGE 0x02305EF0ul
unsigned char CheckSpiFlashCRC(void); unsigned char CheckSpiFlashCRC(void);
......
source/Application/Alarm/Popups.c
View file @ 8252ffd5
...@@ -183,7 +183,7 @@ void Popups_Polling(void) ...@@ -183,7 +183,7 @@ void Popups_Polling(void)
DTC_Count[3u] = Get_ID_18F141F3_Sig_BMS_BMSTtlFlt(); //故障总数 DTC_Count[3u] = Get_ID_18F141F3_Sig_BMS_BMSTtlFlt(); //故障总数
} }
Popups_Polling_Sub(code, POPUP_BMS_BMS1, SND_BMS_BMS1, 101u); Popups_Polling_Sub(code, POPUP_BMS_BMS1, SND_BMS_BMS1, 101u);
#if 0
//Maintenance //Maintenance
code = Get_ID_18F101D0_Sig_VCU_GrMntnRmnd(); code = Get_ID_18F101D0_Sig_VCU_GrMntnRmnd();
...@@ -213,7 +213,7 @@ void Popups_Polling(void) ...@@ -213,7 +213,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP_COM_Maintenance); Popup_Delete(POPUP_COM_Maintenance);
Sound_Delete(SND_Maintenance); Sound_Delete(SND_Maintenance);
} }
#endif
//OvrSpd //OvrSpd
uint32_t speed = 0; uint32_t speed = 0;
uint32_t Limit_Speed_Set = 89ul; uint32_t Limit_Speed_Set = 89ul;
......
source/Application/Graphic/GUI/GUI.c
View file @ 8252ffd5
...@@ -853,7 +853,7 @@ void GUI_Middle_001_09(void) ...@@ -853,7 +853,7 @@ void GUI_Middle_001_09(void)
{ {
GUI_Translate_Display(Middle_Sprite, Set_Menu2_24_Word0, 509U, 106U, 2u); /*二级菜单 辅助控制器*/ GUI_Translate_Display(Middle_Sprite, Set_Menu2_24_Word0, 509U, 106U, 2u); /*二级菜单 辅助控制器*/
GUI_Translate_Display(Middle_Sprite, Set_Menu2_16_Word0, 496U, 150U, 2u); /*二级菜单 ABS*/ GUI_Translate_Display(Middle_Sprite, Set_Menu2_16_Word0, 496U, 150U, 2u); /*二级菜单 ABS*/
GUI_Translate_Display(Middle_Sprite, Set_Menu2_28_Word1, 469U, 196U, 2u); /*二级菜单 软件版本*/ GUI_Translate_Display(Middle_Sprite, Set_Menu2_28_Word1, 491U, 196U, 2u); /*二级菜单 软件版本*/
GUI_Translate_Display(Middle_Sprite, Yy_2_word1, 593U, 253U, 2u); /*二级菜单 语言*/ GUI_Translate_Display(Middle_Sprite, Yy_2_word1, 593U, 253U, 2u); /*二级菜单 语言*/
GUI_Translate_Display(Middle_Sprite, Set_Menu2_27_Word0, 508U, 297U, 2u); /*二级菜单 返回*/ GUI_Translate_Display(Middle_Sprite, Set_Menu2_27_Word0, 508U, 297U, 2u); /*二级菜单 返回*/
} }
...@@ -5456,6 +5456,10 @@ void GUI_Middle(void) ...@@ -5456,6 +5456,10 @@ void GUI_Middle(void)
uint32_t minute = Get_ID_18F141F3_Sig_BMS_ChgRemnderM(); //m uint32_t minute = Get_ID_18F141F3_Sig_BMS_ChgRemnderM(); //m
minute *= 5u; minute *= 5u;
if (minute > 55u)
{
minute = 55u;
}
GUI_Translate_Display(Middle_Sprite, ImageID_Number_18_white[hour / 10], 433u, 152u, 0u); /*十位*/ GUI_Translate_Display(Middle_Sprite, ImageID_Number_18_white[hour / 10], 433u, 152u, 0u); /*十位*/
GUI_Translate_Display(Middle_Sprite, ImageID_Number_18_white[hour % 10], 451u, 152u, 0u); /*个位*/ GUI_Translate_Display(Middle_Sprite, ImageID_Number_18_white[hour % 10], 451u, 152u, 0u); /*个位*/
...@@ -5658,8 +5662,8 @@ void GUI_Middle(void) ...@@ -5658,8 +5662,8 @@ void GUI_Middle(void)
} }
else else
{ {
GUI_Translate_Display(Middle_Sprite, Set_Arrow_L, 455U, 202U, 0); /*二级菜单 箭头*/ GUI_Translate_Display(Middle_Sprite, Set_Arrow_L, 455U + 15U, 202U, 0); /*二级菜单 箭头*/
GUI_Translate_Display(Middle_Sprite, Set_Arrow_R, 807U, 201U, 0); /*二级菜单 箭头*/ GUI_Translate_Display(Middle_Sprite, Set_Arrow_R, 807U - 15U, 201U, 0); /*二级菜单 箭头*/
} }
switch (VhlInfTyp_Get()) switch (VhlInfTyp_Get())
......
source/Application/Graphic/GUI/images.c
View file @ 8252ffd5
...@@ -1120,93 +1120,93 @@ static const t_PicStruct Pic_Attribute[] = ...@@ -1120,93 +1120,93 @@ static const t_PicStruct Pic_Attribute[] =
{ /*Set_Menu2_27_Word0 X0_Y0.png*/ 0u, 0u, 262u, 22u, ARGB8888, 0x1221B9B0u }, { /*Set_Menu2_27_Word0 X0_Y0.png*/ 0u, 0u, 262u, 22u, ARGB8888, 0x1221B9B0u },
{ /*Set_Menu2_27_Word1 X0_Y0.png*/ 0u, 0u, 40u, 20u, ARGB8888, 0x122213C0u }, { /*Set_Menu2_27_Word1 X0_Y0.png*/ 0u, 0u, 40u, 20u, ARGB8888, 0x122213C0u },
{ /*Set_Menu2_28_Word0 X539_Y196.png*/ 539u, 196u, 202u, 30u, ARGB8888, 0x12222040u }, { /*Set_Menu2_28_Word0 X539_Y196.png*/ 539u, 196u, 202u, 30u, ARGB8888, 0x12222040u },
{ /*Set_Menu2_28_Word1 X469_Y199.png*/ 469u, 199u, 342u, 24u, ARGB8888, 0x12227EF0u }, { /*Set_Menu2_28_Word1 X491_Y196.png*/ 491u, 196u, 300u, 20u, ARGB8888, 0x12227EF0u },
{ /*Set_Menu2_30_Word0 X560_Y150.png*/ 560u, 150u, 160u, 24u, ARGB8888, 0x1222FF30u }, { /*Set_Menu2_30_Word0 X560_Y150.png*/ 560u, 150u, 160u, 24u, ARGB8888, 0x1222DCB0u },
{ /*Set_Menu2_30_Word1 X505_Y153.png*/ 505u, 153u, 270u, 18u, ARGB8888, 0x12233B30u }, { /*Set_Menu2_30_Word1 X505_Y153.png*/ 505u, 153u, 270u, 18u, ARGB8888, 0x122318B0u },
{ /*Set_Menu2_32_Word0 X568_Y106.png*/ 568u, 106u, 144u, 22u, ARGB8888, 0x12238720u }, { /*Set_Menu2_32_Word0 X568_Y106.png*/ 568u, 106u, 144u, 22u, ARGB8888, 0x122364A0u },
{ /*Set_Menu2_32_Word1 X517_Y108.png*/ 517u, 108u, 246u, 18u, ARGB8888, 0x1223B8A0u }, { /*Set_Menu2_32_Word1 X517_Y108.png*/ 517u, 108u, 246u, 18u, ARGB8888, 0x12239620u },
{ /*Set_Menu2_CSBJ_Title_Word0 X535_Y128.png*/ 535u, 128u, 180u, 30u, ARGB8888, 0x1223FDD0u }, { /*Set_Menu2_CSBJ_Title_Word0 X535_Y128.png*/ 535u, 128u, 180u, 30u, ARGB8888, 0x1223DB50u },
{ /*Set_Menu2_CSBJ_Title_Word1 X504_Y132.png*/ 504u, 132u, 240u, 26u, ARGB8888, 0x12245230u }, { /*Set_Menu2_CSBJ_Title_Word1 X504_Y132.png*/ 504u, 132u, 240u, 26u, ARGB8888, 0x12242FB0u },
{ /*Set_Menu2_HFMRSZ_Title_Word0 X535_Y128.png*/ 535u, 128u, 180u, 30u, ARGB8888, 0x1224B3B0u }, { /*Set_Menu2_HFMRSZ_Title_Word0 X535_Y128.png*/ 535u, 128u, 180u, 30u, ARGB8888, 0x12249130u },
{ /*Set_Menu2_HFMRSZ_Title_Word1 X536_Y210.png*/ 536u, 210u, 176u, 58u, ARGB8888, 0x12250810u }, { /*Set_Menu2_HFMRSZ_Title_Word1 X536_Y210.png*/ 536u, 210u, 176u, 58u, ARGB8888, 0x1224E590u },
{ /*Set_Menu2_RJLD_Title_Word0 X535_Y128.png*/ 535u, 128u, 180u, 30u, ARGB8888, 0x1225A790u }, { /*Set_Menu2_RJLD_Title_Word0 X535_Y128.png*/ 535u, 128u, 180u, 30u, ARGB8888, 0x12258510u },
{ /*Set_Menu2_RJLD_Title_Word1 X434_Y131.png*/ 434u, 131u, 380u, 28u, ARGB8888, 0x1225FBF0u }, { /*Set_Menu2_RJLD_Title_Word1 X434_Y131.png*/ 434u, 131u, 380u, 28u, ARGB8888, 0x1225D970u },
{ /*Set_Menu2_SPGS_Title_Word0 X535_Y128.png*/ 535u, 128u, 180u, 30u, ARGB8888, 0x1226A230u }, { /*Set_Menu2_SPGS_Title_Word0 X535_Y128.png*/ 535u, 128u, 180u, 30u, ARGB8888, 0x12267FB0u },
{ /*Set_Menu2_SPGS_Title_Word1 X548_Y230.png*/ 548u, 230u, 152u, 20u, ARGB8888, 0x1226F690u }, { /*Set_Menu2_SPGS_Title_Word1 X548_Y230.png*/ 548u, 230u, 152u, 20u, ARGB8888, 0x1226D410u },
{ /*Set_Menu2_SPGS_Title_Word2 X434_Y131.png*/ 434u, 131u, 380u, 28u, ARGB8888, 0x12272610u }, { /*Set_Menu2_SPGS_Title_Word2 X434_Y131.png*/ 434u, 131u, 380u, 28u, ARGB8888, 0x12270390u },
{ /*Set_Menu2_Vehicle_Light_Moon X0_Y0.png*/ 0u, 0u, 18u, 18u, ARGB8888, 0x1227CC50u }, { /*Set_Menu2_Vehicle_Light_Moon X0_Y0.png*/ 0u, 0u, 18u, 18u, ARGB8888, 0x1227A9D0u },
{ /*Set_Menu2_Vehicle_Light_Title X483_Y248.png*/ 483u, 248u, 286u, 8u, ARGB8888, 0x1227D160u }, { /*Set_Menu2_Vehicle_Light_Title X483_Y248.png*/ 483u, 248u, 286u, 8u, ARGB8888, 0x1227AEE0u },
{ /*Set_Menu2_Vehicle_Sun_L X0_Y0.png*/ 0u, 0u, 18u, 18u, ARGB8888, 0x1227F520u }, { /*Set_Menu2_Vehicle_Sun_L X0_Y0.png*/ 0u, 0u, 18u, 18u, ARGB8888, 0x1227D2A0u },
{ /*Set_Menu2_YJLD_Title_Word0 X535_Y128.png*/ 535u, 128u, 180u, 30u, ARGB8888, 0x1227FA30u }, { /*Set_Menu2_YJLD_Title_Word0 X535_Y128.png*/ 535u, 128u, 180u, 30u, ARGB8888, 0x1227D7B0u },
{ /*Set_Menu2_YJLD_Title_Word1 X434_Y131.png*/ 434u, 131u, 380u, 28u, ARGB8888, 0x12284E90u }, { /*Set_Menu2_YJLD_Title_Word1 X434_Y131.png*/ 434u, 131u, 380u, 28u, ARGB8888, 0x12282C10u },
{ /*Set_Menu3_Cancel_01_Word0 X653_Y316.png*/ 653u, 316u, 70u, 20u, ARGB8888, 0x1228F4D0u }, { /*Set_Menu3_Cancel_01_Word0 X653_Y316.png*/ 653u, 316u, 70u, 20u, ARGB8888, 0x1228D250u },
{ /*Set_Menu3_Cancel_01_Word1 X641_Y315.png*/ 641u, 315u, 96u, 20u, ARGB8888, 0x12290AB0u }, { /*Set_Menu3_Cancel_01_Word1 X641_Y315.png*/ 641u, 315u, 96u, 20u, ARGB8888, 0x1228E830u },
{ /*Set_Menu3_Cancel_02_Word0 X653_Y316.png*/ 653u, 316u, 70u, 20u, ARGB8888, 0x122928B0u }, { /*Set_Menu3_Cancel_02_Word0 X653_Y316.png*/ 653u, 316u, 70u, 20u, ARGB8888, 0x12290630u },
{ /*Set_Menu3_Cancel_02_Word1 X641_Y315.png*/ 641u, 315u, 96u, 20u, ARGB8888, 0x12293E90u }, { /*Set_Menu3_Cancel_02_Word1 X641_Y315.png*/ 641u, 315u, 96u, 20u, ARGB8888, 0x12291C10u },
{ /*Set_Menu3_NTSC_01_Word0 X600_Y316.png*/ 600u, 316u, 48u, 20u, ARGB8888, 0x12295C90u }, { /*Set_Menu3_NTSC_01_Word0 X600_Y316.png*/ 600u, 316u, 48u, 20u, ARGB8888, 0x12293A10u },
{ /*Set_Menu3_NTSC_01_Word1 X580_Y315.png*/ 580u, 315u, 88u, 20u, ARGB8888, 0x12296B90u }, { /*Set_Menu3_NTSC_01_Word1 X580_Y315.png*/ 580u, 315u, 88u, 20u, ARGB8888, 0x12294910u },
{ /*Set_Menu3_NTSC_02_Word0 X600_Y316.png*/ 600u, 316u, 48u, 20u, ARGB8888, 0x12298710u }, { /*Set_Menu3_NTSC_02_Word0 X600_Y316.png*/ 600u, 316u, 48u, 20u, ARGB8888, 0x12296490u },
{ /*Set_Menu3_NTSC_02_Word1 X580_Y315.png*/ 580u, 315u, 88u, 20u, ARGB8888, 0x12299610u }, { /*Set_Menu3_NTSC_02_Word1 X580_Y315.png*/ 580u, 315u, 88u, 20u, ARGB8888, 0x12297390u },
{ /*Set_Menu3_OFF_01_Word0 X495_Y317.png*/ 495u, 317u, 36u, 18u, ARGB8888, 0x1229B190u }, { /*Set_Menu3_OFF_01_Word0 X495_Y317.png*/ 495u, 317u, 36u, 18u, ARGB8888, 0x12298F10u },
{ /*Set_Menu3_OFF_01_Word1 X482_Y315.png*/ 482u, 315u, 62u, 20u, ARGB8888, 0x1229BBB0u }, { /*Set_Menu3_OFF_01_Word1 X482_Y315.png*/ 482u, 315u, 62u, 20u, ARGB8888, 0x12299930u },
{ /*Set_Menu3_OFF_02_Word0 X495_Y317.png*/ 495u, 317u, 36u, 18u, ARGB8888, 0x1229CF10u }, { /*Set_Menu3_OFF_02_Word0 X495_Y317.png*/ 495u, 317u, 36u, 18u, ARGB8888, 0x1229AC90u },
{ /*Set_Menu3_OFF_02_Word1 X482_Y315.png*/ 482u, 315u, 62u, 20u, ARGB8888, 0x1229D930u }, { /*Set_Menu3_OFF_02_Word1 X482_Y315.png*/ 482u, 315u, 62u, 20u, ARGB8888, 0x1229B6B0u },
{ /*Set_Menu3_PAL_01_Word0 X716_Y317.png*/ 716u, 317u, 36u, 18u, ARGB8888, 0x1229EC90u }, { /*Set_Menu3_PAL_01_Word0 X716_Y317.png*/ 716u, 317u, 36u, 18u, ARGB8888, 0x1229CA10u },
{ /*Set_Menu3_PAL_01_Word1 X705_Y315.png*/ 705u, 315u, 60u, 20u, ARGB8888, 0x1229F6B0u }, { /*Set_Menu3_PAL_01_Word1 X705_Y315.png*/ 705u, 315u, 60u, 20u, ARGB8888, 0x1229D430u },
{ /*Set_Menu3_PAL_02_Word0 X716_Y317.png*/ 716u, 317u, 36u, 18u, ARGB8888, 0x122A0970u }, { /*Set_Menu3_PAL_02_Word0 X716_Y317.png*/ 716u, 317u, 36u, 18u, ARGB8888, 0x1229E6F0u },
{ /*Set_Menu3_PAL_02_Word1 X705_Y315.png*/ 705u, 315u, 60u, 20u, ARGB8888, 0x122A1390u }, { /*Set_Menu3_PAL_02_Word1 X705_Y315.png*/ 705u, 315u, 60u, 20u, ARGB8888, 0x1229F110u },
{ /*Set_Menu3_TC_01_Word0 X548_Y230.png*/ 548u, 230u, 152u, 20u, ARGB8888, 0x122A2650u }, { /*Set_Menu3_TC_01_Word0 X548_Y230.png*/ 548u, 230u, 152u, 20u, ARGB8888, 0x122A03D0u },
{ /*Set_Menu3_TC_01_Word1 X522_Y230.png*/ 522u, 230u, 204u, 20u, ARGB8888, 0x122A55D0u }, { /*Set_Menu3_TC_01_Word1 X522_Y230.png*/ 522u, 230u, 204u, 20u, ARGB8888, 0x122A3350u },
{ /*Set_Menu3_TC_02_Word1 X522_Y230.png*/ 522u, 230u, 204u, 20u, ARGB8888, 0x122A9590u }, { /*Set_Menu3_TC_02_Word1 X522_Y230.png*/ 522u, 230u, 204u, 20u, ARGB8888, 0x122A7310u },
{ /*Set_Menu3_TC_03_Word0 X434_Y131.png*/ 434u, 131u, 380u, 28u, ARGB8888, 0x122AD550u }, { /*Set_Menu3_TC_03_Word0 X434_Y131.png*/ 434u, 131u, 380u, 28u, ARGB8888, 0x122AB2D0u },
{ /*Set_Menu3_TC_03_Word1 X512_Y209.png*/ 512u, 209u, 224u, 62u, ARGB8888, 0x122B7B90u }, { /*Set_Menu3_TC_03_Word1 X512_Y209.png*/ 512u, 209u, 224u, 62u, ARGB8888, 0x122B5910u },
{ /*Set_Menu3_YES_01_Word0 X525_Y316.png*/ 525u, 316u, 36u, 20u, ARGB8888, 0x122C5490u }, { /*Set_Menu3_YES_01_Word0 X525_Y316.png*/ 525u, 316u, 36u, 20u, ARGB8888, 0x122C3210u },
{ /*Set_Menu3_YES_01_Word1 X514_Y315.png*/ 514u, 315u, 58u, 20u, ARGB8888, 0x122C5FD0u }, { /*Set_Menu3_YES_01_Word1 X514_Y315.png*/ 514u, 315u, 58u, 20u, ARGB8888, 0x122C3D50u },
{ /*Set_Menu3_YES_02_Word0 X525_Y316.png*/ 525u, 316u, 36u, 20u, ARGB8888, 0x122C71F0u }, { /*Set_Menu3_YES_02_Word0 X525_Y316.png*/ 525u, 316u, 36u, 20u, ARGB8888, 0x122C4F70u },
{ /*Set_Menu3_YES_02_Word1 X514_Y315.png*/ 514u, 315u, 58u, 20u, ARGB8888, 0x122C7D30u }, { /*Set_Menu3_YES_02_Word1 X514_Y315.png*/ 514u, 315u, 58u, 20u, ARGB8888, 0x122C5AB0u },
{ /*Yy_1 X619_Y106.png*/ 619u, 106u, 42u, 22u, ARGB8888, 0x122C8F50u }, { /*Yy_1 X619_Y106.png*/ 619u, 106u, 42u, 22u, ARGB8888, 0x122C6CD0u },
{ /*Yy_1_word1 X597_Y109.png*/ 597u, 109u, 86u, 20u, ARGB8888, 0x122C9DC0u }, { /*Yy_1_word1 X597_Y109.png*/ 597u, 109u, 86u, 20u, ARGB8888, 0x122C7B40u },
{ /*Yy_2 X617_Y150.png*/ 617u, 150u, 46u, 24u, ARGB8888, 0x122CB8A0u }, { /*Yy_2 X617_Y150.png*/ 617u, 150u, 46u, 24u, ARGB8888, 0x122C9620u },
{ /*Yy_2_word1 X593_Y153.png*/ 593u, 153u, 94u, 22u, ARGB8888, 0x122CC9E0u }, { /*Yy_2_word1 X593_Y153.png*/ 593u, 153u, 94u, 22u, ARGB8888, 0x122CA760u },
{ /*Yy_3 X611_Y197.png*/ 611u, 197u, 56u, 28u, ARGB8888, 0x122CEA30u }, { /*Yy_3 X611_Y197.png*/ 611u, 197u, 56u, 28u, ARGB8888, 0x122CC7B0u },
{ /*Yy_3_word1 X580_Y200.png*/ 580u, 200u, 118u, 26u, ARGB8888, 0x122D02B0u }, { /*Yy_3_word1 X580_Y200.png*/ 580u, 200u, 118u, 26u, ARGB8888, 0x122CE030u },
{ /*dianliang X174_Y414.png*/ 174u, 414u, 38u, 20u, ARGB8888, 0x122D32A0u }, { /*dianliang X174_Y414.png*/ 174u, 414u, 38u, 20u, ARGB8888, 0x122D1020u },
{ /*dianliang1 X176_Y415.png*/ 176u, 415u, 30u, 16u, ARGB8888, 0x122D3E80u }, { /*dianliang1 X176_Y415.png*/ 176u, 415u, 30u, 16u, ARGB8888, 0x122D1C00u },
{ /*ECU_01_Word0 X771_Y19.png*/ 771u, 19u, 86u, 20u, ARGB8888, 0x122D4600u }, { /*ECU_01_Word0 X771_Y19.png*/ 771u, 19u, 86u, 20u, ARGB8888, 0x122D2380u },
{ /*ECU_01_Word1 X786_Y19.png*/ 786u, 19u, 82u, 22u, ARGB8888, 0x122D60E0u }, { /*ECU_01_Word1 X786_Y19.png*/ 786u, 19u, 82u, 22u, ARGB8888, 0x122D3E60u },
{ /*ECU_02_Word01 X687_Y413.png*/ 687u, 413u, 86u, 20u, ARGB8888, 0x122D7D10u }, { /*ECU_02_Word01 X687_Y413.png*/ 687u, 413u, 86u, 20u, ARGB8888, 0x122D5A90u },
{ /*ECU_02_Word02 X673_Y415.png*/ 673u, 415u, 86u, 16u, ARGB8888, 0x122D97F0u }, { /*ECU_02_Word02 X673_Y415.png*/ 673u, 415u, 86u, 16u, ARGB8888, 0x122D7570u },
{ /*ECU_03_Word0 X687_Y445.png*/ 687u, 445u, 86u, 20u, ARGB8888, 0x122DAD70u }, { /*ECU_03_Word0 X687_Y445.png*/ 687u, 445u, 86u, 20u, ARGB8888, 0x122D8AF0u },
{ /*ECU_03_Word1 X673_Y447.png*/ 673u, 447u, 86u, 16u, ARGB8888, 0x122DC850u }, { /*ECU_03_Word1 X673_Y447.png*/ 673u, 447u, 86u, 16u, ARGB8888, 0x122DA5D0u },
{ /*ECU_04_Word0 X412_Y413.png*/ 412u, 413u, 86u, 20u, ARGB8888, 0x122DDDD0u }, { /*ECU_04_Word0 X412_Y413.png*/ 412u, 413u, 86u, 20u, ARGB8888, 0x122DBB50u },
{ /*ECU_04_Word1 X425_Y415.png*/ 425u, 415u, 94u, 16u, ARGB8888, 0x122DF8B0u }, { /*ECU_04_Word1 X425_Y415.png*/ 425u, 415u, 94u, 16u, ARGB8888, 0x122DD630u },
{ /*ECU_05_Word0 X412_Y445.png*/ 412u, 445u, 86u, 20u, ARGB8888, 0x122E1030u }, { /*ECU_05_Word0 X412_Y445.png*/ 412u, 445u, 86u, 20u, ARGB8888, 0x122DEDB0u },
{ /*ECU_05_Word1 X425_Y447.png*/ 425u, 447u, 120u, 16u, ARGB8888, 0x122E2B10u }, { /*ECU_05_Word1 X425_Y447.png*/ 425u, 447u, 120u, 16u, ARGB8888, 0x122E0890u },
{ /*ECU_06_Word0 X38_Y445.png*/ 38u, 445u, 86u, 20u, ARGB8888, 0x122E4910u }, { /*ECU_06_Word0 X38_Y445.png*/ 38u, 445u, 86u, 20u, ARGB8888, 0x122E2690u },
{ /*ECU_06_Word1 X21_Y447.png*/ 21u, 447u, 156u, 18u, ARGB8888, 0x122E63F0u }, { /*ECU_06_Word1 X21_Y447.png*/ 21u, 447u, 156u, 18u, ARGB8888, 0x122E4170u },
{ /*ECU_07_Word0 X40_Y445.png*/ 40u, 445u, 86u, 20u, ARGB8888, 0x122E8FD0u }, { /*ECU_07_Word0 X40_Y445.png*/ 40u, 445u, 86u, 20u, ARGB8888, 0x122E6D50u },
{ /*ECU_07_Word1 X22_Y447.png*/ 22u, 447u, 100u, 18u, ARGB8888, 0x122EAAB0u }, { /*ECU_07_Word1 X22_Y447.png*/ 22u, 447u, 100u, 18u, ARGB8888, 0x122E8830u },
{ /*ECU_08_Word0 X410_Y445.png*/ 410u, 445u, 86u, 20u, ARGB8888, 0x122EC6D0u }, { /*ECU_08_Word0 X410_Y445.png*/ 410u, 445u, 86u, 20u, ARGB8888, 0x122EA450u },
{ /*ECU_08_Word1 X425_Y447.png*/ 425u, 447u, 94u, 16u, ARGB8888, 0x122EE1B0u }, { /*ECU_08_Word1 X425_Y447.png*/ 425u, 447u, 94u, 16u, ARGB8888, 0x122EBF30u },
{ /*ECU_09_Word0 X685_Y445.png*/ 685u, 445u, 86u, 20u, ARGB8888, 0x122EF930u }, { /*ECU_09_Word0 X685_Y445.png*/ 685u, 445u, 86u, 20u, ARGB8888, 0x122ED6B0u },
{ /*ECU_09_Word1 X673_Y447.png*/ 673u, 447u, 94u, 16u, ARGB8888, 0x122F1410u }, { /*ECU_09_Word1 X673_Y447.png*/ 673u, 447u, 94u, 16u, ARGB8888, 0x122EF190u },
{ /*ECU_10_Word0 X412_Y445.png*/ 412u, 445u, 86u, 20u, ARGB8888, 0x122F2B90u }, { /*ECU_10_Word0 X412_Y445.png*/ 412u, 445u, 86u, 20u, ARGB8888, 0x122F0910u },
{ /*ECU_10_Word1 X425_Y447.png*/ 425u, 447u, 94u, 16u, ARGB8888, 0x122F4670u }, { /*ECU_10_Word1 X425_Y447.png*/ 425u, 447u, 94u, 16u, ARGB8888, 0x122F23F0u },
{ /*ECU_11_Word0 X687_Y445.png*/ 687u, 445u, 86u, 20u, ARGB8888, 0x122F5DF0u }, { /*ECU_11_Word0 X687_Y445.png*/ 687u, 445u, 86u, 20u, ARGB8888, 0x122F3B70u },
{ /*ECU_11_Word1 X673_Y447.png*/ 673u, 447u, 86u, 16u, ARGB8888, 0x122F78D0u }, { /*ECU_11_Word1 X673_Y447.png*/ 673u, 447u, 86u, 16u, ARGB8888, 0x122F5650u },
{ /*ECU_12_Word0 X1118_Y413.png*/ 1118u, 413u, 38u, 20u, ARGB8888, 0x122F8E50u }, { /*ECU_12_Word0 X1118_Y413.png*/ 1118u, 413u, 38u, 20u, ARGB8888, 0x122F6BD0u },
{ /*ECU_12_Word1 X955_Y415.png*/ 955u, 415u, 58u, 16u, ARGB8888, 0x122F9A30u }, { /*ECU_12_Word1 X955_Y415.png*/ 955u, 415u, 58u, 16u, ARGB8888, 0x122F77B0u },
{ /*ECU_13_Word0 X39_Y413.png*/ 39u, 413u, 38u, 20u, ARGB8888, 0x122FA8B0u }, { /*ECU_13_Word0 X39_Y413.png*/ 39u, 413u, 38u, 20u, ARGB8888, 0x122F8630u },
{ /*ECU_13_Word1 X21_Y415.png*/ 21u, 415u, 74u, 18u, ARGB8888, 0x122FB490u }, { /*ECU_13_Word1 X21_Y415.png*/ 21u, 415u, 74u, 18u, ARGB8888, 0x122F9210u },
{ /*Image1 X338_Y48.png*/ 338u, 48u, 36u, 20u, ARGB8888, 0x122FC960u }, { /*Image1 X338_Y48.png*/ 338u, 48u, 36u, 20u, ARGB8888, 0x122FA6E0u },
{ /*Image2 X772_Y48.png*/ 772u, 48u, 36u, 20u, ARGB8888, 0x122FD4A0u }, { /*Image2 X772_Y48.png*/ 772u, 48u, 36u, 20u, ARGB8888, 0x122FB220u },
{ /*ODO X1012_Y447.png*/ 1012u, 447u, 60u, 16u, ARGB8888, 0x122FDFE0u }, { /*ODO X1012_Y447.png*/ 1012u, 447u, 60u, 16u, ARGB8888, 0x122FBD60u },
{ /*TripA X1002_Y446.png*/ 1002u, 446u, 70u, 20u, ARGB8888, 0x122FEEE0u }, { /*TripA X1002_Y446.png*/ 1002u, 446u, 70u, 20u, ARGB8888, 0x122FCC60u },
{ /*TripB X1002_Y446.png*/ 1002u, 446u, 70u, 20u, ARGB8888, 0x123004C0u }, { /*TripB X1002_Y446.png*/ 1002u, 446u, 70u, 20u, ARGB8888, 0x122FE240u },
{ /*unit X281_Y417.png*/ 281u, 417u, 20u, 14u, ARGB8888, 0x12301AA0u }, { /*unit X281_Y417.png*/ 281u, 417u, 20u, 14u, ARGB8888, 0x122FF820u },
{ /*unit_Mpa X0_Y0.png*/ 0u, 0u, 56u, 20u, ARGB8888, 0x12301F00u }, { /*unit_Mpa X0_Y0.png*/ 0u, 0u, 56u, 20u, ARGB8888, 0x122FFC80u },
{ /*youliang X174_Y414.png*/ 174u, 414u, 38u, 20u, ARGB8888, 0x12303080u }, { /*youliang X174_Y414.png*/ 174u, 414u, 38u, 20u, ARGB8888, 0x12300E00u },
{ /*pointer X213_Y236.png*/ 213u, 236u, 170u, 26u, ARGB8888, 0x12303C60u }, { /*pointer X213_Y236.png*/ 213u, 236u, 170u, 26u, ARGB8888, 0x123019E0u },
}; };
t_PicStruct get_Pic_Attribute(uint32_t index) t_PicStruct get_Pic_Attribute(uint32_t index)
......
source/Driver/Graphic/loc_graphics_data.h
View file @ 8252ffd5
...@@ -229,7 +229,7 @@ static const SpritesHandler_t SpriteHandler[Max_Sprite] = ...@@ -229,7 +229,7 @@ static const SpritesHandler_t SpriteHandler[Max_Sprite] =
{Bottm3_Sprite, {292, 434, 96, 30, 1}, TARGET_VRAM, &Bottm3SpriteBuf, &Bottm3Index, Bottm3LogicLayerAttr, MAX_Bottm3_SUP_LAYER, &Bottm3Update, &Bottm3En, /*NULL*/GUI_Bottm3 }, {Bottm3_Sprite, {292, 434, 96, 30, 1}, TARGET_VRAM, &Bottm3SpriteBuf, &Bottm3Index, Bottm3LogicLayerAttr, MAX_Bottm3_SUP_LAYER, &Bottm3Update, &Bottm3En, /*NULL*/GUI_Bottm3 },
{Bottm4_Sprite, {408, 412, 204, 30, 1}, TARGET_VRAM, &Bottm4SpriteBuf, &Bottm4Index, Bottm4LogicLayerAttr, MAX_Bottm4_SUP_LAYER, &Bottm4Update, &Bottm4En, /*NULL*/GUI_Bottm4 }, {Bottm4_Sprite, {408, 412, 204, 30, 1}, TARGET_VRAM, &Bottm4SpriteBuf, &Bottm4Index, Bottm4LogicLayerAttr, MAX_Bottm4_SUP_LAYER, &Bottm4Update, &Bottm4En, /*NULL*/GUI_Bottm4 },
{Bottm5_Sprite, {408, 444, 230, 30, 1}, TARGET_VRAM, &Bottm5SpriteBuf, &Bottm5Index, Bottm5LogicLayerAttr, MAX_Bottm5_SUP_LAYER, &Bottm5Update, &Bottm5En, /*NULL*/GUI_Bottm5 }, {Bottm5_Sprite, {408, 444, 230, 30, 1}, TARGET_VRAM, &Bottm5SpriteBuf, &Bottm5Index, Bottm5LogicLayerAttr, MAX_Bottm5_SUP_LAYER, &Bottm5Update, &Bottm5En, /*NULL*/GUI_Bottm5 },
{Bottm6_Sprite, {673, 412, 178, 30, 1}, TARGET_VRAM, &Bottm6SpriteBuf, &Bottm6Index, Bottm6LogicLayerAttr, MAX_Bottm6_SUP_LAYER, &Bottm6Update, &Bottm6En, /*NULL*/GUI_Bottm6 }, {Bottm6_Sprite, {673, 412, 188, 30, 1}, TARGET_VRAM, &Bottm6SpriteBuf, &Bottm6Index, Bottm6LogicLayerAttr, MAX_Bottm6_SUP_LAYER, &Bottm6Update, &Bottm6En, /*NULL*/GUI_Bottm6 },
{Bottm7_Sprite, {673, 444, 218, 30, 1}, TARGET_VRAM, &Bottm7SpriteBuf, &Bottm7Index, Bottm7LogicLayerAttr, MAX_Bottm7_SUP_LAYER, &Bottm7Update, &Bottm7En, /*NULL*/GUI_Bottm7 }, {Bottm7_Sprite, {673, 444, 218, 30, 1}, TARGET_VRAM, &Bottm7SpriteBuf, &Bottm7Index, Bottm7LogicLayerAttr, MAX_Bottm7_SUP_LAYER, &Bottm7Update, &Bottm7En, /*NULL*/GUI_Bottm7 },
//{Bottm8_Sprite, {579, 408, 122, 64, 1}, TARGET_SDRAM, &Bottm8SpriteBuf, &Bottm8Index, Bottm8LogicLayerAttr, MAX_Bottm8_SUP_LAYER, &Bottm8Update, &Bottm8En, /*NULL*/GUI_Bottm8 }, //{Bottm8_Sprite, {579, 408, 122, 64, 1}, TARGET_SDRAM, &Bottm8SpriteBuf, &Bottm8Index, Bottm8LogicLayerAttr, MAX_Bottm8_SUP_LAYER, &Bottm8Update, &Bottm8En, /*NULL*/GUI_Bottm8 },
{Bottm9_Sprite, {891, 434, 90, 30, 1}, TARGET_VRAM, &Bottm9SpriteBuf, &Bottm9Index, Bottm9LogicLayerAttr, MAX_Bottm9_SUP_LAYER, &Bottm9Update, &Bottm9En, /*NULL*/GUI_Bottm9 }, {Bottm9_Sprite, {891, 434, 90, 30, 1}, TARGET_VRAM, &Bottm9SpriteBuf, &Bottm9Index, Bottm9LogicLayerAttr, MAX_Bottm9_SUP_LAYER, &Bottm9Update, &Bottm9En, /*NULL*/GUI_Bottm9 },
......
source/System/main.c
View file @ 8252ffd5
...@@ -107,6 +107,8 @@ ...@@ -107,6 +107,8 @@
//V1.3.1 //V1.3.1
//20240112 同步0038加英文变更程序修改，去掉菜单自动退出（查看信息不方便） //20240112 同步0038加英文变更程序修改，去掉菜单自动退出（查看信息不方便）
//20240505 菜单自动退出恢复，不合格英文图片替换 //20240505 菜单自动退出恢复，不合格英文图片替换
//20240515 修改电池最高单位摄氏度显示不全问题
//20240522 修改选中模块版本英文图片，调整对三角号位置；屏蔽保养弹出报警；预计充电时间分钟最大由75改为55
#include "r_typedefs.h" #include "r_typedefs.h"
#include "sys_scheduler.h" #include "sys_scheduler.h"
......
utility/工程文件（释放绥化）/释放软件说明.txt
View file @ 8252ffd5
1、SQ_0037_BootApp_S1.3.1_F1.1.2_240505.srec，完整版，适用于新生产的无程序仪表 1、SQ_0037_BootApp_S1.3.1_F1.1.2_240522.srec，完整版，适用于新生产的无程序仪表
2、SQ_0037_UpdateApp_S1.3.1_F1.1.2_240505.bin，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用 2、SQ_0037_UpdateApp_S1.3.1_F1.1.2_240522.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