Skip to content

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

合并功能

parents ac3aebbd f3107d95
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 38 deletions
source/Application/Alarm/Popups.c
View file @ c25411b7
......@@ -1201,7 +1201,6 @@ void Popups_Sound_Playing(uint8_t PopupSnd)
* Return : None
* onther : None
--------------------------------------------------------------------------*/
//uint16_t Sound_test = 0;
void Popup_Alone_Sound_Server(void)
{
COMMON_PowerStatus_t u8IG_st;
......@@ -1209,6 +1208,7 @@ void Popup_Alone_Sound_Server(void)
uint32_t u32IG_ON_Timer = 0x00u;
uint8_t variable_1 = 0u;
uint8_t variable_2 = 0u;
uint8_t variable_3 = 0u;
uint16_t E_Speed = 0u;
uint16_t V_Speed = 0u;
uint8_t EVSC1 = 0u;
......@@ -1528,6 +1528,60 @@ void Popup_Alone_Sound_Server(void)
{
Sound_Delete(SND_Fuel_Saving);
}
/* 车道偏离 3Hz*/
/*18FE5BE8(FLI2) Byte7, Bit4-1:0101(B) & 10F007E8(FLI1) Byte1, Bit8-7: 01(B)*/
/*18FE5BE8(FLI2) Byte7, Bit4-1:0101(B) & 10F007E8(FLI1) Byte1, Bit6-5: 01(B)*/
variable_1 = Get_ID_18FE5BE8_Sig_Lane_Departure_Warning_Sys_Sta();
variable_2 = Get_ID_10F007E8_Sig_Lane_Departure_Imminent_Right();
variable_3 = Get_ID_10F007E8_Sig_Lane_Departure_Imminent_Left();
if ((variable_1 == 5u) && ((variable_2 == 1u) || (variable_3 == 1u)))
{
Sound_Request (SND_LDWS, 1);
}
else
{
Sound_Delete (SND_LDWS ) ;
}
/* 一级碰撞预警 长鸣*/
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_3 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
if ((variable_1 == 7u) || (variable_2 == 7u) || (variable_3 == 7u))
{
Sound_Request (SND_Collision_Level1, 1);
}
else
{
Sound_Delete (SND_Collision_Level1 ) ;
}
/* 二级碰撞预警 4HZ*/
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_3 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
if ((variable_1 == 6u) || (variable_2 == 6u) || (variable_3 == 6u))
{
Sound_Request (SND_Collision_Level2, 1);
}
else
{
Sound_Delete (SND_Collision_Level2 ) ;
}
/* 三级碰撞预警 2HZ*/
variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
variable_3 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
if ((variable_1 == 5u) || (variable_2 == 5u) || (variable_3 == 5u))
{
Sound_Request (SND_Collision_Level3, 1);
}
else
{
Sound_Delete (SND_Collision_Level3 ) ;
}
}
else /*IG-OFF*/
{
......@@ -1566,8 +1620,11 @@ void Popup_Alone_Sound_Server(void)
Sound_Delete(SND_Cyclone_High0_5); /*18 气悬车高调整*/
Sound_Delete(SND_SEATBELT_SPEED); /*19 安全带*/
Sound_Delete(SND_Fuel_Saving); /*20 省油耗建议*/
Sound_Delete(SND_LDWS) ; /* 轨道偏离*/
Sound_Delete(SND_Collision_Level1) ; /* 一级碰撞预警 长鸣*/
Sound_Delete(SND_Collision_Level2) ; /* 二级碰撞预警 4HZ*/
Sound_Delete(SND_Collision_Level3) ; /* 三级碰撞预警 2HZ*/
}
}
}
}
\ No newline at end of file
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ c25411b7
......@@ -237,12 +237,12 @@ void Can_Set_Buff_18FED917(uint8_t CopyData[])
{
uint8_t Blanding_SW_Signal = 0u;/*1 5-6*/
uint8_t Tralier_ABS_Fully_Operational = 0u;/*2 3-4*/
uint8_t Tlailer_ABS_Detect = 0u;/*2 5-6*/
static uint8_t Tlailer_ABS_Detect = 0u;/*2 5-6*/
uint8_t Tlailer_Connected = 0u; /*2 7-8*/
Blanding_SW_Signal = Line_In_Get_Status(LINE_IN_RET_BLENDING); /*A10*/
/*根据禅道编号5102内容修改----start----*/
/*20230301变更申请调整----start----*/
if (Line_In_Get_Status(LINE_IN_TRAILER_ABS) == 1u) /*B33*/
{
Tralier_ABS_Fully_Operational = 0x00u;
......@@ -262,9 +262,24 @@ void Can_Set_Buff_18FED917(uint8_t CopyData[])
}
else
{
Tlailer_ABS_Detect = 0x0u;
if (
(Line_In_Get_Status(LINE_IN_TRAILER_CONNECT) == 1u) && /*B06 LOW*/
(Line_In_Get_Status(LINE_IN_ABS_DETECT) == 1u) && /*A33 LOW*/
(Line_In_Get_Status(LINE_IN_TRAILER_ABS_INFO) == 1u) /*B03 LOW*/
)
{
Tlailer_ABS_Detect = 0x0u;
}
else if (
(Line_In_Get_Status(LINE_IN_TRAILER_CONNECT) == 0u) && /*B06 HIGH*/
(Line_In_Get_Status(LINE_IN_ABS_DETECT) == 0u) && /*A33 HIGH*/
(Line_In_Get_Status(LINE_IN_TRAILER_ABS_INFO) == 0u) /*B03 HIGH*/
)
{
Tlailer_ABS_Detect = 0x0u;
}
}
/*根据禅道编号5102内容修改----end----*/
/*----end----*/
Tlailer_Connected = Line_In_Get_Status(LINE_IN_TRAILER_CONNECT); /*B6*/
......
source/Application/Sound_Alarm/Sound_List.h
View file @ c25411b7
......@@ -12,6 +12,10 @@
typedef enum SoundName
{
SND_Key_Notremoved = 0x00 , /*00 忘拔钥匙 */
SND_LDWS , /* 车道偏离*/
SND_Collision_Level1, /* 一级碰撞预警 长鸣*/
SND_Collision_Level2, /* 二级碰撞预警 4HZ*/
SND_Collision_Level3, /* 三级碰撞预警 2HZ*/
SND_Braking , /*01 制动 */
SND_Air_Brake , /*02 制动气压 */
SND_BRAKE_LOCK , /*03 BRAKE LOCK */
......@@ -72,6 +76,10 @@ static const SoundAttributeStruct SoundList[SND_INDEX_MAX] =
声音名称 | 音源 | 模式
-------------------------------------------------------------------------------------*/
{/*00 SND_Key_Notremoved */ SND_SRC_Key_Notremoved , SND_TYPE_NORMAL, },
{/* SND_LDWS */ SND_SRC_LDWS , SND_TYPE_NORMAL, },
{/* SND_Collision_Level1*/ SND_SRC_Collision_L1 , SND_TYPE_NORMAL, },
{/* SND_Collision_Level2*/ SND_SRC_Collision_L2 , SND_TYPE_NORMAL, },
{/* SND_Collision_Level3*/ SND_SRC_Collision_L3 , 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, },
......
source/Application/Sound_Alarm/Sound_Scheduler.c
View file @ c25411b7
......@@ -158,17 +158,4 @@ void Sound_Scheduling_Service(void)
SoundScheduling.Next = SND_NONE;
}
}
}
static uint8_t wbyTest = 0 ;
void Sound_Management_Service( void )
{
//if(wbyTest)
//{
// Sound_Request(SND_TICK,1);
//}
//else
//{
// Sound_Delete(SND_TICK);
//}
}
}
\ No newline at end of file
source/Application/Sound_Alarm/Sound_Scheduler.h
View file @ c25411b7
......@@ -42,7 +42,6 @@ void Sound_Scheduler_Init ( void );
void Sound_Request ( uint8_t Sound, uint8_t ReqCode );
void Sound_Delete ( uint8_t Sound );
void Sound_Scheduling_Service ( void );
void Sound_Management_Service( void );
#endif
source/Application/Sound_Alarm/Sound_Source.h
View file @ c25411b7
......@@ -15,6 +15,10 @@
typedef enum
{
SND_SRC_Key_Notremoved = 0x00 , /*00 忘拔钥匙 */
SND_SRC_LDWS , /* 车道偏离*/
SND_SRC_Collision_L1 , /* 一级碰撞预警 长鸣*/
SND_SRC_Collision_L2 , /* 二级碰撞预警 4HZ*/
SND_SRC_Collision_L3 , /* 三级碰撞预警 2HZ*/
SND_SRC_Braking , /*01 制动 */
SND_SRC_Air_Brake , /*02 制动气压 */
SND_SRC_BRAKE_LOCK , /*03 BRAKE LOCK */
......@@ -82,6 +86,10 @@ static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] =
音源名称 | 音源序号 | 优先级 | 循环次数 | 播放模式 | 周期(ms)
------------------------------------------------------------------------------------------------*/
{/*00 SND_SRC_Key_Notremoved */ 0x03u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*00 1HZ 4 忘拔钥匙 */
{/*00 SND_SRC_LDWS */ 0x10u, 1, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 333u, },
{/*00 SND_SRC_Collision_L1 */ 0x0Fu, 0, SND_CYCLE_NONSTOP, SND_MODE_LOOP, 0u, },
{/*00 SND_SRC_Collision_L2 */ 0x10u, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 250u, },
{/*00 SND_SRC_Collision_L3 */ 0x11u, 0, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 500u, },
{/*01 SND_SRC_Braking */ 0x00u, 2, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*01 连续 1 制动 */
{/*02 SND_SRC_Air_Brake */ 0x01u, 3, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*02 连续 2 制动气压 */
{/*03 SND_SRC_BRAKE_LOCK */ 0x04u, 4, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*03 BRAKE LOCK */
......
source/Driver/Buzzer/Buzzer.c
View file @ c25411b7
......@@ -15,6 +15,8 @@
#define BUZZER_PWM_CHANNEL TIMERB_0_CH11
BuzzerPlayCtrlStruct BuzzerPlayCtrl;
static uint8_t FMQ_Init_Flag;
static uint8_t FMQ_Init_Flag_Back = 0xff;
/******************************************************************************
函数名：Buzzer_Start_Up
......@@ -31,10 +33,11 @@ void Buzzer_Start_Up(void)
BuzzerPlayCtrl.Note = 0;
BuzzerPlayCtrl.Timer = 0;
BuzzerPlayCtrl.Fade = 0;
FMQ_Init_Flag_Back = 0xff;
FMQ_Init_Flag = 9;
BUZZER_CTRL = 0;
TimerB_PWM_Channel_Stop(BUZZER_PWM_CHANNEL);
TimerB_PWM_Channel_Init(BUZZER_PWM_CHANNEL, TIMERB_CLOCK_0, TIMERB_HIGH);
TimerB_PWM_Channel_Init(BUZZER_PWM_CHANNEL, TIMERB_CLOCK_0, TIMERB_LOW);
}
/******************************************************************************
......@@ -54,6 +57,8 @@ void Buzzer_Shutdown(void)
BUZZER_CTRL = 0;
TimerB_PWM_Channel_Stop(BUZZER_PWM_CHANNEL);
FMQ_Init_Flag_Back = 0xff;
FMQ_Init_Flag = 9;
}
/******************************************************************************
......@@ -120,6 +125,8 @@ void Buzzer_Stop_Play(void)
BuzzerPlayCtrl.Fade = 0;
BUZZER_CTRL = 0;
FMQ_Init_Flag_Back = 0xff;
FMQ_Init_Flag = 9;
TimerB_PWM_Channel_Stop(BUZZER_PWM_CHANNEL);
}
......@@ -148,12 +155,18 @@ void Buzzer_Play_ISR(void)
if (SndTracks[BuzzerPlayCtrl.Track].Note[BuzzerPlayCtrl.Note].Freq)
{
TimerB_PWM_Channel_Fre_Set(BUZZER_PWM_CHANNEL, SndTracks[BuzzerPlayCtrl.Track].Note[BuzzerPlayCtrl.Note].Freq, SndTracks[BuzzerPlayCtrl.Track].Note[BuzzerPlayCtrl.Note].Duty);
// TimerB_PWM_Channel_Duty_Set(BUZZER_PWM_CHANNEL, SndTracks[BuzzerPlayCtrl.Track].Note[BuzzerPlayCtrl.Note].Duty);
TimerB_PWM_Channel_Start(BUZZER_PWM_CHANNEL);
if ( FMQ_Init_Flag_Back != FMQ_Init_Flag )
{
TimerB_PWM_Channel_Fre_Set(BUZZER_PWM_CHANNEL, SndTracks[BuzzerPlayCtrl.Track].Note[BuzzerPlayCtrl.Note].Freq, SndTracks[BuzzerPlayCtrl.Track].Note[BuzzerPlayCtrl.Note].Duty);
// TimerB_PWM_Channel_Duty_Set(BUZZER_PWM_CHANNEL, SndTracks[BuzzerPlayCtrl.Track].Note[BuzzerPlayCtrl.Note].Duty);
TimerB_PWM_Channel_Start(BUZZER_PWM_CHANNEL);
FMQ_Init_Flag_Back = FMQ_Init_Flag;
}
}
else
{
FMQ_Init_Flag_Back = 0xff;
FMQ_Init_Flag = 9;
TimerB_PWM_Channel_Stop(BUZZER_PWM_CHANNEL);
}
......@@ -170,12 +183,16 @@ void Buzzer_Play_ISR(void)
else
{
BUZZER_CTRL = 0;
FMQ_Init_Flag_Back = 0xff;
FMQ_Init_Flag = 9;
TimerB_PWM_Channel_Stop(BUZZER_PWM_CHANNEL);
BuzzerPlayCtrl.Mode = BUZZER_MODE_IDLE;
}
}
}
else if (BuzzerPlayCtrl.Timer < BuzzerPlayCtrl.Fade)
{
BUZZER_CTRL = 0;
}
}
}
\ No newline at end of file
source/Driver/Buzzer/Sound_Tracks.h
View file @ c25411b7
......@@ -186,7 +186,7 @@ static const SndTrackStruct SndTracks[] =
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
000 | 500ms | BUZZER_Track_Index_3900hz_500Dty
008 | 500ms | BUZZER_Track_Index_3900hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
......@@ -205,7 +205,7 @@ static const SndTrackStruct SndTracks[] =
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
001 | 980ms | 2kHz淡出
009 | 980ms | 2kHz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
......@@ -224,7 +224,7 @@ static const SndTrackStruct SndTracks[] =
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
002 | 550ms | 长雷达提示音,800Hz长鸣
010 | 550ms | 长雷达提示音,800Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
......@@ -243,7 +243,7 @@ static const SndTrackStruct SndTracks[] =
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
003 | 300ms | 中雷达提示音,800Hz长鸣
011 | 300ms | 中雷达提示音,800Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
......@@ -262,7 +262,7 @@ static const SndTrackStruct SndTracks[] =
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
004 | 175ms | 短雷达提示音,800Hz长鸣
012 | 175ms | 短雷达提示音,800Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
......@@ -281,7 +281,7 @@ static const SndTrackStruct SndTracks[] =
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
005 | 53ms | 转向提示音Tick
013 | 53ms | 转向提示音Tick
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
......@@ -300,7 +300,7 @@ static const SndTrackStruct SndTracks[] =
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
006 | 52ms | 转向提示音Tock
014 | 52ms | 转向提示音Tock
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
......@@ -308,13 +308,67 @@ static const SndTrackStruct SndTracks[] =
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 780, 250, 3, 0,
/* 1 */ 780, 250, 3, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
015 | 500ms |
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 500, 500, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
016 | 100ms | 2kHz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 125, 125, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
017 | 100ms | 2kHz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 250, 250, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
......
source/System/tasks.c
View file @ c25411b7
......@@ -212,7 +212,7 @@ void Sys_Run_Mode_20ms_Tasks(void)
Speed_Processing_Service();
AirPressure_Processing_Service();
Voltmeter_Processing_Service();
Sound_Management_Service();
Popup_Alone_Sound_Server();
CD4051B_Debounce_Service();
if (BackOdoFlagSta == 0)
{
......@@ -268,7 +268,6 @@ void Sys_Run_Mode_100ms_Tasks(void)
LED_Driver_Work_Check();
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