Commit ae44a4c2 authored by hu's avatar hu

调整FLASH FV00.09

parent 94bd9c5e
...@@ -97,8 +97,10 @@ Power_Status_t Power_KL30_Init ( void ) ...@@ -97,8 +97,10 @@ Power_Status_t Power_KL30_Init ( void )
Fuel_VCC05V_OUT_EN = 1U ; /*燃油电源 使能*/ Fuel_VCC05V_OUT_EN = 1U ; /*燃油电源 使能*/
AIR_5V_OUT_EN = 1u; /*气压 5V*/ AIR_5V_OUT_EN = 1u; /*气压 5V*/
ACC5V_LED_PWM_MCU = 1u; ACC5V_LED_PWM_MCU = 1u;
BUZZER_ACC_OUT_EN = 1u;
IS31_Init(); IS31_Init();
Sound_Scheduler_Init(); Sound_Scheduler_Init();
Sound_Player_Init(); Sound_Player_Init();
RTE_PWM_Init(); RTE_PWM_Init();
...@@ -131,6 +133,7 @@ void Power_Sleep_Init(void) ...@@ -131,6 +133,7 @@ void Power_Sleep_Init(void)
Fuel_VCC05V_OUT_EN = 1U ; /*燃油电源 使能*/ Fuel_VCC05V_OUT_EN = 1U ; /*燃油电源 使能*/
AIR_5V_OUT_EN = 1u; /*气压 5V*/ AIR_5V_OUT_EN = 1u; /*气压 5V*/
ACC5V_LED_PWM_MCU = 1u; ACC5V_LED_PWM_MCU = 1u;
BUZZER_ACC_OUT_EN = 1u;
IS31_Shutdown(); IS31_Shutdown();
...@@ -174,6 +177,7 @@ Power_Status_t Power_Wakeup_Init ( void ) ...@@ -174,6 +177,7 @@ Power_Status_t Power_Wakeup_Init ( void )
Fuel_VCC05V_OUT_EN = 1U ; /*燃油电源 使能*/ Fuel_VCC05V_OUT_EN = 1U ; /*燃油电源 使能*/
AIR_5V_OUT_EN = 1u; /*气压 5V*/ AIR_5V_OUT_EN = 1u; /*气压 5V*/
ACC5V_LED_PWM_MCU = 1u; ACC5V_LED_PWM_MCU = 1u;
BUZZER_ACC_OUT_EN = 1u;
IS31_Init(); IS31_Init();
/*报警调度初始化*/ /*报警调度初始化*/
......
...@@ -1153,7 +1153,7 @@ void Popup_Alone_Sound_Server(void) ...@@ -1153,7 +1153,7 @@ void Popup_Alone_Sound_Server(void)
{ {
if (u8IG_st == COMMON_POWER_ON) if (u8IG_st == COMMON_POWER_ON)
{ {
#if 0
/*00 忘拔钥匙*/ /*00 忘拔钥匙*/
Sound_Delete(SND_Key_Notremoved); Sound_Delete(SND_Key_Notremoved);
...@@ -1422,20 +1422,20 @@ void Popup_Alone_Sound_Server(void) ...@@ -1422,20 +1422,20 @@ void Popup_Alone_Sound_Server(void)
{ {
Sound_Delete(SND_Fuel_Saving); 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 & 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 & 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 & 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 & 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 & 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 & 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 & 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 & 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 & 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 & 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 & 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_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_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*/ //if (CD4051_COM7_X2_IN == 1u) Sound_Request ( SND_Air_Brake, 1 ); else Sound_Delete( SND_Air_Brake );/*B17 = 1*/
......
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#include "GPIO.h" #include "GPIO.h"
#include "r_typedefs.h" #include "r_typedefs.h"
#define BUZZER_PWM_CHANNEL 4
#define LINE_BUZZER BUZZER_ACC_OUT_EN #define LINE_BUZZER BUZZER_ACC_OUT_EN
#ifndef BUZZER_CTRL #ifndef BUZZER_CTRL
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -31,6 +31,12 @@ enum SpriteName ...@@ -31,6 +31,12 @@ enum SpriteName
ditu = 0u, ditu = 0u,
ditu_1, ditu_1,
ditu_2, ditu_2,
quanping_black,
quanping_blue,
quanping_green,
quanping_MSK,
quanping_red,
quanping_white,
Nb_12_0, Nb_12_0,
Nb_12_1, Nb_12_1,
Nb_12_2, Nb_12_2,
......
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