Commit 8cbfdcac authored by 张金硕's avatar 张金硕

🌈 style:优化代码,减少警告

parent c167fd00
......@@ -39,6 +39,8 @@ extern void BackLight_Process(void);
extern Light_uint8_t Backlight_GetPwmLevel(void);
extern void Data_Light_Res_service(Light_uint8_t deltaTime);
#endif
......@@ -59,4 +59,4 @@ extern TEXT_STRUCT TextPara[];
extern uint8_t UUIDConfigBuf[21];
extern uint8_t IOState;
#endif
\ No newline at end of file
#endif
......@@ -4,11 +4,11 @@
#define FAST_TIME 15 //20*20 400ms变化一格
#define NORMAL_TIME 500 //500*20 10s变化一格
#define Disconnected_TIME 1 //掉线时间
#pragma ghs section bss = ".myNonInitArea"
// #pragma ghs section bss = ".myNonInitArea"
//_Data_Cng Data_Cng_Percent;
//_Data_Cng Data_Cng_Pressure;
Hys_uint8_t u8HysRamData[HYS_RAM_DATA_LEN];
#pragma ghs section bss = default
// #pragma ghs section bss = default
DataCoolantTempStruct DataCoolantTemp ;
DataCoolantTempDisStruct DataCoolantTemp_Dis;
......
......@@ -101,4 +101,4 @@ uint8_t Get_OilPressureStauts(void)
{
return 0u;
}
}
\ No newline at end of file
}
......@@ -7,4 +7,4 @@ void Oil_Pressure_KL30_Init(void);
void Oil_Pressure_KL15_Init(void);
void Oil_R_Cal(uint8_t deltaTime);
uint8_t Get_OilPressureStauts(void);
#endif
\ No newline at end of file
#endif
......@@ -3,7 +3,7 @@
#include "CAN_CH0_CAN_Communication_Matrix.h"
FaultCodeList_t FaultCode_t;
uint32_t FaultCodeList [MaxFaultCode];
static uint8_t u8FaultCodeValid = 0;
// static uint8_t u8FaultCodeValid = 0;
uint32_t Get_FaultCodeDtc1(void)
{
uint32_t u16FaultCode = 0x0000;
......
......@@ -40,6 +40,7 @@ void FaultCode_Servers(void);
extern uint32_t Get_Current_FaultCode(void);
extern uint8_t Get_Current_Hight_FaultCode(void);
extern uint8_t Get_Current_Mid_FaultCode(void);
extern uint8_t Get_FaultCode_Lost(void);
// extern uint8_t Get_FaultCode_Valid(void);
#endif
\ No newline at end of file
#endif
......@@ -68,4 +68,4 @@ Hys_uint8_t HYS_Get_Seg(HYS_Num_en_t enHYSIndex);
HYS_Operate_Type_en_t HYS_Reset_Physical_Quantity(HYS_Num_en_t enHYSIndex);
/*读取版本号*/
Hys_uint8_t HYS_Version_Read(void);
#endif
\ No newline at end of file
#endif
......@@ -28,7 +28,7 @@ static uint16_t SocStartupCnt = 0u;
static Core_Monitor_t Core_Monitor;
static Rec_ID_12_Struct RecID12;
Rec_0x012_un_t g_unRec_0x012;
static void Core_Poweroff_Service();
static void Core_Poweroff_Service(void);
uint8_t g_u8AvgSpeedOFFValid = 0U;
uint8_t SOC_Online_Status_Get(void)
......
......@@ -129,8 +129,8 @@ static const uint16_t BootAnimationList[AMT630H_ANIMATION_PIC_NUM] = {
};
void AMT630H_Animation_PlayProc(uint16_t PicIndex)
{
unsigned char *pBuf;
uint32_t tmpLen = 0;
// unsigned char *pBuf;
// uint32_t tmpLen = 0;
SetPageGuid(GRAPHICS_PAGE_0, 1, 0, 0);
SetPageBackground(GRAPHICS_PAGE_0, PicIndex);
// if (AMT630H_Animation_DispPic == (AMT630H_ANIMATION_PIC_NUM - 30))
......
......@@ -46,19 +46,19 @@ static void AMT630H_GUI_Clock_Setting(uint8_t Clock_Hour, uint8_t Clock_Min, uin
void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode); /*背光设置*/
void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode); /*显示模式*/
void AMT630H_GUI_Bluetooth_Connect_Setting(uint8_t select, uint8_t Connect_ON); /*蓝牙连接*/
void AMT630H_GUI_Unit_Setting(Menu_Interface_en_t select); /*单位设置*/
void AMT630H_GUI_Language_Setting(Menu_Interface_en_t select); /*语言设置*/
void AMT630H_GUI_Unit_Setting(Menu_Item_en_t select); /*单位设置*/
void AMT630H_GUI_Language_Setting(Menu_Item_en_t select); /*语言设置*/
void AMT630H_GUI_Phone_Connect_Win(void); /*手机互联*/
void AMT630H_GUI_ReadPosittion_Display(void);
/*投屏界面*/
void AMT630H_GUI_Display_Navigation_Area(void);
void AMT630H_GUI_PhoneConnect_Second_LowHalf(void);
static void AMT630H_GUI_PhoneConnect_Light();
static void AMT630H_GUI_PhoneConnect_Light(void);
static void AMT630H_GUI_PhoneConnect_TIME(uint16_t Hour ,uint16_t Minute);
static void AMT630H_GUI_PhoneConnect_VSpeed(uint16_t VechileSpeed);
static void AMT630H_GUI_PhoneConnect_ESpeed(uint16_t ESpeed);
static void AMT630H_GUI_PhoneConnect_Fuel(uint8_t Fuel);
static void AMT630H_GUI_PhoneConnect_Telephone();
static void AMT630H_GUI_PhoneConnect_Telephone(void);
static void AMT630H_GUI_PhoneConnect_Voltage(uint16_t Voltage);
/*OTA界面*/
void AMT630H_GUI_Display_OTA_Page_Information(void);
......@@ -217,30 +217,30 @@ void AMT630H_GUI_Fault_Information(void)
}
static uint16_t NumbeList_FaultCode_day[]={
Pic_0040_605_289,
Pic_0041_606_290,
Pic_0042_604_289,
Pic_0043_604_289,
Pic_0044_604_290,
Pic_0045_604_290,
Pic_0046_605_289,
Pic_0047_605_290,
Pic_0048_605_289,
Pic_0049_605_289,
};
static uint16_t NumbeList_FaultCode_night[]={
Pic_0225_605_289,
Pic_0226_606_290,
Pic_0227_604_289,
Pic_0228_604_289,
Pic_0229_604_290,
Pic_0230_604_290,
Pic_0231_605_289,
Pic_0232_605_290,
Pic_0233_605_289,
Pic_0234_605_289,
};
// static uint16_t NumbeList_FaultCode_day[]={
// Pic_0040_605_289,
// Pic_0041_606_290,
// Pic_0042_604_289,
// Pic_0043_604_289,
// Pic_0044_604_290,
// Pic_0045_604_290,
// Pic_0046_605_289,
// Pic_0047_605_290,
// Pic_0048_605_289,
// Pic_0049_605_289,
// };
// static uint16_t NumbeList_FaultCode_night[]={
// Pic_0225_605_289,
// Pic_0226_606_290,
// Pic_0227_604_289,
// Pic_0228_604_289,
// Pic_0229_604_290,
// Pic_0230_604_290,
// Pic_0231_605_289,
// Pic_0232_605_290,
// Pic_0233_605_289,
// Pic_0234_605_289,
// };
uint8_t FaultCodevalid_monitor = 2;
/*故障码显示函数*/
......@@ -579,11 +579,11 @@ static uint16_t Bluetooth_num_night[] = {
*/
void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
{
uint8_t Contect_totalnumber;
// uint8_t Contect_totalnumber;
DISPLAY_NUM_ST DisplayNumPara;
uint16_t connect_personnumber;
connect_personnumber = BlueToothPhoneData.PhoneBookTotalCount;
Contect_totalnumber = 0;
// Contect_totalnumber = 0;
if(g_u8Display_Mode == ModeDAY)
{
......@@ -2035,29 +2035,29 @@ void AMT630H_GUI_Backlight_Setting(Menu_Item_en_t back_mode) /*图 背光*/
}
}
static uint16_t Bluetooth_Connect_num_day[] = {
Pic_0040_605_289,
Pic_0041_606_290,
Pic_0042_604_289,
Pic_0043_604_289,
Pic_0044_604_290,
Pic_0045_604_290,
Pic_0046_605_289,
Pic_0047_605_290,
Pic_0048_605_289,
Pic_0049_605_289};
static uint16_t Bluetooth_Connect_num_night[] = {
Pic_0225_605_289,
Pic_0226_606_290,
Pic_0227_604_289,
Pic_0228_604_289,
Pic_0229_604_290,
Pic_0230_604_290,
Pic_0231_605_289,
Pic_0232_605_290,
Pic_0233_605_289,
Pic_0234_605_289};
// static uint16_t Bluetooth_Connect_num_day[] = {
// Pic_0040_605_289,
// Pic_0041_606_290,
// Pic_0042_604_289,
// Pic_0043_604_289,
// Pic_0044_604_290,
// Pic_0045_604_290,
// Pic_0046_605_289,
// Pic_0047_605_290,
// Pic_0048_605_289,
// Pic_0049_605_289};
// static uint16_t Bluetooth_Connect_num_night[] = {
// Pic_0225_605_289,
// Pic_0226_606_290,
// Pic_0227_604_289,
// Pic_0228_604_289,
// Pic_0229_604_290,
// Pic_0230_604_290,
// Pic_0231_605_289,
// Pic_0232_605_290,
// Pic_0233_605_289,
// Pic_0234_605_289};
/**
* @brief 蓝牙连接 二级菜单
* @param[in] select 0为选择蓝牙连接 1选择同步联系人 2选择返回
......@@ -2069,8 +2069,8 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
DISPLAY_NUM_ST DisplayNumPara;
uint16_t connect_personnumber;
connect_personnumber = BlueToothPhoneData.PhoneBookTotalCount;
uint8_t Contect_totalnumber;
Contect_totalnumber = 0;
// uint8_t Contect_totalnumber;
// Contect_totalnumber = 0;
if(g_u8Display_Mode == ModeDAY)
{
if(g_u8Language == CH)
......@@ -2305,7 +2305,7 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
* @brief 单位设置 二级菜单
* @param[in] select 0为公制 1为英制
*/
void AMT630H_GUI_Unit_Setting(Menu_Interface_en_t select) /*图 单位设置*/
void AMT630H_GUI_Unit_Setting(Menu_Item_en_t select) /*图 单位设置*/
{
if(g_u8Display_Mode == ModeDAY)
{
......@@ -2423,7 +2423,7 @@ void AMT630H_GUI_Unit_Setting(Menu_Interface_en_t select) /*图 单位设置*/
* @brief 语言设置 二级菜单
* @param[in] select 0为中文 1为英文
*/
void AMT630H_GUI_Language_Setting(Menu_Interface_en_t select) /*图 语言设置*/
void AMT630H_GUI_Language_Setting(Menu_Item_en_t select) /*图 语言设置*/
{
if(g_u8Display_Mode == ModeDAY)
{
......@@ -2674,20 +2674,20 @@ static const uint16_t NumbeList_PhoneConnect_TIME_NIGHT[] = {
Pic_0962_357_553,
Pic_0963_358_553,
};
static const uint16_t NumbeList_Telephone[] = {
Pic_0536_54_499,
Pic_0537_55_499,
Pic_0538_54_499,
Pic_0539_54_499,
Pic_0540_54_499,
Pic_0541_54_499,
Pic_0542_55_499,
Pic_0543_54_499,
Pic_0544_54_499,
Pic_0545_54_499,
Pic_0546_58_514,
Pic_0547_57_510,
};
// static const uint16_t NumbeList_Telephone[] = {
// Pic_0536_54_499,
// Pic_0537_55_499,
// Pic_0538_54_499,
// Pic_0539_54_499,
// Pic_0540_54_499,
// Pic_0541_54_499,
// Pic_0542_55_499,
// Pic_0543_54_499,
// Pic_0544_54_499,
// Pic_0545_54_499,
// Pic_0546_58_514,
// Pic_0547_57_510,
// };
static const uint16_t NumbeList_Voltage_DAY[] = {
Pic_0565_943_451,
Pic_0567_948_451,
......@@ -3051,7 +3051,7 @@ static void AMT630H_GUI_Light()
;
}
}
static void AMT630H_GUI_PhoneConnect_Light()
static void AMT630H_GUI_PhoneConnect_Light(void)
{
if(Get_TelltalesLedSts(em_LED_Turn_Left))
{
......@@ -3393,7 +3393,7 @@ static void AMT630H_GUI_Telephone()
*PARAMETER : NULL
*RETURN : NULL
*/
static void AMT630H_GUI_PhoneConnect_Telephone()
static void AMT630H_GUI_PhoneConnect_Telephone(void)
{
if (g_u8Display_Mode == ModeDAY)
{
......@@ -3544,26 +3544,26 @@ static void AMT630H_GUI_PhoneConnect_Telephone()
*PARAMETER : uint8_t Fuel- 燃油格数
*RETURN : NULL
*/
static void AMT630H_GUI_PhoneConnect_UPtele()
{
if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
{ if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)||
(BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)||
(BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming))
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0519_648_5);
SetPagePic(GRAPHICS_PAGE_0, Pic_0520_760_50);
}
else
{
;
}
}
else
{
;
}
}
// static void AMT630H_GUI_PhoneConnect_UPtele()
// {
// if(BlueToothPhoneData.BlueToothSignalSate == BlueTooth_Connection)
// { if((BlueToothPhoneData.BlueToothPhoneSate == Phone_Outgoing)||
// (BlueToothPhoneData.BlueToothPhoneSate == Phone_Talking)||
// (BlueToothPhoneData.BlueToothPhoneSate == Phone_Incoming))
// {
// SetPagePic(GRAPHICS_PAGE_0, Pic_0519_648_5);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0520_760_50);
// }
// else
// {
// ;
// }
// }
// else
// {
// ;
// }
// }
/*
*NAME : AMT630H_GUI_Fuel
......@@ -5638,4 +5638,4 @@ void AMT630H_GUI_ReadPosittion_Display(void)
uint8_t GET_Backlight(void)
{
return g_u8Backlight;
}
\ No newline at end of file
}
......@@ -4,6 +4,7 @@
#include <stdint.h>
#include "UDS_ISO14229_Services.h"
#include "flash.h"
#include "Device\Cmsemicon\BAT32A279\RTE\UART\RTE_UART.h"
#define NULL 0
extern uint8_t UartRevBuff[0x1000];
......@@ -27,7 +28,7 @@ void DisplayNum(uint8_t page, DISPLAY_NUM_ST *pNumData, int32_t NumVal)
uint8_t i = 0;
int32_t TmpNum;
uint16_t tmpIndex = 0;
uint8_t PointFrontRearBlank = 2;
// uint8_t PointFrontRearBlank = 2;
uint16_t DotPosition = 0;
uint8_t DotInterval = 0;
uint16_t NumberList[20];
......
......@@ -40,6 +40,15 @@
#include "Application\BlueTooth.h"
#include "cgc.h"
#include "UDS\UDS_ISO14229_Services.h"
#include "PowerManagement\PowerManag_user.h"
#include "PowerManagement\PowerManagement.h"
#include "Can_User.h"
#include "Line_in\Line_In_user.h"
#include "Mileage\Services_Mileage_User.h"
#include "Mileage\Services_Mileage.h"
#include "Eeprom\eeManager_Interface.h"
#include "Protocol_User.h"
#include "FaultCode.h"
#endif
......@@ -24,7 +24,7 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//选择
case KEY_EVENT_LONG_PRESS_1: //2
if((Get_Dis_OdoAndTrip() == 1) && (Get_ActualVechileSpeed() == 0))
{
Data_Clear_Trip(0);
Data_Clear_Trip(EM_TRIP_A);
}
Key_Clear_Time();
break;
......@@ -549,4 +549,4 @@ uint8_t Get_Dis_Bluetooth_Open_Close(void)
uint8_t Get_Dis_Language(void)
{
return MenuData.Language; //0中文,1英文
}
\ No newline at end of file
}
......@@ -426,4 +426,8 @@ void Menu_User_WAKEUP(void);
/*-----------------------------------------------------------------------------------*/
/*-----------------------------------------------------------------------------------*/
/*-----------------------------------------------------------------------------------*/
void Menu_Logic_Operation_Clock_Hour_Tenb_Set(Menu_Key_en_t enKeyType);
void Menu_Logic_Operation_Clock_Hour_Bit_Set(Menu_Key_en_t enKeyType);
void Menu_Logic_Operation_Clock_Min_Tenb_Set(Menu_Key_en_t enKeyType);
void Menu_Logic_Operation_Clock_Min_Bit_Set(Menu_Key_en_t enKeyType);
#endif
......@@ -3,7 +3,7 @@
#include "Mileage\Services_Mileage.h"
#include "Eeprom\eepromManage.h"
#include "CommonInterface.h"
#include "Key\Key_user.h"
__align(4)
......
#include "PowerManagement.h"
#include "Components.h"
#include "FaultCode.h"
#include "System_Monitor\System_Monitor_User.h"
RTC_Information_st_t g_stRTCInformation;
......@@ -222,7 +223,7 @@ static Power_Status_em Power_Stay_Protect(void)
{
Power_Status_em u8PowerSts;
// static uint8_t i;
static uint8_t Delaycnt;
// static uint8_t Delaycnt;
/* 关闭所有外设,坪保留AD采集,电溝状思切�? */
......
......@@ -39,8 +39,8 @@ static Tellib_uint16_t LED_Bluetooth_Judgement(void);
static void LED_Bluetooth_Execution(Tellib_uint16_t led_status);
static Tellib_uint16_t LED_E_Judgement(void);
static void LED_E_Execution(Tellib_uint16_t led_status);
static Tellib_uint16_t LED_S_Judgement(void);
static void LED_S_Execution(Tellib_uint16_t led_status);
// static Tellib_uint16_t LED_S_Judgement(void);
// static void LED_S_Execution(Tellib_uint16_t led_status);
uint8_t u8CanId401Flag = 0;
__align(4)
const LED_Attribute_st LED_Attribute [ LED_Max ] = {
......
......@@ -221,7 +221,7 @@ void RTE_Calc_Freq(uint8_t u8ch)
uint8_t i = 0U;
uint16_t u16TDR;
uint16_t u16TSR;
uint8_t u8RollingCh = 0;
// uint8_t u8RollingCh = 0;
if((u8ch < 0) || (u8ch >= RTE_TIM40_CH_SUM))
{
......@@ -244,7 +244,7 @@ void RTE_Calc_Freq(uint8_t u8ch)
case RTE_TIM40_CH1:
u16TDR = TM40->TDR[1U];
u16TSR = TM40->TSR[1U];
u8RollingCh = 0U;
// u8RollingCh = 0U;
break;
case RTE_TIM40_CH2:
u16TDR = TM40->TDR[2U];
......
......@@ -3,6 +3,7 @@
#include "cgc.h"
#include "gpio.h"
#include "isr.h"
#include <string.h>
uint32_t RTE_UART_Init(UART_Channel_en_t enUARTCh, UART_Channel_Config_st_t *penUARTCfg);
......
......@@ -37,6 +37,7 @@ extern void Sys_Scheduler_ISR(void);
extern void Sys_Pseudo_Real_Time_Tasks(void);
extern void Sys_2ms_Tasks(void);
extern void Sys_5ms_Tasks(void);
extern void Sys_10ms_Tasks(void);
extern void Sys_20ms_Tasks(void);
extern void Sys_50ms_Tasks(void);
......
......@@ -132,4 +132,4 @@ void Sys_Exact_50us_Tasks(void)
// PORT->PCLR0 = (1<<3);
// g_u8GPIOTurnOver = 1U;
// }
}
\ No newline at end of file
}
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