Skip to content

TianYing_ty100
TianYing_ty100
Commit d87979f0 authored by 李俭双's avatar 李俭双
Browse files
Options

🐞 fix:代码评审问题：统一IG信号

parent 0494bb29
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 17 deletions
Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing200.BAT
View file @ d87979f0
SET PATH=C:\Keil_v5\ARM\ARMCC\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Users\tyw05\AppData\Local\Microsoft\WindowsApps;
SET CPU_TYPE=BAT32G139GK64FB
SET CPU_VENDOR=Cmsemicon
SET UV2_TARGET=TianYing200
SET CPU_CLOCK=0x00B71B00
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_fuel.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\backlight.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_espeed.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_vspeed.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\gpiouser.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\can_ch0_can_communication_matrix.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\commoninterface.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\seg_display.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\gui_display.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\can_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\can_app.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_tpms.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_voltage.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\bluetooth.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\protocol_crc16.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\protocol_lib.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\protocol_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\code.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_coolant.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\bu98r10.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\services_mileage_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\eemanager_interface.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\key_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\line_in_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\led_driver_interface.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\simulated_iic_2_master.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\analog_circuits.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\analog_signals.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\powermanag_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\system_monitor_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\telltales_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\system_monitor.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\service_interval.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\service_interval_user.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_tick_timer_bat32a239.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_wdt_bat32a239.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_gpio_bat32a239.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\deepsleep.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_rtc.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\trmerm.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_adc_interim_version.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_can.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rte_clock_select_bat32a239.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\uart_demo.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\main.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\sys_scheduler.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\sys_scheduler_lib.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\sys_task_list.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\adc.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\can.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\cgc.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\cmp.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\dac.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\delay.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\dma.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\elc.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\epwm.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\flash.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\gpio.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\i2c.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\i2ca.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\interval.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\intp.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\key.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\pcbz.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\pga.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rtc.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\sci_common.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\sspi.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\tim.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\tima.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\timb.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\timm.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\uart.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\wdt.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\isr.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\docan_iso15765.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\uds_iso14229_server.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\uds_iso14229_services.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\isr_bat32g139.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmAsm" --Via ".\objects\startup_bat32g139._ia"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\system_bat32g139.__i"
"C:\Keil_v5\ARM\ARMCC\Bin\ArmLink" --Via ".\Objects\TianYing.lnp"
"C:\Keil_v5\ARM\ARMCC\Bin\fromelf.exe" ".\Objects\TianYing.axf" --i32combined --output ".\Objects\TianYing.hex"
Firmware/Source/Application/BackLight/BackLight.c
View file @ d87979f0
...@@ -21,7 +21,7 @@ void BackLight_Init(void) ...@@ -21,7 +21,7 @@ void BackLight_Init(void)
void BackLight_Process(void) void BackLight_Process(void)
{ {
if (SYS_OPR_STAT_IGN_ON) if (Common_Get_IG_Sts( ) == COMMON_POWER_ON)
{ {
//if (Line_In_Get_Status(LINE_IN_Little_Lamp)) //if (Line_In_Get_Status(LINE_IN_Little_Lamp))
//{ //{
......
Firmware/Source/Application/Data_Coolant/Data_Coolant.c
View file @ d87979f0
...@@ -197,7 +197,7 @@ void Data_Coolant_Temp_Processing_Service(void) ...@@ -197,7 +197,7 @@ void Data_Coolant_Temp_Processing_Service(void)
Coolant_Temperature = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature(); Coolant_Temperature = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature();
Coolant_Temperature_State = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature_State(); Coolant_Temperature_State = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature_State();
if (SYS_OPR_STAT_IGN_ON ) if (Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{ {
if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x101_Msg_Count) == CAN_SIG_LOST) if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x101_Msg_Count) == CAN_SIG_LOST)
{ {
...@@ -253,7 +253,7 @@ void Data_Coolant_Temp_Processing_Service(void) ...@@ -253,7 +253,7 @@ void Data_Coolant_Temp_Processing_Service(void)
void Data_Coolant_Temp_Display ( void ) void Data_Coolant_Temp_Display ( void )
{ {
if(SYS_OPR_STAT_IGN_ON) if(Common_Get_IG_Sts( ) == COMMON_POWER_ON)
{ {
if (Common_GetIgnOnTime() < 3030) if (Common_GetIgnOnTime() < 3030)
{ {
......
Firmware/Source/Application/Data_ESpeed/Data_ESpeed.c
View file @ d87979f0
...@@ -52,7 +52,7 @@ void Data_Engine_Speed_Processing_Service ( void ) ...@@ -52,7 +52,7 @@ void Data_Engine_Speed_Processing_Service ( void )
Engine_Speed_State = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Speed_State(); Engine_Speed_State = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Speed_State();
//第1步：获取实际转速值及转速有效性 //第1步：获取实际转速值及转速有效性
if ( SYS_OPR_STAT_IGN_ON) if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON)
{ {
if((CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x101_Msg_Count) == CAN_SIG_LOST)||(Engine_Speed_State == 1)) if((CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x101_Msg_Count) == CAN_SIG_LOST)||(Engine_Speed_State == 1))
{ {
......
Firmware/Source/Application/Data_VSpeed/Data_VSpeed.c
View file @ d87979f0
...@@ -79,7 +79,7 @@ void Data_Vehicle_Speed_Processing_Service(void) ...@@ -79,7 +79,7 @@ void Data_Vehicle_Speed_Processing_Service(void)
ESC_VehicleSpeedState = Get_CAN_CH0_ID_101_Sig_ECU_Vehicle_Speed_State( ); ESC_VehicleSpeedState = Get_CAN_CH0_ID_101_Sig_ECU_Vehicle_Speed_State( );
// 第1步：获取实际车速值及车速有效性 // 第1步：获取实际车速值及车速有效性
if( SYS_OPR_STAT_IGN_ON) if( Common_Get_IG_Sts( ) == COMMON_POWER_ON)
{ {
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x101_Msg_Count) == CAN_SIG_LOST) if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x101_Msg_Count) == CAN_SIG_LOST)
{ {
......
Firmware/Source/Application/Data_Voltage/Data_Voltage.c
View file @ d87979f0
...@@ -14,7 +14,7 @@ void Data_Voltage_Processing_Service ( void ) ...@@ -14,7 +14,7 @@ void Data_Voltage_Processing_Service ( void )
{ {
uint8_t voltage = 0; uint8_t voltage = 0;
uint8_t i = 0; uint8_t i = 0;
if ( SYS_OPR_STAT_IGN_ON ) if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{ {
if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x401_Msg_Count) == CAN_SIG_LOST) if(CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x401_Msg_Count) == CAN_SIG_LOST)
{ {
......
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @ d87979f0
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
void Gauge_Clock_Display(void) void Gauge_Clock_Display(void)
{ {
uint8_t PageType_DIS = 0; uint8_t PageType_DIS = 0;
if (SYS_OPR_STAT_IGN_ON) if (Common_Get_IG_Sts( ) == COMMON_POWER_ON)
{ {
PageType_DIS = Get_Current_PageType(); PageType_DIS = Get_Current_PageType();
...@@ -67,7 +67,7 @@ void Gauge_Service(void) ...@@ -67,7 +67,7 @@ void Gauge_Service(void)
{ {
static uint16_t VSpeed_Count = 0u; static uint16_t VSpeed_Count = 0u;
uint8_t k = 0; uint8_t k = 0;
if ( SYS_OPR_STAT_IGN_ON ) if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{ {
if (ClearODO_Flag == 1) if (ClearODO_Flag == 1)
{ {
...@@ -137,7 +137,7 @@ void Gauge_Service(void) ...@@ -137,7 +137,7 @@ void Gauge_Service(void)
uint8_t k = 0; uint8_t k = 0;
if (ClearODO_Flag == 1) if (ClearODO_Flag == 1)
{ {
if ( SYS_OPR_STAT_IGN_ON ) if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{ {
Check_SEG_Display(); Check_SEG_Display();
for(k = 0; k < LampCh0_MAX; k ++) for(k = 0; k < LampCh0_MAX; k ++)
...@@ -166,7 +166,7 @@ void Gauge_Service(void) ...@@ -166,7 +166,7 @@ void Gauge_Service(void)
} }
else else
{ {
if ( SYS_OPR_STAT_IGN_ON ) if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{ {
if (Common_GetIgnOnTime() >= 3030) if (Common_GetIgnOnTime() >= 3030)
{ {
......
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @ d87979f0
...@@ -4598,7 +4598,7 @@ void Checkself_SEG_Display(void) ...@@ -4598,7 +4598,7 @@ void Checkself_SEG_Display(void)
void TYW_Check_Count(void) void TYW_Check_Count(void)
{ {
if ((ClearODO_Flag == 1) && (SYS_OPR_STAT_IGN_ON)) if ((ClearODO_Flag == 1) && (Common_Get_IG_Sts( ) == COMMON_POWER_ON))
{ {
if (check_SEG_step < 249u) if (check_SEG_step < 249u)
{ {
......
Firmware/Source/Component/Key/Key_user.c
View file @ d87979f0
...@@ -144,7 +144,7 @@ Key_Status_en_t Key_Status_Read_Left(void) ...@@ -144,7 +144,7 @@ Key_Status_en_t Key_Status_Read_Left(void)
Key_Status_en_t Key_Status_Read_Right(void) Key_Status_en_t Key_Status_Read_Right(void)
{ {
Key_Status_en_t enKeyReal = KEY_REALTIME_LOOSEN; Key_Status_en_t enKeyReal = KEY_REALTIME_LOOSEN;
// if (SYS_OPR_STAT_IGN_ON) // if (Common_Get_IG_Sts( ) == COMMON_POWER_ON)
// { // {
// if (RTE_GPIO_Get_Level(SET_P_IN)) // if (RTE_GPIO_Get_Level(SET_P_IN))
// { // {
...@@ -486,7 +486,7 @@ void TYW_RESET_ODO(void) ...@@ -486,7 +486,7 @@ void TYW_RESET_ODO(void)
{ {
uint8_t Clear_EE[4] = {0xff, 0xff, 0xff, 0xff}; uint8_t Clear_EE[4] = {0xff, 0xff, 0xff, 0xff};
uint8_t Clear_EE_8[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; uint8_t Clear_EE_8[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
if(SYS_OPR_STAT_IGN_ON) if(Common_Get_IG_Sts( ) == COMMON_POWER_ON)
{ {
if(ClearODO_Flag < 1) if(ClearODO_Flag < 1)
{ {
......
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @ d87979f0
...@@ -83,7 +83,7 @@ static void Power_KL30_Init(void) ...@@ -83,7 +83,7 @@ static void Power_KL30_Init(void)
Data_Coolant_Temp_KL30_Init(); Data_Coolant_Temp_KL30_Init();
LINE_IN_Init(); LINE_IN_Init();
Key_KL30_Init_EXample(); Key_KL30_Init_EXample();
//Light_Sensor_Init_Example();//注意顺序1
LED_Driver_Init_Example();//注意顺序2 LED_Driver_Init_Example();//注意顺序2
LED_Driver_Service_Immediate(); LED_Driver_Service_Immediate();
Data_User_Mileage_KL30Init(); Data_User_Mileage_KL30Init();
...@@ -152,7 +152,7 @@ static void Power_Wakeup_Init(void) ...@@ -152,7 +152,7 @@ static void Power_Wakeup_Init(void)
Key_KL30_Init_EXample(); Key_KL30_Init_EXample();
Line_In_KL15_ON_Init(); Line_In_KL15_ON_Init();
MenuData_TCS_Init(); MenuData_TCS_Init();
//Light_Sensor_Init_Example();//注意顺序1
LED_Driver_Init_Example();//注意顺序2 LED_Driver_Init_Example();//注意顺序2
LED_Driver_Service_Immediate(); LED_Driver_Service_Immediate();
Protocol_KL30_Wakeup_Init(); Protocol_KL30_Wakeup_Init();
...@@ -261,7 +261,7 @@ static Power_Status_em Power_Stay_OFF(void) ...@@ -261,7 +261,7 @@ static Power_Status_em Power_Stay_OFF(void)
Power_Status_em u8PowerSts; Power_Status_em u8PowerSts;
u8PowerSts = EM_IGN_OFF; u8PowerSts = EM_IGN_OFF;
if (SYS_OPR_STAT_IGN_ON) if (Common_Get_IG_Sts( ) == COMMON_POWER_ON)
{ {
u8PowerSts = EM_IGN_ON_Init; u8PowerSts = EM_IGN_ON_Init;
} }
......
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ d87979f0
...@@ -761,7 +761,7 @@ static void LED_Navigato_Execution(Tellib_uint16_t led_status) ...@@ -761,7 +761,7 @@ static void LED_Navigato_Execution(Tellib_uint16_t led_status)
void Turn_Left_Right_Lamp(void) void Turn_Left_Right_Lamp(void)
{ {
if ( SYS_OPR_STAT_IGN_ON ) if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
{ {
if ((Common_GetIgnOnTime() >= 3030) && (ClearODO_Flag == 0)) if ((Common_GetIgnOnTime() >= 3030) && (ClearODO_Flag == 0))
{ {
......
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