Skip to content

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

调整声音

parent c0d5bb03
Hide whitespace changes
Inline Side-by-side
Showing with 652 additions and 294 deletions
source/Application/APP/SEG_LCD/SEG_DISPLAY.c
View file @ 0a99ded1
......@@ -856,7 +856,7 @@ static void SEG_Tacho_Display(uint8_t Value, uint8_t Valid, uint8_t seg_status)
}
else
{
mSEG[i] = 1;
mSEG[i] = 0;
}
}
}
......@@ -932,7 +932,7 @@ static void SEG_VehicleSpeed_Display(uint8_t Value, uint8_t Valid, uint8_t seg_s
}
else
{
mSEG[i] = 1;
mSEG[i] = 0;
}
}
}
......
source/Application/Alarm/Popups.c
View file @ 0a99ded1
......@@ -2,6 +2,7 @@
#include "Popup_List.h"
#include "Popup_Message_List.h"
#include "Sound_List.h"
#include "Sound_Scheduler.h"
#include "GUI.h"
#include "Common_Interface.h"
......@@ -12,6 +13,7 @@
#include "Data_Gear.h"
#include "Line_in.h"
#include "CD4051.h"
#include "Telltales_user.h"
#include "Data_CoolantTemperature.h"
#include "Data_VehicleSpeed.h"
......@@ -20,11 +22,27 @@
#include "FuelConfig.h"
#include "Service_TPMS.h"
/*-------------------------------------------------------------------------
* Function Name : Popups_Management_Service
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void Popups_Management_Service(void)
{
Popups_Polling();
}
/*-------------------------------------------------------------------------
* Function Name : Popups_Polling
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void Popups_Polling(void)
{
uint16_t i = 0x00u;
......@@ -1046,6 +1064,14 @@ void Popups_Polling(void)
}
}
/*-------------------------------------------------------------------------
* Function Name : Popups_Displaying
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void Popups_Displaying(uint8_t PopupMsg)
{
if (PopupMsg < POPUP_MSG_NUMBER_TOTAL)
......@@ -1062,6 +1088,14 @@ void Popups_Displaying(uint8_t PopupMsg)
}
}
/*-------------------------------------------------------------------------
* Function Name : Popups_Sound_Playing
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void Popups_Sound_Playing(uint8_t PopupSnd)
{
uint8_t ReqCode = 0u;
......@@ -1078,3 +1112,302 @@ void Popups_Sound_Playing(uint8_t PopupSnd)
break;
}
}
/*-------------------------------------------------------------------------
* Function Name : Popup_Alone_Sound_Server
* Description :
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
void Popup_Alone_Sound_Server(void)
{
COMMON_PowerStatus_t u8IG_st;
uint32_t u32IG_OFF_Timer = 0x00u;
uint32_t u32IG_ON_Timer = 0x00u;
uint8_t variable_1 = 0u;
u32IG_ON_Timer = Common_GetIgnOnTime();
u32IG_OFF_Timer = Common_GetIgnOffTime();
u8IG_st = Common_Get_IG_Sts();
if ((u32IG_ON_Timer <= PopupStart) && (u32IG_ON_Timer >= 2u))
{
;
}
else
{
if (u8IG_st == COMMON_POWER_ON)
{
Sound_Delete(SND_Key_Notremoved); /*00 忘拔钥匙 */
/*A21-GND A23-OPEN*/
if ((CD4051_COM1_X4_IN == 0u) && (CD4051_COM1_X7_IN == 1u))
{
Sound_Request(SND_Braking, 1u); /*01 制动 */
}
else
{
Sound_Delete(SND_Braking);
}
/**/
if (0)
{
Sound_Request(SND_Air_Brake, 1u); /*02 制动气压 */
}
else
{
Sound_Delete(SND_Air_Brake);
}
/**/
if (0)
{
Sound_Request(SND_BRAKE_LOCK, 1u); /*03 BRAKE LOCK */
}
else
{
Sound_Delete(SND_BRAKE_LOCK);
}
/**/
if (0)
{
Sound_Request(SND_Parking_Brake, 1u); /*04 停车制动忘记复位 */
}
else
{
Sound_Delete(SND_Parking_Brake);
}
/**/
if (0)
{
Sound_Request(SND_Car_Dump_SPEED, 1u); /*05 车厢报警自卸蜂鸣器*/
}
else
{
Sound_Delete(SND_Car_Dump_SPEED);
}
/**/
if (0)
{
Sound_Request(SND_Temp_High, 1u); /*06 水温过热 */
}
else
{
Sound_Delete(SND_Temp_High);
}
/**/
if (0)
{
Sound_Request(SND_Coolant_Low, 1u); /*07 冷却水量 */
}
else
{
Sound_Delete(SND_Coolant_Low);
}
/**/
if (0)
{
Sound_Request(SND_Oil_pressure_Low, 1u); /*08 -(预留：油压) */
}
else
{
Sound_Delete(SND_Oil_pressure_Low);
}
/**/
if (0)
{
Sound_Request(SND_ACC_AIR, 1u); /*09 ACC AIR */
}
else
{
Sound_Delete(SND_ACC_AIR);
}
/**/
if (0)
{
Sound_Request(SND_BackUP_SPEED, 1u); /*10 倒车警报 */
}
else
{
Sound_Delete(SND_BackUP_SPEED);
}
/**/
if (0)
{
Sound_Request(SND_DS_SPEED, 1u); /*11 DS 警报 */
}
else
{
Sound_Delete(SND_DS_SPEED);
}
/**/
if (0)
{
Sound_Request(SND_ROWS_SPEED, 1u); /*12 ROWS 警报 */
}
else
{
Sound_Delete(SND_ROWS_SPEED);
}
/**/
if (0)
{
Sound_Request(SND_Roll_SPEED, 1u); /*13 Roll 警报 */
}
else
{
Sound_Delete(SND_Roll_SPEED);
}
/**/
if (0)
{
Sound_Request(SND_EVSC_SPEED, 1u); /*14 EVSC */
}
else
{
Sound_Delete(SND_EVSC_SPEED);
}
/**/
if (0)
{
Sound_Request(SND_DPD_SPEED1, 1u); /*15 DPD 手动再生 */
}
else
{
Sound_Delete(SND_DPD_SPEED1);
}
/**/
if (0)
{
Sound_Request(SND_DPD_SPEED2, 1u); /*15 DPD 手动再生 */
}
else
{
Sound_Delete(SND_DPD_SPEED2);
}
/**/
if (0)
{
Sound_Request(SND_DPD_SPEED4, 1u); /*15 DPD 手动再生 */
}
else
{
Sound_Delete(SND_DPD_SPEED4);
}
/**/
if (0)
{
Sound_Request(SND_NEES, 1u); /*16 NEES */
}
else
{
Sound_Delete(SND_NEES);
}
/**/
if (0)
{
Sound_Request(SND_ECO_STOP, 1u); /*17 eco stop */
}
else
{
Sound_Delete(SND_ECO_STOP);
}
/**/
if (0)
{
Sound_Request(SND_Cyclone_High4HZ, 1u); /*18 气悬车高调整 */
}
else
{
Sound_Delete(SND_Cyclone_High4HZ);
}
/**/
if (0)
{
Sound_Request(SND_Cyclone_High0_5, 1u); /*18 气悬车高调整 */
}
else
{
Sound_Delete(SND_Cyclone_High0_5);
}
/**/
if (0)
{
Sound_Request(SND_SEATBELT_SPEED, 1u); /*19 安全带 */
}
else
{
Sound_Delete(SND_SEATBELT_SPEED);
}
/**/
if (0)
{
Sound_Request(SND_Fuel_Saving, 1u); /*20 省油耗建议 */
}
else
{
Sound_Delete(SND_Fuel_Saving);
}
}
else /*IG-OFF*/
{
/*A3-28 A20-GND B39-OPEN A2-OPEN*/
variable_1 = Line_In_Get_Status(LINE_IN_ACC);
if ((CD4051_COM3_X7_IN == 1u) && (CD4051_COM3_X5_IN == 0u) && (variable_1 == 1u))
{
Sound_Request(SND_Key_Notremoved, 1u); /*00 忘拔钥匙 */
}
else
{
Sound_Delete(SND_Key_Notremoved);
}
Sound_Delete(SND_Braking); /*01 制动 */
Sound_Delete(SND_Air_Brake); /*02 制动气压 */
Sound_Delete(SND_BRAKE_LOCK); /*03 BRAKE LOCK */
Sound_Delete(SND_Parking_Brake); /*04 停车制动忘记复位 */
Sound_Delete(SND_Car_Dump_SPEED); /*05 车厢报警自卸蜂鸣器*/
Sound_Delete(SND_Temp_High); /*06 水温过热 */
Sound_Delete(SND_Coolant_Low); /*07 冷却水量 */
Sound_Delete(SND_Oil_pressure_Low); /*08 -(预留：油压) */
Sound_Delete(SND_ACC_AIR); /*09 ACC AIR */
Sound_Delete(SND_BackUP_SPEED); /*10 倒车警报 */
Sound_Delete(SND_DS_SPEED); /*11 DS 警报 */
Sound_Delete(SND_ROWS_SPEED); /*12 ROWS 警报 */
Sound_Delete(SND_Roll_SPEED); /*13 Roll 警报 */
Sound_Delete(SND_EVSC_SPEED); /*14 EVSC */
Sound_Delete(SND_DPD_SPEED1); /*15 DPD 手动再生 */
Sound_Delete(SND_DPD_SPEED2); /*15 DPD 手动再生 */
Sound_Delete(SND_DPD_SPEED4); /*15 DPD 手动再生 */
Sound_Delete(SND_NEES); /*16 NEES */
Sound_Delete(SND_ECO_STOP); /*17 eco stop */
Sound_Delete(SND_Cyclone_High4HZ); /*18 气悬车高调整 */
Sound_Delete(SND_Cyclone_High0_5); /*18 气悬车高调整 */
Sound_Delete(SND_SEATBELT_SPEED); /*19 安全带 */
Sound_Delete(SND_Fuel_Saving); /*20 省油耗建议 */
}
}
}
source/Application/Alarm/Popups.h
View file @ 0a99ded1
......@@ -23,5 +23,6 @@ void Popups_Management_Service ( void );
void Popups_Polling ( void );
void Popups_Displaying ( uint8_t PopupID );
void Popups_Sound_Playing ( uint8_t PopupID );
void Popup_Alone_Sound_Server(void);
#endif
\ No newline at end of file
source/Application/Graphic/GUI/GUI.h
View file @ 0a99ded1
......@@ -14,9 +14,9 @@
#define FState_COilTimeOutNum 60u /*3S*/
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10000)) /*硬件版本号01.00.00*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10100)) /*软件版本号01.01.00*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(8)) /*FLASH版本号FV00.08*/
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10000)) /*硬件版本号 HV:01.00.00*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10101)) /*软件版本号 SV:01.01.00*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(8)) /*FLASH版本号 FV:00.08*/
typedef struct
{
......
source/Application/Sound_Alarm/PCM_Sound_Tracks.h
View file @ 0a99ded1
......@@ -10,16 +10,16 @@
typedef enum
{
PCM_Track_Index_Crash = 0U,
PCM_Track_Index_DoorOpen,
PCM_Track_Index_Key,
PCM_Track_Index_Crash = 0U,
PCM_Track_Index_DoorOpen,
PCM_Track_Index_Key,
PCM_Track_Index_OverSpeed,
PCM_Track_Index_OverSpeed_2S,
PCM_Track_Index_Seatbelta,
PCM_Track_Index_Warrning,
PCM_Track_Index_TICK,
PCM_Track_Index_OverSpeed_2S,
PCM_Track_Index_Seatbelta,
PCM_Track_Index_Warrning,
PCM_Track_Index_TICK,
PCM_Track_Index_TOCK,
PCM_Track_Index_MAX,
} PCM_Track_Index_en_t;
......
source/Application/Sound_Alarm/Sound_List.h
View file @ 0a99ded1
......@@ -26,10 +26,13 @@ typedef enum SoundName
SND_ROWS_SPEED , /*12 ROWS 警报 */
SND_Roll_SPEED , /*13 Roll 警报 */
SND_EVSC_SPEED , /*14 EVSC */
SND_DPD_SPEED , /*15 DPD 手动再生 */
SND_DPD_SPEED1 , /*15 DPD 手动再生 */
SND_DPD_SPEED2 , /*15 DPD 手动再生 */
SND_DPD_SPEED4 , /*15 DPD 手动再生 */
SND_NEES , /*16 NEES */
SND_ECO_STOP , /*17 eco stop */
SND_Cyclone_High , /*18 气悬车高调整 */
SND_Cyclone_High4HZ , /*18 气悬车高调整 */
SND_Cyclone_High0_5 , /*18 气悬车高调整 */
SND_SEATBELT_SPEED , /*19 安全带 */
SND_Fuel_Saving , /*20 省油耗建议 */
SND_TICK , /*21 转向 */
......@@ -83,10 +86,13 @@ static const SoundAttributeStruct SoundList[SND_INDEX_MAX] =
{/*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, },
{/*15 SND_DPD_SPEED1 */ SND_SRC_DPD_SPEED1 , SND_TYPE_NORMAL, },
{/*15 SND_DPD_SPEED2 */ SND_SRC_DPD_SPEED2 , SND_TYPE_NORMAL, },
{/*15 SND_DPD_SPEED4 */ SND_SRC_DPD_SPEED4 , 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, },
{/*18 SND_Cyclone_High4HZ */ SND_SRC_Cyclone_High4HZ , SND_TYPE_NORMAL, },
{/*18 SND_Cyclone_High0_5 */ SND_SRC_Cyclone_High0_5 , 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, },
......
source/Application/Sound_Alarm/Sound_Scheduler.c
View file @ 0a99ded1
......@@ -8,6 +8,8 @@ uint8_t SoundEnableCode[SND_TOTAL_NUMBER];
SoundSchedulingStruct SoundScheduling;
/*SoundSeatbeltCtrlStruct SoundSeatbelt; */
extern SoundPlayCtrlStruct SoundPlayCtrl;
void Sound_Scheduler_Init(void)
{
uint8_t i;
......@@ -138,8 +140,17 @@ void Sound_Scheduling_Service(void)
if (SoundScheduling.Next < SND_TOTAL_NUMBER)
{
if (SoundScheduling.Current < SND_TOTAL_NUMBER) //如果当前有声音正在播放,则停止播放该声音
{
Sound_Stop(SoundList[SoundScheduling.Current].Src);
//当前声音未播完被打断，清空播放标记----20220107----
if (SoundPlayCtrl.Cycle != 0)
{
SoundEnableCode[SoundScheduling.Current] = 0;
}
//----20220107----
}
if (Sound_Play(SoundList[SoundScheduling.Next].Src) == 0) //如果请求的声音播放成功
{
SoundEnableCode[SoundScheduling.Next] = SoundScheduling.ReqCode; //声音已播放
......
source/Application/Sound_Alarm/Sound_Scheduler.h
View file @ 0a99ded1
......@@ -14,7 +14,7 @@ typedef struct
uint8_t StopReq;
} SoundSchedulingStruct;
/*
/*
#define SND_SEATBELT_120s_TIME 117000
......@@ -26,12 +26,12 @@ typedef struct
typedef struct
{
uint8_t DrMode;
uint8_t PaMode;
uint16_t DrTimer;
uint16_t PaTimer;
uint8_t DrMode;
uint8_t PaMode;
uint16_t DrTimer;
uint16_t PaTimer;
} SoundSeatbeltCtrlStruct;
*/
*/
......
source/Application/Sound_Alarm/Sound_Source.h
View file @ 0a99ded1
......@@ -29,10 +29,13 @@ typedef enum
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_DPD_SPEED1 , /*15 DPD 手动再生 */
SND_SRC_DPD_SPEED2 , /*15 DPD 手动再生 */
SND_SRC_DPD_SPEED4 , /*15 DPD 手动再生 */
SND_SRC_NEES , /*16 NEES */
SND_SRC_ECO_STOP , /*17 eco stop */
SND_SRC_Cyclone_High , /*18 气悬车高调整 */
SND_SRC_Cyclone_High4HZ , /*18 气悬车高调整 */
SND_SRC_Cyclone_High0_5 , /*18 气悬车高调整 */
SND_SRC_SEATBELT_SPEED , /*19 安全带 */
SND_SRC_Fuel_Saving , /*20 省油耗建议 */
SND_SRC_TICK , /*21 转向 */
......@@ -78,29 +81,32 @@ static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] =
/*================================================================================================
音源名称 | 音源序号 | 优先级 | 循环次数 | 播放模式 | 周期(ms)
------------------------------------------------------------------------------------------------*/
{/*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, },
{/*00 SND_SRC_Key_Notremoved */ BUZZER_Track_Index_Tic, 1, 1, SND_MODE_SINGLE, 1000U, },/*00 1HZ 忘拔钥匙 */
{/*01 SND_SRC_Braking */ BUZZER_Track_Index_Tic, 2, 1, SND_MODE_SINGLE, 100U, },/*01 连续 制动 */
{/*02 SND_SRC_Air_Brake */ BUZZER_Track_Index_Tic, 3, 1, SND_MODE_SINGLE, 100U, },/*02 连续 制动气压 */
{/*03 SND_SRC_BRAKE_LOCK */ BUZZER_Track_Index_Tic, 4, 1, SND_MODE_SINGLE, 100U, },/*03 BRAKE LOCK */
{/*04 SND_SRC_Parking_Brake */ BUZZER_Track_Index_Tic, 5, 1, SND_MODE_SINGLE, 100U, },/*04 停车制动忘记复位*/
{/*05 SND_SRC_Car_Dump_SPEED */ BUZZER_Track_Index_Tic, 6, 1, SND_MODE_SINGLE, 100U, },/*05 车厢报警自卸蜂鸣器*/
{/*06 SND_SRC_Temp_High */ BUZZER_Track_Index_Tic, 7, 1, SND_MODE_SINGLE, 100U, },/*06 连续 水温过热 */
{/*07 SND_SRC_Coolant_Low */ BUZZER_Track_Index_Tic, 8, 1, SND_MODE_SINGLE, 100U, },/*07 连续 冷却水量 */
{/*08 SND_SRC_Oil_pressure_Low*/ BUZZER_Track_Index_Tic, 9, 1, SND_MODE_SINGLE, 100U, },/*08 -(预留：油压)*/
{/*09 SND_SRC_ACC_AIR */ BUZZER_Track_Index_Tic, 10, 1, SND_MODE_SINGLE, 100U, },/*09 连续 ACC AIR */
{/*10 SND_SRC_BackUP_SPEED */ BUZZER_Track_Index_Tic, 11, 1, SND_MODE_SINGLE, 1000U, },/*10 1HZ 倒车警报 */
{/*11 SND_SRC_DS_SPEED */ BUZZER_Track_Index_Tic, 12, 1, SND_MODE_SINGLE, 100U, },/*11 DS 警报 */
{/*12 SND_SRC_ROWS_SPEED */ BUZZER_Track_Index_Tic, 13, 1, SND_MODE_SINGLE, 100U, },/*12 ROWS 警报 */
{/*13 SND_SRC_Roll_SPEED */ BUZZER_Track_Index_Tic, 14, 1, SND_MODE_SINGLE, 100U, },/*13 Roll 警报 */
{/*14 SND_SRC_EVSC_SPEED */ BUZZER_Track_Index_Tic, 15, 1, SND_MODE_SINGLE, 100U, },/*14 4HZ EVSC */
{/*15 SND_SRC_DPD_SPEED */ BUZZER_Track_Index_Tic, 16, 1, SND_MODE_SINGLE, 100U, },/*15 1HZ 3 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ BUZZER_Track_Index_Tic, 16, 1, SND_MODE_SINGLE, 100U, },/*15 2HZ 3 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ BUZZER_Track_Index_Tic, 16, 1, SND_MODE_SINGLE, 100U, },/*15 4HZ 3 DPD 手动再生 */
{/*16 SND_SRC_NEES */ BUZZER_Track_Index_Tic, 17, 1, SND_MODE_SINGLE, 100U, },/*16 NEES */
{/*17 SND_SRC_ECO_STOP */ BUZZER_Track_Index_Tic, 18, 1, SND_MODE_SINGLE, 100U, },/*17 eco stop */
{/*18 SND_SRC_Cyclone_High */ BUZZER_Track_Index_Tic, 19, 1, SND_MODE_SINGLE, 100U, },/*18 4HZ 气悬车高调整 */
{/*18 SND_SRC_Cyclone_High */ BUZZER_Track_Index_Tic, 19, 1, SND_MODE_SINGLE, 100U, },/*18 0.5HZ 气悬车高调整 */
{/*19 SND_SRC_SEATBELT_SPEED */ BUZZER_Track_Index_Tic, 20, 1, SND_MODE_SINGLE, 100U, },/*19 2HZ 安全带 */
{/*20 SND_SRC_Fuel_Saving */ BUZZER_Track_Index_Tic, 21, 1, SND_MODE_SINGLE, 100U, },/*20 1HZ省油耗建议 */
{/*21 SND_SRC_TICK */ 0000u, 22, 1, SND_MODE_SINGLE, 100U, },
{/*22 SND_SRC_TOCK */ 0001u, 23, 1, SND_MODE_SINGLE, 100U, },
/*==============================================================================================*/
};
......
source/Application/Sound_Alarm/Sound_Track_Playback.c
View file @ 0a99ded1
......@@ -56,7 +56,7 @@ void Snd_PCM_Track_Repeat_Play ( uint8_t TrackID, uint8_t Channel )
#if SND_SYS_PCM_CHANNEL_ENABLE
if ( ( TrackID >= PCM_TRACK_TOTAL_NUM ) || ( Channel > 4 ) )
return;
//I2S_MAX98357_InternalFlash_CH0_Player(PCMTrackAttrTable[TrackID].pPCMData, PCMTrackAttrTable[TrackID].Size , 0xFFFFU);
//I2S_MAX98357_InternalFlash_CH0_Player(PCMTrackAttrTable[TrackID].pPCMData, PCMTrackAttrTable[TrackID].Size , 0xFFFFU);
//Sound_System_Repeat_Play_PCM ( PCMTrackAttrTable[TrackID].pPCMData, PCMTrackAttrTable[TrackID].Size, Channel, PCMTrackAttrTable[TrackID].Gain );
#endif
}
......@@ -69,8 +69,8 @@ void Snd_PCM_Track_Repeat_Play ( uint8_t TrackID, uint8_t Channel )
void Snd_PCM_Track_Stop_Play ( uint8_t Channel )
{
#if SND_SYS_PCM_CHANNEL_ENABLE
// Sound_System_Stop_Play_PCM ( Channel );
// I2S_MAX98357_Stop( Channel);
// Sound_System_Stop_Play_PCM ( Channel );
// I2S_MAX98357_Stop( Channel);
#endif
}
......
source/Application/Sound_Alarm/Sound_Track_Playback.h
View file @ 0a99ded1
......@@ -15,12 +15,12 @@
/* Includes ------------------------------------------------------------------*/
//#include "include.h"
// #include "Sound_System.h"
#include "TYW_stdint.h"
#ifndef SND_SYS_PCM_CHANNEL_ENABLE
// #include "Sound_System.h"
#include "TYW_stdint.h"
#ifndef SND_SYS_PCM_CHANNEL_ENABLE
#define SND_SYS_PCM_CHANNEL_ENABLE 1
#endif
......
source/Driver/Buzzer/Sound_Tracks.h
View file @ 0a99ded1
......@@ -16,254 +16,254 @@
******************************************************************************/
typedef struct
{
uint16_t Freq; //声音频率(Hz),0表示静音(休止符)
uint16_t Duty; //声音占空比(%)
uint16_t Interval; //声音长度(ms)
uint16_t Fade; //声音淡出时间(ms)
}SndTrackNoteStruct;
uint16_t Freq; //声音频率(Hz),0表示静音(休止符)
uint16_t Duty; //声音占空比(%)
uint16_t Interval; //声音长度(ms)
uint16_t Fade; //声音淡出时间(ms)
} SndTrackNoteStruct;
/******************************************************************************
音轨属性结构
******************************************************************************/
typedef struct
{
uint8_t NoteNum; //总音符数
uint8_t PreCharge; //预充电时间(ms),影响第一个音符的播放力度
SndTrackNoteStruct Note[SND_TRACK_MAX_NOTE_NUM];
}SndTrackStruct;
uint8_t NoteNum; //总音符数
uint8_t PreCharge; //预充电时间(ms),影响第一个音符的播放力度
SndTrackNoteStruct Note[SND_TRACK_MAX_NOTE_NUM];
} SndTrackStruct;
/******************************************************************************
音轨属性表
******************************************************************************/
static const SndTrackStruct SndTracks[] =
static const SndTrackStruct SndTracks[] =
{
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
000 | 500ms | BUZZER_Track_Index_3900hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2380, 210, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
000 | 500ms | BUZZER_Track_Index_3900hz_500Dty
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2380, 210, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
001 | 980ms | 2kHz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 50, 930, 850,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
002 | 550ms | 长雷达提示音,800Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 800, 50, 500, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
003 | 300ms | 中雷达提示音,800Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 800, 50, 250, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
004 | 175ms | 短雷达提示音,800Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 800, 50, 125, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
005 | 53ms | 转向提示音Tick
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 780, 50, 3, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
006 | 52ms | 转向提示音Tock
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 780, 25, 3, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
007 | 980ms | 通用提示音,660Hz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 660, 50, 930, 850,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
008 | 980ms | 通用提示音,784Hz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 784, 50, 930, 850,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
009 | 980ms | 通用提示音,1000Hz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 1000, 50, 930, 850,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
010 | 980ms | 双音提示音,1000Hz + 784Hz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
3, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 1000, 50, 200, 150,
/* 2 */ 0, 0, 20, 0,
/* 3 */ 784, 50, 710, 620,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
011 | 500ms | 850Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 850, 50, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
001 | 980ms | 2kHz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 2300, 50, 930, 850,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
002 | 550ms | 长雷达提示音,800Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 800, 50, 500, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
003 | 300ms | 中雷达提示音,800Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 800, 50, 250, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
004 | 175ms | 短雷达提示音,800Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 800, 50, 125, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
005 | 53ms | 转向提示音Tick
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 780, 50, 3, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
006 | 52ms | 转向提示音Tock
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 780, 25, 3, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
007 | 980ms | 通用提示音,660Hz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 660, 50, 930, 850,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
008 | 980ms | 通用提示音,784Hz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 784, 50, 930, 850,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
009 | 980ms | 通用提示音,1000Hz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 1000, 50, 930, 850,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
010 | 980ms | 双音提示音,1000Hz + 784Hz淡出
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
3, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 1000, 50, 200, 150,
/* 2 */ 0, 0, 20, 0,
/* 3 */ 784, 50, 710, 620,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
{
/*==============================================================
音轨编号 | 总长度 | 描述
----------+--------+--------------------------------------------
011 | 500ms | 850Hz长鸣
----------------------------------------------------------------
总音符数 | 预充电时间(ms) |
--------------------------------------------------------------*/
1, 50,
/*--------------------------------------------------------------
音符编号 | 声音频率(Hz) | 占空比(%) | 时长(ms) | 淡出时间(ms)
--------------------------------------------------------------*/
/* 1 */ 850, 50, 450, 0,
/* 2 */ 0, 0, 0, 0,
/* 3 */ 0, 0, 0, 0,
/* 4 */ 0, 0, 0, 0,
/*============================================================*/
},
};
......@@ -271,7 +271,7 @@ static const SndTrackStruct SndTracks[] =
/******************************************************************************
音轨总数
******************************************************************************/
#define SND_TRACK_TOTAL_NUM (sizeof(SndTracks) / sizeof(SndTrackStruct))
#define SND_TRACK_TOTAL_NUM (sizeof(SndTracks) / sizeof(SndTrackStruct))
......
source/System/tasks.c
View file @ 0a99ded1
......@@ -139,6 +139,7 @@ void Sys_Run_Mode_10ms_Tasks(void)
loc_Display_Service();
Data_Mileage_Write_EEPROM();
Line_In_Debounce_Service();
Popup_Alone_Sound_Server();
Telltales_Management();
// Test_LED_AllLight();
Key_Service();
......
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