Skip to content

H
haoJin750TFT
Commit 1e26d5f6 authored by 王雅楠's avatar 王雅楠
Browse files
Options

Merge branch 'wangyanan' into 'dev' 

Wangyanan

See merge request !51
parents eba84b97 d0183b03
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 57 deletions
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h
View file @ 1e26d5f6
......@@ -20,7 +20,7 @@ User definitions
typedef unsigned short MD_STATUS;
#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
#define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
#define APP_BASE (0x0000C400ul)
/* Status list definition */
......
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ 1e26d5f6
......@@ -3,8 +3,10 @@
uint8_t Pic_mode = PIC_DAYTIME_CH;
uint8_t g_u8Display_Mode = ModeDAY;
uint8_t g_u8Display_Mode_select = ModeDAY;
uint8_t g_u8Language = CH;
uint8_t g_u8Backlight = Backlight_4 ;
uint8_t g_u8Backlight_select = Backlight_4 ;
uint8_t g_u8UnitSetting = Metric ;
uint8_t g_u8SelfCheck = 0;/*自检*/
......@@ -282,7 +284,7 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
*/
void AMT630H_GUI_Display_Mode_Information()
{
if (g_u8Display_Mode == ModeDAY)
if (g_u8Display_Mode_select == ModeDAY)
{
if(g_u8Language == CH)/*日间中文*/
{
......@@ -309,7 +311,7 @@ void AMT630H_GUI_Display_Mode_Information()
SetPagePic(GRAPHICS_PAGE_0, Pic_0074_422_103);
}
}
else if(g_u8Display_Mode == ModeNIGHT)
else if(g_u8Display_Mode_select == ModeNIGHT)
{
if(g_u8Language == CH)/*夜间中文*/
{
......@@ -334,8 +336,43 @@ void AMT630H_GUI_Display_Mode_Information()
SetPagePic(GRAPHICS_PAGE_0, Pic_0262_461_118);
}
}
/*else if自动模式没写*/
else if(g_u8Display_Mode_select == ModeATUO)
{
if(g_u8Display_Mode == ModeDAY)
{
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0146_27_396);/*下方菜单*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0150_448_343);
SetPagePic(GRAPHICS_PAGE_0, Pic_0148_472_231);
SetPagePic(GRAPHICS_PAGE_0, Pic_0151_476_117);
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0071_18_397);/*下方菜单*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0075_409_345);
SetPagePic(GRAPHICS_PAGE_0, Pic_0073_456_232);
SetPagePic(GRAPHICS_PAGE_0, Pic_0076_461_118);
}
}
else if(g_u8Display_Mode == ModeNIGHT)
{
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0333_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0337_448_343);
SetPagePic(GRAPHICS_PAGE_0, Pic_0335_472_231);
SetPagePic(GRAPHICS_PAGE_0, Pic_0338_476_117);
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0257_18_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0261_409_345);
SetPagePic(GRAPHICS_PAGE_0, Pic_0259_456_232);
SetPagePic(GRAPHICS_PAGE_0, Pic_0262_461_118);
}
}
}
}
......@@ -366,7 +403,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0122_436_519);
}
/*背光等级选择*/
if(g_u8Backlight == Backlight_5)
if(g_u8Backlight_select == Backlight_5)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0059_509_353);
SetPagePic(GRAPHICS_PAGE_0, Pic_0060_504_307);
......@@ -374,7 +411,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0062_503_219);
SetPagePic(GRAPHICS_PAGE_0, Pic_0063_495_145);
}
else if(g_u8Backlight == Backlight_4)
else if(g_u8Backlight_select == Backlight_4)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0059_509_353);
SetPagePic(GRAPHICS_PAGE_0, Pic_0060_504_307);
......@@ -382,7 +419,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0064_493_190);
SetPagePic(GRAPHICS_PAGE_0, Pic_0065_504_136);
}
else if(g_u8Backlight == Backlight_3)
else if(g_u8Backlight_select == Backlight_3)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0059_509_353);
SetPagePic(GRAPHICS_PAGE_0, Pic_0060_504_307);
......@@ -390,7 +427,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0062_503_186);
SetPagePic(GRAPHICS_PAGE_0, Pic_0065_504_136);
}
else if(g_u8Backlight == Backlight_2)
else if(g_u8Backlight_select == Backlight_2)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0059_509_353);
SetPagePic(GRAPHICS_PAGE_0, Pic_0067_495_281);
......@@ -398,7 +435,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0062_503_186);
SetPagePic(GRAPHICS_PAGE_0, Pic_0065_504_136);
}
else if(g_u8Backlight == Backlight_1)
else if(g_u8Backlight_select == Backlight_1)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0069_506_332);
SetPagePic(GRAPHICS_PAGE_0, Pic_0060_504_286);
......@@ -406,7 +443,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0062_503_186);
SetPagePic(GRAPHICS_PAGE_0, Pic_0065_504_136);
}
else if(g_u8Backlight == Backlight_ATUO)
else if(g_u8Backlight_select == Backlight_ATUO)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0059_509_286);
SetPagePic(GRAPHICS_PAGE_0, Pic_0060_504_236);
......@@ -441,7 +478,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0310_436_519);
}
/*背光等级选择*/
if(g_u8Backlight == Backlight_5)
if(g_u8Backlight_select == Backlight_5)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0245_509_353);
SetPagePic(GRAPHICS_PAGE_0, Pic_0246_504_307);
......@@ -449,7 +486,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0248_503_219);
SetPagePic(GRAPHICS_PAGE_0, Pic_0249_495_145);
}
else if(g_u8Backlight == Backlight_4)
else if(g_u8Backlight_select == Backlight_4)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0245_509_353);
SetPagePic(GRAPHICS_PAGE_0, Pic_0246_504_307);
......@@ -457,7 +494,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0250_493_190);
SetPagePic(GRAPHICS_PAGE_0, Pic_0251_504_136);
}
else if(g_u8Backlight == Backlight_3)
else if(g_u8Backlight_select == Backlight_3)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0245_509_353);
SetPagePic(GRAPHICS_PAGE_0, Pic_0246_504_307);
......@@ -465,7 +502,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0248_503_186);
SetPagePic(GRAPHICS_PAGE_0, Pic_0251_504_136);
}
else if(g_u8Backlight == Backlight_2)
else if(g_u8Backlight_select == Backlight_2)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0245_509_353);
SetPagePic(GRAPHICS_PAGE_0, Pic_0253_495_281);
......@@ -473,7 +510,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0248_503_186);
SetPagePic(GRAPHICS_PAGE_0, Pic_0251_504_136);
}
else if(g_u8Backlight == Backlight_1)
else if(g_u8Backlight_select == Backlight_1)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0255_506_332);
SetPagePic(GRAPHICS_PAGE_0, Pic_0246_504_286);
......@@ -481,7 +518,7 @@ void AMT630H_GUI_Backlight_Information(void)
SetPagePic(GRAPHICS_PAGE_0, Pic_0248_503_186);
SetPagePic(GRAPHICS_PAGE_0, Pic_0251_504_136);
}
else if(g_u8Backlight == Backlight_ATUO)
else if(g_u8Backlight_select == Backlight_ATUO)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0245_509_286);
SetPagePic(GRAPHICS_PAGE_0, Pic_0246_504_236);
......@@ -1444,6 +1481,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_DAYTIME) == 1)
{
g_u8Display_Mode = ModeDAY;
g_u8Display_Mode_select = ModeDAY;
}
else
{
......@@ -1474,6 +1512,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_NIGHTTIME) == 1)
{
g_u8Display_Mode = ModeNIGHT;
g_u8Display_Mode_select = ModeNIGHT;
}
else
{
......@@ -1502,7 +1541,15 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
}
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_AUTO) == 1)
{
g_u8Display_Mode = ModeATUO;
g_u8Display_Mode_select = ModeATUO;
if(LightR_Status == 0)
{
g_u8Display_Mode = ModeNIGHT;
}
else if(LightR_Status == 1)
{
g_u8Display_Mode = ModeDAY;
}
}
else
{
......@@ -1541,6 +1588,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_DAYTIME) == 1)
{
g_u8Display_Mode = ModeDAY;
g_u8Display_Mode_select = ModeDAY;
}
else
{
......@@ -1572,6 +1620,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_NIGHTTIME) == 1)
{
g_u8Display_Mode = ModeNIGHT;
g_u8Display_Mode_select = ModeNIGHT;
}
else
{
......@@ -1601,7 +1650,15 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
}
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_AUTO) == 1)
{
g_u8Display_Mode = ModeATUO ;
g_u8Display_Mode_select = ModeATUO;
if(LightR_Status == 0)
{
g_u8Display_Mode = ModeNIGHT;
}
else if(LightR_Status == 1)
{
g_u8Display_Mode = ModeDAY;
}
}
else
{
......@@ -1612,6 +1669,10 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
break;
}
}
else
{
;
}
}
......@@ -1621,13 +1682,6 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
*/
void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
{
/*case 0 自动*/
/*case 1 选中1*/
/*case 2 选中2*/
/*case 3 选中3*/
/*case 4 选中4*/
/*case 5 选中5*/
if(g_u8Display_Mode == ModeDAY)/*日间模式*/
{
if(g_u8Language == CH)
......@@ -1653,6 +1707,7 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_5))
{
g_u8Backlight = Backlight_5 ;
g_u8Backlight_select =Backlight_5 ;
}
else
{
......@@ -1671,6 +1726,7 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_4))
{
g_u8Backlight = Backlight_4 ;
g_u8Backlight_select =Backlight_4 ;
}
else
{
......@@ -1689,6 +1745,7 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_3))
{
g_u8Backlight = Backlight_3 ;
g_u8Backlight_select =Backlight_3 ;
}
else
{
......@@ -1707,6 +1764,7 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_2))
{
g_u8Backlight = Backlight_2 ;
g_u8Backlight_select =Backlight_2 ;
}
else
{
......@@ -1725,6 +1783,7 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_1))
{
g_u8Backlight = Backlight_1 ;
g_u8Backlight_select =Backlight_1 ;
}
else
{
......@@ -1749,7 +1808,31 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
/*记忆选择*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_AUTO))
{
g_u8Backlight = Backlight_ATUO ;
g_u8Backlight_select = Backlight_ATUO ;
if(Backlight_SetPwmLevel() == 5)
{
g_u8Backlight = Backlight_5;
}
else if(Backlight_SetPwmLevel() == 4)
{
g_u8Backlight = Backlight_4;
}
else if(Backlight_SetPwmLevel() == 3)
{
g_u8Backlight = Backlight_3;
}
else if(Backlight_SetPwmLevel() == 2)
{
g_u8Backlight = Backlight_2;
}
else if(Backlight_SetPwmLevel() == 1)
{
g_u8Backlight = Backlight_1;
}
else
{
;
}
}
else
{
......@@ -1785,6 +1868,7 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_5))
{
g_u8Backlight = Backlight_5 ;
g_u8Backlight_select = Backlight_5 ;
}
else
{
......@@ -1803,6 +1887,7 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_4))
{
g_u8Backlight = Backlight_4 ;
g_u8Backlight_select = Backlight_4 ;
}
else
{
......@@ -1821,6 +1906,7 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_3))
{
g_u8Backlight = Backlight_3 ;
g_u8Backlight_select = Backlight_3 ;
}
else
{
......@@ -1839,6 +1925,7 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_2))
{
g_u8Backlight = Backlight_2 ;
g_u8Backlight_select = Backlight_2 ;
}
else
{
......@@ -1857,6 +1944,7 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_1))
{
g_u8Backlight = Backlight_1 ;
g_u8Backlight_select = Backlight_1 ;
}
else
{
......@@ -1881,7 +1969,31 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
/*记忆选择*/
if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_AUTO))
{
g_u8Backlight = Backlight_ATUO ;
g_u8Backlight_select = Backlight_ATUO ;
if(Backlight_SetPwmLevel() == 5)
{
g_u8Backlight = Backlight_5;
}
else if(Backlight_SetPwmLevel() == 4)
{
g_u8Backlight = Backlight_4;
}
else if(Backlight_SetPwmLevel() == 3)
{
g_u8Backlight = Backlight_3;
}
else if(Backlight_SetPwmLevel() == 2)
{
g_u8Backlight = Backlight_2;
}
else if(Backlight_SetPwmLevel() == 1)
{
g_u8Backlight = Backlight_1;
}
else
{
;
}
}
else
{
......@@ -2743,13 +2855,17 @@ static void AMT630H_GUI_Light()
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0740_682_21);
}
if(Get_TelltalesLedSts(em_LED_E))
if(Get_TelltalesLedSts(em_LED_E) == 1)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0748_194_26);//E
}
else if(Get_TelltalesLedSts(em_LED_E) == 2)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0748_194_26);
SetPagePic(GRAPHICS_PAGE_0, Pic_0749_192_26);//S
}
if(Get_TelltalesLedSts(em_LED_S))
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0749_192_26);
;
}
}
......@@ -3382,54 +3498,54 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
DisplayNumPara.DecimalNum = 1;/*小数点后一位*/
if((Tripnumber<10000)&&(Tripnumber>=1000))
{
DisplayNumPara.x = 125;
DisplayNumPara.x = 140;
DisplayNumPara.MinDigits = 4;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_163_324);/*KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_187_324);//KM
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_163_324);/*单位mile*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_187_324);/*单位mile*/
}
}
else if((Tripnumber<1000)&&(Tripnumber>=100))
{
DisplayNumPara.x = 101;
DisplayNumPara.x = 116;
DisplayNumPara.MinDigits = 3;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_163_324);/*KM*/
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_139_324);/*单位mile*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_163_324);/*单位mile*/
}
}
else if((Tripnumber<100)&&(Tripnumber>=10))
{
DisplayNumPara.x = 77;
DisplayNumPara.x = 93;
DisplayNumPara.MinDigits = 2;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_115_324);/*KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*KM*/
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_115_324);/*单位mile*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_139_324);/*单位mile*/
}
}
else if((Tripnumber<10)&&(Tripnumber>=0))
{
DisplayNumPara.x = 53;
DisplayNumPara.x = 93;
DisplayNumPara.MinDigits = 2;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_91_324);/*单位KM*/
SetPagePic(GRAPHICS_PAGE_0,Pic_0580_139_324);/*KM*/
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_91_324);/*单位mile*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0861_139_324);/*单位mile*/
}
}
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Tripnumber);
......@@ -3444,48 +3560,54 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
DisplayNumPara.DecimalNum = 1;/*小数点后一位*/
if((Tripnumber<10000)&&(Tripnumber>=1000))
{
DisplayNumPara.x = 125;
DisplayNumPara.x = 140;
DisplayNumPara.MinDigits = 4;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_163_324);/*KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_187_324);/*单位km*/
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_163_324);/*单位mile*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_187_324);/*单位mile*/
}
}
else if((Tripnumber<1000)&&(Tripnumber>=100))
{
DisplayNumPara.x = 101;
DisplayNumPara.x = 116;
DisplayNumPara.MinDigits = 3;
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_139_324);/*KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_139_324);/*单位mile*/
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_163_324);/*KM*/
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_163_324);/*单位mile*/
}
}
else if((Tripnumber<100)&&(Tripnumber>=10))
{
DisplayNumPara.x = 77;
DisplayNumPara.x = 93;
DisplayNumPara.MinDigits = 2;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_115_324);/*KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*KM*/
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_115_324);/*单位mile*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_139_324);/*单位mile*/
}
}
else if((Tripnumber<10)&&(Tripnumber>=0))
{
DisplayNumPara.x = 53;
DisplayNumPara.x = 93;
DisplayNumPara.MinDigits = 2;
if(Uint == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0688_91_324);/*单位KM*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0580_139_324);/*单位KM*/
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_91_324);/*单位mile*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0863_139_324);/*单位mile*/
}
}
DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Tripnumber);
......
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ 1e26d5f6
......@@ -283,7 +283,7 @@ static Tellib_uint16_t LED_HEV_Judgement(void)
}
else
{
if((Get_CAN_CH0_ID_111_Sig_ISG_Ready() == 0x01UL)||((Get_CAN_CH0_ID_111_Sig_ISG_Power() == 1u)&&(Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable() == 0u)))
if((Get_CAN_CH0_ID_111_Sig_ISG_Ready() == 0x01UL)||((Get_CAN_CH0_ID_111_Sig_ISG_Power() == 1u)&&(Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable() == 2u))||((Get_CAN_CH0_ID_111_Sig_ISG_Power() == 1u)&&(Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable() == 1u)))
{
LED_STATE = 1u;
}
......
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