Skip to content

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

调整FLASH，FV00.07；增加报警

parent 19728d86
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 742 additions and 870 deletions
source/Application/APP/Telltales/Telltales_user.c
View file @ 47d704c4
......@@ -13,6 +13,7 @@
#include "IS31FL3236.h"
#include "Service_TPMS.h"
#include "Data_AirPressure.h"
#include "Data_CoolantTemperature.h"
static uint8_t L12_Air_Sta ;
......@@ -2049,12 +2050,21 @@ Temp
******************************************************************************/
uint8_t LED_Temp_Judgement(void)
{
uint8_t u8Result = 0u;
static uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u;
if (m_Condition1 == 1u)
m_Condition1 = Coolant_Get_CurSeg();
if (K_Line_Set.K_Line_LID43 == 0x82u)
{
u8Result = 1u;
if ((m_Condition1 >= 12u) && (Coolant_Get_Valid() == 1u))
{
u8Result = 1u;
}
else if (m_Condition1 <= 9u)
{
u8Result = 0u;
}
}
else
{
......@@ -2065,22 +2075,37 @@ uint8_t LED_Temp_Judgement(void)
}
void LED_Temp_Execution(uint8_t led_status)
{
if (led_status == 1u)
COMMON_PowerStatus_t u8IG_st;
u8IG_st = Common_Get_IG_Sts();
if (u8IG_st == COMMON_POWER_ON)
{
//TimerB_PWM_Channel_Duty_Set(TIMERB_2_CH7 , testBG );//水温格白色
TEMP_R_LED_OUT = 1u ;/*水温红灯*/
Water_Temp_Led_R_MCU_OUT = 1u;
if ((led_status == 1u) && (K_Line_Set.K_Line_LID43 == 0x82u))
{
//TimerB_PWM_Channel_Duty_Set(TIMERB_2_CH7 , testBG );//水温格白色
TEMP_R_LED_OUT = 1u ;/*水温红灯*/
Water_Temp_Led_R_MCU_OUT = 0u;
TEMP_W_LED_OUT = 0u ;//水温字符白色指示灯
Water_Temp_Led_W_MCU_OUT = 0u;
TEMP_W_LED_OUT = 0u ;//水温字符白色指示灯
Water_Temp_Led_W_MCU_OUT = 1u;
}
else
{
TEMP_R_LED_OUT = 0u ;/*水温红灯*/
Water_Temp_Led_R_MCU_OUT = 0u;
TEMP_W_LED_OUT = 1u ;//水温字符白色指示灯
Water_Temp_Led_W_MCU_OUT = 1u;
}
}
else
{
TEMP_R_LED_OUT = 0u ;/*水温红灯*/
Water_Temp_Led_R_MCU_OUT = 0u;
TEMP_W_LED_OUT = 1u ;//水温字符白色指示灯
Water_Temp_Led_W_MCU_OUT = 1u;
TEMP_W_LED_OUT = 0u ;//水温字符白色指示灯
Water_Temp_Led_W_MCU_OUT = 0u;
}
}
......@@ -2109,21 +2134,32 @@ uint8_t LED_Fuel_Judgement(void)
}
void LED_Fuel_Execution(uint8_t led_status)
{
if (led_status == 1u)
COMMON_PowerStatus_t u8IG_st;
u8IG_st = Common_Get_IG_Sts();
if (u8IG_st == COMMON_POWER_ON)
{
FUEL_LED_Y_MCU = 1U ;
FUEL_W_LED_OUT = 0U ;
if (led_status == 1u)
{
FUEL_LED_Y_MCU = 1U ;
FUEL_W_LED_OUT = 0U ;
}
else
{
FUEL_LED_Y_MCU = 0U ;
FUEL_W_LED_OUT = 1U ;
}
}
else
{
FUEL_LED_Y_MCU = 0U ;
FUEL_W_LED_OUT = 1U ;
FUEL_W_LED_OUT = 0U ;
}
}
/******************************************************************************
Fuel
Common_Get_L12_Air_Sta
信号接口：
信号定义：
输出信号：
......
source/Application/Alarm/Popup_List.c
View file @ 47d704c4
This diff is collapsed.
source/Application/Alarm/Popup_List.h
View file @ 47d704c4
This diff is collapsed.
source/Application/Alarm/Popups.c
View file @ 47d704c4
This diff is collapsed.
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ 47d704c4
......@@ -974,6 +974,18 @@ uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void)
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg0C010305_Msg_Count, 5u) >> 2u) & 0x03u));
}
uint32_t Get_ID_18FECA03_Sig_SPN(void)
{
return ((((uint32_t)((uint32_t)CAN_MSG_Read(ID_CanMsg18FECA03_Msg_Count, 4u) >> 0u) & 0xE0u) << 16u) + \
(((uint32_t)((uint32_t)CAN_MSG_Read(ID_CanMsg18FECA03_Msg_Count, 3u) >> 0u) & 0xFFu) << 8u) + \
((uint32_t)((uint32_t)CAN_MSG_Read(ID_CanMsg18FECA03_Msg_Count, 2u) >> 0u) & 0xFFu));
}
uint8_t Get_ID_18FECA03_Sig_FMI(void)
{
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FECA03_Msg_Count, 4u) >> 0u) & 0x1Fu);
}
uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
{
uint8_t u8Result = ID_TOTAL_MAX;
......
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
View file @ 47d704c4
......@@ -222,6 +222,8 @@ extern uint8_t Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void);
extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void);
extern uint8_t Get_ID_18021733_Sig_Setup_cmd(void);
extern uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void);
extern uint32_t Get_ID_18FECA03_Sig_SPN(void);
extern uint8_t Get_ID_18FECA03_Sig_FMI(void);
extern uint8_t Co_Can_ConvertSubID(uint32_t MsgID);
......
source/Application/Graphic/GUI/GUI.c
View file @ 47d704c4
......@@ -5919,7 +5919,7 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
return;
}
V_Speed = Common_Get_Act_V_Speed();
V_Speed = Common_Get_Disp_V_Speed();
if (V_Speed > 66u) /*有车速*/
{
......
source/Application/Graphic/GUI/GUI.h
View file @ 47d704c4
This diff is collapsed.
source/Application/RTE/Common_Interface.c
View file @ 47d704c4
......@@ -57,20 +57,19 @@ static void Individual_ECU_Communication(void);
_EOL_K_LINE_SET K_Line_Set;
/**/
static uint16_t User_FDJYLQQ_Time;
static uint16_t User_RYLQQ_Time;
static uint16_t User_BSXY_Time;
static uint16_t User_CSQY_Time;
static uint16_t User_LHQY_Time;
static uint16_t User_KQGZJ_Time;
static uint16_t User_DLZXY_Time;
static uint16_t User_LT_Time;
static uint8_t CRUISE_1_Time ;
static uint8_t CRUISE_STUDY_Time;
static uint8_t CRUISE_SLD1_Time ;
static uint8_t CRUISE_SLD2_Time ;
static uint16_t User_FDJYLQQ_Time;
static uint16_t User_RYLQQ_Time;
static uint16_t User_BSXY_Time;
static uint16_t User_CSQY_Time;
static uint16_t User_LHQY_Time;
static uint16_t User_KQGZJ_Time;
static uint16_t User_DLZXY_Time;
static uint16_t User_LT_Time;
static uint16_t CRUISE_1_Time;
static uint16_t CRUISE_STUDY_Time;
static uint16_t CRUISE_SLD1_Time;
static uint16_t CRUISE_SLD2_Time;
/*每次唤醒调用*/
void Common_DataInit(void)
......@@ -90,14 +89,14 @@ void Common_DataInit(void)
PowerIgnOffTimeLine = 0x0ul;
/**/
User_FDJYLQQ_Time = 0x00u;
User_RYLQQ_Time = 0x00u;
User_BSXY_Time = 0x00u;
User_CSQY_Time = 0x00u;
User_LHQY_Time = 0x00u;
User_KQGZJ_Time = 0x00u;
User_DLZXY_Time = 0x00u;
User_LT_Time = 0x00u;
User_FDJYLQQ_Time = 0x00u;
User_RYLQQ_Time = 0x00u;
User_BSXY_Time = 0x00u;
User_CSQY_Time = 0x00u;
User_LHQY_Time = 0x00u;
User_KQGZJ_Time = 0x00u;
User_DLZXY_Time = 0x00u;
User_LT_Time = 0x00u;
CRUISE_1_Time = 0x00u;
CRUISE_STUDY_Time = 0x00u;
......@@ -266,30 +265,30 @@ void Common_Input_Para(void)
}
else
{
User_FDJYLQQ_Time = 0 ;
User_FDJYLQQ_Time = 0;
}
if ((State_Flag.User_RYLQQ_FLAG == 1) || (State_Flag.User_RYLQQ_FLAG == 2))
if ((State_Flag.User_RYLQQ_FLAG == 1) || (State_Flag.User_RYLQQ_FLAG == 2))
{
if (User_RYLQQ_Time < 601)
User_RYLQQ_Time ++;
User_RYLQQ_Time++;
}
else
{
User_RYLQQ_Time = 0;
User_RYLQQ_Time = 0;
}
if ((State_Flag.User_BSXY_FLAG == 1) || (State_Flag.User_BSXY_FLAG == 2))
if ((State_Flag.User_BSXY_FLAG == 1) || (State_Flag.User_BSXY_FLAG == 2))
{
if (User_BSXY_Time < 601)
User_BSXY_Time ++;
User_BSXY_Time++;
}
else
{
User_BSXY_Time = 0;
}
if ((State_Flag.User_CSQY_FLAG == 1) || (State_Flag.User_CSQY_FLAG == 2))
if ((State_Flag.User_CSQY_FLAG == 1) || (State_Flag.User_CSQY_FLAG == 2))
{
if (User_CSQY_Time < 601)
User_CSQY_Time++;
......@@ -299,7 +298,7 @@ void Common_Input_Para(void)
User_CSQY_Time = 0;
}
if ((State_Flag.User_LHQY_FLAG == 1) || (State_Flag.User_LHQY_FLAG == 2))
if ((State_Flag.User_LHQY_FLAG == 1) || (State_Flag.User_LHQY_FLAG == 2))
{
if (User_LHQY_Time < 601)
User_LHQY_Time++;
......@@ -309,7 +308,7 @@ void Common_Input_Para(void)
User_LHQY_Time = 0;
}
if ((State_Flag.User_KQGZJ_FLAG == 1) || (State_Flag.User_KQGZJ_FLAG == 2))
if ((State_Flag.User_KQGZJ_FLAG == 1) || (State_Flag.User_KQGZJ_FLAG == 2))
{
if (User_KQGZJ_Time < 601)
User_KQGZJ_Time++;
......@@ -319,20 +318,20 @@ void Common_Input_Para(void)
User_KQGZJ_Time = 0;
}
if ((State_Flag.User_DLZXY_FLAG == 1) || (State_Flag.User_DLZXY_FLAG == 2))
if ((State_Flag.User_DLZXY_FLAG == 1) || (State_Flag.User_DLZXY_FLAG == 2))
{
if (User_DLZXY_Time < 601)
User_DLZXY_Time ++;
User_DLZXY_Time++;
}
else
{
User_DLZXY_Time = 0;
}
if ((State_Flag.User_LT_FLAG == 1) || (State_Flag.User_LT_FLAG == 2))
if ((State_Flag.User_LT_FLAG == 1) || (State_Flag.User_LT_FLAG == 2))
{
if (User_LT_Time < 601)
User_LT_Time ++ ;
User_LT_Time++;
}
else
{
......@@ -342,20 +341,20 @@ void Common_Input_Para(void)
/**/
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 1u)
{
if (CRUISE_1_Time < 40)
if (CRUISE_1_Time < 1500u)
{
CRUISE_1_Time++ ;
CRUISE_1_Time++;
}
}
else
{
CRUISE_1_Time = 0;
CRUISE_1_Time = 0;
}
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 2u)
{
if (CRUISE_STUDY_Time < 40)
if (CRUISE_STUDY_Time < 1500u)
{
CRUISE_STUDY_Time++ ;
CRUISE_STUDY_Time++;
}
}
else
......@@ -364,14 +363,14 @@ void Common_Input_Para(void)
}
if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 3u)
{
if (CRUISE_SLD1_Time < 40)
if (CRUISE_SLD1_Time < 1500u)
{
CRUISE_SLD1_Time++;
}
}
else
{
CRUISE_SLD1_Time = 0;
CRUISE_SLD1_Time = 0;
}
}
else
......@@ -392,16 +391,15 @@ void Common_Input_Para(void)
Common_Set_Disp_E_Speed(0u);
/*----*/
User_FDJYLQQ_Time = 0u ;
User_RYLQQ_Time = 0u ;
User_BSXY_Time = 0u ;
User_CSQY_Time = 0u ;
User_LHQY_Time = 0u ;
User_KQGZJ_Time = 0u ;
User_DLZXY_Time = 0u ;
User_LT_Time = 0u ;
User_FDJYLQQ_Time = 0u;
User_RYLQQ_Time = 0u;
User_BSXY_Time = 0u;
User_CSQY_Time = 0u;
User_LHQY_Time = 0u;
User_KQGZJ_Time = 0u;
User_DLZXY_Time = 0u;
User_LT_Time = 0u;
/*----*/
}
}
......@@ -478,18 +476,37 @@ int32_t SEGGER_RTT_printf(uint16_t BufferIndex, const char *sFormat, ...)
return 0;
}
uint8_t Common_Get_Cruise_Time(void)
uint8_t Common_Get_Cruise_TimeSta(void)
{
return CRUISE_1_Time;
}
uint8_t Time_Sta = 0u;
uint8_t Common_Get_Cruise_SLD_Time(void)
{
return CRUISE_SLD1_Time;
if ((CRUISE_1_Time > 0u) && (CRUISE_1_Time < 1500u))
{
Time_Sta = 1u;
}
else
{
Time_Sta = 0u;
}
return Time_Sta;
}
uint8_t Common_Get_Cruise_SLD_TimeSta(void)
{
uint8_t Time_Sta = 0u;
if ((CRUISE_SLD1_Time > 0u) && (CRUISE_SLD1_Time < 1500u))
{
Time_Sta = 1u;
}
else
{
Time_Sta = 0u;
}
return Time_Sta;
}
/*EOL诊断配置数据转换为仪表配置数据*/
void ReadDTCEOLValue_Meter_K_LINE(void)
......
source/Application/RTE/Common_Interface.h
View file @ 47d704c4
......@@ -126,8 +126,8 @@ void Set_Can18FF5510_FirstRecv_Event(void);
void Set_Can18FF2300_FirstRecv_Event(void);
uint8_t Get_CanFirstRecv_Event(uint8_t ID);
uint8_t Common_Get_Cruise_Time(void);
uint8_t Common_Get_Cruise_SLD_Time(void);
uint8_t Common_Get_Cruise_TimeSta(void);
uint8_t Common_Get_Cruise_SLD_TimeSta(void);
void ReadDTCEOLValue_Meter_K_LINE(void);
void K_LINE_EOL_InitVal(void);
......
source/Driver/Graphic/images.c
View file @ 47d704c4
......@@ -263,23 +263,23 @@ static const t_PicStruct Pic_Attribute[] =
{ /*CN_Alarm_G5_10_11_wenzi3 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x10577CC0u },
{ /*CN_Alarm_G5_10_11_wenzi4 X486_Y225.png*/ 486u, 225u, 280u, 132u, ARGB8888, 0x1057F200u },
{ /*CN_Alarm_G5_10_11_wenzi5 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x105A3380u },
{ /*CN_Alarm_G5_12__25_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x105AA8C0u },
{ /*CN_Alarm_G5_12__25_weizhi10 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x105B1940u },
{ /*CN_Alarm_G5_12__25_weizhi11 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x105C2C40u },
{ /*CN_Alarm_G5_12__25_weizhi7 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x105D3F40u },
{ /*CN_Alarm_G5_12__25_weizhi8 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x105E5240u },
{ /*CN_Alarm_G5_12__25_weizhi9 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x105F6540u },
{ /*CN_Alarm_G5_12__25_wenzi1 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10607840u },
{ /*CN_Alarm_G5_12__25_wenzi2 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10618B40u },
{ /*CN_Alarm_G5_12__25_wenzi3 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10629E40u },
{ /*CN_Alarm_G5_12__25_wenzi4 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1063B140u },
{ /*CN_Alarm_G5_12__25_wenzi5 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1064C440u },
{ /*CN_Alarm_G5_12__25_wenzi6 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1065D740u },
{ /*CN_Alarm_G5_13_14_weizhi5 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1066EA40u },
{ /*CN_Alarm_G5_13_14_wenzi X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1067FD40u },
{ /*CN_Alarm_G5_13_14__image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x10691040u },
{ /*CN_Alarm_G5_13_14__wenzi1 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x106980C0u },
{ /*CN_Alarm_G5_13_14__wenzi2 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x1069F600u },
{ /*CN_Alarm_G5_12_25_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x105AA8C0u },
{ /*CN_Alarm_G5_12_25_wenzi1 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x105B1940u },
{ /*CN_Alarm_G5_12_25_wenzi10 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x105C2C40u },
{ /*CN_Alarm_G5_12_25_wenzi11 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x105D3F40u },
{ /*CN_Alarm_G5_12_25_wenzi2 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x105E5240u },
{ /*CN_Alarm_G5_12_25_wenzi3 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x105F6540u },
{ /*CN_Alarm_G5_12_25_wenzi4 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10607840u },
{ /*CN_Alarm_G5_12_25_wenzi5 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10618B40u },
{ /*CN_Alarm_G5_12_25_wenzi6 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10629E40u },
{ /*CN_Alarm_G5_12_25_wenzi7 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1063B140u },
{ /*CN_Alarm_G5_12_25_wenzi8 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1064C440u },
{ /*CN_Alarm_G5_12_25_wenzi9 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1065D740u },
{ /*CN_Alarm_G5_13_14_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x1066EA40u },
{ /*CN_Alarm_G5_13_14_wenzi X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10675AC0u },
{ /*CN_Alarm_G5_13_14_wenzi1 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x10686DC0u },
{ /*CN_Alarm_G5_13_14_wenzi2 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x1068E300u },
{ /*CN_Alarm_G5_13_14_wenzi5 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10695840u },
{ /*CN_Alarm_G5_16_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x106A6B40u },
{ /*CN_Alarm_G5_16_wenzi1 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x106ADBC0u },
{ /*CN_Alarm_G5_16_wenzi2 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x106BEEC0u },
......@@ -288,20 +288,20 @@ static const t_PicStruct Pic_Attribute[] =
{ /*CN_Alarm_G5_12_23_weizhi3 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x106F1600u },
{ /*CN_Alarm_G5_12_23_wenzi1 X386_Y283.png*/ 386u, 283u, 364u, 40u, ARGB8888, 0x106F8B40u },
{ /*CN_Alarm_G5_12_23_wenzi2 X386_Y283.png*/ 386u, 283u, 364u, 40u, ARGB8888, 0x10706EC0u },
{ /*CN_Alarm__G5_12_23_wenzi4 X486_Y225.png*/ 486u, 225u, 280u, 132u, ARGB8888, 0x10715240u },
{ /*CN_Alarm__G5_17_18_21_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x107393C0u },
{ /*CN_Alarm__G5_17_18_21_image2 X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x10740440u },
{ /*CN_Alarm__G5_17_18_21_wenzi1 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x107474C0u },
{ /*CN_Alarm__G5_17_18_21_wenzi2 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x107587C0u },
{ /*CN_Alarm__G5_17_18_21_wenzi3 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1075FD00u },
{ /*CN_Alarm__G5_17_18_21_wenzi4 X492_Y194.png*/ 492u, 194u, 240u, 68u, ARGB8888, 0x10771000u },
{ /*CN_Alarm__G5_17_18_21_wenzi5 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x10780F00u },
{ /*CN_Alarm_G5_12_23_wenzi4 X486_Y225.png*/ 486u, 225u, 280u, 132u, ARGB8888, 0x10715240u },
{ /*CN_Alarm_G5_17_18_21_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x107393C0u },
{ /*CN_Alarm_G5_17_18_21_image2 X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x10740440u },
{ /*CN_Alarm_G5_17_18_21_wenzi1 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x107474C0u },
{ /*CN_Alarm_G5_17_18_21_wenzi2 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x107587C0u },
{ /*CN_Alarm_G5_17_18_21_wenzi3 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1075FD00u },
{ /*CN_Alarm_G5_17_18_21_wenzi4 X492_Y194.png*/ 492u, 194u, 240u, 68u, ARGB8888, 0x10771000u },
{ /*CN_Alarm_G5_17_18_21_wenzi5 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x10780F00u },
{ /*CN_Alarm_G5_2_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x10788440u },
{ /*CN_Alarm_G5_2_image2 X492_Y194.png*/ 492u, 194u, 240u, 68u, ARGB8888, 0x1078F4C0u },
{ /*CN_Alarm_G5_2_wenzi X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x1079F3C0u },
{ /*CN_Alarm_G5_2_wenzi1 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x107A6900u },
{ /*CN_Alarm_G5_2_wenzi2 X486_Y225.png*/ 486u, 225u, 280u, 132u, ARGB8888, 0x107B7C00u },
{ /*CN_Alarm_G5_3_mage X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x107DBD80u },
{ /*CN_Alarm_G5_3_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x107DBD80u },
{ /*CN_Alarm_G5_3_wenzi1 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x107E2E00u },
{ /*CN_Alarm_G5_3_wenzi2 X486_Y225.png*/ 486u, 225u, 280u, 132u, ARGB8888, 0x107F4100u },
{ /*CN_Alarm_G5_3_wenzi3 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x10818280u },
......@@ -321,10 +321,10 @@ static const t_PicStruct Pic_Attribute[] =
{ /*CN_Alarm_G5_7_wenzi1 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x108DAC80u },
{ /*CN_Alarm_G5_7_wenzi2 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x108EBF80u },
{ /*CN_Alarm_G5_89_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x108F34C0u },
{ /*CN_Alarm_G5_89_iwenzi1 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x108FA540u },
{ /*CN_Alarm_G5_89_iwenzi2 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x10901A80u },
{ /*CN_Alarm_G5_89_iwenzi3 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10908FC0u },
{ /*CN_Alarm_G5_89_iwenzi4 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1091A2C0u },
{ /*CN_Alarm_G5_89_wenzi1 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x108FA540u },
{ /*CN_Alarm_G5_89_wenzi2 X484_Y191.png*/ 484u, 191u, 268u, 28u, ARGB8888, 0x10901A80u },
{ /*CN_Alarm_G5_89_wenzi3 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10908FC0u },
{ /*CN_Alarm_G5_89_wenzi4 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x1091A2C0u },
{ /*CN_Alarm_stop_31_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x1092B5C0u },
{ /*CN_Alarm_stop_31_wenzi1 X391_Y277.png*/ 391u, 277u, 400u, 44u, ARGB8888, 0x10932640u },
{ /*CN_Alarm_stop_32_image X383_Y189.png*/ 383u, 189u, 100u, 72u, ARGB8888, 0x10943940u },
......
source/Driver/Graphic/images.h
View file @ 47d704c4
......@@ -287,23 +287,23 @@ enum SpriteName
CN_Alarm_G5_10_11_wenzi3,
CN_Alarm_G5_10_11_wenzi4,
CN_Alarm_G5_10_11_wenzi5,
CN_Alarm_G5_12__25_image,
CN_Alarm_G5_12__25_weizhi10,
CN_Alarm_G5_12__25_weizhi11,
CN_Alarm_G5_12__25_weizhi7,
CN_Alarm_G5_12__25_weizhi8,
CN_Alarm_G5_12__25_weizhi9,
CN_Alarm_G5_12__25_wenzi1,
CN_Alarm_G5_12__25_wenzi2,
CN_Alarm_G5_12__25_wenzi3,
CN_Alarm_G5_12__25_wenzi4,
CN_Alarm_G5_12__25_wenzi5,
CN_Alarm_G5_12__25_wenzi6,
CN_Alarm_G5_13_14_weizhi5,
CN_Alarm_G5_12_25_image,
CN_Alarm_G5_12_25_wenzi1,
CN_Alarm_G5_12_25_wenzi10,
CN_Alarm_G5_12_25_wenzi11,
CN_Alarm_G5_12_25_wenzi2,
CN_Alarm_G5_12_25_wenzi3,
CN_Alarm_G5_12_25_wenzi4,
CN_Alarm_G5_12_25_wenzi5,
CN_Alarm_G5_12_25_wenzi6,
CN_Alarm_G5_12_25_wenzi7,
CN_Alarm_G5_12_25_wenzi8,
CN_Alarm_G5_12_25_wenzi9,
CN_Alarm_G5_13_14_image,
CN_Alarm_G5_13_14_wenzi,
CN_Alarm_G5_13_14__image,
CN_Alarm_G5_13_14__wenzi1,
CN_Alarm_G5_13_14__wenzi2,
CN_Alarm_G5_13_14_wenzi1,
CN_Alarm_G5_13_14_wenzi2,
CN_Alarm_G5_13_14_wenzi5,
CN_Alarm_G5_16_image,
CN_Alarm_G5_16_wenzi1,
CN_Alarm_G5_16_wenzi2,
......@@ -312,20 +312,20 @@ enum SpriteName
CN_Alarm_G5_12_23_weizhi3,
CN_Alarm_G5_12_23_wenzi1,
CN_Alarm_G5_12_23_wenzi2,
CN_Alarm__G5_12_23_wenzi4,
CN_Alarm__G5_17_18_21_image,
CN_Alarm__G5_17_18_21_image2,
CN_Alarm__G5_17_18_21_wenzi1,
CN_Alarm__G5_17_18_21_wenzi2,
CN_Alarm__G5_17_18_21_wenzi3,
CN_Alarm__G5_17_18_21_wenzi4,
CN_Alarm__G5_17_18_21_wenzi5,
CN_Alarm_G5_12_23_wenzi4,
CN_Alarm_G5_17_18_21_image,
CN_Alarm_G5_17_18_21_image2,
CN_Alarm_G5_17_18_21_wenzi1,
CN_Alarm_G5_17_18_21_wenzi2,
CN_Alarm_G5_17_18_21_wenzi3,
CN_Alarm_G5_17_18_21_wenzi4,
CN_Alarm_G5_17_18_21_wenzi5,
CN_Alarm_G5_2_image,
CN_Alarm_G5_2_image2,
CN_Alarm_G5_2_wenzi,
CN_Alarm_G5_2_wenzi1,
CN_Alarm_G5_2_wenzi2,
CN_Alarm_G5_3_mage,
CN_Alarm_G5_3_image,
CN_Alarm_G5_3_wenzi1,
CN_Alarm_G5_3_wenzi2,
CN_Alarm_G5_3_wenzi3,
......@@ -345,10 +345,10 @@ enum SpriteName
CN_Alarm_G5_7_wenzi1,
CN_Alarm_G5_7_wenzi2,
CN_Alarm_G5_89_image,
CN_Alarm_G5_89_iwenzi1,
CN_Alarm_G5_89_iwenzi2,
CN_Alarm_G5_89_iwenzi3,
CN_Alarm_G5_89_iwenzi4,
CN_Alarm_G5_89_wenzi1,
CN_Alarm_G5_89_wenzi2,
CN_Alarm_G5_89_wenzi3,
CN_Alarm_G5_89_wenzi4,
CN_Alarm_stop_31_image,
CN_Alarm_stop_31_wenzi1,
CN_Alarm_stop_32_image,
......
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