Skip to content

R
RT_RMR42E
Commit ab5a58eb authored by 郑萍's avatar 郑萍
Browse files
Options

✨ feat:电源模式切换到Key_ACC自检

parent a438ed2b
Hide whitespace changes
Inline Side-by-side
Showing with 606 additions and 561 deletions
Firmware/Source/Application/BackLight/BackLight.c
View file @ ab5a58eb
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
uint8_t interact_PWM_Low_Duty = 0; uint8_t interact_PWM_Low_Duty = 0;
void BackLight_Process(void) void BackLight_Process(void)
{ {
if (SYS_OPR_STAT_IGN_ON) if (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF )
{ {
TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_DAY); TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_DAY);
} }
...@@ -21,7 +21,7 @@ void BackLight_Process(void) ...@@ -21,7 +21,7 @@ void BackLight_Process(void)
void Interact_Light_Process(void) void Interact_Light_Process(void)
{ {
if (SYS_OPR_STAT_IGN_ON) if (Get_CAN_Power_State() != PKEY_ON && Get_CAN_Power_State() != KEY_OFF )
{ {
TimerM_PWM_set_duty(TIMERM_COUNTER0, TIMERM_CHD, interact_PWM_Low_Duty * 10); TimerM_PWM_set_duty(TIMERM_COUNTER0, TIMERM_CHD, interact_PWM_Low_Duty * 10);
} }
......
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
View file @ ab5a58eb
...@@ -173,6 +173,38 @@ void System_Indicator_OFF_callback(void) ...@@ -173,6 +173,38 @@ void System_Indicator_OFF_callback(void)
{ {
System_Indicator_CANFlag = 1; System_Indicator_CANFlag = 1;
} }
uint8_t Get_CAN_Power_State(void)
{
uint8_t state = 0;
uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode();
switch (Signal1)
{
case 0x0:
state = KEY_OFF;
break;
case 0x1:
state = PKEY_ON;
break;
case 0x2:
state = KEY_ACC;
break;
case 0x3:
state = READY;
break;
case 0x4:
state = CHRG_PLUGIN;
break;
case 0x5:
state = CHRGING;
break;
case 0x6:
state = CHRGEND;
break;
default:
break;
}
return state;
}
uint8_t Get_CAN_CH0_ID_393_Sig_ICU_ProtoSubVer(void) uint8_t Get_CAN_CH0_ID_393_Sig_ICU_ProtoSubVer(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x393_Msg_Count, 6u) >> 0u) & 0xFFu)); return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0,CAN_CH0_ID_CAN_0x393_Msg_Count, 6u) >> 0u) & 0xFFu));
......
Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.h
View file @ ab5a58eb
...@@ -30,6 +30,18 @@ typedef enum ...@@ -30,6 +30,18 @@ typedef enum
CAN_CH0_ID_TOTAL_MAX, CAN_CH0_ID_TOTAL_MAX,
} CAN_CH0_CAN_MSG_ID_t; } CAN_CH0_CAN_MSG_ID_t;
typedef enum
{
KEY_OFF = 0,
PKEY_ON,
KEY_ACC,
READY,
CHRG_PLUGIN,
CHRGING,
CHRGEND,
} POWER_CHECK_STATE_t;
typedef enum typedef enum
{ {
...@@ -125,5 +137,6 @@ extern uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID); ...@@ -125,5 +137,6 @@ extern uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID);
extern uint8_t System_Indicator_CANFlag; extern uint8_t System_Indicator_CANFlag;
void System_Indicator_ON_callback(void); void System_Indicator_ON_callback(void);
void System_Indicator_OFF_callback(void); void System_Indicator_OFF_callback(void);
extern uint8_t Get_CAN_Power_State(void);
#endif #endif
Firmware/Source/Application/CommonInterface/CommonInterface.c
View file @ ab5a58eb
#include "CommonInterface\CommonInterface.h" #include "CommonInterface\CommonInterface.h"
#include "CAN_APP\CAN_CH0_CAN_Communication_Matrix.h"
static uint32_t PowerIgnOnTimeLine; static uint32_t PowerIgnOnTimeLine;
uint32_t PowerIgnOffTimeLine; uint32_t PowerIgnOffTimeLine;
uint8_t Power_CheckSelf = 0;
static uint32_t PowerSocTimeLine; static uint32_t PowerSocTimeLine;
static COMMON_PowerStatus_t PowerSts; /*1 ON ; 0 OFF*/ static COMMON_PowerStatus_t PowerSts; /*1 ON ; 0 OFF*/
...@@ -50,7 +51,7 @@ uint16_t Common_Get_Act_V_Speed_ODO(void) ...@@ -50,7 +51,7 @@ uint16_t Common_Get_Act_V_Speed_ODO(void)
// uint16_t Common_Get_Disp_V_Speed(void) // uint16_t Common_Get_Disp_V_Speed(void)
// { // {
// return Disp_V_Speed; // return Disp_V_Speed;
// } // }
uint16_t Common_Get_TireSize(void) uint16_t Common_Get_TireSize(void)
{ {
...@@ -106,27 +107,31 @@ void Common_Input_Para(void) ...@@ -106,27 +107,31 @@ void Common_Input_Para(void)
{ {
if (SYS_OPR_STAT_IGN_ON) if (SYS_OPR_STAT_IGN_ON)
{ {
Common_Set_IG_Sts(COMMON_POWER_ON); if ((Get_CAN_Power_State() != KEY_OFF))
Common_Set_IG_Sts_Valid(COMMON_Valid); {
Common_Set_IG_Sts(COMMON_POWER_ON);
Common_Set_IG_Sts_Valid(COMMON_Valid);
// Common_Set_Act_V_Speed(Get_ActualVechileSpeed()); PowerIgnOffTimeLine = 0ul;
// Common_Set_Disp_V_Speed(Get_DispVechileSpeed());
// if (Get_VechileSpeedValid() == COMMON_Valid) if (PowerIgnOnTimeLine < 0x7ffffffful)
// { {
// Common_Set_Act_V_Speed_Valid(COMMON_Valid); PowerIgnOnTimeLine += 2u;
// Common_Set_Disp_V_Speed_Valid(COMMON_Valid); }
// } }
// else else
// { {
// Common_Set_Act_V_Speed_Valid(COMMON_InValid); PowerIgnOnTimeLine = 0ul;
// Common_Set_Disp_V_Speed_Valid(COMMON_InValid); if (PowerIgnOffTimeLine < 0x7ffffffful)
// } {
PowerIgnOffTimeLine += 2u;
PowerIgnOffTimeLine = 0ul; }
Common_Set_IG_Sts(COMMON_POWER_OFF);
if (PowerIgnOnTimeLine < 0x7ffffffful) Common_Set_IG_Sts_Valid(COMMON_Valid);
}
if ((Get_CAN_Power_State() == PKEY_ON))
{ {
PowerIgnOnTimeLine += 2u; PowerIgnOnTimeLine = 0ul;
} }
} }
else else
...@@ -138,10 +143,6 @@ void Common_Input_Para(void) ...@@ -138,10 +143,6 @@ void Common_Input_Para(void)
} }
Common_Set_IG_Sts(COMMON_POWER_OFF); Common_Set_IG_Sts(COMMON_POWER_OFF);
Common_Set_IG_Sts_Valid(COMMON_Valid); Common_Set_IG_Sts_Valid(COMMON_Valid);
// /*车转真实值OFF为0*/
// Common_Set_Act_V_Speed(0u);
// Common_Set_Disp_V_Speed(0u);
} }
} }
...@@ -160,16 +161,14 @@ uint32_t Common_GetSocTime(void) ...@@ -160,16 +161,14 @@ uint32_t Common_GetSocTime(void)
return PowerSocTimeLine; return PowerSocTimeLine;
} }
/** /**
* @brief 公里转换英里 * @brief 公里转换英里
* @return 公里 * @return 公里
*/ */
uint32_t Data_Km_To_Mile(uint32_t Km) uint32_t Data_Km_To_Mile(uint32_t Km)
{ {
//Km *= 621; // Km *= 621;
//Km /= 1000; // Km /= 1000;
Km *= 100; Km *= 100;
Km /= 161; Km /= 161;
return Km; return Km;
...@@ -184,5 +183,3 @@ uint32_t Data_Mile_To_Km(uint32_t Mile) ...@@ -184,5 +183,3 @@ uint32_t Data_Mile_To_Km(uint32_t Mile)
Mile /= 100; Mile /= 100;
return Mile; return Mile;
} }
Firmware/Source/Application/GUI_Display/GUI_Display.c
View file @ ab5a58eb
#include "GUI_Display\GUI_Display.h" #include "GUI_Display\GUI_Display.h"
#include "SEG_DISPLAY\SEG_DISPLAY.h" #include "SEG_DISPLAY\SEG_DISPLAY.h"
#include "Application.h" #include "Application.h"
uint8_t SOC_1_Flag_Count = 0; uint8_t SOC_1_Flag_Count = 0;
...@@ -49,7 +49,7 @@ uint8_t SOC_2_Count = 0; ...@@ -49,7 +49,7 @@ uint8_t SOC_2_Count = 0;
// } // }
// } // }
// } // }
// } // }
// void Gauge_Power_2_SOC_Display(void) // void Gauge_Power_2_SOC_Display(void)
// { // {
...@@ -103,7 +103,7 @@ uint8_t SOC_2_Count = 0; ...@@ -103,7 +103,7 @@ uint8_t SOC_2_Count = 0;
// VSpeedDisplayValue = 0u; // VSpeedDisplayValue = 0u;
// SEG_SET_VSpeed_NUM(0u, 0u); // SEG_SET_VSpeed_NUM(0u, 0u);
// } // }
// } // }
void Gauge_Clock_Display(void) void Gauge_Clock_Display(void)
{ {
...@@ -111,7 +111,7 @@ void Gauge_Clock_Display(void) ...@@ -111,7 +111,7 @@ void Gauge_Clock_Display(void)
// if (Common_Get_IG_Sts( ) == COMMON_POWER_ON) // if (Common_Get_IG_Sts( ) == COMMON_POWER_ON)
// { // {
// // PageType_DIS = Get_Current_PageType(); // // PageType_DIS = Get_Current_PageType();
// if ( PageType_DIS == 1 ) // if ( PageType_DIS == 1 )
// { // {
// if(FLASH_SYNC_1Hz) // if(FLASH_SYNC_1Hz)
...@@ -122,7 +122,7 @@ void Gauge_Clock_Display(void) ...@@ -122,7 +122,7 @@ void Gauge_Clock_Display(void)
// { // {
// SEG_SET_Clock(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), 1, 0, 1); // SEG_SET_Clock(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), 1, 0, 1);
// } // }
// } // }
// else if ( PageType_DIS == 2 ) // else if ( PageType_DIS == 2 )
// { // {
...@@ -135,7 +135,7 @@ void Gauge_Clock_Display(void) ...@@ -135,7 +135,7 @@ void Gauge_Clock_Display(void)
// SEG_SET_Clock(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), 1, 1, 0); // SEG_SET_Clock(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), 1, 1, 0);
// } // }
// } // }
// else // else
// { // {
// SEG_SET_Clock(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), FLASH_SYNC_1Hz, 1, 1); // SEG_SET_Clock(Get_Dis_Hour_Time(), Get_Dis_Minute_Time(), FLASH_SYNC_1Hz, 1, 1);
// } // }
...@@ -148,9 +148,9 @@ void Gauge_Clock_Display(void) ...@@ -148,9 +148,9 @@ void Gauge_Clock_Display(void)
void Gauge_Trip_Display(void) void Gauge_Trip_Display(void)
{ {
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON ) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
SEG_SET_TRIP_NUM(1u, Get_Trip_Value()); SEG_SET_TRIP_NUM(1u, Get_Trip_Value());
} }
else else
{ {
...@@ -160,7 +160,7 @@ void Gauge_Trip_Display(void) ...@@ -160,7 +160,7 @@ void Gauge_Trip_Display(void)
void Gauge_ODO_Display(void) void Gauge_ODO_Display(void)
{ {
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON ) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
SEG_SET_ODO_NUM(1u, Get_ODO_Value() / 10u); SEG_SET_ODO_NUM(1u, Get_ODO_Value() / 10u);
} }
...@@ -171,7 +171,7 @@ void Gauge_ODO_Display(void) ...@@ -171,7 +171,7 @@ void Gauge_ODO_Display(void)
} }
void Gauge_EspeedDial_Display(void) void Gauge_EspeedDial_Display(void)
{ {
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON ) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
// SEG_SET_EspeedDial(1, Get_DispEngineSpeed()/1000, Get_DispEngineSpeed()); // SEG_SET_EspeedDial(1, Get_DispEngineSpeed()/1000, Get_DispEngineSpeed());
} }
...@@ -181,8 +181,8 @@ void Gauge_EspeedDial_Display(void) ...@@ -181,8 +181,8 @@ void Gauge_EspeedDial_Display(void)
} }
} }
void Gauge_Frame_Display(void) void Gauge_Frame_Display(void)
{ {
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON ) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
SEG_SET_Frame(1); SEG_SET_Frame(1);
} }
...@@ -192,98 +192,78 @@ void Gauge_Frame_Display(void) ...@@ -192,98 +192,78 @@ void Gauge_Frame_Display(void)
} }
} }
void Clear_Bu98(void) void Clear_Bu98(void)
{ {
uint8_t i = 0; uint8_t i = 0;
for(i = 0; i < BU98R10_DDRAM_SIZE; i ++) for (i = 0; i < BU98R10_DDRAM_SIZE; i++)
{ {
BU98R10Chip0DDRAM.Byte[i] = 0; BU98R10Chip0DDRAM.Byte[i] = 0;
BU98R10Chip1DDRAM.Byte[i] = 0; BU98R10Chip1DDRAM.Byte[i] = 0;
} }
} }
void Gauge_Service(void) void Gauge_Service(void)
{ {
static uint16_t VSpeed_Count = 0u; uint8_t i = 0;
Gauge_Frame_Display(); Gauge_Frame_Display();
if (0) if (0)
{ {
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON ) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
Check_SEG_Display(); Check_SEG_Display();
} }
else else
{ {
Clear_Bu98(); Clear_Bu98();
// RTE_GPIO_Set_Level(VSPEED_TEN_OUT, 0);
// RTE_GPIO_Set_Level(VSPEED_HUNDREDS_OUT, 0);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_29_MPH, 0);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_30_KM_H, 0);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_07_Key_ISTOP, 0);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_02_Normal_Voltage, 0);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_High_Low_Voltage, 0);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_06_Screen_Time, 0);
} }
} }
else else
{ {
if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON ) if (Common_Get_IG_Sts() == COMMON_POWER_ON && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16000 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9000)
{ {
if (Common_GetIgnOnTime() >= 3000) if (Get_CAN_Power_State() != PKEY_ON )
{ {
// Gauge_Power_1_SOC_Display(); if (Common_GetIgnOnTime() >= 3000)
// Gauge_Power_2_SOC_Display(); {
Gauge_ODO_Display(); // Gauge_Power_1_SOC_Display();
Gauge_Clock_Display(); // Gauge_Power_2_SOC_Display();
Gauge_Trip_Display(); Checkself_Init();
Gauge_EspeedDial_Display(); Gauge_ODO_Display();
SEG_SET_Clock(22,22,1,1,1); Gauge_Clock_Display();
SEG_SET_Fault_Code(1,2222); Gauge_Trip_Display();
SEG_SET_EleDial(1,10,22); Gauge_EspeedDial_Display();
SEG_SET_FuelDial(1,8); SEG_SET_Clock(22, 22, 1, 1, 1);
SEG_SET_GEAR(1,1); SEG_SET_Fault_Code(0, 2222);
SEG_SET_Cutterhead(1,2); SEG_SET_EleDial(1, 10, 22);
SEG_SET_LED_STS(0,1); SEG_SET_FuelDial(0, 8);
SEG_SET_LED_STS(1,1); SEG_SET_GEAR(1, 1);
SEG_SET_LED_STS(2,1); SEG_SET_Cutterhead(1, 2);
SEG_SET_LED_STS(3,1); SEG_SET_Frame(1);
SEG_SET_LED_STS(4,1); interact_PWM_Low_Duty = 0;
SEG_SET_LED_STS(5,1); }
SEG_SET_LED_STS(6,1); else
SEG_SET_LED_STS(7,1); {
SEG_SET_LED_STS(8,1); Checkself_SEG_Display();
SEG_SET_LED_STS(9,1); }
SEG_SET_LED_STS(10,1);
SEG_SET_LED_STS(11,1);
SEG_SET_LED_STS(12,1);
SEG_SET_LED_STS(13,1);
SEG_SET_LED_STS(14,1);
SEG_SET_LED_STS(15,1);
SEG_SET_LED_STS(16,1);
SEG_SET_LED_STS(17,1);
SEG_SET_LED_STS(18,1);
SEG_SET_Frame(1);
} }
else else
{ {
Checkself_SEG_Display(); // Clear_Bu98();
// for (i = 0; i < LampCh0_MAX; i++)
// {
// LED_Driver_Channel_Set(LampChannel_0, i, LED_OFF);
// }
interact_PWM_Low_Duty = 50;
//蜂鸣器
} }
} }
else else
{ {
Clear_Bu98(); Clear_Bu98();
// RTE_GPIO_Set_Level(VSPEED_TEN_OUT, 0); for (i = 0; i < LampCh0_MAX; i++)
// RTE_GPIO_Set_Level(VSPEED_HUNDREDS_OUT, 0); {
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_29_MPH, 0); LED_Driver_Channel_Set(LampChannel_0, i, LED_OFF);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_30_KM_H, 0); }
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_07_Key_ISTOP, 0);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_02_Normal_Voltage, 0);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_High_Low_Voltage, 0);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_06_Screen_Time, 0);
} }
} }
} }
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @ ab5a58eb
...@@ -19,20 +19,20 @@ const uint8_t SEG_UNDISPLAY_NUMBER0[] = {0x00u, 0x06u, 0x5Bu, 0x4Fu, 0x66u, 0x6D ...@@ -19,20 +19,20 @@ const uint8_t SEG_UNDISPLAY_NUMBER0[] = {0x00u, 0x06u, 0x5Bu, 0x4Fu, 0x66u, 0x6D
_Fun_Res SEG_SET_Frame(uint8_t m_Flag) _Fun_Res SEG_SET_Frame(uint8_t m_Flag)
{ {
if ( m_Flag == 1 ) if (m_Flag == 1)
{ {
/*边框*/ /*边框*/
IC2_SEG040 = IC_SEG_ON; IC2_SEG040 = IC_SEG_ON;
IC2_SEG140 = IC_SEG_ON; IC2_SEG140 = IC_SEG_ON;
IC1_SEG086 = IC_SEG_ON; IC1_SEG086 = IC_SEG_ON;
} }
else else
{ {
/*边框*/ /*边框*/
IC2_SEG040 = IC_SEG_OFF; IC2_SEG040 = IC_SEG_OFF;
IC2_SEG140 = IC_SEG_OFF; IC2_SEG140 = IC_SEG_OFF;
IC1_SEG086 = IC_SEG_OFF; IC1_SEG086 = IC_SEG_OFF;
} }
} }
/**@brief 指示灯显示函数 /**@brief 指示灯显示函数
...@@ -45,9 +45,9 @@ _Fun_Res SEG_SET_Frame(uint8_t m_Flag) ...@@ -45,9 +45,9 @@ _Fun_Res SEG_SET_Frame(uint8_t m_Flag)
_Fun_Res SEG_SET_LED_STS(uint8_t LED_NUM, uint8_t m_Flag) _Fun_Res SEG_SET_LED_STS(uint8_t LED_NUM, uint8_t m_Flag)
{ {
_Fun_Res m_Res; _Fun_Res m_Res;
uint8_t Flag; uint8_t Flag;
uint8_t Num; uint8_t Num;
if ( m_Flag == 0u ) if (m_Flag == 0u)
{ {
Flag = IC_SEG_OFF; Flag = IC_SEG_OFF;
} }
...@@ -56,67 +56,67 @@ _Fun_Res SEG_SET_LED_STS(uint8_t LED_NUM, uint8_t m_Flag) ...@@ -56,67 +56,67 @@ _Fun_Res SEG_SET_LED_STS(uint8_t LED_NUM, uint8_t m_Flag)
Flag = IC_SEG_ON; Flag = IC_SEG_ON;
} }
Num = LED_NUM; Num = LED_NUM;
switch ( Num ) switch (Num)
{ {
case SEG_LED_Recharge: case SEG_LED_Recharge:
IC1_SEG150 = Flag; IC1_SEG150 = Flag;
break; break;
case SEG_LED_Engine_Failure: case SEG_LED_Engine_Failure:
IC1_SEG156 = Flag; IC1_SEG156 = Flag;
break; break;
case SEG_LED_Battery_Failure: case SEG_LED_Battery_Failure:
IC1_SEG155 = Flag; IC1_SEG155 = Flag;
break; break;
case SEG_LED_Oil_press_Warning: case SEG_LED_Oil_press_Warning:
IC1_SEG154 = Flag; IC1_SEG154 = Flag;
break; break;
case SEG_LED_System_Light: case SEG_LED_System_Light:
IC1_SEG153 = Flag; IC1_SEG153 = Flag;
break; break;
case SEG_LED_Power_Battery_Failure: case SEG_LED_Power_Battery_Failure:
IC1_SEG152 = Flag; IC1_SEG152 = Flag;
break; break;
case SEG_LED_Chloramine: case SEG_LED_Chloramine:
IC1_SEG151 = Flag; IC1_SEG151 = Flag;
break; break;
case SEG_LED_Cutter_Overload: case SEG_LED_Cutter_Overload:
IC1_SEG139 = Flag; IC1_SEG139 = Flag;
break; break;
case SEG_LED_Seat_Detection: case SEG_LED_Seat_Detection:
IC1_SEG142 = Flag; IC1_SEG142 = Flag;
break; break;
case SEG_LED_Key_Access: case SEG_LED_Key_Access:
IC1_SEG140 = Flag; IC1_SEG140 = Flag;
break; break;
case SEG_LED_Ready: case SEG_LED_Ready:
IC1_SEG141 = Flag; IC1_SEG141 = Flag;
break; break;
case SEG_LED_Cutter_Head_switch: case SEG_LED_Cutter_Head_switch:
IC1_SEG119 = Flag; IC1_SEG119 = Flag;
break; break;
case SEG_LED_engine_Burn: case SEG_LED_engine_Burn:
IC1_SEG056 = Flag; IC1_SEG056 = Flag;
break; break;
case SEG_LED_External_Discharge: case SEG_LED_External_Discharge:
IC1_SEG057 = Flag; IC1_SEG057 = Flag;
break; break;
case SEG_LED_bluetooth: case SEG_LED_bluetooth:
IC1_SEG055 = Flag; IC1_SEG055 = Flag;
break; break;
case SEG_LED_Distance_Light: case SEG_LED_Distance_Light:
IC1_SEG085 = Flag; IC1_SEG085 = Flag;
break; break;
case SEG_LED_Cruise_Control: case SEG_LED_Cruise_Control:
IC1_SEG084 = Flag; IC1_SEG084 = Flag;
break; break;
case SEG_LED_HHT_Charger: case SEG_LED_HHT_Charger:
IC2_SEG093 = Flag; IC2_SEG093 = Flag;
break; break;
case SEG_LED_Fuel_Oil: case SEG_LED_Fuel_Oil:
IC2_SEG105 = Flag; IC2_SEG105 = Flag;
break; break;
default: default:
break; break;
} }
m_Res = EX_OK; m_Res = EX_OK;
...@@ -132,7 +132,7 @@ _Fun_Res SEG_SET_LED_STS(uint8_t LED_NUM, uint8_t m_Flag) ...@@ -132,7 +132,7 @@ _Fun_Res SEG_SET_LED_STS(uint8_t LED_NUM, uint8_t m_Flag)
_Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag) _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag)
{ {
_Fun_Res m_Res; _Fun_Res m_Res;
if(m_Flag) if (m_Flag)
{ {
IC1_SEG118 = IC_SEG_ON; IC1_SEG118 = IC_SEG_ON;
IC1_SEG073 = IC_SEG_ON; IC1_SEG073 = IC_SEG_ON;
...@@ -140,7 +140,7 @@ _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag) ...@@ -140,7 +140,7 @@ _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag)
IC1_SEG079 = IC_SEG_ON; IC1_SEG079 = IC_SEG_ON;
IC1_SEG117 = IC_SEG_ON; IC1_SEG117 = IC_SEG_ON;
IC1_SEG083 = IC_SEG_ON; IC1_SEG083 = IC_SEG_ON;
if(LED_NUM ==1) if (LED_NUM == 1)
{ {
IC1_SEG075 = IC_SEG_OFF; IC1_SEG075 = IC_SEG_OFF;
IC1_SEG082 = IC_SEG_ON; IC1_SEG082 = IC_SEG_ON;
...@@ -150,7 +150,7 @@ _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag) ...@@ -150,7 +150,7 @@ _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag)
IC1_SEG076 = IC_SEG_OFF; IC1_SEG076 = IC_SEG_OFF;
IC1_SEG077 = IC_SEG_OFF; IC1_SEG077 = IC_SEG_OFF;
} }
else if(LED_NUM == 2) else if (LED_NUM == 2)
{ {
IC1_SEG075 = IC_SEG_ON; IC1_SEG075 = IC_SEG_ON;
IC1_SEG082 = IC_SEG_ON; IC1_SEG082 = IC_SEG_ON;
...@@ -160,7 +160,7 @@ _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag) ...@@ -160,7 +160,7 @@ _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag)
IC1_SEG076 = IC_SEG_OFF; IC1_SEG076 = IC_SEG_OFF;
IC1_SEG077 = IC_SEG_ON; IC1_SEG077 = IC_SEG_ON;
} }
else if(LED_NUM == 3) else if (LED_NUM == 3)
{ {
IC1_SEG075 = IC_SEG_ON; IC1_SEG075 = IC_SEG_ON;
IC1_SEG082 = IC_SEG_ON; IC1_SEG082 = IC_SEG_ON;
...@@ -197,8 +197,8 @@ _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag) ...@@ -197,8 +197,8 @@ _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag)
IC1_SEG117 = IC_SEG_OFF; IC1_SEG117 = IC_SEG_OFF;
IC1_SEG083 = IC_SEG_OFF; IC1_SEG083 = IC_SEG_OFF;
} }
m_Res = EX_OK; m_Res = EX_OK;
return m_Res; return m_Res;
} }
...@@ -216,120 +216,117 @@ _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag) ...@@ -216,120 +216,117 @@ _Fun_Res SEG_SET_Cutterhead(uint16_t LED_NUM, uint8_t m_Flag)
_Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag, uint8_t m_Gear) _Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag, uint8_t m_Gear)
{ {
/*挡位符号*/ /*挡位符号*/
if ( m_Gear_Flag == 1u ) if (m_Gear_Flag == 1u)
{
if (m_Gear == Gear_P)
{ {
if ( m_Gear == Gear_P ) IC2_SEG100 = IC_SEG_ON;
{ IC2_SEG097 = IC_SEG_ON;
IC2_SEG100 = IC_SEG_ON; IC2_SEG148 = IC_SEG_ON;
IC2_SEG097 = IC_SEG_ON; IC2_SEG147 = IC_SEG_ON;
IC2_SEG148 = IC_SEG_ON; IC2_SEG146 = IC_SEG_ON;
IC2_SEG147 = IC_SEG_ON; IC2_SEG099 = IC_SEG_ON;
IC2_SEG146 = IC_SEG_ON; IC2_SEG101 = IC_SEG_ON;
IC2_SEG099 = IC_SEG_ON; IC2_SEG094 = IC_SEG_ON;
IC2_SEG101 = IC_SEG_ON; IC2_SEG095 = IC_SEG_ON;
IC2_SEG094 = IC_SEG_ON; IC2_SEG149 = IC_SEG_ON;
IC2_SEG095 = IC_SEG_ON; IC2_SEG145 = IC_SEG_ON;
IC2_SEG149 = IC_SEG_ON; IC2_SEG141 = IC_SEG_ON;
IC2_SEG145 = IC_SEG_ON; IC2_SEG104 = IC_SEG_ON;
IC2_SEG141 = IC_SEG_ON; IC2_SEG103 = IC_SEG_ON;
IC2_SEG104 = IC_SEG_ON; IC2_SEG098 = IC_SEG_ON;
IC2_SEG103 = IC_SEG_ON; IC2_SEG150 = IC_SEG_ON;
IC2_SEG098 = IC_SEG_ON;
IC2_SEG150 = IC_SEG_ON;
IC2_SEG096 = IC_SEG_OFF;
IC2_SEG142 = IC_SEG_OFF;
IC2_SEG143 = IC_SEG_OFF;
IC2_SEG144 = IC_SEG_OFF;
IC2_SEG102 = IC_SEG_OFF;
}
else if ( m_Gear == 1 )
{
IC2_SEG097 = IC_SEG_OFF;
IC2_SEG148 = IC_SEG_OFF;
IC2_SEG147 = IC_SEG_ON;
IC2_SEG146 = IC_SEG_OFF;
IC2_SEG099 = IC_SEG_OFF;
IC2_SEG101 = IC_SEG_OFF;
IC2_SEG100 = IC_SEG_OFF;
IC2_SEG142 = IC_SEG_OFF;
IC2_SEG143 = IC_SEG_OFF;
IC2_SEG032 = IC_SEG_OFF;
IC2_SEG094 = IC_SEG_ON;//圈
IC2_SEG095 = IC_SEG_ON;
IC2_SEG149 = IC_SEG_ON;
IC2_SEG145 = IC_SEG_ON;
IC2_SEG141 = IC_SEG_ON;
IC2_SEG104 = IC_SEG_ON;
IC2_SEG103 = IC_SEG_ON;
IC2_SEG098 = IC_SEG_ON;
IC2_SEG150 = IC_SEG_ON;
IC2_SEG096 = IC_SEG_OFF;
IC2_SEG144 = IC_SEG_ON;
IC2_SEG102 = IC_SEG_OFF;
}
else if ( m_Gear == 2 )
{
IC2_SEG097 = IC_SEG_OFF;
IC2_SEG096 = IC_SEG_OFF;
IC2_SEG142 = IC_SEG_OFF;
IC2_SEG144 = IC_SEG_OFF;
IC2_SEG100 = IC_SEG_ON;
IC2_SEG101 = IC_SEG_ON;
IC2_SEG099 = IC_SEG_ON;
IC2_SEG146 = IC_SEG_ON;
IC2_SEG147 = IC_SEG_ON;
IC2_SEG148 = IC_SEG_ON;
IC2_SEG102 = IC_SEG_ON;
IC2_SEG143 = IC_SEG_ON;
IC2_SEG094 = IC_SEG_ON;//圈 IC2_SEG096 = IC_SEG_OFF;
IC2_SEG095 = IC_SEG_ON; IC2_SEG142 = IC_SEG_OFF;
IC2_SEG149 = IC_SEG_ON; IC2_SEG143 = IC_SEG_OFF;
IC2_SEG145 = IC_SEG_ON; IC2_SEG144 = IC_SEG_OFF;
IC2_SEG141 = IC_SEG_ON; IC2_SEG102 = IC_SEG_OFF;
IC2_SEG104 = IC_SEG_ON;
IC2_SEG103 = IC_SEG_ON;
IC2_SEG098 = IC_SEG_ON;
IC2_SEG150 = IC_SEG_ON;
}
else
{
;
}
} }
else else if (m_Gear == 1)
{ {
IC2_SEG094 = IC_SEG_OFF;
IC2_SEG095 = IC_SEG_OFF;
IC2_SEG149 = IC_SEG_OFF;
IC2_SEG145 = IC_SEG_OFF;
IC2_SEG141 = IC_SEG_OFF;
IC2_SEG104 = IC_SEG_OFF;
IC2_SEG103 = IC_SEG_OFF;
IC2_SEG098 = IC_SEG_OFF;
IC2_SEG097 = IC_SEG_OFF; IC2_SEG097 = IC_SEG_OFF;
IC2_SEG148 = IC_SEG_OFF; IC2_SEG148 = IC_SEG_OFF;
IC2_SEG147 = IC_SEG_OFF; IC2_SEG147 = IC_SEG_ON;
IC2_SEG144 = IC_SEG_OFF;
IC2_SEG143 = IC_SEG_OFF;
IC2_SEG102 = IC_SEG_OFF;
IC2_SEG100 = IC_SEG_OFF;
IC2_SEG101 = IC_SEG_OFF;
IC2_SEG096 = IC_SEG_OFF;
IC2_SEG099 = IC_SEG_OFF;
IC2_SEG146 = IC_SEG_OFF; IC2_SEG146 = IC_SEG_OFF;
IC2_SEG099 = IC_SEG_OFF;
IC2_SEG101 = IC_SEG_OFF;
IC2_SEG100 = IC_SEG_OFF;
IC2_SEG142 = IC_SEG_OFF; IC2_SEG142 = IC_SEG_OFF;
IC2_SEG150 = IC_SEG_OFF; IC2_SEG143 = IC_SEG_OFF;
IC2_SEG032 = IC_SEG_OFF;
IC2_SEG094 = IC_SEG_ON; // 圈
IC2_SEG095 = IC_SEG_ON;
IC2_SEG149 = IC_SEG_ON;
IC2_SEG145 = IC_SEG_ON;
IC2_SEG141 = IC_SEG_ON;
IC2_SEG104 = IC_SEG_ON;
IC2_SEG103 = IC_SEG_ON;
IC2_SEG098 = IC_SEG_ON;
IC2_SEG150 = IC_SEG_ON;
IC2_SEG096 = IC_SEG_OFF;
IC2_SEG144 = IC_SEG_ON;
IC2_SEG102 = IC_SEG_OFF;
} }
else if (m_Gear == 2)
{
IC2_SEG097 = IC_SEG_OFF;
IC2_SEG096 = IC_SEG_OFF;
IC2_SEG142 = IC_SEG_OFF;
IC2_SEG144 = IC_SEG_OFF;
IC2_SEG100 = IC_SEG_ON;
IC2_SEG101 = IC_SEG_ON;
IC2_SEG099 = IC_SEG_ON;
IC2_SEG146 = IC_SEG_ON;
IC2_SEG147 = IC_SEG_ON;
IC2_SEG148 = IC_SEG_ON;
IC2_SEG102 = IC_SEG_ON;
IC2_SEG143 = IC_SEG_ON;
IC2_SEG094 = IC_SEG_ON; // 圈
IC2_SEG095 = IC_SEG_ON;
IC2_SEG149 = IC_SEG_ON;
IC2_SEG145 = IC_SEG_ON;
IC2_SEG141 = IC_SEG_ON;
IC2_SEG104 = IC_SEG_ON;
IC2_SEG103 = IC_SEG_ON;
IC2_SEG098 = IC_SEG_ON;
IC2_SEG150 = IC_SEG_ON;
}
else
{
;
}
}
else
{
IC2_SEG094 = IC_SEG_OFF;
IC2_SEG095 = IC_SEG_OFF;
IC2_SEG149 = IC_SEG_OFF;
IC2_SEG145 = IC_SEG_OFF;
IC2_SEG141 = IC_SEG_OFF;
IC2_SEG104 = IC_SEG_OFF;
IC2_SEG103 = IC_SEG_OFF;
IC2_SEG098 = IC_SEG_OFF;
IC2_SEG097 = IC_SEG_OFF;
IC2_SEG148 = IC_SEG_OFF;
IC2_SEG147 = IC_SEG_OFF;
IC2_SEG144 = IC_SEG_OFF;
IC2_SEG143 = IC_SEG_OFF;
IC2_SEG102 = IC_SEG_OFF;
IC2_SEG100 = IC_SEG_OFF;
IC2_SEG101 = IC_SEG_OFF;
IC2_SEG096 = IC_SEG_OFF;
IC2_SEG099 = IC_SEG_OFF;
IC2_SEG146 = IC_SEG_OFF;
IC2_SEG142 = IC_SEG_OFF;
IC2_SEG150 = IC_SEG_OFF;
}
} }
/**@brief 燃油表盘显示函数 /**@brief 燃油表盘显示函数
* @param[in] m_Flag 段与数字是否显示 -1 显示 -0 不显示 * @param[in] m_Flag 段与数字是否显示 -1 显示 -0 不显示
...@@ -342,64 +339,62 @@ _Fun_Res SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG) ...@@ -342,64 +339,62 @@ _Fun_Res SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG)
{ {
_Fun_Res m_Res; _Fun_Res m_Res;
// uint8_t Num; // uint8_t Num;
uint8_t m8; uint8_t m8;
if ( m_Flag == 1u ) if (m_Flag == 1u)
{ {
IC1_SEG052 = IC_SEG_GREY; IC1_SEG052 = IC_SEG_GREY;
IC1_SEG051 = IC_SEG_GREY; IC1_SEG051 = IC_SEG_GREY;
IC1_SEG050 = IC_SEG_GREY; IC1_SEG050 = IC_SEG_GREY;
IC1_SEG049 = IC_SEG_GREY; IC1_SEG049 = IC_SEG_GREY;
IC1_SEG048 = IC_SEG_GREY; IC1_SEG048 = IC_SEG_GREY;
IC1_SEG047 = IC_SEG_GREY; IC1_SEG047 = IC_SEG_GREY;
IC1_SEG046 = IC_SEG_GREY; IC1_SEG046 = IC_SEG_GREY;
IC1_SEG045 = IC_SEG_GREY; IC1_SEG045 = IC_SEG_GREY;
IC1_SEG053 = IC_SEG_ON;
IC1_SEG053 = IC_SEG_ON; IC1_SEG105 = IC_SEG_ON;
IC1_SEG105 = IC_SEG_ON; IC1_SEG044 = IC_SEG_ON;
IC1_SEG044 = IC_SEG_ON; switch (m_SEG)
switch ( m_SEG )
{
case 8u:
IC1_SEG045 = IC_SEG_ON;
case 7u:
IC1_SEG046 = IC_SEG_ON;
case 6u:
IC1_SEG047 = IC_SEG_ON;
case 5u:
IC1_SEG048 = IC_SEG_ON;
case 4u:
IC1_SEG049 = IC_SEG_ON;
case 3u:
IC1_SEG050 = IC_SEG_ON;
case 2u:
IC1_SEG051 = IC_SEG_ON;
case 1u:
IC1_SEG052 = IC_SEG_ON;
case 0u:
break;
default:
break;
}
}
else
{ {
IC2_SEG052 = IC_SEG_OFF; case 8u:
IC2_SEG051 = IC_SEG_OFF; IC1_SEG045 = IC_SEG_ON;
IC2_SEG050 = IC_SEG_OFF; case 7u:
IC2_SEG049 = IC_SEG_OFF; IC1_SEG046 = IC_SEG_ON;
IC2_SEG048 = IC_SEG_OFF; case 6u:
IC2_SEG047 = IC_SEG_OFF; IC1_SEG047 = IC_SEG_ON;
IC2_SEG046 = IC_SEG_OFF; case 5u:
IC2_SEG045 = IC_SEG_OFF; IC1_SEG048 = IC_SEG_ON;
case 4u:
IC1_SEG049 = IC_SEG_ON;
case 3u:
IC1_SEG050 = IC_SEG_ON;
case 2u:
IC1_SEG051 = IC_SEG_ON;
case 1u:
IC1_SEG052 = IC_SEG_ON;
case 0u:
break;
default:
break;
} }
m_Res = EX_OK; }
else
{
IC2_SEG052 = IC_SEG_OFF;
IC2_SEG051 = IC_SEG_OFF;
IC2_SEG050 = IC_SEG_OFF;
IC2_SEG049 = IC_SEG_OFF;
IC2_SEG048 = IC_SEG_OFF;
IC2_SEG047 = IC_SEG_OFF;
IC2_SEG046 = IC_SEG_OFF;
IC2_SEG045 = IC_SEG_OFF;
}
m_Res = EX_OK;
return m_Res; return m_Res;
} }
/**@brief 电量表盘显示函数 /**@brief 电量表盘显示函数
* @param[in] m_Flag 段与数字是否显示 -1 显示 -0 不显示 * @param[in] m_Flag 段与数字是否显示 -1 显示 -0 不显示
* @param[in] m_SEG 车速表盘段数0<=m_SEG<=10 * @param[in] m_SEG 车速表盘段数0<=m_SEG<=10
...@@ -410,9 +405,9 @@ _Fun_Res SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG) ...@@ -410,9 +405,9 @@ _Fun_Res SEG_SET_FuelDial(uint8_t m_Flag, uint8_t m_SEG)
_Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
_Fun_Res m_Res; _Fun_Res m_Res;
uint8_t Num; uint8_t Num;
uint8_t m8; uint8_t m8;
if ( m_Flag == 1u ) if (m_Flag == 1u)
{ {
IC1_SEG072 = IC_SEG_GREY; IC1_SEG072 = IC_SEG_GREY;
IC1_SEG071 = IC_SEG_GREY; IC1_SEG071 = IC_SEG_GREY;
...@@ -456,44 +451,43 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -456,44 +451,43 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
IC1_SEG135 = IC_SEG_GREY; IC1_SEG135 = IC_SEG_GREY;
IC1_SEG134 = IC_SEG_GREY; IC1_SEG134 = IC_SEG_GREY;
switch (m_SEG)
switch ( m_SEG )
{ {
case 10u: case 10u:
IC1_SEG136 = IC_SEG_ON; IC1_SEG136 = IC_SEG_ON;
IC1_SEG125 = IC_SEG_ON; IC1_SEG125 = IC_SEG_ON;
case 9u: case 9u:
IC1_SEG137 = IC_SEG_ON; IC1_SEG137 = IC_SEG_ON;
IC1_SEG126 = IC_SEG_ON; IC1_SEG126 = IC_SEG_ON;
case 8u: case 8u:
IC1_SEG138 = IC_SEG_ON; IC1_SEG138 = IC_SEG_ON;
IC1_SEG127 = IC_SEG_ON; IC1_SEG127 = IC_SEG_ON;
case 7u: case 7u:
IC1_SEG143 = IC_SEG_ON; IC1_SEG143 = IC_SEG_ON;
IC1_SEG128 = IC_SEG_ON; IC1_SEG128 = IC_SEG_ON;
case 6u: case 6u:
IC1_SEG144 = IC_SEG_ON; IC1_SEG144 = IC_SEG_ON;
IC1_SEG129 = IC_SEG_ON; IC1_SEG129 = IC_SEG_ON;
case 5u: case 5u:
IC1_SEG145 = IC_SEG_ON; IC1_SEG145 = IC_SEG_ON;
IC1_SEG130 = IC_SEG_ON; IC1_SEG130 = IC_SEG_ON;
case 4u: case 4u:
IC1_SEG146 = IC_SEG_ON; IC1_SEG146 = IC_SEG_ON;
IC1_SEG131 = IC_SEG_ON; IC1_SEG131 = IC_SEG_ON;
case 3u: case 3u:
IC1_SEG147 = IC_SEG_ON; IC1_SEG147 = IC_SEG_ON;
IC1_SEG132 = IC_SEG_ON; IC1_SEG132 = IC_SEG_ON;
case 2u: case 2u:
IC1_SEG148 = IC_SEG_ON; IC1_SEG148 = IC_SEG_ON;
IC1_SEG133 = IC_SEG_ON; IC1_SEG133 = IC_SEG_ON;
case 1u: case 1u:
IC1_SEG135 = IC_SEG_ON; IC1_SEG135 = IC_SEG_ON;
IC1_SEG134 = IC_SEG_ON; IC1_SEG134 = IC_SEG_ON;
case 0u: case 0u:
break; break;
default: default:
break; break;
} }
/*百位*/ /*百位*/
Num = m_NUM / 100u; Num = m_NUM / 100u;
...@@ -506,9 +500,9 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -506,9 +500,9 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
IC1_SEG072 = IC_SEG_OFF; IC1_SEG072 = IC_SEG_OFF;
} }
Num = (m_NUM / 10u) % 10u; Num = (m_NUM / 10u) % 10u;
m8 = SEG_DISPLAY_NUMBER0 [ Num ]; m8 = SEG_DISPLAY_NUMBER0[Num];
if ( Bit_Is_Set(m8, 0) ) if (Bit_Is_Set(m8, 0))
{ {
IC1_SEG069 = IC_SEG_ON; IC1_SEG069 = IC_SEG_ON;
} }
...@@ -516,7 +510,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -516,7 +510,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG069 = IC_SEG_OFF; IC1_SEG069 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 1) ) if (Bit_Is_Set(m8, 1))
{ {
IC1_SEG068 = IC_SEG_ON; IC1_SEG068 = IC_SEG_ON;
} }
...@@ -524,7 +518,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -524,7 +518,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG068 = IC_SEG_OFF; IC1_SEG068 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 2) ) if (Bit_Is_Set(m8, 2))
{ {
IC1_SEG066 = IC_SEG_ON; IC1_SEG066 = IC_SEG_ON;
} }
...@@ -532,7 +526,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -532,7 +526,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG066 = IC_SEG_OFF; IC1_SEG066 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 3) ) if (Bit_Is_Set(m8, 3))
{ {
IC1_SEG065 = IC_SEG_ON; IC1_SEG065 = IC_SEG_ON;
} }
...@@ -540,7 +534,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -540,7 +534,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG065 = IC_SEG_OFF; IC1_SEG065 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 5) ) if (Bit_Is_Set(m8, 5))
{ {
IC1_SEG070 = IC_SEG_ON; IC1_SEG070 = IC_SEG_ON;
} }
...@@ -548,7 +542,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -548,7 +542,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG070 = IC_SEG_OFF; IC1_SEG070 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if (Bit_Is_Set(m8, 4))
{ {
IC1_SEG071 = IC_SEG_ON; IC1_SEG071 = IC_SEG_ON;
} }
...@@ -556,7 +550,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -556,7 +550,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG071 = IC_SEG_OFF; IC1_SEG071 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if (Bit_Is_Set(m8, 6))
{ {
IC1_SEG067 = IC_SEG_ON; IC1_SEG067 = IC_SEG_ON;
} }
...@@ -566,8 +560,8 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -566,8 +560,8 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
} }
/*个位*/ /*个位*/
Num = m_NUM % 10u; Num = m_NUM % 10u;
m8 = SEG_DISPLAY_NUMBER0 [ Num ]; m8 = SEG_DISPLAY_NUMBER0[Num];
if ( Bit_Is_Set(m8, 0) ) if (Bit_Is_Set(m8, 0))
{ {
IC1_SEG060 = IC_SEG_ON; IC1_SEG060 = IC_SEG_ON;
} }
...@@ -575,7 +569,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -575,7 +569,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG060 = IC_SEG_OFF; IC1_SEG060 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 1) ) if (Bit_Is_Set(m8, 1))
{ {
IC1_SEG059 = IC_SEG_ON; IC1_SEG059 = IC_SEG_ON;
} }
...@@ -583,7 +577,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -583,7 +577,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG059 = IC_SEG_OFF; IC1_SEG059 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 2) ) if (Bit_Is_Set(m8, 2))
{ {
IC1_SEG058 = IC_SEG_ON; IC1_SEG058 = IC_SEG_ON;
} }
...@@ -591,7 +585,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -591,7 +585,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG058 = IC_SEG_OFF; IC1_SEG058 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 3) ) if (Bit_Is_Set(m8, 3))
{ {
IC1_SEG064 = IC_SEG_ON; IC1_SEG064 = IC_SEG_ON;
} }
...@@ -599,7 +593,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -599,7 +593,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG064 = IC_SEG_OFF; IC1_SEG064 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 5) ) if (Bit_Is_Set(m8, 5))
{ {
IC1_SEG061 = IC_SEG_ON; IC1_SEG061 = IC_SEG_ON;
} }
...@@ -607,7 +601,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -607,7 +601,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG061 = IC_SEG_OFF; IC1_SEG061 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if (Bit_Is_Set(m8, 4))
{ {
IC1_SEG063 = IC_SEG_ON; IC1_SEG063 = IC_SEG_ON;
} }
...@@ -615,7 +609,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -615,7 +609,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
{ {
IC1_SEG063 = IC_SEG_OFF; IC1_SEG063 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if (Bit_Is_Set(m8, 6))
{ {
IC1_SEG062 = IC_SEG_ON; IC1_SEG062 = IC_SEG_ON;
} }
...@@ -668,7 +662,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM) ...@@ -668,7 +662,7 @@ _Fun_Res SEG_SET_EleDial(uint8_t m_Flag, uint8_t m_SEG, uint16_t m_NUM)
IC1_SEG135 = IC_SEG_OFF; IC1_SEG135 = IC_SEG_OFF;
IC1_SEG134 = IC_SEG_OFF; IC1_SEG134 = IC_SEG_OFF;
} }
return m_Res; return m_Res;
} }
/**@brief 故障码显示 /**@brief 故障码显示
...@@ -682,14 +676,14 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -682,14 +676,14 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
_Fun_Res m_Res; _Fun_Res m_Res;
uint16_t Num; uint16_t Num;
uint8_t m8; uint8_t m8;
if ( (m_Flag > 3u) || (m_NUM > 9999u) ) if ((m_Flag > 3u) || (m_NUM > 9999u))
{ {
m_Res = EX_ERR; m_Res = EX_ERR;
} }
else else
{ {
if ( m_Flag == 1u ) if (m_Flag == 1u)
{ {
IC1_SEG087 = IC_SEG_ON; IC1_SEG087 = IC_SEG_ON;
IC1_SEG094 = IC_SEG_ON; IC1_SEG094 = IC_SEG_ON;
...@@ -723,9 +717,9 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -723,9 +717,9 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
/*千位*/ /*千位*/
Num = (m_NUM / 1000u) % 10u; Num = (m_NUM / 1000u) % 10u;
m8 = SEG_DISPLAY_NUMBER0 [ Num ]; m8 = SEG_DISPLAY_NUMBER0[Num];
if ( Bit_Is_Set(m8, 0) ) if (Bit_Is_Set(m8, 0))
{ {
IC1_SEG094 = IC_SEG_ON; IC1_SEG094 = IC_SEG_ON;
} }
...@@ -733,7 +727,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -733,7 +727,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG094 = IC_SEG_OFF; IC1_SEG094 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 1) ) if (Bit_Is_Set(m8, 1))
{ {
IC1_SEG093 = IC_SEG_ON; IC1_SEG093 = IC_SEG_ON;
} }
...@@ -741,7 +735,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -741,7 +735,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG093 = IC_SEG_OFF; IC1_SEG093 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 2) ) if (Bit_Is_Set(m8, 2))
{ {
IC1_SEG091 = IC_SEG_ON; IC1_SEG091 = IC_SEG_ON;
} }
...@@ -749,7 +743,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -749,7 +743,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG091 = IC_SEG_OFF; IC1_SEG091 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 3) ) if (Bit_Is_Set(m8, 3))
{ {
IC1_SEG090 = IC_SEG_ON; IC1_SEG090 = IC_SEG_ON;
} }
...@@ -757,7 +751,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -757,7 +751,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG090 = IC_SEG_OFF; IC1_SEG090 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 5) ) if (Bit_Is_Set(m8, 5))
{ {
IC1_SEG088 = IC_SEG_ON; IC1_SEG088 = IC_SEG_ON;
} }
...@@ -765,7 +759,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -765,7 +759,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG088 = IC_SEG_OFF; IC1_SEG088 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if (Bit_Is_Set(m8, 4))
{ {
IC1_SEG089 = IC_SEG_ON; IC1_SEG089 = IC_SEG_ON;
} }
...@@ -773,7 +767,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -773,7 +767,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG089 = IC_SEG_OFF; IC1_SEG089 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if (Bit_Is_Set(m8, 6))
{ {
IC1_SEG092 = IC_SEG_ON; IC1_SEG092 = IC_SEG_ON;
} }
...@@ -783,9 +777,9 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -783,9 +777,9 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
} }
/*百位*/ /*百位*/
Num = (m_NUM / 100u) % 10u; Num = (m_NUM / 100u) % 10u;
m8 = SEG_DISPLAY_NUMBER0 [ Num ]; m8 = SEG_DISPLAY_NUMBER0[Num];
if ( Bit_Is_Set(m8, 0) ) if (Bit_Is_Set(m8, 0))
{ {
IC1_SEG101 = IC_SEG_ON; IC1_SEG101 = IC_SEG_ON;
} }
...@@ -793,7 +787,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -793,7 +787,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG101 = IC_SEG_OFF; IC1_SEG101 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 1) ) if (Bit_Is_Set(m8, 1))
{ {
IC1_SEG100 = IC_SEG_ON; IC1_SEG100 = IC_SEG_ON;
} }
...@@ -801,7 +795,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -801,7 +795,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG100 = IC_SEG_OFF; IC1_SEG100 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 2) ) if (Bit_Is_Set(m8, 2))
{ {
IC1_SEG098 = IC_SEG_ON; IC1_SEG098 = IC_SEG_ON;
} }
...@@ -809,7 +803,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -809,7 +803,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG098 = IC_SEG_OFF; IC1_SEG098 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 3) ) if (Bit_Is_Set(m8, 3))
{ {
IC1_SEG097 = IC_SEG_ON; IC1_SEG097 = IC_SEG_ON;
} }
...@@ -817,7 +811,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -817,7 +811,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG097 = IC_SEG_OFF; IC1_SEG097 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 5) ) if (Bit_Is_Set(m8, 5))
{ {
IC1_SEG095 = IC_SEG_ON; IC1_SEG095 = IC_SEG_ON;
} }
...@@ -825,7 +819,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -825,7 +819,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG095 = IC_SEG_OFF; IC1_SEG095 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if (Bit_Is_Set(m8, 4))
{ {
IC1_SEG096 = IC_SEG_ON; IC1_SEG096 = IC_SEG_ON;
} }
...@@ -833,7 +827,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -833,7 +827,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG096 = IC_SEG_OFF; IC1_SEG096 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if (Bit_Is_Set(m8, 6))
{ {
IC1_SEG099 = IC_SEG_ON; IC1_SEG099 = IC_SEG_ON;
} }
...@@ -843,8 +837,8 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -843,8 +837,8 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
} }
/*十位*/ /*十位*/
Num = (m_NUM / 10u) % 10u; Num = (m_NUM / 10u) % 10u;
m8 = SEG_DISPLAY_NUMBER0 [ Num ]; m8 = SEG_DISPLAY_NUMBER0[Num];
if ( Bit_Is_Set(m8, 0) ) if (Bit_Is_Set(m8, 0))
{ {
IC1_SEG108 = IC_SEG_ON; IC1_SEG108 = IC_SEG_ON;
} }
...@@ -852,7 +846,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -852,7 +846,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG108 = IC_SEG_OFF; IC1_SEG108 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 1) ) if (Bit_Is_Set(m8, 1))
{ {
IC1_SEG107 = IC_SEG_ON; IC1_SEG107 = IC_SEG_ON;
} }
...@@ -860,7 +854,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -860,7 +854,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG107 = IC_SEG_OFF; IC1_SEG107 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 2) ) if (Bit_Is_Set(m8, 2))
{ {
IC1_SEG105 = IC_SEG_ON; IC1_SEG105 = IC_SEG_ON;
} }
...@@ -868,7 +862,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -868,7 +862,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG105 = IC_SEG_OFF; IC1_SEG105 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 3) ) if (Bit_Is_Set(m8, 3))
{ {
IC1_SEG104 = IC_SEG_ON; IC1_SEG104 = IC_SEG_ON;
} }
...@@ -876,7 +870,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -876,7 +870,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG104 = IC_SEG_OFF; IC1_SEG104 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 5) ) if (Bit_Is_Set(m8, 5))
{ {
IC1_SEG102 = IC_SEG_ON; IC1_SEG102 = IC_SEG_ON;
} }
...@@ -884,7 +878,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -884,7 +878,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG102 = IC_SEG_OFF; IC1_SEG102 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if (Bit_Is_Set(m8, 4))
{ {
IC1_SEG103 = IC_SEG_ON; IC1_SEG103 = IC_SEG_ON;
} }
...@@ -892,7 +886,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -892,7 +886,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG103 = IC_SEG_OFF; IC1_SEG103 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if (Bit_Is_Set(m8, 6))
{ {
IC1_SEG106 = IC_SEG_ON; IC1_SEG106 = IC_SEG_ON;
} }
...@@ -902,8 +896,8 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -902,8 +896,8 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
} }
/*个位*/ /*个位*/
Num = m_NUM % 10u; Num = m_NUM % 10u;
m8 = SEG_DISPLAY_NUMBER0 [ Num ]; m8 = SEG_DISPLAY_NUMBER0[Num];
if ( Bit_Is_Set(m8, 0) ) if (Bit_Is_Set(m8, 0))
{ {
IC1_SEG115 = IC_SEG_ON; IC1_SEG115 = IC_SEG_ON;
} }
...@@ -911,7 +905,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -911,7 +905,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG115 = IC_SEG_OFF; IC1_SEG115 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 1) ) if (Bit_Is_Set(m8, 1))
{ {
IC1_SEG114 = IC_SEG_ON; IC1_SEG114 = IC_SEG_ON;
} }
...@@ -919,7 +913,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -919,7 +913,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG114 = IC_SEG_OFF; IC1_SEG114 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 2) ) if (Bit_Is_Set(m8, 2))
{ {
IC1_SEG113 = IC_SEG_ON; IC1_SEG113 = IC_SEG_ON;
} }
...@@ -927,7 +921,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -927,7 +921,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG113 = IC_SEG_OFF; IC1_SEG113 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 3) ) if (Bit_Is_Set(m8, 3))
{ {
IC1_SEG112 = IC_SEG_ON; IC1_SEG112 = IC_SEG_ON;
} }
...@@ -935,7 +929,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -935,7 +929,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG112 = IC_SEG_OFF; IC1_SEG112 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 5) ) if (Bit_Is_Set(m8, 5))
{ {
IC1_SEG109 = IC_SEG_ON; IC1_SEG109 = IC_SEG_ON;
} }
...@@ -943,7 +937,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -943,7 +937,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG109 = IC_SEG_OFF; IC1_SEG109 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if (Bit_Is_Set(m8, 4))
{ {
IC1_SEG111 = IC_SEG_ON; IC1_SEG111 = IC_SEG_ON;
} }
...@@ -951,7 +945,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM) ...@@ -951,7 +945,7 @@ _Fun_Res SEG_SET_Fault_Code(uint8_t m_Flag, uint16_t m_NUM)
{ {
IC1_SEG111 = IC_SEG_OFF; IC1_SEG111 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if (Bit_Is_Set(m8, 6))
{ {
IC1_SEG110 = IC_SEG_ON; IC1_SEG110 = IC_SEG_ON;
} }
...@@ -2094,13 +2088,9 @@ _Fun_Res SEG_SET_TRIP_NUM(uint8_t m_Flag, uint16_t m_NUM) ...@@ -2094,13 +2088,9 @@ _Fun_Res SEG_SET_TRIP_NUM(uint8_t m_Flag, uint16_t m_NUM)
IC1_SEG115 = IC_SEG_ON; IC1_SEG115 = IC_SEG_ON;
IC1_SEG101 = IC_SEG_ON; IC1_SEG101 = IC_SEG_ON;
/*千位*/ /*千位*/
Num = (m_NUM / 1000u) % 10u; Num = (m_NUM / 1000u) % 10u;
m8 = SEG_UNDISPLAY_NUMBER0[Num]; m8 = SEG_UNDISPLAY_NUMBER0[Num];
if (Bit_Is_Set(m8, 0)) if (Bit_Is_Set(m8, 0))
{ {
...@@ -2394,15 +2384,15 @@ _Fun_Res SEG_SET_TRIP_NUM(uint8_t m_Flag, uint16_t m_NUM) ...@@ -2394,15 +2384,15 @@ _Fun_Res SEG_SET_TRIP_NUM(uint8_t m_Flag, uint16_t m_NUM)
_Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t m_Flag1, uint8_t m_Flag2) _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t m_Flag1, uint8_t m_Flag2)
{ {
_Fun_Res m_Res; _Fun_Res m_Res;
uint8_t Num; uint8_t Num;
uint8_t m8; uint8_t m8;
if ( (m_hour >= 99u) || (m_minute >= 99u) || (m_icon > 1u) || (m_Flag1 > 1u) || (m_Flag2 > 1u) ) if ((m_hour >= 99u) || (m_minute >= 99u) || (m_icon > 1u) || (m_Flag1 > 1u) || (m_Flag2 > 1u))
{ {
m_Res = EX_ERR; m_Res = EX_ERR;
} }
else else
{ {
if ( m_icon == 1u ) if (m_icon == 1u)
{ {
IC2_SEG084 = IC_SEG_ON; IC2_SEG084 = IC_SEG_ON;
} }
...@@ -2410,11 +2400,11 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2410,11 +2400,11 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG084 = IC_SEG_OFF; IC2_SEG084 = IC_SEG_OFF;
} }
if ( m_Flag1 == 1u ) if (m_Flag1 == 1u)
{ {
Num = m_hour / 10u; /*86104-11*/ Num = m_hour / 10u; /*86104-11*/
m8 = SEG_DISPLAY_NUMBER0 [ Num ]; m8 = SEG_DISPLAY_NUMBER0[Num];
if ( Bit_Is_Set(m8, 0) ) if (Bit_Is_Set(m8, 0))
{ {
IC2_SEG036 = IC_SEG_ON; IC2_SEG036 = IC_SEG_ON;
} }
...@@ -2422,7 +2412,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2422,7 +2412,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG036 = IC_SEG_OFF; IC2_SEG036 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 1) ) if (Bit_Is_Set(m8, 1))
{ {
IC2_SEG035 = IC_SEG_ON; IC2_SEG035 = IC_SEG_ON;
} }
...@@ -2430,7 +2420,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2430,7 +2420,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG035 = IC_SEG_OFF; IC2_SEG035 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 2) ) if (Bit_Is_Set(m8, 2))
{ {
IC2_SEG079 = IC_SEG_ON; IC2_SEG079 = IC_SEG_ON;
} }
...@@ -2438,7 +2428,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2438,7 +2428,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG079 = IC_SEG_OFF; IC2_SEG079 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 3) ) if (Bit_Is_Set(m8, 3))
{ {
IC2_SEG078 = IC_SEG_ON; IC2_SEG078 = IC_SEG_ON;
} }
...@@ -2446,7 +2436,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2446,7 +2436,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG078 = IC_SEG_OFF; IC2_SEG078 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 5) ) if (Bit_Is_Set(m8, 5))
{ {
IC2_SEG037 = IC_SEG_ON; IC2_SEG037 = IC_SEG_ON;
} }
...@@ -2454,7 +2444,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2454,7 +2444,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG037 = IC_SEG_OFF; IC2_SEG037 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if (Bit_Is_Set(m8, 4))
{ {
IC2_SEG039 = IC_SEG_ON; IC2_SEG039 = IC_SEG_ON;
} }
...@@ -2462,7 +2452,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2462,7 +2452,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG039 = IC_SEG_OFF; IC2_SEG039 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if (Bit_Is_Set(m8, 6))
{ {
IC2_SEG038 = IC_SEG_ON; IC2_SEG038 = IC_SEG_ON;
} }
...@@ -2471,8 +2461,8 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2471,8 +2461,8 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
IC2_SEG038 = IC_SEG_OFF; IC2_SEG038 = IC_SEG_OFF;
} }
Num = m_hour % 10u; Num = m_hour % 10u;
m8 = SEG_DISPLAY_NUMBER0 [ Num ]; m8 = SEG_DISPLAY_NUMBER0[Num];
if ( Bit_Is_Set(m8, 0) ) if (Bit_Is_Set(m8, 0))
{ {
IC2_SEG033 = IC_SEG_ON; IC2_SEG033 = IC_SEG_ON;
} }
...@@ -2480,7 +2470,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2480,7 +2470,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG033 = IC_SEG_OFF; IC2_SEG033 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 1) ) if (Bit_Is_Set(m8, 1))
{ {
IC2_SEG032 = IC_SEG_ON; IC2_SEG032 = IC_SEG_ON;
} }
...@@ -2488,7 +2478,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2488,7 +2478,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG032 = IC_SEG_OFF; IC2_SEG032 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 2) ) if (Bit_Is_Set(m8, 2))
{ {
IC2_SEG083 = IC_SEG_ON; IC2_SEG083 = IC_SEG_ON;
} }
...@@ -2496,7 +2486,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2496,7 +2486,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG083 = IC_SEG_OFF; IC2_SEG083 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 3) ) if (Bit_Is_Set(m8, 3))
{ {
IC2_SEG082 = IC_SEG_ON; IC2_SEG082 = IC_SEG_ON;
} }
...@@ -2504,7 +2494,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2504,7 +2494,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG082 = IC_SEG_OFF; IC2_SEG082 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 5) ) if (Bit_Is_Set(m8, 5))
{ {
IC2_SEG034 = IC_SEG_ON; IC2_SEG034 = IC_SEG_ON;
} }
...@@ -2512,7 +2502,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2512,7 +2502,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG034 = IC_SEG_OFF; IC2_SEG034 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if (Bit_Is_Set(m8, 4))
{ {
IC2_SEG081 = IC_SEG_ON; IC2_SEG081 = IC_SEG_ON;
} }
...@@ -2520,7 +2510,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2520,7 +2510,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG081 = IC_SEG_OFF; IC2_SEG081 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if (Bit_Is_Set(m8, 6))
{ {
IC2_SEG080 = IC_SEG_ON; IC2_SEG080 = IC_SEG_ON;
} }
...@@ -2546,11 +2536,11 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2546,11 +2536,11 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
IC2_SEG034 = IC_SEG_OFF; IC2_SEG034 = IC_SEG_OFF;
IC2_SEG080 = IC_SEG_OFF; IC2_SEG080 = IC_SEG_OFF;
} }
if ( m_Flag2 == 1u ) if (m_Flag2 == 1u)
{ {
Num = m_minute / 10u; Num = m_minute / 10u;
m8 = SEG_DISPLAY_NUMBER0 [ Num ]; m8 = SEG_DISPLAY_NUMBER0[Num];
if ( Bit_Is_Set(m8, 0) ) if (Bit_Is_Set(m8, 0))
{ {
IC2_SEG030 = IC_SEG_ON; IC2_SEG030 = IC_SEG_ON;
} }
...@@ -2558,7 +2548,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2558,7 +2548,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG030 = IC_SEG_OFF; IC2_SEG030 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 1) ) if (Bit_Is_Set(m8, 1))
{ {
IC2_SEG029 = IC_SEG_ON; IC2_SEG029 = IC_SEG_ON;
} }
...@@ -2566,7 +2556,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2566,7 +2556,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG029 = IC_SEG_OFF; IC2_SEG029 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 2) ) if (Bit_Is_Set(m8, 2))
{ {
IC2_SEG088 = IC_SEG_ON; IC2_SEG088 = IC_SEG_ON;
} }
...@@ -2574,7 +2564,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2574,7 +2564,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG088 = IC_SEG_OFF; IC2_SEG088 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 3) ) if (Bit_Is_Set(m8, 3))
{ {
IC2_SEG087 = IC_SEG_ON; IC2_SEG087 = IC_SEG_ON;
} }
...@@ -2582,7 +2572,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2582,7 +2572,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG087 = IC_SEG_OFF; IC2_SEG087 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 5) ) if (Bit_Is_Set(m8, 5))
{ {
IC2_SEG031 = IC_SEG_ON; IC2_SEG031 = IC_SEG_ON;
} }
...@@ -2590,7 +2580,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2590,7 +2580,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG031 = IC_SEG_OFF; IC2_SEG031 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if (Bit_Is_Set(m8, 4))
{ {
IC2_SEG086 = IC_SEG_ON; IC2_SEG086 = IC_SEG_ON;
} }
...@@ -2598,7 +2588,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2598,7 +2588,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG086 = IC_SEG_OFF; IC2_SEG086 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if (Bit_Is_Set(m8, 6))
{ {
IC2_SEG085 = IC_SEG_ON; IC2_SEG085 = IC_SEG_ON;
} }
...@@ -2607,8 +2597,8 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2607,8 +2597,8 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
IC2_SEG085 = IC_SEG_OFF; IC2_SEG085 = IC_SEG_OFF;
} }
Num = m_minute % 10u; Num = m_minute % 10u;
m8 = SEG_DISPLAY_NUMBER0 [ Num ]; m8 = SEG_DISPLAY_NUMBER0[Num];
if ( Bit_Is_Set(m8, 0) ) if (Bit_Is_Set(m8, 0))
{ {
IC2_SEG027 = IC_SEG_ON; IC2_SEG027 = IC_SEG_ON;
} }
...@@ -2616,7 +2606,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2616,7 +2606,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG027 = IC_SEG_OFF; IC2_SEG027 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 1) ) if (Bit_Is_Set(m8, 1))
{ {
IC2_SEG026 = IC_SEG_ON; IC2_SEG026 = IC_SEG_ON;
} }
...@@ -2624,7 +2614,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2624,7 +2614,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG026 = IC_SEG_OFF; IC2_SEG026 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 2) ) if (Bit_Is_Set(m8, 2))
{ {
IC2_SEG092 = IC_SEG_ON; IC2_SEG092 = IC_SEG_ON;
} }
...@@ -2632,7 +2622,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2632,7 +2622,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG092 = IC_SEG_OFF; IC2_SEG092 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 3) ) if (Bit_Is_Set(m8, 3))
{ {
IC2_SEG091 = IC_SEG_ON; IC2_SEG091 = IC_SEG_ON;
} }
...@@ -2640,7 +2630,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2640,7 +2630,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG091 = IC_SEG_OFF; IC2_SEG091 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 5) ) if (Bit_Is_Set(m8, 5))
{ {
IC2_SEG028 = IC_SEG_ON; IC2_SEG028 = IC_SEG_ON;
} }
...@@ -2648,7 +2638,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2648,7 +2638,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG028 = IC_SEG_OFF; IC2_SEG028 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 4) ) if (Bit_Is_Set(m8, 4))
{ {
IC2_SEG090 = IC_SEG_ON; IC2_SEG090 = IC_SEG_ON;
} }
...@@ -2656,7 +2646,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t ...@@ -2656,7 +2646,7 @@ _Fun_Res SEG_SET_Clock(uint8_t m_hour, uint8_t m_minute, uint8_t m_icon, uint8_t
{ {
IC2_SEG090 = IC_SEG_OFF; IC2_SEG090 = IC_SEG_OFF;
} }
if ( Bit_Is_Set(m8, 6) ) if (Bit_Is_Set(m8, 6))
{ {
IC2_SEG089 = IC_SEG_ON; IC2_SEG089 = IC_SEG_ON;
} }
...@@ -2703,23 +2693,21 @@ void SEG_Scan_SET_FuelDial(void) ...@@ -2703,23 +2693,21 @@ void SEG_Scan_SET_FuelDial(void)
} }
} }
uint8_t Espeed_check_SEG_step = 0; uint8_t Espeed_check_SEG_step = 0;
void SEG_Scan_SET_EspeedDial(void) void SEG_Scan_SET_EspeedDial(void)
{ {
uint16_t a = 0; uint16_t a = 0;
a = (Espeed_check_SEG_step / 2) * 100; a = (Espeed_check_SEG_step / 2) * 100;
//SEG_SET_EspeedDial(1, a / 1000, a); // SEG_SET_EspeedDial(1, a / 1000, a);
} }
uint8_t check_SEG_step = 0; uint8_t check_SEG_step = 0;
///*仪表段码扫描函数*/ ///*仪表段码扫描函数*/
//void Check_SEG_Display(void) // void Check_SEG_Display(void)
//{ //{
// uint32_t a; // uint32_t a;
// a = check_SEG_step / 25u; // a = check_SEG_step / 25u;
...@@ -2745,7 +2733,7 @@ uint8_t check_SEG_step = 0; ...@@ -2745,7 +2733,7 @@ uint8_t check_SEG_step = 0;
// SEG_Scan_SET_FuelDial(); // SEG_Scan_SET_FuelDial();
// SEG_Scan_SET_EspeedDial(); // SEG_Scan_SET_EspeedDial();
// //
//} //}
uint8_t Checkself_SEG_step = 0; uint8_t Checkself_SEG_step = 0;
...@@ -2773,7 +2761,7 @@ void Checkself_SEG_Display(void) ...@@ -2773,7 +2761,7 @@ void Checkself_SEG_Display(void)
SEG_SET_FuelDial(1, Fuel); SEG_SET_FuelDial(1, Fuel);
Espeed = (Checkself_SEG_step * 2 / 5) * 1000; Espeed = (Checkself_SEG_step * 2 / 5) * 1000;
//SEG_SET_EspeedDial(1, Espeed / 1000, Espeed); // SEG_SET_EspeedDial(1, Espeed / 1000, Espeed);
Vspeed = Checkself_SEG_step * 7; Vspeed = Checkself_SEG_step * 7;
if (Vspeed > 198) if (Vspeed > 198)
...@@ -2790,6 +2778,36 @@ void Checkself_SEG_Display(void) ...@@ -2790,6 +2778,36 @@ void Checkself_SEG_Display(void)
hour = (Checkself_SEG_step / 3) * 11; hour = (Checkself_SEG_step / 3) * 11;
min = (Checkself_SEG_step / 3) * 11; min = (Checkself_SEG_step / 3) * 11;
SEG_SET_Clock(hour, min, 1, 1, 1); SEG_SET_Clock(hour, min, 1, 1, 1);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_00_Grass_Full_R, LED_ON);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_01_Power_Battery_Failure_R, LED_ON);
// LED_Driver_Channel_Set(LampChannel_0, LampCh0_02_System_Indicator_R, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_04_GEAR_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_08_Battery_Charging_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_10_READY_G, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_11_Key_Access_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_12_Seat_Detection_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_13_OVERLOAD_R, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_14_Cutterhead_Switch_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_Cutterhead_Gear_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_17_External_Discharge_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_21_LED_Open_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_31_Working_Hours_One_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_32_Charging_Connection_R, LED_ON);
SEG_SET_LED_STS(SEG_LED_Recharge, 1);
// SEG_SET_LED_STS(SEG_LED_System_Light, 1);
SEG_SET_LED_STS(SEG_LED_Chloramine, 1);
SEG_SET_LED_STS(SEG_LED_Cutter_Overload, 1);
SEG_SET_LED_STS(SEG_LED_Seat_Detection, 1);
SEG_SET_LED_STS(SEG_LED_Key_Access, 1);
SEG_SET_LED_STS(SEG_LED_Ready, 1);
SEG_SET_LED_STS(SEG_LED_Cutter_Head_switch, 1);
SEG_SET_LED_STS(SEG_LED_External_Discharge, 1);
SEG_SET_LED_STS(SEG_LED_Distance_Light, 1);
SEG_SET_LED_STS(SEG_LED_HHT_Charger, 1);
if (Checkself_SEG_step_count < 60) if (Checkself_SEG_step_count < 60)
{ {
...@@ -2819,5 +2837,4 @@ void Checkself_SEG_Display(void) ...@@ -2819,5 +2837,4 @@ void Checkself_SEG_Display(void)
void TYW_Check_Count(void) void TYW_Check_Count(void)
{ {
} }
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @ ab5a58eb
...@@ -53,6 +53,7 @@ static void Power_KL30_Init(void) ...@@ -53,6 +53,7 @@ static void Power_KL30_Init(void)
Checkself_Init(); Checkself_Init();
LINE_IN_Init(); LINE_IN_Init();
LED_Driver_Init_Example();//注意顺序2 LED_Driver_Init_Example();//注意顺序2
LED_Driver_Service_Immediate();
Data_User_Mileage_KL30Init(); Data_User_Mileage_KL30Init();
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400, 64000000); TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400, 64000000);
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000); TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
......
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ ab5a58eb
...@@ -67,39 +67,39 @@ static void LED_Power_Battery_Failure_R_Execution(Tellib_uint16_t led ...@@ -67,39 +67,39 @@ static void LED_Power_Battery_Failure_R_Execution(Tellib_uint16_t led
uint8_t u8CanId401Flag = 0; uint8_t u8CanId401Flag = 0;
const LED_Attribute_st LED_Attribute [ LED_Max ] = { const LED_Attribute_st LED_Attribute [ LED_Max ] = {
/* 指示灯索引 是否自检 外部信号自检 工作电源状态 自检开始时间 自检持续时间 指示灯点亮条件 指示灯执行函数 */ /* 指示灯索引 是否自检 外部信号自检 工作电源状态 自检开始时间 自检持续时间 指示灯点亮条件 指示灯执行函数 */
{em_LED_EFI_failure_Y, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_EFI_failure_Judgement, LED_EFI_failure_Execution }, {em_LED_EFI_failure_Y, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_EFI_failure_Judgement, LED_EFI_failure_Execution },
{em_LED_Fuel_Alarm_Y, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Fuel_Alarm_Judgement, LED_Fuel_Alarm_Execution }, {em_LED_Fuel_Alarm_Y, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Fuel_Alarm_Judgement, LED_Fuel_Alarm_Execution },
{em_LED_Lead_Acid_Battery_Failure_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Lead_Acid_Battery_Failure_Judgement, LED_Lead_Acid_Battery_Failure_Execution }, {em_LED_Lead_Acid_Battery_Failure_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Lead_Acid_Battery_Failure_Judgement, LED_Lead_Acid_Battery_Failure_Execution },
{em_LED_Oil_Pressure_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Oil_Pressure_Judgement, LED_Oil_Pressure_Execution }, {em_LED_Oil_Pressure_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Oil_Pressure_Judgement, LED_Oil_Pressure_Execution },
{em_LED_Grass_Full_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Grass_Full_Judgement, LED_Grass_Full_Execution }, {em_LED_Grass_Full_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Grass_Full_Judgement, LED_Grass_Full_Execution },
{em_LED_OVERLOAD_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_OVERLOAD_Judgement, LED_OVERLOAD_Execution }, {em_LED_OVERLOAD_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_OVERLOAD_Judgement, LED_OVERLOAD_Execution },
{em_LED_READY_G, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_READY_Judgement, LED_READY_Execution }, {em_LED_READY_G, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_READY_Judgement, LED_READY_Execution },
{em_LED_Seat_Detection_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Seat_Detection_Judgement, LED_Seat_Detection_Execution }, {em_LED_Seat_Detection_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Seat_Detection_Judgement, LED_Seat_Detection_Execution },
{em_LED_Key_Access_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Key_Access_Judgement, LED_Key_Access_Execution }, {em_LED_Key_Access_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Key_Access_Judgement, LED_Key_Access_Execution },
{em_LED_Battery_Charging_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Battery_Charging_Judgement, LED_Battery_Charging_Execution }, {em_LED_Battery_Charging_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Battery_Charging_Judgement, LED_Battery_Charging_Execution },
{em_LED_Cutterhead_Switch_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Cutterhead_Switch_Judgement, LED_Cutterhead_Switch_Execution }, {em_LED_Cutterhead_Switch_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Cutterhead_Switch_Judgement, LED_Cutterhead_Switch_Execution },
{em_LED_GEAR_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_GEAR_Judgement, LED_GEAR_Execution }, {em_LED_GEAR_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_GEAR_Judgement, LED_GEAR_Execution },
{em_LED_External_Discharge_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_External_Discharge_Judgement, LED_External_Discharge_Execution }, {em_LED_External_Discharge_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_External_Discharge_Judgement, LED_External_Discharge_Execution },
{em_LED_Engine_Works_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Engine_Works_Judgement, LED_Engine_Works_Execution }, {em_LED_Engine_Works_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Engine_Works_Judgement, LED_Engine_Works_Execution },
{em_LED_Bluetooth_Connection_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Bluetooth_Connection_Judgement, LED_Bluetooth_Connection_Execution }, {em_LED_Bluetooth_Connection_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Bluetooth_Connection_Judgement, LED_Bluetooth_Connection_Execution },
{em_LED_LED_Open_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_LED_Open_Judgement, LED_LED_Open_Execution }, {em_LED_LED_Open_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_LED_Open_Judgement, LED_LED_Open_Execution },
{em_LED_Cruise_Control_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Cruise_Control_Judgement, LED_Cruise_Control_Execution }, {em_LED_Cruise_Control_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Cruise_Control_Judgement, LED_Cruise_Control_Execution },
{em_LED_Tire_pressure_F_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Tire_pressure_F_Judgement, LED_Tire_pressure_F_Execution }, {em_LED_Tire_pressure_F_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Tire_pressure_F_Judgement, LED_Tire_pressure_F_Execution },
{em_LED_Tire_pressure_R_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Tire_pressure_R_Judgement, LED_Tire_pressure_R_Execution }, {em_LED_Tire_pressure_R_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Tire_pressure_R_Judgement, LED_Tire_pressure_R_Execution },
{em_LED_Gears_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Gears_Judgement, LED_Gears_Execution }, {em_LED_Gears_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Gears_Judgement, LED_Gears_Execution },
{em_LED_Cutterhead_Gear_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Cutterhead_Gear_Judgement, LED_Cutterhead_Gear_Execution }, {em_LED_Cutterhead_Gear_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Cutterhead_Gear_Judgement, LED_Cutterhead_Gear_Execution },
{em_LED_Working_Hours_One_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Working_Hours_One_Judgement, LED_Working_Hours_One_Execution }, {em_LED_Working_Hours_One_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Working_Hours_One_Judgement, LED_Working_Hours_One_Execution },
{em_LED_Fault_Codes_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Fault_Codes_Judgement, LED_Fault_Codes_Execution }, {em_LED_Fault_Codes_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Fault_Codes_Judgement, LED_Fault_Codes_Execution },
{em_LED_System_Indicator_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_SystIndicator_R_Judgement, LED_SystIndicator_R_Execution }, {em_LED_System_Indicator_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_SystIndicator_R_Judgement, LED_SystIndicator_R_Execution },
{em_LED_P_GEAR_G, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_P_GEAR_G_Judgement, LED_P_GEAR_G_Execution }, {em_LED_P_GEAR_G, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_P_GEAR_G_Judgement, LED_P_GEAR_G_Execution },
{em_LED_Fuel_Alarm_W, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Fuel_Alarm_W_Judgement, LED_Fuel_Alarm_W_Execution }, {em_LED_Fuel_Alarm_W, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Fuel_Alarm_W_Judgement, LED_Fuel_Alarm_W_Execution },
{em_LED_Charging_Connection_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Charging_Connection_R_Judgement, LED_Charging_Connection_R_Execution }, {em_LED_Charging_Connection_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Charging_Connection_R_Judgement, LED_Charging_Connection_R_Execution },
{em_LED_Power_Battery_Failure_R, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Power_Battery_Failure_R_Judgement, LED_Power_Battery_Failure_R_Execution }, {em_LED_Power_Battery_Failure_R, NoSelfCheck, ExterNalCheck, LED_IGN_ON, 0u, 3000ul, LED_Power_Battery_Failure_R_Judgement, LED_Power_Battery_Failure_R_Execution },
}; };
Tellib_uint8_t Tel_Mem [ Tel_MEM_Block_Size * LED_Max + Tel_MEM_Block_Addition ]; Tellib_uint8_t Tel_Mem [ Tel_MEM_Block_Size * LED_Max + Tel_MEM_Block_Addition ];
uint8_t PowerSts_num;
void Telltales_Init(void) void Telltales_Init(void)
{ {
TelExtPara m_ExtPara; TelExtPara m_ExtPara;
...@@ -107,6 +107,7 @@ void Telltales_Init(void) ...@@ -107,6 +107,7 @@ void Telltales_Init(void)
m_ExtPara.LED_PowerOFF_TimerCbk = Common_GetIgnOffTime; m_ExtPara.LED_PowerOFF_TimerCbk = Common_GetIgnOffTime;
m_ExtPara.LED_PowerON_TimerCbk = Common_GetIgnOnTime; m_ExtPara.LED_PowerON_TimerCbk = Common_GetIgnOnTime;
m_ExtPara.LED_PowerCbk = Common_Get_IG_Sts; m_ExtPara.LED_PowerCbk = Common_Get_IG_Sts;
PowerSts_num = Common_Get_IG_Sts();
u8CanId401Flag = 0; u8CanId401Flag = 0;
Telltales_KL30_Wakeup_Init(Tel_Mem, LED_Attribute, &m_ExtPara); Telltales_KL30_Wakeup_Init(Tel_Mem, LED_Attribute, &m_ExtPara);
} }
...@@ -279,8 +280,8 @@ static void LED_OVERLOAD_Execution(Tellib_uint16_t led_status) ...@@ -279,8 +280,8 @@ static void LED_OVERLOAD_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_READY_Judgement(void) static Tellib_uint16_t LED_READY_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode(); Tellib_uint8_t Signal1 = Get_CAN_Power_State();
if (Signal1 == 0x3) if (Signal1 == READY)
{ {
LED_STATE = 1; LED_STATE = 1;
interact_PWM_Low_Duty = 30; interact_PWM_Low_Duty = 30;
...@@ -372,16 +373,16 @@ static Tellib_uint16_t LED_Battery_Charging_Judgement(void) ...@@ -372,16 +373,16 @@ static Tellib_uint16_t LED_Battery_Charging_Judgement(void)
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc(); Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigAcc();
Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge(); Tellib_uint8_t Signal2 = Get_CAN_CH0_ID_18202922_Sig_MBMS_TOTALSigCharge();
Tellib_uint8_t Signal3 = Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode(); Tellib_uint8_t Signal3 = Get_CAN_Power_State();
if(ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9000 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16000) if(ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) >= 9000 && ADC_Read_Signal(ADC_CH_KL30_VOLTAGE) <= 16000)
{ {
if (Signal1 == 0x1 && Signal2 == 0X1) if (Signal1 == 0x1 && Signal2 == 0X1)
{ {
if(Signal3 == 0x4 || Signal3 == 0x6) if(Signal3 == CHRG_PLUGIN || Signal3 == CHRGING)
{ {
LED_STATE = 2; LED_STATE = 2;
} }
else if(Signal3 == 0x5) else if(Signal3 == CHRGEND)
{ {
LED_STATE = 1; LED_STATE = 1;
} }
...@@ -824,26 +825,30 @@ static Tellib_uint16_t LED_SystIndicator_R_Judgement(void) ...@@ -824,26 +825,30 @@ static Tellib_uint16_t LED_SystIndicator_R_Judgement(void)
} }
static void LED_SystIndicator_R_Execution(Tellib_uint16_t led_status) static void LED_SystIndicator_R_Execution(Tellib_uint16_t led_status)
{ {
if ( led_status == 1u ) // if ( led_status == 1u )
{ // {
LED_Driver_Channel_Set(LampChannel_0, LampCh0_02_System_Indicator_R, LED_ON); // LED_Driver_Channel_Set(LampChannel_0, LampCh0_02_System_Indicator_R, LED_ON);
SEG_SET_LED_STS(SEG_LED_System_Light,1); // SEG_SET_LED_STS(SEG_LED_System_Light,1);
} // }
else // else
{ // {
LED_Driver_Channel_Set(LampChannel_0, LampCh0_02_System_Indicator_R, LED_OFF); // LED_Driver_Channel_Set(LampChannel_0, LampCh0_02_System_Indicator_R, LED_OFF);
SEG_SET_LED_STS(SEG_LED_System_Light,0); // SEG_SET_LED_STS(SEG_LED_System_Light,0);
} // }
} }
static Tellib_uint16_t LED_P_GEAR_G_Judgement(void) static Tellib_uint16_t LED_P_GEAR_G_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState(); Tellib_uint8_t Signal1 = Get_CAN_CH0_ID_125_Sig_MMCU_ParkingGearState();
if (Signal1 == 0x1) Tellib_uint8_t Signal2 = Get_CAN_Power_State();
if ( Signal1 == 0x1 )
{ {
LED_STATE = 1; LED_STATE = 1;
} }
else if(Signal2 == PKEY_ON)
{
LED_STATE = 2;
}
else else
{ {
LED_STATE = 0; LED_STATE = 0;
...@@ -855,14 +860,29 @@ static void LED_P_GEAR_G_Execution(Tellib_uint16_t led_status) ...@@ -855,14 +860,29 @@ static void LED_P_GEAR_G_Execution(Tellib_uint16_t led_status)
if ( led_status == 1u ) if ( led_status == 1u )
{ {
LED_Driver_Channel_Set(LampChannel_0, LampCh0_04_GEAR_W, LED_ON); LED_Driver_Channel_Set(LampChannel_0, LampCh0_04_GEAR_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_ON); LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_ON);
// SEG_SET_LED_STS(1,1); SEG_SET_GEAR(Gear_P, 1);
}
else if(led_status == 2u)
{
if(FLASH_SYNC_1Hz)
{
LED_Driver_Channel_Set(LampChannel_0, LampCh0_04_GEAR_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_ON);
SEG_SET_GEAR(Gear_P, 1);
}
else
{
LED_Driver_Channel_Set(LampChannel_0, LampCh0_04_GEAR_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_OFF);
SEG_SET_GEAR(Gear_P, 0);
}
} }
else else
{ {
LED_Driver_Channel_Set(LampChannel_0, LampCh0_04_GEAR_W, LED_ON); LED_Driver_Channel_Set(LampChannel_0, LampCh0_04_GEAR_W, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_OFF); LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_OFF);
// SEG_SET_LED_STS(1,0); SEG_SET_GEAR(Gear_P, 0);
} }
} }
static Tellib_uint16_t LED_Fuel_Alarm_W_Judgement(void) static Tellib_uint16_t LED_Fuel_Alarm_W_Judgement(void)
......
Firmware/Source/System/Sys_Task_List.c
View file @ ab5a58eb
...@@ -21,15 +21,6 @@ void Sys_2ms_Tasks(void) ...@@ -21,15 +21,6 @@ void Sys_2ms_Tasks(void)
Sys_Status_Update_Service(); Sys_Status_Update_Service();
Analog_Signal_Conv_Service(); Analog_Signal_Conv_Service();
CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u); CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp,2u);
// if (RTE_GPIO_Get_Level(VSPEED_TEN_OUT))
// {
// RTE_GPIO_Config(VSPEED_TEN_OUT, RTE_GPIO_DIR_OUT|RTE_GPIO_LEVEL_LOW);
// }
// else
// {
// RTE_GPIO_Config(VSPEED_TEN_OUT, RTE_GPIO_DIR_OUT|RTE_GPIO_LEVEL_HIGH);
// }
} }
void Sys_5ms_Tasks(void) void Sys_5ms_Tasks(void)
...@@ -66,15 +57,9 @@ void Sys_50ms_Tasks(void) ...@@ -66,15 +57,9 @@ void Sys_50ms_Tasks(void)
uint8_t u8LEDDriverCheckCount = 0U; uint8_t u8LEDDriverCheckCount = 0U;
void Sys_100ms_Tasks(void) void Sys_100ms_Tasks(void)
{ {
// if(PageType == Page_Time)
// {
// RTE_RTC_Get_CounterValue(&counter_val);
// counter_val.time.RTC_Hours = RTC_Bcd2ToByte(counter_val.time.RTC_Hours);
// counter_val.time.RTC_Minutes = RTC_Bcd2ToByte(counter_val.time.RTC_Minutes);
// }
BackLight_Process(); BackLight_Process();
Interact_Light_Process(); Interact_Light_Process();
// Services_Mileage_Callback();
S3_ServerCNTT(); S3_ServerCNTT();
if (u8LEDDriverCheckCount >= 10U) if (u8LEDDriverCheckCount >= 10U)
......
Firmware/Source/System/main.c
View file @ ab5a58eb
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "cgc.h" #include "cgc.h"
#include "userdefine.h" #include "userdefine.h"
#include "Components.h" #include "Components.h"
/** /**
* @brief Main program. * @brief Main program.
*/ */
......
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