Skip to content

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

增加声音提示部分信息，增加背光调节部分信息、显示;调整15电唤醒模式

parent 3ba2e1d3
Hide whitespace changes
Inline Side-by-side
Showing with 376 additions and 203 deletions
source/Application/APP/BackLight/BGLInterface.c
View file @ c0d5bb03
......@@ -14,20 +14,21 @@ uint16_t CurLcdBackLightCycle;
*/
const uint16_t BackLightValue_TFT_Default[BL_TYPE_TOTAL][BL_LV_TOTAL] =
{
{50, 113, 177, 240, 303, 368, 430, 493, 557, 620, 683, 747, 810, 873, 937, 1000},
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{3, 8, 15, 23, 43, 68, 98, 130, 170, 212, 267, 323, 385, 450, 523, 600},
{
/*0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15*/
{50, 113, 177, 240, 303, 368, 430, 493, 557, 620, 683, 747, 810, 873, 937, 1000},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 3, 8, 15, 23, 43, 68, 98, 130, 170, 212, 267, 323, 385, 450, 523, 600},
};
/*¡°BackLightValue_DIAL¡± corresponds to ¡°Pointer¡±*/
const uint16_t BackLightValue_DIAL_Default[BL_TYPE_TOTAL][BL_LV_TOTAL] =
{
{50, 113, 177, 240, 303, 368, 430, 493, 557, 620, 683, 747, 810, 873, 937, 1000},
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{3, 8, 15, 23, 43, 68, 98, 130, 170, 212, 267, 323, 385, 450, 523, 600},
{
/*0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15*/
{50, 113, 177, 240, 303, 368, 430, 493, 557, 620, 683, 747, 810, 873, 937, 1000},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 3, 8, 15, 23, 43, 68, 98, 130, 170, 212, 267, 323, 385, 450, 523, 600},
};
......@@ -37,20 +38,27 @@ const uint16_t BackLightValue_DIAL_Default[BL_TYPE_TOTAL][BL_LV_TOTAL] =
背光等级 不同仪表配置不同
*/
const uint16_t BackLightValue_R_Default[BL_THEME_TOTAL][BL_TYPE_TOTAL][BL_LV_TOTAL] =
{
{
{20, 70, 140, 210, 280, 350, 400, 470, 540, 610, 680, 680},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
},
{
{10, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 100},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
},
{
{{20, 70, 140, 210, 280, 350, 400, 470, 540, 610, 680, 680},
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
{{10, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 100},
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}},
{{5, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 50},
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}};
{5, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 50},
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
}
};
const uint8_t PwmChannel[BACKLIGHT_TOTAL] =
/* TFT 表盘 */
{TIMERB_2_CH1, TIMERB_0_CH15};
{TIMERB_2_CH1, TIMERB_0_CH15};
/**@brief Back Ground Light Config function
* @author TYW
* @param[in] BGLType 背光类型
......
source/Application/APP/Key/Key_user.c
View file @ c0d5bb03
......@@ -788,25 +788,26 @@ void Key_Operation_Return(Key_Event_en_t enKeyEvent)
{
if (
(bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_3) || /*语言设定*/
(bCurMenuIDX == _MN_DSP_LEVEL3_7_MENU_1) || /*亮度调节*/
((bCurMenuIDX >= _MN_DSP_LEVEL3_4_MENU_41) && (bCurMenuIDX <= _MN_DSP_LEVEL3_4_MENU_47)) /*省油设定子菜单*/
)
{
MenuFlag.Menu_Return = 0;
MenuFlag.Menu_Return = 0u;
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
}
else if (bCurMenuIDX == _MN_DSP_LEVEL3_4_MENU_5) /*胎压设置界面返回操作*/
{
if (User_set_Num.User_TpmsStatus != 2) /*不是正在匹配状态*/
if (User_set_Num.User_TpmsStatus != 2u) /*不是正在匹配状态*/
{
NextMenu(MenuOptTab[bCurMenuIDX].VK_IDX_EXIT);
}
else
{
User_set_Num.User_TpmsStatus = 1; /*退出匹配界面*/
if (User_set_Num.User_Temp_Return == 0)
User_set_Num.User_TpmsStatus = 1u; /*退出匹配界面*/
if (User_set_Num.User_Temp_Return == 0u)
{
User_set_Num.User_Temp_Return = 1; /*取消配对标记*/
User_set_Num.User_TpmsSend = 3; /*报文外发状态*/
User_set_Num.User_Temp_Return = 1u; /*取消配对标记*/
User_set_Num.User_TpmsSend = 3u; /*报文外发状态*/
}
else
{
......
source/Application/Graphic/GUI/GUI.c
View file @ c0d5bb03
......@@ -2814,6 +2814,28 @@ void GUI_BG_UserSetMenu3_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSetMenu8_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_UserSetMenu8_Display(uint8_t Mode)
{
uint8_t Flag = 0;
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_UserSetMenu4_Display
* Description :
......@@ -5700,6 +5722,29 @@ void GUI_BG_UserSet_SYSD_Parking_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_User_Light_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_User_Light_Display(uint8_t Mode)
{
uint32_t User_Value = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
/*--------------------------------------------------------------------------
* Function Name : GUI_BG_Enter_Return_Display
* Description :
......
source/Application/Graphic/GUI/GUI.h
View file @ c0d5bb03
......@@ -361,6 +361,7 @@ void GUI_BG_UserSetMenu4_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu5_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu6_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu7_Display(uint8_t Mode); /**/
void GUI_BG_UserSetMenu8_Display(uint8_t Mode); /**/
void GUI_BG_Demo_Menu_Display(uint8_t Mode); /*二级菜单--系统演示模式*/
void GUI_BG_DemoMenu1_Display(uint8_t Mode); /**/
void GUI_BG_DemoMenu2_Display(uint8_t Mode); /**/
......@@ -406,6 +407,7 @@ void GUI_BG_UserSet_SYSD_JADD_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_JSUB_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_IDLING_Display(uint8_t Mode); /**/
void GUI_BG_UserSet_SYSD_Parking_Display(uint8_t Mode); /**/
void GUI_BG_User_Light_Display(uint8_t Mode); /**/
void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
......
source/Application/Graphic/Menu/Menu.h
View file @ c0d5bb03
......@@ -54,6 +54,7 @@ typedef enum
_MN_DSP_LEVEL2_4_MENU_1, /* 26 设定日期*/
_MN_DSP_LEVEL2_4_MENU_2, /* 27 设定时间*/
_MN_DSP_LEVEL2_4_MENU_7, /* 亮度调节*/
_MN_DSP_LEVEL2_4_MENU_3, /* 28 语言设定*/
_MN_DSP_LEVEL2_4_MENU_4, /* 29 设定节油驾驶建议*/
_MN_DSP_LEVEL2_4_MENU_5, /* 30 TPMS轮胎设定*/
......@@ -96,6 +97,7 @@ typedef enum
_MN_DSP_LEVEL3_4_MENU_46, /* 61 长时间怠速设定*/
_MN_DSP_LEVEL3_4_MENU_47, /* 62 辅助驻车解除设定*/
_MN_DSP_LEVEL3_4_MENU_5, /* 63 轮胎匹配画面*/
_MN_DSP_LEVEL3_7_MENU_1, /* 亮度调节*/
/*四级菜单*/
_MN_DSP_LEVEL4_4_MENU_1, /* 64 速度设定-高速路*/
......@@ -269,6 +271,10 @@ EXTERN_MEU_PROCESS void Level2_4Menu_2Enter(void);
EXTERN_MEU_PROCESS void Level2_4Menu_2Do(void);
EXTERN_MEU_PROCESS void Level2_4Menu_2Exit(void);
EXTERN_MEU_PROCESS void Level2_4Menu_7Enter(void);
EXTERN_MEU_PROCESS void Level2_4Menu_7Do(void);
EXTERN_MEU_PROCESS void Level2_4Menu_7Exit(void);
EXTERN_MEU_PROCESS void Level2_4Menu_3Enter(void);
EXTERN_MEU_PROCESS void Level2_4Menu_3Do(void);
EXTERN_MEU_PROCESS void Level2_4Menu_3Exit(void);
......@@ -421,6 +427,10 @@ EXTERN_MEU_PROCESS void Level3_4Menu_5Enter(void);
EXTERN_MEU_PROCESS void Level3_4Menu_5Do(void);
EXTERN_MEU_PROCESS void Level3_4Menu_5Exit(void);
EXTERN_MEU_PROCESS void Level3_4Menu_7Enter(void);
EXTERN_MEU_PROCESS void Level3_4Menu_7Do(void);
EXTERN_MEU_PROCESS void Level3_4Menu_7Exit(void);
EXTERN_MEU_PROCESS void Level3_5Menu_1Enter(void);
EXTERN_MEU_PROCESS void Level3_5Menu_1Do(void);
EXTERN_MEU_PROCESS void Level3_5Menu_1Exit(void);
......
source/Application/Graphic/Menu/Menu_user.c
View file @ c0d5bb03
......@@ -55,8 +55,9 @@ const _MenuOptTab MenuOptTab[] =
/*25*/{ _MN_DSP_LEVEL3_3_MENU_7, _MN_DSP_LEVEL2_3_MENU_6, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_3, Level2_3Menu_7Enter, Level2_3Menu_7Do, Level2_3Menu_7Exit},
/*26*/{ _MN_DSP_LEVEL3_4_MENU_11, _MN_IDX_NULL, _MN_DSP_LEVEL2_4_MENU_2, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_1Enter, Level2_4Menu_1Do, Level2_4Menu_1Exit},
/*27*/{ _MN_DSP_LEVEL3_4_MENU_21, _MN_DSP_LEVEL2_4_MENU_1, _MN_DSP_LEVEL2_4_MENU_3, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_2Enter, Level2_4Menu_2Do, Level2_4Menu_2Exit},
/*28*/{ _MN_DSP_LEVEL3_4_MENU_3, _MN_DSP_LEVEL2_4_MENU_2, _MN_DSP_LEVEL2_4_MENU_4, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_3Enter, Level2_4Menu_3Do, Level2_4Menu_3Exit},
/*27*/{ _MN_DSP_LEVEL3_4_MENU_21, _MN_DSP_LEVEL2_4_MENU_1, _MN_DSP_LEVEL2_4_MENU_7, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_2Enter, Level2_4Menu_2Do, Level2_4Menu_2Exit},
/* */{ _MN_DSP_LEVEL3_7_MENU_1, _MN_DSP_LEVEL2_4_MENU_2, _MN_DSP_LEVEL2_4_MENU_3, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_7Enter, Level2_4Menu_7Do, Level2_4Menu_7Exit},
/*28*/{ _MN_DSP_LEVEL3_4_MENU_3, _MN_DSP_LEVEL2_4_MENU_7, _MN_DSP_LEVEL2_4_MENU_4, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_3Enter, Level2_4Menu_3Do, Level2_4Menu_3Exit},
/*29*/{ _MN_DSP_LEVEL3_4_MENU_41, _MN_DSP_LEVEL2_4_MENU_3, _MN_DSP_LEVEL2_4_MENU_5, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_4Enter, Level2_4Menu_4Do, Level2_4Menu_4Exit},
/*30*/{ _MN_DSP_LEVEL3_4_MENU_5, _MN_DSP_LEVEL2_4_MENU_4, _MN_DSP_LEVEL2_4_MENU_6, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_5Enter, Level2_4Menu_5Do, Level2_4Menu_5Exit},
/*31*/{ _MN_IDX_NULL , _MN_DSP_LEVEL2_4_MENU_5, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_6Enter, Level2_4Menu_6Do, Level2_4Menu_6Exit},
......@@ -99,6 +100,7 @@ const _MenuOptTab MenuOptTab[] =
/*62*/{ _MN_DSP_LEVEL4_4_MENU_7, _MN_DSP_LEVEL3_4_MENU_46, _MN_IDX_NULL, _MN_DSP_LEVEL2_4_MENU_4, Level3_4Menu_4Enter_7, Level3_4Menu_4Do_7, Level3_4Menu_4Exit_7},
/*63*/{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_4_MENU_5, Level3_4Menu_5Enter, Level3_4Menu_5Do, Level3_4Menu_5Exit},
/* */{ _MN_IDX_NULL, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL2_4_MENU_7, Level3_4Menu_7Enter, Level3_4Menu_7Do, Level3_4Menu_7Exit},
/*四级菜单*/
/*64*/{ _MN_DSP_LEVEL3_4_MENU_41, _MN_IDX_NULL, _MN_IDX_NULL, _MN_DSP_LEVEL3_4_MENU_41, Level4_4Menu_1Enter, Level4_4Menu_1Do, Level4_4Menu_1Exit},
......@@ -555,6 +557,18 @@ void Level2_4Menu_3Do(void)
void Level2_4Menu_3Exit(void)
{}
/*----二级菜单----用户设定----系列子菜单*/
/*亮度调节*/
void Level2_4Menu_7Enter(void)
{}
void Level2_4Menu_7Do(void)
{
GUI_OftenShow_Display();
GUI_BG_UserSet_Menu_Display(GUI_DISP_MODE_NORMAL);
GUI_BG_UserSetMenu8_Display(GUI_DISP_MODE_NORMAL);
}
void Level2_4Menu_7Exit(void)
{}
/*----二级菜单----用户设定----系列子菜单*/
/*设定节油驾驶建议*/
void Level2_4Menu_4Enter(void)
......@@ -1290,6 +1304,18 @@ void Level3_4Menu_5Do(void)
void Level3_4Menu_5Exit(void)
{}
/*----三级菜单----TPMS轮胎设定----系列子菜单*/
/*亮度调节设定*/
void Level3_4Menu_7Enter(void)
{}
void Level3_4Menu_7Do(void)
{
GUI_OftenShow_Display();
GUI_BG_User_Light_Display(GUI_DISP_MODE_NORMAL);
}
void Level3_4Menu_7Exit(void)
{}
/*----三级菜单----系统演示----系列子菜单*/
/*LDWS 警报演示*/
void Level3_5Menu_1Enter(void)
......
source/Application/Sound_Alarm/Sound_List.h
View file @ c0d5bb03
......@@ -11,11 +11,31 @@
******************************************************************************/
typedef enum SoundName
{
SND_Key_Notremoved = 0x00 , /*00 忘拔钥匙 */
SND_Braking , /*01 制动 */
SND_Air_Brake , /*02 制动气压 */
SND_BRAKE_LOCK , /*03 BRAKE LOCK */
SND_Parking_Brake , /*04 停车制动忘记复位 */
SND_Car_Dump_SPEED , /*05 车厢报警自卸蜂鸣器*/
SND_Temp_High , /*06 水温过热 */
SND_Coolant_Low , /*07 冷却水量 */
SND_Oil_pressure_Low, /*08 -(预留：油压) */
SND_ACC_AIR , /*09 ACC AIR */
SND_BackUP_SPEED , /*10 倒车警报 */
SND_DS_SPEED , /*11 DS 警报 */
SND_ROWS_SPEED , /*12 ROWS 警报 */
SND_Roll_SPEED , /*13 Roll 警报 */
SND_EVSC_SPEED , /*14 EVSC */
SND_DPD_SPEED , /*15 DPD 手动再生 */
SND_NEES , /*16 NEES */
SND_ECO_STOP , /*17 eco stop */
SND_Cyclone_High , /*18 气悬车高调整 */
SND_SEATBELT_SPEED , /*19 安全带 */
SND_Fuel_Saving , /*20 省油耗建议 */
SND_TICK , /*21 转向 */
SND_TOCK , /*22 转向 */
SND_TICK = 0x00, /*51转向 29 */
SND_TOCK, /*52转向 30 */
SND_INDEX_MAX,
SND_INDEX_MAX ,
} SoundName_en_t;
......@@ -48,11 +68,31 @@ static const SoundAttributeStruct SoundList[SND_INDEX_MAX] =
/*=====================================================================================
声音名称 | 音源 | 模式
-------------------------------------------------------------------------------------*/
{ /*51 SND_TICK, */ SND_SRC_TICK, SND_TYPE_NORMAL, },
{ /*52 SND_TOCK, */ SND_SRC_TOCK, SND_TYPE_NORMAL, },
{/*00 SND_Key_Notremoved */ SND_SRC_Key_Notremoved , SND_TYPE_NORMAL, },
{/*01 SND_Braking */ SND_SRC_Braking , SND_TYPE_NORMAL, },
{/*02 SND_Air_Brake */ SND_SRC_Air_Brake , SND_TYPE_NORMAL, },
{/*03 SND_BRAKE_LOCK */ SND_SRC_BRAKE_LOCK , SND_TYPE_NORMAL, },
{/*04 SND_Parking_Brake */ SND_SRC_Parking_Brake , SND_TYPE_NORMAL, },
{/*05 SND_Car_Dump_SPEED */ SND_SRC_Car_Dump_SPEED , SND_TYPE_NORMAL, },
{/*06 SND_Temp_High */ SND_SRC_Temp_High , SND_TYPE_NORMAL, },
{/*07 SND_Coolant_Low */ SND_SRC_Coolant_Low , SND_TYPE_NORMAL, },
{/*08 SND_Oil_pressure_Low*/ SND_SRC_Oil_pressure_Low , SND_TYPE_NORMAL, },
{/*09 SND_ACC_AIR */ SND_SRC_ACC_AIR , SND_TYPE_NORMAL, },
{/*10 SND_BackUP_SPEED */ SND_SRC_BackUP_SPEED , SND_TYPE_NORMAL, },
{/*11 SND_DS_SPEED */ SND_SRC_DS_SPEED , SND_TYPE_NORMAL, },
{/*12 SND_ROWS_SPEED */ SND_SRC_ROWS_SPEED , SND_TYPE_NORMAL, },
{/*13 SND_Roll_SPEED */ SND_SRC_Roll_SPEED , SND_TYPE_NORMAL, },
{/*14 SND_EVSC_SPEED */ SND_SRC_EVSC_SPEED , SND_TYPE_NORMAL, },
{/*15 SND_DPD_SPEED */ SND_SRC_DPD_SPEED , SND_TYPE_NORMAL, },
{/*16 SND_NEES */ SND_SRC_NEES , SND_TYPE_NORMAL, },
{/*17 SND_ECO_STOP */ SND_SRC_ECO_STOP , SND_TYPE_NORMAL, },
{/*18 SND_Cyclone_High */ SND_SRC_Cyclone_High , SND_TYPE_NORMAL, },
{/*19 SND_SEATBELT_SPEED */ SND_SRC_SEATBELT_SPEED , SND_TYPE_NORMAL, },
{/*20 SND_Fuel_Saving */ SND_SRC_Fuel_Saving , SND_TYPE_NORMAL, },
{/*21 SND_TICK */ SND_SRC_TICK , SND_TYPE_NORMAL, },
{/*22 SND_TOCK */ SND_SRC_TOCK , SND_TYPE_NORMAL, },
/*====================================================================================*/
};
#endif
\ No newline at end of file
source/Application/Sound_Alarm/Sound_Source.h
View file @ c0d5bb03
......@@ -14,9 +14,29 @@
******************************************************************************/
typedef enum
{
SND_SRC_TICK = 0x00u,/*51转向 29 */
SND_SRC_TOCK, /*52转向 30 */
SND_SRC_Key_Notremoved = 0x00 , /*00 忘拔钥匙 */
SND_SRC_Braking , /*01 制动 */
SND_SRC_Air_Brake , /*02 制动气压 */
SND_SRC_BRAKE_LOCK , /*03 BRAKE LOCK */
SND_SRC_Parking_Brake , /*04 停车制动忘记复位 */
SND_SRC_Car_Dump_SPEED , /*05 车厢报警自卸蜂鸣器*/
SND_SRC_Temp_High , /*06 水温过热 */
SND_SRC_Coolant_Low , /*07 冷却水量 */
SND_SRC_Oil_pressure_Low, /*08 -(预留：油压) */
SND_SRC_ACC_AIR , /*09 ACC AIR */
SND_SRC_BackUP_SPEED , /*10 倒车警报 */
SND_SRC_DS_SPEED , /*11 DS 警报 */
SND_SRC_ROWS_SPEED , /*12 ROWS 警报 */
SND_SRC_Roll_SPEED , /*13 Roll 警报 */
SND_SRC_EVSC_SPEED , /*14 EVSC */
SND_SRC_DPD_SPEED , /*15 DPD 手动再生 */
SND_SRC_NEES , /*16 NEES */
SND_SRC_ECO_STOP , /*17 eco stop */
SND_SRC_Cyclone_High , /*18 气悬车高调整 */
SND_SRC_SEATBELT_SPEED , /*19 安全带 */
SND_SRC_Fuel_Saving , /*20 省油耗建议 */
SND_SRC_TICK , /*21 转向 */
SND_SRC_TOCK , /*22 转向 */
SND_SRC_INDEX_MAX,
} SND_SRC_Index_en_t;
......@@ -58,8 +78,29 @@ static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] =
/*================================================================================================
音源名称 | 音源序号 | 优先级 | 循环次数 | 播放模式 | 周期(ms)
------------------------------------------------------------------------------------------------*/
{/* SND_SRC_TICK, */ BUZZER_Track_Index_Tic, 1, 1, SND_MODE_SINGLE, 100U, },
{/* SND_SRC_TOCK, */ BUZZER_Track_Index_Tac, 2, 1, SND_MODE_SINGLE, 100U, },
{/*00 SND_SRC_Key_Notremoved */ BUZZER_Track_Index_Tic, 1, 1, SND_MODE_SINGLE, 100U, },
{/*01 SND_SRC_Braking */ BUZZER_Track_Index_Tic, 2, 1, SND_MODE_SINGLE, 100U, },
{/*02 SND_SRC_Air_Brake */ BUZZER_Track_Index_Tic, 3, 1, SND_MODE_SINGLE, 100U, },
{/*03 SND_SRC_BRAKE_LOCK */ BUZZER_Track_Index_Tic, 4, 1, SND_MODE_SINGLE, 100U, },
{/*04 SND_SRC_Parking_Brake */ BUZZER_Track_Index_Tic, 5, 1, SND_MODE_SINGLE, 100U, },
{/*05 SND_SRC_Car_Dump_SPEED */ BUZZER_Track_Index_Tic, 6, 1, SND_MODE_SINGLE, 100U, },
{/*06 SND_SRC_Temp_High */ BUZZER_Track_Index_Tic, 7, 1, SND_MODE_SINGLE, 100U, },
{/*07 SND_SRC_Coolant_Low */ BUZZER_Track_Index_Tic, 8, 1, SND_MODE_SINGLE, 100U, },
{/*08 SND_SRC_Oil_pressure_Low*/ BUZZER_Track_Index_Tic, 9, 1, SND_MODE_SINGLE, 100U, },
{/*09 SND_SRC_ACC_AIR */ BUZZER_Track_Index_Tic, 10, 1, SND_MODE_SINGLE, 100U, },
{/*10 SND_SRC_BackUP_SPEED */ BUZZER_Track_Index_Tic, 11, 1, SND_MODE_SINGLE, 100U, },
{/*11 SND_SRC_DS_SPEED */ BUZZER_Track_Index_Tic, 12, 1, SND_MODE_SINGLE, 100U, },
{/*12 SND_SRC_ROWS_SPEED */ BUZZER_Track_Index_Tic, 13, 1, SND_MODE_SINGLE, 100U, },
{/*13 SND_SRC_Roll_SPEED */ BUZZER_Track_Index_Tic, 14, 1, SND_MODE_SINGLE, 100U, },
{/*14 SND_SRC_EVSC_SPEED */ BUZZER_Track_Index_Tic, 15, 1, SND_MODE_SINGLE, 100U, },
{/*15 SND_SRC_DPD_SPEED */ BUZZER_Track_Index_Tic, 16, 1, SND_MODE_SINGLE, 100U, },
{/*16 SND_SRC_NEES */ BUZZER_Track_Index_Tic, 17, 1, SND_MODE_SINGLE, 100U, },
{/*17 SND_SRC_ECO_STOP */ BUZZER_Track_Index_Tic, 18, 1, SND_MODE_SINGLE, 100U, },
{/*18 SND_SRC_Cyclone_High */ BUZZER_Track_Index_Tic, 19, 1, SND_MODE_SINGLE, 100U, },
{/*19 SND_SRC_SEATBELT_SPEED */ BUZZER_Track_Index_Tic, 20, 1, SND_MODE_SINGLE, 100U, },
{/*20 SND_SRC_Fuel_Saving */ BUZZER_Track_Index_Tic, 21, 1, SND_MODE_SINGLE, 100U, },
{/*21 SND_SRC_TICK */ BUZZER_Track_Index_Tic, 22, 1, SND_MODE_SINGLE, 100U, },
{/*22 SND_SRC_TOCK */ BUZZER_Track_Index_Tac, 23, 1, SND_MODE_SINGLE, 100U, },
/*==============================================================================================*/
};
......
source/Driver/Clock/Clock.c
View file @ c0d5bb03
......@@ -22,159 +22,159 @@ extern uint32_t TestBackupRam;
} while ((pstatus) == 1U)
static const r_dev_ClkGenConfig_t g_stClockGenCfg =
{
/*mainosc*/
{
/* FrequencyHz */ R_DEV_MOSC_FRQ_HZ,
/* StabiTimeNs */ 400000UL,
/* Gain */ 3U,
/* Running */ 1U,
/* StpReqMsk */ 1U,
},
/*subosc*/
{
/* FrequencyHz */ 32768UL,
/* Running */ 0U,
/* StpReqMsk */ 0U,
},
/* PLL */
{
/*PLL0*/
{
/* Mode */ R_DEV_PLL_SSCG,
/* DithMode */ R_DEV_PLL_DITH_DOWN,
/* DithRange */ 3U,
/* ModFreq */ 50UL,
/* FrequencyHz */ 480UL * 1000UL * 1000UL,
/* StabiTimeNs */ 40000UL,
/* StpReqMsk */ 0U,
},
/*PLL1*/
{
/* Mode */ R_DEV_PLL_ON,
/* DithMode */ R_DEV_PLL_DITH_FIXED,
/* DithRange */ 0U,
/* ModFreq */ 0UL,
/* FrequencyHz */ 480UL * 1000UL * 1000UL,
/* StabiTimeNs */ 40000UL,
/* StpReqMsk */ 0U,
},
/*PLL2*/
{
/* Mode */ R_DEV_PLL_OFF,
/* DithMode */ R_DEV_PLL_DITH_FIXED,
/* DithRange */ 0U,
/* ModFreq */ 0UL,
/* FrequencyHz */ 0UL,
/* StabiTimeNs */ 0UL,
/* StpReqMsk */ 0U,
},
},
/* ROSC */
/* RoscStpReqMsk */ 1U,
/* BusEnable */
{
/* R_DEV_CLK_PLL0 */ 1U,
/* R_DEV_CLK_PLL1 */ 1U,
/* R_DEV_CLK_PLL2 */ 0U,
/* R_DEV_CLK_PLL0PIX */ 1U,
/* R_DEV_CLK_SDRB */ 1U,
/* R_DEV_CLK_ETNBP */ 1U,
/* R_DEV_CLK_MLBP */ 1U,
/* R_DEV_CLK_RSCANP */ 1U,
/* R_DEV_CLK_XCC */ 1U,
/* R_DEV_CLK_ETNBXCC */ 1U,
/* R_DEV_CLK_MLBXCC */ 1U,
},
{
/*mainosc*/
{
/* FrequencyHz */ R_DEV_MOSC_FRQ_HZ,
/* StabiTimeNs */ 400000UL,
/* Gain */ 3U,
/* Running */ 1U,
/* StpReqMsk */ 1U,
},
/*subosc*/
{
/* FrequencyHz */ 32768UL,
/* Running */ 0U,
/* StpReqMsk */ 0U,
},
/* PLL */
{
/*PLL0*/
{
/* Mode */ R_DEV_PLL_SSCG,
/* DithMode */ R_DEV_PLL_DITH_DOWN,
/* DithRange */ 3U,
/* ModFreq */ 50UL,
/* FrequencyHz */ 480UL * 1000UL * 1000UL,
/* StabiTimeNs */ 40000UL,
/* StpReqMsk */ 0U,
},
/*PLL1*/
{
/* Mode */ R_DEV_PLL_ON,
/* DithMode */ R_DEV_PLL_DITH_FIXED,
/* DithRange */ 0U,
/* ModFreq */ 0UL,
/* FrequencyHz */ 480UL * 1000UL * 1000UL,
/* StabiTimeNs */ 40000UL,
/* StpReqMsk */ 0U,
},
/*PLL2*/
{
/* Mode */ R_DEV_PLL_OFF,
/* DithMode */ R_DEV_PLL_DITH_FIXED,
/* DithRange */ 0U,
/* ModFreq */ 0UL,
/* FrequencyHz */ 0UL,
/* StabiTimeNs */ 0UL,
/* StpReqMsk */ 0U,
},
},
/* ROSC */
/* RoscStpReqMsk */ 1U,
/* BusEnable */
{
/* R_DEV_CLK_PLL0 */ 1U,
/* R_DEV_CLK_PLL1 */ 1U,
/* R_DEV_CLK_PLL2 */ 0U,
/* R_DEV_CLK_PLL0PIX */ 1U,
/* R_DEV_CLK_SDRB */ 1U,
/* R_DEV_CLK_ETNBP */ 1U,
/* R_DEV_CLK_MLBP */ 1U,
/* R_DEV_CLK_RSCANP */ 1U,
/* R_DEV_CLK_XCC */ 1U,
/* R_DEV_CLK_ETNBXCC */ 1U,
/* R_DEV_CLK_MLBXCC */ 1U,
},
};
static const r_dev_ClkSelConfig_t g_stClkSelectionCfg[] =
/* Cks SrcId Div StpReqMsk */
{
/* {R_DEV_CKS_RSCAN, R_DEV_CKS_SRC_PLLFIX, } */
{R_DEV_CKS_RSCANXIN, R_DEV_CKS_SRC_MOSC, 1, 0u},
{R_DEV_CKS_WDT0, R_DEV_CKS_SRC_LRNG, 256, 0u},
{R_DEV_CKS_RTC, R_DEV_CKS_SRC_MOSC, 2, 0u},
{R_DEV_CKS_OSTM, R_DEV_CKS_SRC_MOSC, 2, 0u},
{R_DEV_CKS_CLKJIT, R_DEV_CKS_SRC_DIV, 6, 0u},
{R_DEV_CKS_PLLFIX, R_DEV_CKS_SRC_PLL1, 1, 0u},
{R_DEV_CKS_CLKFIX, R_DEV_CKS_SRC_DIV, 6, 0u},
{R_DEV_CKS_CPU, R_DEV_CKS_SRC_PLL0, 2, 0u},
{R_DEV_CKS_SFMA, R_DEV_CKS_SRC_PLL0, 3, 0u},
{R_DEV_CKS_SSIF, R_DEV_CKS_SRC_PLLFIX, 156, 0u},
/* delimiter - do not remove */
{R_DEV_CKS_LAST, R_DEV_CKS_SRC_MOSC, 2, 0u},
/* Cks SrcId Div StpReqMsk */
{
/* {R_DEV_CKS_RSCAN, R_DEV_CKS_SRC_PLLFIX, } */
{R_DEV_CKS_RSCANXIN, R_DEV_CKS_SRC_MOSC, 1, 0u},
{R_DEV_CKS_WDT0, R_DEV_CKS_SRC_LRNG, 256, 0u},
{R_DEV_CKS_RTC, R_DEV_CKS_SRC_MOSC, 2, 0u},
{R_DEV_CKS_OSTM, R_DEV_CKS_SRC_MOSC, 2, 0u},
{R_DEV_CKS_CLKJIT, R_DEV_CKS_SRC_DIV, 6, 0u},
{R_DEV_CKS_PLLFIX, R_DEV_CKS_SRC_PLL1, 1, 0u},
{R_DEV_CKS_CLKFIX, R_DEV_CKS_SRC_DIV, 6, 0u},
{R_DEV_CKS_CPU, R_DEV_CKS_SRC_PLL0, 2, 0u},
{R_DEV_CKS_SFMA, R_DEV_CKS_SRC_PLL0, 3, 0u},
{R_DEV_CKS_SSIF, R_DEV_CKS_SRC_PLLFIX, 156, 0u},
/* delimiter - do not remove */
{R_DEV_CKS_LAST, R_DEV_CKS_SRC_MOSC, 2, 0u},
};
void Clock_Pre_Init(void)
{
/* use the config, call Clock Gen Init */
R_DEV_ClkGenInit((r_dev_ClkGenConfig_t *)(&g_stClockGenCfg), g_stClkSelectionCfg);
/* use the config, call Clock Gen Init */
R_DEV_ClkGenInit((r_dev_ClkGenConfig_t *)(&g_stClockGenCfg), g_stClkSelectionCfg);
/* use the config, store settings (needs to be repeated after low init */
R_DEV_ClkGenInitStore((r_dev_ClkGenConfig_t *)(&g_stClockGenCfg));
/* use the config, store settings (needs to be repeated after low init */
R_DEV_ClkGenInitStore((r_dev_ClkGenConfig_t *)(&g_stClockGenCfg));
}
void Clock_Init(void)
{
/* use the config, store settings */
R_DEV_ClkGenInitStore((r_dev_ClkGenConfig_t *)(&g_stClockGenCfg));
/* use the config, store settings */
R_DEV_ClkGenInitStore((r_dev_ClkGenConfig_t *)(&g_stClockGenCfg));
}
/*Clock monitor initialization*/
static void Clock_Monitor_A_Init(void)
{
/*only open monitor2 ，Monitor main clock*/
CLMA2CMPH = 652U; /*+-10%*/
/*only open monitor2 ，Monitor main clock*/
CLMA2CMPH = 652U; /*+-10%*/
CLMA2CMPL = 435U; /*+-10%*/
CLMA2CMPL = 435U; /*+-10%*/
CLOCK_PROTECTED_WRITE(CLMA2PCMD, CLMA2PS, CLMA2CTL0, 0x01U);
CLOCK_PROTECTED_WRITE(CLMA2PCMD, CLMA2PS, CLMA2CTL0, 0x01U);
}
/*Stop all of the modules before Call the following function,except RTC*/
/*falling edge detection*/
void Clock_Enter_Sleep_Mode(void)
{
/*Stop modules*/
/*port buffer into hold state*/
/*Disable interrupt*/
/*Clear the interrupt flag*/
/*config interrupt , mask or unmask*/
/*Clear wake-up flag*/
/*Config wake-up factors*/
/*You can choose more than one PIN*/
/*(Except in D1M1A and D1M1-V2) ,Change CPU clock to EMCLK*/
CLOCK_PROTECTED_WRITE(SYSPROTCMD1, SYSPROTS1, SYSCKSC_ICPUCLKS_CTL, 0x01U); /*select EMCLK*/
/*Config clock domains . It's already set up in the initialization function */
/*MainOsc continues operation in DEEPSTOP mode*/
SYSMOSCSTPM = 0x03U;
/*High Speed IntOsc stops operation in DEEPSTOP mode.*/
// SYSROSCSTPM = 0x02U;
R_DEV_SetGenStopMask(R_DEV_HS_RING, 0U);
/*Clock domain C_AWO_AWOT is stopped in DEEPSTOP mode*/
SYSCKSC_AAWOTD_STPM = 0x02U;
/*Clock domain C_AWO_RTCA is not stopped in DEEPSTOP mode*/
SYSCKSC_ARTCAD_STPM = 0X03U;
/*Clock domain C_AWO_FOUT is stopped in DEEPSTOP mode*/
SYSCKSC_AFOUTS_STPM = 0X02U;
/*Stop all active PLLs*/
// CLOCK_PROTECTED_WRITE(SYSPROTCMD1, SYSPROTS1, SYSPLL0E, 0x02U); /*Stop the PLL0*/
// CLOCK_PROTECTED_WRITE(SYSPROTCMD1, SYSPROTS1, SYSPLL1E, 0x02U); /*Stop the PLL1*/
R_DEV_ClkGenStop(R_DEV_PLL0);
R_DEV_ClkGenStop(R_DEV_PLL1);
/*Clear the RESF register*/
/*start DEEPSTOP mode*/
/*wait for the transition to the DEEPSTOP mode by the unconditional loop*/
/*Stop modules*/
/*port buffer into hold state*/
/*Disable interrupt*/
/*Clear the interrupt flag*/
/*config interrupt , mask or unmask*/
/*Clear wake-up flag*/
/*Config wake-up factors*/
/*You can choose more than one PIN*/
/*(Except in D1M1A and D1M1-V2) ,Change CPU clock to EMCLK*/
CLOCK_PROTECTED_WRITE(SYSPROTCMD1, SYSPROTS1, SYSCKSC_ICPUCLKS_CTL, 0x01U); /*select EMCLK*/
/*Config clock domains . It's already set up in the initialization function */
/*MainOsc continues operation in DEEPSTOP mode*/
SYSMOSCSTPM = 0x03U;
/*High Speed IntOsc stops operation in DEEPSTOP mode.*/
// SYSROSCSTPM = 0x02U;
R_DEV_SetGenStopMask(R_DEV_HS_RING, 0U);
/*Clock domain C_AWO_AWOT is stopped in DEEPSTOP mode*/
SYSCKSC_AAWOTD_STPM = 0x02U;
/*Clock domain C_AWO_RTCA is not stopped in DEEPSTOP mode*/
SYSCKSC_ARTCAD_STPM = 0X03U;
/*Clock domain C_AWO_FOUT is stopped in DEEPSTOP mode*/
SYSCKSC_AFOUTS_STPM = 0X02U;
/*Stop all active PLLs*/
// CLOCK_PROTECTED_WRITE(SYSPROTCMD1, SYSPROTS1, SYSPLL0E, 0x02U); /*Stop the PLL0*/
// CLOCK_PROTECTED_WRITE(SYSPROTCMD1, SYSPROTS1, SYSPLL1E, 0x02U); /*Stop the PLL1*/
R_DEV_ClkGenStop(R_DEV_PLL0);
R_DEV_ClkGenStop(R_DEV_PLL1);
/*Clear the RESF register*/
/*start DEEPSTOP mode*/
/*wait for the transition to the DEEPSTOP mode by the unconditional loop*/
}
#pragma ghs section bss = ".absinitarea"
......@@ -184,55 +184,55 @@ uint32_t u32ResetSource;
Clock_Startup_Mode_en_t Clock_Get_Startup_Mode(void)
{
Clock_Startup_Mode_en_t enClockMode;
Clock_Startup_Mode_en_t enClockMode;
uint32_t u32ResetRESFValue = 0U;
uint32_t u32ResetRESFRValue = 0U;
uint32_t u32ResetRESFValue = 0U;
uint32_t u32ResetRESFRValue = 0U;
/* Read reset factor */
u32ResetRESFValue = SYSRESF;
u32ResetRESFRValue = SYSRESFR;
/* Read reset factor */
u32ResetRESFValue = SYSRESF;
u32ResetRESFRValue = SYSRESFR;
u32ResetSource = SYSRESF;
u32ResetSource = SYSRESF;
/* Clear reset factor */
SYSRESFC = 0xC70FU;
SYSRESFCR = 0xC70FU;
/* Clear reset factor */
SYSRESFC = 0xC70FU;
SYSRESFCR = 0xC70FU;
if (u32ResetRESFValue & 0x0000C30FU)
{
enClockMode = CLOCK_STARTUP_PWR_ON;
}
else
{
enClockMode = CLOCK_STARTUP_WAKE_UP;
}
if (u32ResetRESFValue & 0x0000C30FU)
{
enClockMode = CLOCK_STARTUP_PWR_ON;
}
else
{
enClockMode = CLOCK_STARTUP_WAKE_UP;
}
return enClockMode;
return enClockMode;
}
void Sys_Enter_Sleep_Mode(void)
{
WDT_Clear();
CLOCK_PROTECTED_WRITE(SYSPROTCMD0, SYSPROTS0, SYSCKSC_AWDTA0D_CTL, 0x06U); /* 看门狗时钟2048分频*/
WDT_Clear();
CLOCK_PROTECTED_WRITE(SYSPROTCMD0, SYSPROTS0, SYSCKSC_AWDTA0D_CTL, 0x06U); /* 看门狗时钟2048分频*/
GPIO_Init(GPIO_SLEEP_MODE);
GPIO_Init(GPIO_SLEEP_MODE);
__DI();
SYSWUFC0 = 0x7FFFFU;
/*---------------------------------------------*/
GPIO_Wakeup_PIN_Set(GPIO_WAKEUP_PIN_P0_5, GPIO_WAKEUP_FALLING_EDGE);
GPIO_Wakeup_PIN_Set(GPIO_WAKEUP_PIN_P0_0, GPIO_WAKEUP_RISING_EDGE);
/*----------------------------------------------*/
SYSWUFMSK0 &= 0x7FFFEU;
__DI();
SYSWUFC0 = 0x7FFFFU;
/*---------------------------------------------*/
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----*/
/*----------------------------------------------*/
SYSWUFMSK0 &= 0x7FFFEU;
Clock_Enter_Sleep_Mode();
Clock_Enter_Sleep_Mode();
SYSRESFC = 0xC70FU;
SYSRESFC = 0xC70FU;
CLOCK_PROTECTED_WRITE(SYSPROTCMD0, SYSPROTS0, SYSSTBC0PSC, 0x02U);
CLOCK_PROTECTED_WRITE(SYSPROTCMD0, SYSPROTS0, SYSSTBC0PSC, 0x02U);
RTC_Backup_Time();
TestBackupRam = 0xaabbccddu;
hardware_reset();
RTC_Backup_Time();
TestBackupRam = 0xaabbccddu;
hardware_reset();
}
source/Driver/Graphic/loc_graphics_data.h
View file @ c0d5bb03
......@@ -109,7 +109,7 @@ uint8_t CalendarEn = 0u;
LogicLayerAttr_t CalendarLogicLayerAttr[MAX_CALENDAR_SUP_LAYER];
/**/
#define MAX_MENU_SUP_LAYER 57
#define MAX_MENU_SUP_LAYER 60
MultiBufferSprite_t MENUSpriteBuf;
uint8_t MENUIndex = 0u;
uint8_t MENUUpdate = 0u;
......
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