Skip to content

I
IVECO_NS216
Commit 7373087e authored by 杨真东's avatar 杨真东
Browse files
Options

Merge branch 'shihao' into 'develop' 

Shihao

See merge request !9
parents 18a0ec89 04693880
Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 58 deletions
source/Appliciation/APP/InnerPicIndex.h
View file @ 7373087e
......@@ -15109,8 +15109,97 @@ const unsigned char __attribute__((aligned(8))) Alarm_ICON_12_4_X140_Y101[128] =
0x33, 0xFF, 0x77, 0x00, 0x33, 0xFF, 0x77, 0x00, 0x33, 0xFF, 0xF8, 0xF3, 0xF6, 0xFF, 0x00, 0x00,
};
const unsigned char __attribute__((aligned(8)))Set_CN_04_X79_Y131[764] = {
0xFA, 0x02, 0x54, 0x00, 0x12, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0x0C, 0x8F, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F,
0x0F, 0x0F, 0x0F, 0x0F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x6F, 0xFF, 0x35, 0x03, 0x9B, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0x35, 0x03, 0x03, 0x03, 0x03, 0x06, 0x0B, 0x4F, 0xDF, 0xFF, 0xFF, 0x98,
0x03, 0x25, 0xFF, 0xFF, 0xFF, 0xFF, 0x05, 0x03, 0x7B, 0xFF, 0xFF, 0xFF, 0x6B, 0x03, 0x66, 0xFF,
0xFF, 0x6F, 0x08, 0x03, 0x30, 0x30, 0x12, 0x07, 0x2D, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x40, 0x15,
0xDF, 0xFF, 0xFF, 0x00, 0x63, 0xF6, 0xF6, 0x32, 0x33, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x34,
0x69, 0x69, 0x22, 0x22, 0x69, 0x69, 0x34, 0x00, 0x69, 0x69, 0x47, 0x00, 0x66, 0xFF, 0x33, 0x00,
0x99, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x33, 0x00, 0x99, 0xFF, 0xFD, 0xF8, 0xC1, 0x10,
0x03, 0x8F, 0xFF, 0xFF, 0x20, 0x00, 0x9D, 0xFF, 0xFF, 0x69, 0x00, 0x30, 0x14, 0xFF, 0xFF, 0xFF,
0x24, 0x00, 0xC8, 0xFF, 0x9D, 0x00, 0x31, 0xFB, 0xFF, 0xFF, 0xFD, 0xF6, 0xF7, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFD, 0xFB, 0xFF, 0xBF, 0x28, 0x10, 0xF8, 0xFF, 0xFF, 0x33, 0x23, 0x9F, 0x9F, 0xFF,
0xFF, 0xBF, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x21, 0x10, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
0x98, 0xFF, 0x33, 0x00, 0x99, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x33, 0x00, 0x99, 0xFF,
0xFF, 0xFF, 0xFF, 0x85, 0x00, 0x24, 0xFF, 0xFF, 0x74, 0x00, 0x47, 0xFF, 0xFF, 0x03, 0x42, 0x86,
0x00, 0x7B, 0xFF, 0x9F, 0x00, 0x31, 0xFF, 0xFF, 0xFC, 0x40, 0x00, 0x09, 0x4F, 0x8F, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x83, 0x60, 0x30, 0x00, 0xFF, 0xD8, 0x41, 0xB0, 0xF8, 0xFF, 0xFF, 0xFF, 0xF8,
0xF0, 0xF0, 0xF0, 0xFC, 0xFF, 0xF3, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xB0, 0x00, 0x60, 0xF0, 0xF0,
0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xFF, 0x33, 0x00, 0x99, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0x33, 0x00, 0x99, 0xFF, 0xFF, 0xFF, 0xFF, 0x99, 0x00, 0x00, 0xFF, 0xFF, 0xF9, 0x00, 0x03, 0xFF,
0x69, 0x00, 0xB7, 0xFC, 0x20, 0x14, 0xFF, 0x68, 0x00, 0x86, 0xFF, 0xFF, 0xFF, 0xFD, 0xF4, 0xB0,
0x40, 0x00, 0x02, 0x08, 0x4F, 0xFF, 0xFF, 0xFF, 0xFF, 0x66, 0x00, 0xFF, 0xFF, 0x45, 0x03, 0x23,
0x33, 0x33, 0x33, 0x33, 0x13, 0x14, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0x66, 0x00, 0xF0, 0xF0, 0xF0,
0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0x30, 0x00, 0xFF, 0xFF, 0xFF, 0x33, 0x00, 0x99, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0x33, 0x00, 0x99, 0xFF, 0xFF, 0xFF, 0xFF, 0x48, 0x00, 0x53, 0xFF, 0xFF,
0xFF, 0x52, 0x00, 0x9C, 0x14, 0x41, 0xFF, 0xFF, 0x84, 0x00, 0x8C, 0x23, 0x10, 0xFC, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xF6, 0x40, 0x00, 0x6B, 0xFF, 0xFF, 0xFF, 0x66, 0x00, 0xFF,
0xDF, 0xFF, 0x92, 0x03, 0x6F, 0xFF, 0xDF, 0x2B, 0x10, 0xD5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x66,
0x00, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x21, 0x00, 0xFF, 0xFF, 0xFF, 0x33, 0x00,
0x79, 0x9F, 0x9F, 0x9F, 0x9F, 0xBF, 0xFF, 0xFF, 0x33, 0x00, 0x79, 0x9F, 0x8F, 0x4F, 0x08, 0x00,
0x60, 0xFC, 0xFF, 0xFF, 0xFF, 0xB8, 0x00, 0x24, 0x00, 0xB7, 0xFF, 0xFF, 0xFC, 0x10, 0x16, 0x00,
0x63, 0xFF, 0xFF, 0xFF, 0x6F, 0x09, 0x4F, 0xBF, 0xFF, 0xFF, 0x8F, 0x15, 0x00, 0xC7, 0xFF, 0xFF,
0xFF, 0x66, 0x00, 0x1B, 0x12, 0xBC, 0xFF, 0xF4, 0x40, 0x07, 0x04, 0x70, 0xF8, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x66, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x22, 0x00, 0xFF,
0xFF, 0xFF, 0x83, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x83, 0xFF, 0xFF, 0x83, 0x60, 0x60, 0x60,
0x60, 0x90, 0xF1, 0xF8, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x80, 0x60, 0x80, 0xFF, 0xFF, 0xFF,
0xFF, 0x94, 0x60, 0x60, 0xC8, 0xFF, 0xFF, 0xFF, 0xFB, 0xF2, 0x80, 0x40, 0x30, 0x30, 0x60, 0xC0,
0xF8, 0xFF, 0xFF, 0xFF, 0xBF, 0x03, 0x40, 0xF2, 0x7D, 0x2F, 0x0B, 0x04, 0x40, 0xD0, 0x80, 0x21,
0x06, 0x0D, 0x3F, 0xCF, 0xFF, 0x5F, 0x3F, 0x26, 0x00, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39, 0x39,
0x39, 0x12, 0x00, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xFF, 0xFF, 0xFC, 0xF2, 0xF7, 0xFC,
0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF4, 0xF5, 0xFF, 0xFF, 0xF8, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6,
0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xFF, 0x00, 0x00, };
const unsigned char __attribute__((aligned(8)))Set_CN_04_1_X34_Y172[64] = {
0x40, 0x00, 0xAD, 0x80, 0x0A, 0x80, 0x00, 0x7F, 0x00, 0x37, 0x00, 0x02, 0xD3, 0x00, 0xD2, 0xF0,
0x00, 0xE1, 0x00, 0x37, 0x00, 0x7F, 0x00, 0x01, 0xD5, 0x00, 0xD3, 0xFF, 0x00, 0x00, 0x00, 0x01,
0xD6, 0x00, 0xD3, 0xFF, 0x81, 0x00, 0x00, 0x10, 0xD5, 0x00, 0xD3, 0xFF, 0x00, 0x00, 0x00, 0x10,
0x00, 0xF7, 0x00, 0x73, 0x00, 0x10, 0xD3, 0x00, 0xD2, 0x0F, 0x00, 0x1E, 0x00, 0x73, 0x00, 0xF7,
};
const unsigned char __attribute__((aligned(8)))Set_CN_04_2_X34_Y172[64] = {
0x40, 0x00, 0xAD, 0x80, 0x0A, 0x80, 0x00, 0x7F, 0x00, 0x37, 0x00, 0xE2, 0xD3, 0xF0, 0xD2, 0x00,
0x00, 0x01, 0x00, 0x37, 0x00, 0x7F, 0x00, 0x01, 0x00, 0x00, 0xD4, 0xFF, 0xD4, 0x00, 0x00, 0x01,
0x81, 0x00, 0xD4, 0xFF, 0xD5, 0x00, 0x00, 0x10, 0x00, 0x00, 0xD4, 0xFF, 0xD4, 0x00, 0x00, 0x10,
0x00, 0xF7, 0x00, 0x73, 0x00, 0x1E, 0xD3, 0x0F, 0xD2, 0x00, 0x00, 0x10, 0x00, 0x73, 0x00, 0xF7,
};
const unsigned char __attribute__((aligned(8)))Set_CN_04_3_X112_Y190[152] = {
0x96, 0x00, 0x10, 0x00, 0x12, 0x00, 0xBF, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,
0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x8F, 0xFB, 0xF3, 0xF3, 0xF3, 0x31, 0x00, 0xF3, 0xF3, 0xF3, 0xF3,
0x62, 0x00, 0x92, 0xF3, 0xF3, 0xF8, 0xFF, 0xFF, 0xFF, 0xFF, 0x33, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
0x66, 0x00, 0x99, 0xFF, 0xFF, 0xFF, 0x9F, 0x9F, 0x9F, 0x9F, 0x23, 0x00, 0x9F, 0x9F, 0x9F, 0x9F,
0x46, 0x00, 0x79, 0x9F, 0x9F, 0x9F, 0x90, 0x90, 0x90, 0x90, 0x00, 0x20, 0x90, 0x90, 0x90, 0x90,
0x40, 0x00, 0x70, 0x90, 0x90, 0x90, 0xFF, 0xFF, 0xFF, 0x7C, 0x00, 0x74, 0xFF, 0xFF, 0xFF, 0xFF,
0x66, 0x00, 0x99, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4D, 0x02, 0x40, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF,
0x66, 0x00, 0x99, 0xFF, 0xFF, 0xFF, 0x4F, 0x04, 0x10, 0xB2, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0x66, 0x00, 0x99, 0xFF, 0xFF, 0xFF, 0xFD, 0xF5, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xF8, 0xF3, 0xFB, 0xFF, 0xFF, 0xFF, 0x00, 0x00, };
const unsigned char __attribute__((aligned(8)))Set_CN_04_4_X112_Y190[152] = {
0x96, 0x00, 0x10, 0x00, 0x12, 0x00, 0xFF, 0xFF, 0xFD, 0x36, 0x07, 0xBF, 0xFF, 0xFF, 0xFF, 0xFF,
0xCF, 0x05, 0x24, 0xFC, 0xFF, 0xFF, 0xFF, 0xBF, 0x9F, 0x9C, 0x30, 0x43, 0x9F, 0x9F, 0x9F, 0x8F,
0x04, 0x20, 0x99, 0x9F, 0xBF, 0xFF, 0xFF, 0x83, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60,
0x60, 0x60, 0x60, 0x60, 0x83, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x03,
0x03, 0x03, 0x03, 0x03, 0x03, 0x35, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x04, 0x00, 0x40, 0x04,
0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x6F, 0x09, 0x01, 0x40, 0xF6, 0xFD, 0xB2,
0x10, 0x07, 0x3F, 0xCF, 0xFF, 0xFF, 0x2B, 0x05, 0x11, 0x50, 0xD1, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF,
0xFC, 0xF2, 0x60, 0x10, 0x04, 0x38, 0xFB, 0xF8, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xFC, 0x00, 0x00, };
#endif
source/Appliciation/DataProcess.c
View file @ 7373087e
......@@ -222,6 +222,7 @@ void Data_30KL_Init(void)
Urea_Init();
Gear_Init();
MenuData.Lost = 0;
MenuData.Ldws = 2;
}
void Data_15KL_Init(void)
......
source/Appliciation/DataProcess.h
View file @ 7373087e
......@@ -320,7 +320,7 @@ typedef struct
uint8_t Minute_Back_Send;
uint8_t Seconds;
uint16_t Lost;
uint8_t Ldws;
}Menu_TimeSetData_Struct;
extern Menu_TimeSetData_Struct MenuData;
......
source/Appliciation/Display/GUI.c
View file @ 7373087e
......@@ -265,7 +265,7 @@ void GUI_Service(void)
{
GUI_ECU_Display();
}
if ((MenuCur >= MENU_ITEM_SET_Backlight) && (MenuCur <= MENU_ITEM_SET_TimeMin))
if ((MenuCur >= MENU_ITEM_SET_Backlight) && (MenuCur <= MENU_ITEM_SET_Ldws))
{
GUI_SET_Display();
}
......@@ -4053,6 +4053,14 @@ void GUI_SET_Display(void)
{
GUI_Clock_Display(MenuData.Hour, MenuData.Minute);
}
else if( MenuCur == MENU_ITEM_SET_Ldws )
{
Gui_LDWS(MenuData.Ldws);
}
else
{
;
}
}
/************************************************************************************************************/
void Gui_Backlight(INT8U Backlight)
......@@ -4127,6 +4135,23 @@ void Gui_Volume(INT8U Volume)
}
}
/***********************************************************************************************************/
void Gui_LDWS(INT8U Volume)
{
Draw_Image_Local(( uint8_t * )Set_icon_01_X103_Y76, 103, 76);
Draw_Image_Local(( uint8_t * )Set_CN_04_X79_Y131, 85, 128);
if ( MenuData.Ldws == 1 )
{
Draw_Image_Local(( uint8_t * )Set_CN_04_2_X34_Y172, 34, 169);
Draw_Image_Local(( uint8_t * )Set_CN_04_4_X112_Y190, 111, 186);
}
else
{
Draw_Image_Local(( uint8_t * )Set_CN_04_1_X34_Y172, 34, 169);
Draw_Image_Local(( uint8_t * )Set_CN_04_3_X112_Y190, 111, 186);
}
}
/***********************************************************************************************************/
static const uint16_t TimeHourDigits18PosX [] = {105, 94};
static const uint16_t TimeMinuteDigits18PosX [] = {134, 123};
void GUI_Clock_Display(INT8U HOUR, INT8U Minute)
......
source/Appliciation/Display/GUI.h
View file @ 7373087e
......@@ -144,5 +144,5 @@ extern void Display_Ctrl_Init(void);
extern void Display_Ctrl_OFF_Init(void);
extern uint8_t Get_Coolant_Temp_Cur_Display_Value(void);
void Gui_LDWS(INT8U Volume);
#endif
source/Appliciation/Menu.h
View file @ 7373087e
......@@ -47,6 +47,7 @@ typedef enum
MENU_ITEM_SET_Sound,
MENU_ITEM_SET_TimeHour,
MENU_ITEM_SET_TimeMin,
MENU_ITEM_SET_Ldws,
MENU_ITEM_MAX,
} Menu_Item_en_t;
/*所有菜单界面的枚举*/
......
source/Appliciation/Menu_Interface.c
View file @ 7373087e
......@@ -18,29 +18,30 @@ void Menu_Logic_Operation_SET_Backlight(Menu_Key_en_t enKeyType);
void Menu_Logic_Operation_SET_Sound(Menu_Key_en_t enKeyType);
void Menu_Logic_Operation_SET_TimeHour(Menu_Key_en_t enKeyType);
void Menu_Logic_Operation_SET_TimeMin(Menu_Key_en_t enKeyType);
void Menu_Logic_Operation_SET_LDWS(Menu_Key_en_t enKeyType);
void Menu_u8Data_Updata_Process(uint8_t updateDir , uint8_t datMax, uint8_t datMin, uint8_t datStep, uint8_t *dat);
void Menu_u16Data_Updata_Process(uint8_t updateDir , uint16_t datMax, uint8_t datMin, uint16_t datStep, uint16_t *dat);
void Menu_User_Init(PoMa_Reset_en_t PowerType);
extern uint16_t LocalMinOfs_TBOX;
extern uint16_t LocalHrOfs_TBOX;
RTITimingStruct RealTimeClock;
//Menu_Error_Information_en_t aaa;
void Menu_User_Init(PoMa_Reset_en_t PowerType)
{
Menu_Init_st_t Menu_Init_st;
Menu_Init_st.enMenuBranchLen = MENU_BRANCH_MAX;
Menu_Init_st.enMenuInterfaceLen = MENU_INTERFACE_MAX;
Menu_Init_st.enMenuItemLen = MENU_ITEM_MAX;
Menu_Init_st.uintMenuConfig = 0x0001;
Menu_Init_st.uintMenuCursorMemoryDepth = 0;
if(PowerType == POMA_RESET_KL30)
{
Menu_Init((uint8_t *)u8MenuRamData, (Menu_Item_Attribute_st_t *)stMenuItemAttribute, (Menu_Init_st_t *)&Menu_Init_st);
Menu_Change_Branch_To_Item(MENU_BRANCH_ECU, MENU_ITEM_ECU_TRIP);
//aaa = Menu_Attribute_Error_Check((uint8_t *) u8MenuRamData,(Menu_Item_Attribute_st_t *) stMenuItemAttribute,(Menu_Init_st_t *)&Menu_Init_st);
}
else if(PowerType == POMA_RESET_WAKEUP)
{
......@@ -62,7 +63,14 @@ void Menu_Hide_Service(void)
{
Menu_Item_Exist_Condition_Set(MENU_ITEM_ECU_TPMS, 0);
}
if(Get_NodeConfig_LWDS() == 1)
{
Menu_Item_Exist_Condition_Set(MENU_ITEM_SET_Ldws, 1);
}
else
{
Menu_Item_Exist_Condition_Set(MENU_ITEM_SET_Ldws, 0);
}
if((CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can18FF9CF1_Msg_Count) == CAN_SIG_LOST)||(CanReceive.Can_18FF9CF1 != 1))
{
Menu_Item_Exist_Condition_Set(MENU_ITEM_SET_TimeHour, 1);
......@@ -106,10 +114,11 @@ const Menu_Item_Attribute_st_t stMenuItemAttribute[MENU_ITEM_MAX] =
/*MENU_ITEM_ECU_MAINTAIN */ {MENU_BRANCH_ECU, MENU_INTF_ECU, MENU_ITEM_MAX, 5U, 7U, 1U, 5U, 7U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_ECU_MAINTAIN},
/*MENU_ITEM_ECU_TPMS */ {MENU_BRANCH_ECU, MENU_INTF_ECU, MENU_ITEM_MAX, 6U, 7U, 1U, 6U, 7U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_ECU_TPMS},
/*MENU_ITEM_SET_Backlight */ {MENU_BRANCH_SET, MENU_INTF_SET, MENU_ITEM_MAX, 0U, 4U, 1U, 0U, 4U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_SET_Backlight},
/*MENU_ITEM_SET_Sound */ {MENU_BRANCH_SET, MENU_INTF_SET, MENU_ITEM_MAX, 1U, 4U, 1U, 1U, 4U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_SET_Sound},
/*MENU_ITEM_SET_TimeHour */ {MENU_BRANCH_SET, MENU_INTF_SET, MENU_ITEM_MAX, 2U, 4U, 1U, 2U, 4U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_SET_TimeHour},
/*MENU_ITEM_SET_TimeMin */ {MENU_BRANCH_SET, MENU_INTF_SET, MENU_ITEM_MAX, 3U, 4U, 1U, 3U, 4U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_SET_TimeMin},
/*MENU_ITEM_SET_Backlight */ {MENU_BRANCH_SET, MENU_INTF_SET, MENU_ITEM_MAX, 0U, 5U, 1U, 0U, 5U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_SET_Backlight},
/*MENU_ITEM_SET_Sound */ {MENU_BRANCH_SET, MENU_INTF_SET, MENU_ITEM_MAX, 1U, 5U, 1U, 1U, 5U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_SET_Sound},
/*MENU_ITEM_SET_TimeHour */ {MENU_BRANCH_SET, MENU_INTF_SET, MENU_ITEM_MAX, 2U, 5U, 1U, 2U, 5U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_SET_TimeHour},
/*MENU_ITEM_SET_TimeMin */ {MENU_BRANCH_SET, MENU_INTF_SET, MENU_ITEM_MAX, 3U, 5U, 1U, 3U, 5U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_SET_TimeMin},
{MENU_BRANCH_SET, MENU_INTF_SET, MENU_ITEM_MAX, 4U, 5U, 1U, 4U, 5U, MENU_DIRECTION_LONGITUDINAL, 0XFFU, MENU_INTERFACE_MAX, MENU_JUMP_FIRST, 0xFFFF, MENU_JUMP_FIRST, MENU_INTERFACE_MAX, MENU_JUMP_FIRST,Menu_Logic_Operation_SET_LDWS},
};
void Menu_Logic_Operation_ECU_TRIP(Menu_Key_en_t enKeyType)
......@@ -337,10 +346,18 @@ void Menu_Logic_Operation_SET_Sound(Menu_Key_en_t enKeyType)
{
Menu_Change_Branch_To_Item(MENU_BRANCH_SET, MENU_ITEM_SET_TimeHour);
}
else
else
{
Menu_Change_Branch(MENU_BRANCH_ECU, MENU_CHANGE_HOLD);
if(Get_NodeConfig_LWDS() == 1)
{
Menu_Change_Branch_To_Item(MENU_BRANCH_SET, MENU_ITEM_SET_Ldws);
}
else
{
Menu_Change_Branch(MENU_BRANCH_ECU, MENU_CHANGE_HOLD);
}
}
}
else if (enKeyType == MENU_KEY_RIGHT_SHORT)
{
......@@ -402,36 +419,58 @@ void Menu_Logic_Operation_SET_TimeMin(Menu_Key_en_t enKeyType)
uint8_t datmax = 0u;
uint8_t datmin = 0u;
//if(Pop_Alarm_Get_Current() < POP_ALARM_MAX)
//{
// return;
//}
//else
//{
if(enKeyType == MENU_KEY_LEFT_SHORT)
if(enKeyType == MENU_KEY_LEFT_SHORT)
{
if(Get_NodeConfig_LWDS() == 1)
{
Menu_Change_Branch(MENU_BRANCH_ECU, MENU_CHANGE_HOLD);
RTC_HOUR = MenuData.Hour;
RTC_MINUTE = MenuData.Minute;
RTC_Set_Time((uint8_t*)&g_stRTCInformation);
Menu_Change_Branch_To_Item(MENU_BRANCH_SET, MENU_ITEM_SET_Ldws);
}
else if (enKeyType == MENU_KEY_RIGHT_SHORT)
else
{
updataDir = 1;
datmax = 59u;
datmin = 0u;
Menu_u8Data_Updata_Process(updataDir, datmax, datmin, 1u, (uint8_t*)&(MenuData.Minute));
Menu_Change_Branch(MENU_BRANCH_ECU, MENU_CHANGE_HOLD);
}
else
RTC_HOUR = MenuData.Hour;
RTC_MINUTE = MenuData.Minute;
RTC_Set_Time((uint8_t*)&g_stRTCInformation);
}
else if (enKeyType == MENU_KEY_RIGHT_SHORT)
{
updataDir = 1;
datmax = 59u;
datmin = 0u;
Menu_u8Data_Updata_Process(updataDir, datmax, datmin, 1u, (uint8_t*)&(MenuData.Minute));
}
else
{
if(enKeyType == MENU_KEY_TIMEOUT)
{
if(enKeyType == MENU_KEY_TIMEOUT)
{
Menu_Change_Branch(MENU_BRANCH_ECU, MENU_CHANGE_HOLD);
MenuData.Hour = RTC_HOUR;
MenuData.Minute = RTC_MINUTE;
}
Menu_Change_Branch(MENU_BRANCH_ECU, MENU_CHANGE_HOLD);
MenuData.Hour = RTC_HOUR;
MenuData.Minute = RTC_MINUTE;
}
//}
}
}
void Menu_Logic_Operation_SET_LDWS(Menu_Key_en_t enKeyType)
{
uint8_t updataDir = 0u;
uint8_t datmax = 0u;
uint8_t datmin = 0u;
if(enKeyType == MENU_KEY_LEFT_SHORT)
{
Menu_Change_Branch(MENU_BRANCH_ECU, MENU_CHANGE_HOLD);
}
else if (enKeyType == MENU_KEY_RIGHT_SHORT)
{
updataDir = 1;
datmax = 2u;
datmin = 1u;
Menu_u8Data_Updata_Process(updataDir, datmax, datmin, 1u, (uint8_t*)&(MenuData.Ldws));//1关,2开
}
else
{
;
}
}
......
source/Appliciation/Popup_Alarm_Handle.c
View file @ 7373087e
......@@ -1177,7 +1177,7 @@ Pop_uint8_t u8PopAlarmLDWS_L = 0;
Pop_uint8_t u8PopAlarmLDWS_R = 0;
void Popups_Alarm_Trigger_LDWS(void)
{
if (( SYS_OPR_STAT_IGN_ON )&&(Get_NodeConfig_LWDS() == 1))
if (( SYS_OPR_STAT_IGN_ON )&&(Get_NodeConfig_LWDS() == 1)&&(MenuData.Ldws == 2))
{
if(( CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can18FE5BE8_Msg_Count) == CAN_SIG_NORMAL )&&
( CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can10F007E8_Msg_Count) == CAN_SIG_NORMAL )&&
......
source/Appliciation/Sound_Alarm_handle.c
View file @ 7373087e
......@@ -19,7 +19,7 @@ void Sound_Alarm_Trigger_DOOR(void)
void Sound_Alarm_Trigger_LDWS(void)
{
if (( SYS_OPR_STAT_IGN_ON )&&(Get_NodeConfig_LWDS() == 1))
if (( SYS_OPR_STAT_IGN_ON )&&(Get_NodeConfig_LWDS() == 1)&&(MenuData.Ldws == 2))
{
if(( u8PopAlarmLDWS_L == 0)&&(u8PopAlarmLDWS_R == 0))
{
......
source/Appliciation/Telltales_user.c
View file @ 7373087e
......@@ -1823,29 +1823,37 @@ Tellib_uint16_t LED_LDWS_Lamp_Judge(void)
void LED_LDWS_Lamp_Exec(Tellib_uint16_t led_status)
{
if (led_status == 1u)
{
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_Y].chip, LED_Attr[LED_LDWS_Y].channel, LED_Attr[LED_LDWS_Y].brightness);
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_G].chip, LED_Attr[LED_LDWS_G].channel, 0);
}
else if (led_status == 2u)
if(MenuData.Ldws == 2)
{
if(g_LED.LedBlink_2HZ)
if (led_status == 1u)
{
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_Y].chip, LED_Attr[LED_LDWS_Y].channel, LED_Attr[LED_LDWS_Y].brightness);
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_G].chip, LED_Attr[LED_LDWS_G].channel, 0);
}
else
else if (led_status == 2u)
{
if(g_LED.LedBlink_2HZ)
{
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_Y].chip, LED_Attr[LED_LDWS_Y].channel, LED_Attr[LED_LDWS_Y].brightness);
}
else
{
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_Y].chip, LED_Attr[LED_LDWS_Y].channel, 0);
}
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_G].chip, LED_Attr[LED_LDWS_G].channel, 0);
}
else if (led_status == 3u)
{
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_G].chip, LED_Attr[LED_LDWS_G].channel, LED_Attr[LED_LDWS_G].brightness);
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_Y].chip, LED_Attr[LED_LDWS_Y].channel, 0);
}
else
{
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_G].chip, LED_Attr[LED_LDWS_G].channel, 0);
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_Y].chip, LED_Attr[LED_LDWS_Y].channel, 0);
}
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_G].chip, LED_Attr[LED_LDWS_G].channel, 0);
}
else if (led_status == 3u)
{
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_G].chip, LED_Attr[LED_LDWS_G].channel, LED_Attr[LED_LDWS_G].brightness);
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_Y].chip, LED_Attr[LED_LDWS_Y].channel, 0);
}
else
else
{
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_G].chip, LED_Attr[LED_LDWS_G].channel, 0);
LED_Driver_Channel_Set(LED_Attr[LED_LDWS_Y].chip, LED_Attr[LED_LDWS_Y].channel, 0);
......
source/UDS/EOL_Para.c
View file @ 7373087e
......@@ -7,9 +7,9 @@ _EOL_F010 EOL_F010;
void EOL_InitVal(void)
{
//uint8_t enResult = 0u;
EOL_F010.F010_Byte[0] = 0x10;
EOL_F010.F010_Byte[0] = 0x10;//tpms
EOL_F010.F010_Byte[1] = 0x00;
EOL_F010.F010_Byte[2] = 0x40;
EOL_F010.F010_Byte[2] = 0x44;//gear_esc
EOL_F010.F010_Byte[3] = 0x04;
EOL_F010.F010_Byte[4] = 0x00;
EOL_F010.F010_Byte[5] = 0x00;
......
utility/程序释放/ns216-2024-1-18/NS216_2024-1-18-15-30_SV1.0_HV1.0_BOOTSW1.5_ALL.srec 0 → 100644
View file @ 7373087e
This source diff could not be displayed because it is too large. You can view the blob instead.
utility/程序释放/ns216-2024-1-18/NS216_2024-1-18-15-30_SV1.0_HV1.0_BOOTSW1.5_APP.srec 0 → 100644
View file @ 7373087e
This source diff could not be displayed because it is too large. You can view the blob instead.
utility/程序释放/ns216-2024-1-18/依维柯程序说明.txt 0 → 100644
View file @ 7373087e
NS216_2024-1-18-15-30_SV1.0_HV1.0_BOOTSW1.5_ALL是生产用的程序
NS216_2024-1-18-15-30_SV1.0_HV1.0_BOOTSW1.5_APP是诊断工具升级的程序
\ No newline at end of file
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