Skip to content

V
VC66_7C
Commit 0c17d9cd authored by hu's avatar hu
Browse files
Options

调整OFF档唤醒功能

parent 54438576
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 96 deletions
source/Application/APP/Key/Key_user.c
View file @ 0c17d9cd
......@@ -383,6 +383,20 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
/*主界面 一级菜单 二级菜单那*/
else if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
/*系统演示模式*/
if ((bCurMenuIDX == _MN_DSP_LEVEL2MENU_6) && (K_Line_Set.K_Line_LID27 != 0x01u) && (K_Line_Set.K_Line_LID28 != 0x01u))
{
NextMenu(_MN_DSP_LEVEL2MENU_4);
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_UP);
}
}
else
{
;/*Do Nothing!*/
......@@ -762,6 +776,20 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
/*主界面 一级菜单 二级菜单*/
else if (((bCurMenuIDX >= _MN_DSP_LEVEL1MENU_1) && (bCurMenuIDX <= _MN_DSP_LEVEL1MENU_6)) ||
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)))
{
/*系统演示模式*/
if ((bCurMenuIDX == _MN_DSP_LEVEL2MENU_4) && (K_Line_Set.K_Line_LID27 != 0x01u) && (K_Line_Set.K_Line_LID28 != 0x01u))
{
NextMenu(_MN_DSP_LEVEL2MENU_6);
}
else
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_DOWN);
}
}
else
{
;/*Do Nothing!*/
......
source/Application/APP/PowerManagement/PowerManagement.c
View file @ 0c17d9cd
......@@ -33,7 +33,7 @@ void Power_Management_Service ( void )
case m_IGN_Sleep_Init:
Power_Sleep_Init();
g_Power_St = m_IGN_Sleep;
break;
//break;
case m_IGN_Sleep:
g_Power_St = Power_Stay_Sleep();
break;
......
source/Application/APP/PowerManagement/PowerManagement_user.c
View file @ 0c17d9cd
......@@ -215,7 +215,6 @@ void Power_IG_OFF_Init(void)
Popup_Scheduler_OFF();
//Menu_Init_IG(0u);
GUI_Display_KL15_OFF_Init();
}
void Power_IG_ON_Init(void)
{
......@@ -294,7 +293,7 @@ Power_Status_t Power_Stay_OFF(void)
{
if ((u8Condition1 == COMMON_POWER_OFF ) && (u8Condition2 == COMMON_Valid))
{
if (PowerGetNMStatus() == POWER_NM_SLEEP)
if ((PowerGetNMStatus() == POWER_NM_SLEEP) && (LED_WAKEUP == LEVEL_LOW))
{
u8PowerSts = m_IGN_Sleep_Init;
}
......
source/Application/APP/PowerManagement/System_Monitor.c
View file @ 0c17d9cd
......@@ -5,20 +5,16 @@
#define Base_Vol 0u
#define ENTER_LOW_N_RANGE 6500U
#define EXIT_LOW_N_RANGE 7000U
#define ENTER_LOW_Y_RANGE 9000U
#define EXIT_LOW_Y_RANGE 9500U
#define EXIT_HIGH_Y_RANGE 32000U
#define ENTER_HIGH_Y_RANGE 32500U
#define EXIT_HIGH_N_RANGE 38500U
#define ENTER_HIGH_N_RANGE 39000U
#define EXIT_HIGH_N_RANGE 31000U
#define ENTER_HIGH_N_RANGE 33000U
#define Top_Vol 0xffffu
......@@ -37,31 +33,31 @@ static uint16_t t_FUN_KL30_Debounce;
static uint16_t t_FUN_KL15_Debounce;
static uint16_t FUNSysVol_Range[10u] =
{
Base_Vol,
ENTER_LOW_N_RANGE,
EXIT_LOW_N_RANGE,
ENTER_LOW_Y_RANGE,
EXIT_LOW_Y_RANGE,
EXIT_HIGH_Y_RANGE,
ENTER_HIGH_Y_RANGE,
EXIT_HIGH_N_RANGE,
ENTER_HIGH_N_RANGE,
Top_Vol,
{
Base_Vol,
ENTER_LOW_N_RANGE,
EXIT_LOW_N_RANGE,
ENTER_LOW_Y_RANGE,
EXIT_LOW_Y_RANGE,
EXIT_HIGH_Y_RANGE,
ENTER_HIGH_Y_RANGE,
EXIT_HIGH_N_RANGE,
ENTER_HIGH_N_RANGE,
Top_Vol,
};
static uint16_t NMSysVol_Range[10u] =
{
Base_Vol,
ENTER_LOW_N_RANGE,
EXIT_LOW_N_RANGE,
ENTER_LOW_Y_RANGE,
EXIT_LOW_Y_RANGE,
EXIT_HIGH_Y_RANGE,
ENTER_HIGH_Y_RANGE,
EXIT_HIGH_N_RANGE,
ENTER_HIGH_N_RANGE,
Top_Vol,
{
Base_Vol,
ENTER_LOW_N_RANGE,
EXIT_LOW_N_RANGE,
ENTER_LOW_Y_RANGE,
EXIT_LOW_Y_RANGE,
EXIT_HIGH_Y_RANGE,
ENTER_HIGH_Y_RANGE,
EXIT_HIGH_N_RANGE,
ENTER_HIGH_N_RANGE,
Top_Vol,
};
uint8_t Read_KL30_ConvertFinish(void)
......
source/Application/Alarm/Popups.c
View file @ 0c17d9cd
......@@ -265,7 +265,7 @@ void Popups_Polling(void)
variable_2 = Gui_Get_Voltmeter_DisplayMode(); /*当前电压格数*/
variable_3 = Get_Voltmeter_Valid();
if ((variable_1 == LINE_IN_LOGIC_VALID) || ((variable_2 < 4u) && (variable_3 == 1u)))
if ((variable_1 == 1u) || ((variable_2 < 4u) && (variable_3 == 1u)))
{
Popup_Request(POPUT4_ABNORMAL_CHARGE);
}
......@@ -288,18 +288,6 @@ void Popups_Polling(void)
Popup_Delete(POPUP4_OIL_PRESSURE);
}
/*13.--3--AMT初始化异常 DM1 SPN4220 Key On時*/
variable_4 = Get_ID_18FECA03_Sig_SPN();
if ((variable_4 == 4220u) && (E_Speed > 350u) && (K_Line_Set.K_Line_LID41 == 0x13u))
{
Popup_Request(POPUP4_AMT_INIT_EXCE);
}
else
{
Popup_Delete(POPUP4_AMT_INIT_EXCE);
}
/*14.--4--尿素品质异常（系统检测）*/
if (0)
{
......@@ -330,18 +318,6 @@ void Popups_Polling(void)
Popup_Delete(POPUP4_ADBLUE_SUPPLY);
}
/*17.--7--AMT初始化结束 DM1 SPN4021 Key On時*/
variable_4 = Get_ID_18FECA03_Sig_SPN();
if ((variable_4 == 4021u) && (E_Speed > 350u) && (K_Line_Set.K_Line_LID41 == 0x13u))
{
Popup_Request(POPUP4_START_ENG);
}
else
{
Popup_Delete(POPUP4_START_ENG);
}
/*18.--8--DPD自动再生*/
if (0)
{
......@@ -356,14 +332,36 @@ void Popups_Polling(void)
{
Popup_Clear(POPUT4_ABNORMAL_CHARGE);
Popup_Clear(POPUP4_OIL_PRESSURE);
Popup_Clear(POPUP4_AMT_INIT_EXCE);
Popup_Clear(POPUP4_ADBLUE_QUALITY);
Popup_Clear(POPUP4_ADBLUE_SPRAY);
Popup_Clear(POPUP4_ADBLUE_SUPPLY);
Popup_Clear(POPUP4_START_ENG);
Popup_Clear(POPUP4_DPD_AUTO);
}
/*13.--3--AMT初始化异常 DM1 SPN4220 Key On時*/
variable_4 = Get_ID_18FECA03_Sig_SPN();
if ((variable_4 == 4220u) && (E_Speed > 350u) && (K_Line_Set.K_Line_LID41 == 0x13u))
{
Popup_Request(POPUP4_AMT_INIT_EXCE);
}
else
{
Popup_Delete(POPUP4_AMT_INIT_EXCE);
}
/*17.--7--AMT初始化结束 DM1 SPN4021 Key On時*/
variable_4 = Get_ID_18FECA03_Sig_SPN();
if ((variable_4 == 4021u) && (E_Speed > 350u) && (K_Line_Set.K_Line_LID41 == 0x13u))
{
Popup_Request(POPUP4_START_ENG);
}
else
{
Popup_Delete(POPUP4_START_ENG);
}
/*----第五组---------------------------------------------------------------------*/
/*19.--1--过热（过热，请在安全的场所停车）有车速 LID $43 :0x82*/
variable_1 = Coolant_Get_Valid();
......@@ -1116,7 +1114,7 @@ void Popups_Sound_Playing(uint8_t PopupSnd)
* Return : None
* onther : None
--------------------------------------------------------------------------*/
uint16_t Sound_test = 0;
//uint16_t Sound_test = 0;
void Popup_Alone_Sound_Server(void)
{
COMMON_PowerStatus_t u8IG_st;
......@@ -1147,7 +1145,6 @@ void Popup_Alone_Sound_Server(void)
{
if (u8IG_st == COMMON_POWER_ON)
{
#if 0
/*00 忘拔钥匙*/
Sound_Delete(SND_Key_Notremoved);
......@@ -1254,30 +1251,30 @@ void Popup_Alone_Sound_Server(void)
Sound_Delete(SND_BackUP_SPEED);
}
/**/
/*11 DS 警报 */
if (0)
{
Sound_Request(SND_DS_SPEED, 1u); /*11 DS 警报 */
Sound_Request(SND_DS_SPEED, 1u);
}
else
{
Sound_Delete(SND_DS_SPEED);
}
/**/
/*12 ROWS 警报 */
if (0)
{
Sound_Request(SND_ROWS_SPEED, 1u); /*12 ROWS 警报 */
Sound_Request(SND_ROWS_SPEED, 1u);
}
else
{
Sound_Delete(SND_ROWS_SPEED);
}
/**/
/*13 Roll 警报 */
if (0)
{
Sound_Request(SND_Roll_SPEED, 1u); /*13 Roll 警报 */
Sound_Request(SND_Roll_SPEED, 1u);
}
else
{
......@@ -1344,20 +1341,20 @@ void Popup_Alone_Sound_Server(void)
Sound_Delete(SND_DPD_SPEED4);
}
/**/
/*16 NEES */
if (0)
{
Sound_Request(SND_NEES, 1u); /*16 NEES */
Sound_Request(SND_NEES, 1u);
}
else
{
Sound_Delete(SND_NEES);
}
/**/
/*17 eco stop */
if (0)
{
Sound_Request(SND_ECO_STOP, 1u); /*17 eco stop */
Sound_Request(SND_ECO_STOP, 1u);
}
else
{
......@@ -1416,20 +1413,20 @@ void Popup_Alone_Sound_Server(void)
{
Sound_Delete(SND_Fuel_Saving);
}
#endif
/*音源测试程序*/
if (Sound_test & 0x001) Sound_Request ( SND_Key_Notremoved, 1 ); else Sound_Delete( SND_Key_Notremoved );
if (Sound_test & 0x002) Sound_Request ( SND_Braking, 1 ); else Sound_Delete( SND_Braking );
if (Sound_test & 0x004) Sound_Request ( SND_Air_Brake, 1 ); else Sound_Delete( SND_Air_Brake );
if (Sound_test & 0x008) Sound_Request ( SND_BRAKE_LOCK, 1 ); else Sound_Delete( SND_BRAKE_LOCK );
if (Sound_test & 0x010) Sound_Request ( SND_Parking_Brake, 1 ); else Sound_Delete( SND_Parking_Brake );
if (Sound_test & 0x020) Sound_Request ( SND_Car_Dump_SPEED, 1 ); else Sound_Delete( SND_Car_Dump_SPEED );
if (Sound_test & 0x040) Sound_Request ( SND_Temp_High, 1 ); else Sound_Delete( SND_Temp_High );
if (Sound_test & 0x080) Sound_Request ( SND_Coolant_Low, 1 ); else Sound_Delete( SND_Coolant_Low );
if (Sound_test & 0x100) Sound_Request ( SND_Oil_pressure_Low, 1 ); else Sound_Delete( SND_Oil_pressure_Low );
if (Sound_test & 0x200) Sound_Request ( SND_ACC_AIR, 1 ); else Sound_Delete( SND_ACC_AIR );
if (Sound_test & 0x400) Sound_Request ( SND_BackUP_SPEED, 1 ); else Sound_Delete( SND_BackUP_SPEED );
if (Sound_test & 0x800) Sound_Request ( SND_DS_SPEED, 1 ); else Sound_Delete( SND_DS_SPEED );
//if (Sound_test & 0x001) Sound_Request ( SND_Key_Notremoved, 1 ); else Sound_Delete( SND_Key_Notremoved );
//if (Sound_test & 0x002) Sound_Request ( SND_Braking, 1 ); else Sound_Delete( SND_Braking );
//if (Sound_test & 0x004) Sound_Request ( SND_Air_Brake, 1 ); else Sound_Delete( SND_Air_Brake );
//if (Sound_test & 0x008) Sound_Request ( SND_BRAKE_LOCK, 1 ); else Sound_Delete( SND_BRAKE_LOCK );
//if (Sound_test & 0x010) Sound_Request ( SND_Parking_Brake, 1 ); else Sound_Delete( SND_Parking_Brake );
//if (Sound_test & 0x020) Sound_Request ( SND_Car_Dump_SPEED, 1 ); else Sound_Delete( SND_Car_Dump_SPEED );
//if (Sound_test & 0x040) Sound_Request ( SND_Temp_High, 1 ); else Sound_Delete( SND_Temp_High );
//if (Sound_test & 0x080) Sound_Request ( SND_Coolant_Low, 1 ); else Sound_Delete( SND_Coolant_Low );
//if (Sound_test & 0x100) Sound_Request ( SND_Oil_pressure_Low, 1 ); else Sound_Delete( SND_Oil_pressure_Low );
//if (Sound_test & 0x200) Sound_Request ( SND_ACC_AIR, 1 ); else Sound_Delete( SND_ACC_AIR );
//if (Sound_test & 0x400) Sound_Request ( SND_BackUP_SPEED, 1 ); else Sound_Delete( SND_BackUP_SPEED );
//if (Sound_test & 0x800) Sound_Request ( SND_DS_SPEED, 1 ); else Sound_Delete( SND_DS_SPEED );
//if (CD4051_COM7_X0_IN == 0u) Sound_Request ( SND_Key_Notremoved, 1 ); else Sound_Delete( SND_Key_Notremoved );/*B15 = 0*/
//if (CD4051_COM7_X1_IN == 1u) Sound_Request ( SND_Braking, 1 ); else Sound_Delete( SND_Braking );/*B16 = 1*/
//if (CD4051_COM7_X2_IN == 1u) Sound_Request ( SND_Air_Brake, 1 ); else Sound_Delete( SND_Air_Brake );/*B17 = 1*/
......
source/Application/CAN_APP_NM/AutoSarNM/None_NM.c
View file @ 0c17d9cd
......@@ -28,7 +28,7 @@ void None_NM_Service(void)
}
else
{
if (NM_Idle_Timer <= 1600000ul)
if (NM_Idle_Timer <= 1600000ul) /*休眠唤醒*/
{
NM_Idle_Timer++;
}
......@@ -53,5 +53,5 @@ void None_NM_Request(void)
}
void None_NM_Release(void)
{
}
\ No newline at end of file
source/Driver/CD4051/CD4051.h
View file @ 0c17d9cd
......@@ -15,8 +15,8 @@
#define CD4051B_InputGOIO_Com6 CD4051A_COM6_MCU_IN
#define CD4051B_InputGOIO_Com7 CD4051A_COM7_MCU_IN
#define CD4051B_DEBOUNCE_High_TIME 20u
#define CD4051B_DEBOUNCE_Low_TIME 20u
#define CD4051B_DEBOUNCE_High_TIME 100u
#define CD4051B_DEBOUNCE_Low_TIME 100u
#define CD4051B_DEBOUNCE_High_CNT CD4051B_DEBOUNCE_High_TIME / 20u
#define CD4051B_DEBOUNCE_Low_CNT CD4051B_DEBOUNCE_Low_TIME / 20u
/*通道枚举*/
......
source/Driver/Clock/Clock.c
View file @ 0c17d9cd
......@@ -13,13 +13,13 @@
extern uint32_t TestBackupRam;
#define CLOCK_PROTECTED_WRITE(preg, pstatus, reg, value) \
do \
{ \
(preg) = 0xA5U; \
(reg) = (value); \
(reg) = ~(value); \
(reg) = (value); \
} while ((pstatus) == 1U)
do \
{ \
(preg) = 0xA5U; \
(reg) = (value); \
(reg) = ~(value); \
(reg) = (value); \
} while ((pstatus) == 1U)
static const r_dev_ClkGenConfig_t g_stClockGenCfg =
{
......@@ -224,6 +224,7 @@ void Sys_Enter_Sleep_Mode(void)
/*---------------------------------------------*/
GPIO_Wakeup_PIN_Set(GPIO_WAKEUP_PIN_P0_5, GPIO_WAKEUP_FALLING_EDGE); /*CAN唤醒 ----20220106----*/
GPIO_Wakeup_PIN_Set(GPIO_WAKEUP_PIN_P0_0, GPIO_WAKEUP_HIGH_LEVEL); /*15电唤醒 ----20220106----*/
GPIO_Wakeup_PIN_Set(GPIO_WAKEUP_PIN_P0_7, GPIO_WAKEUP_HIGH_LEVEL); /*硬线唤醒 ----20220314----*/
/*----------------------------------------------*/
SYSWUFMSK0 &= 0x7FFFEU;
......
source/Driver/Graphic/han00002ce20.h
View file @ 0c17d9cd
......@@ -4,7 +4,7 @@ static const HanSansCNFontPos_t Hansans00002ce20[] =
{
//{charid, xpos, ypos, width, height, xoffset, yoffset, xadvance}
{ 0 , 3995 , 552 , 4 , 22 , 0 , 0 , 4 },
#if 0
#if 1
{ 1 , 3995 , 23 , 4 , 22 , 0 , 0 , 4 },
{ 2 , 3995 , 805 , 4 , 22 , 0 , 0 , 4 },
{ 3 , 3995 , 759 , 4 , 22 , 0 , 0 , 4 },
source/System/tasks.c
View file @ 0c17d9cd
......@@ -146,7 +146,6 @@ void Sys_Run_Mode_10ms_Tasks(void)
loc_Display_Service();
Data_Mileage_Write_EEPROM();
Line_In_Debounce_Service();
Popup_Alone_Sound_Server();
Telltales_Left_Right_Management_Service();
if (MenuFlag.Menu_Popup_Flag == 4u)
......@@ -232,6 +231,7 @@ void Sys_Run_Mode_100ms_Tasks(void)
// Menu_Get_Battery_Sts_Exist();
Popups_Management_Service();
Popup_Scheduling_Service();
Popup_Alone_Sound_Server();
/*保养通知数据计算*/
Common_EOL_User_Server();
......
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