Commit 97c8a6ae authored by 郑萍's avatar 郑萍

:tada: init:重新加载好使版本

parent 67f2a9c0
......@@ -623,16 +623,6 @@
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Device\Cmsemicon\BAT32A279\RTE\RTE.h</FilePath>
</File>
<File>
<FileName>RTE_RTC.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Device\Cmsemicon\BAT32A279\RTE\RTC\RTE_RTC.c</FilePath>
</File>
<File>
<FileName>RTE_RTC.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Device\Cmsemicon\BAT32A279\RTE\RTC\RTE_RTC.h</FilePath>
</File>
</Files>
</Group>
<Group>
......
......@@ -6,7 +6,7 @@ st_CanMsgTxOp CAN_CH0_CanMsgTxOp;
const st_CAN_SendAttribute CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL] =
{
{0}
{0}
};
const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
......
......@@ -3,7 +3,9 @@
#include "Components.h"
#include "CAN_Signal\CAN_Lib.h"
extern st_CanMsgOp CAN_CH0_CanMsgOp;
extern st_CanMsgTxOp CAN_CH0_CanMsgTxOp;
typedef enum
......@@ -21,7 +23,7 @@ typedef enum
typedef enum
{
TEST,
TEST,
CAN_CH0_ID_SEND_TOTAL,
} CAN_CH0_CAN_MSG_SEND_ID_t;
......
This diff is collapsed.
#ifndef _CAN_USER_H_
#define _CAN_USER_H_
#include "RTE.h"
#include "Components.h"
// #ifndef _CAN_USER_H_
// #define _CAN_USER_H_
// #include "RTE.h"
// #include "Components.h"
/******************************************************************************
Bus-off
******************************************************************************/
#define RSCAN0_BUS_STABLE 0x00U
#define RSCAN0_BUS_OFF_LV1 0x01U
#define RSCAN0_BUS_OFF_LV2 0x02U
#define RSCAN00_BUS_LIMP 0x03U
/******************************************************************************
Bus-off
******************************************************************************/
// /******************************************************************************
// Bus-off
// ******************************************************************************/
// #define RSCAN0_BUS_STABLE 0x00U
// #define RSCAN0_BUS_OFF_LV1 0x01U
// #define RSCAN0_BUS_OFF_LV2 0x02U
// #define RSCAN00_BUS_LIMP 0x03U
// /******************************************************************************
// Bus-off
// ******************************************************************************/
#define RSCAN0_BUS_OFF_LV1_RECOVERY_TIME 90U
#define RSCAN0_BUS_OFF_LV2_RECOVERY_TIME 1000U
// #define RSCAN0_BUS_OFF_LV1_RECOVERY_TIME 90U
// #define RSCAN0_BUS_OFF_LV2_RECOVERY_TIME 1000U
typedef struct
{
uint8_t Status;
uint8_t Timer;
uint8_t Cnt;
uint8_t ReportDTCCnt;
} RSCAN0BusoffMonitorStruct;
// typedef struct
// {
// uint8_t Status;
// uint8_t Timer;
// uint8_t Cnt;
// uint8_t ReportDTCCnt;
// } RSCAN0BusoffMonitorStruct;
extern void Can_Tx_Apply_Buff(void);
extern void Can_RX_Apply_Buff(void);
extern void Can_BusOff_Recover(uint8_t deltaTime);
extern void COM_CAN_Init(void);
extern void Can_Init(void);
extern void Can_Rx_Cak(CanTxRxMsg *Msg);
extern void Busoff(void);
extern uint8_t COM_APP_Process(st_CAN_Msg *Msg);
extern void Can_Write(st_CAN_Msg *Msg);
// extern void Can_Tx_Apply_Buff(void);
// extern void Can_RX_Apply_Buff(void);
// extern void Can_BusOff_Recover(uint8_t deltaTime);
// extern void COM_CAN_Init(void);
// extern void Can_Init(void);
// extern void Can_Rx_Cak(CanTxRxMsg *Msg);
// extern void Busoff(void);
// extern uint8_t COM_APP_Process(st_CAN_Msg *Msg);
// extern void Can_Write(st_CAN_Msg *Msg);
#endif
// #endif
......@@ -4,7 +4,7 @@
uint32_t PowerIgnOnTimeLine;
uint32_t PowerIgnOffTimeLine;
uint32_t PowerIgnOffTimeLine;
static uint32_t PowerSocTimeLine;
......
......@@ -82,7 +82,8 @@ void Data_Vehicle_Speed_Processing_Service(void)
if ((CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CH0_101_Msg_Count) == CAN_SIG_LOST) || (Vehicle_Speed > 0XFF))
{
/* 先判断掉线 */
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CH0_101_Msg_Count) == CAN_SIG_LOST)
//if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CAN_0x101_Msg_Count) == CAN_SIG_LOST)
if(1)
{
DataVSpeedValid = 0;
DataVSpeedActual = 0;
......
......@@ -35,7 +35,7 @@
#define SWDIO_JTMS RTE_GPIO_PORT04_PIN00
#define Start_stop_MCU RTE_GPIO_PORT04_PIN01
#define KEY_SELECT_MCU RTE_GPIO_PORT04_PIN02
#define Select_button_MCU RTE_GPIO_PORT04_PIN02
#define VCC1V2_AMT_EN RTE_GPIO_PORT04_PIN03 //ljs
#define CAN_MCU_RXD RTE_GPIO_PORT05_PIN00
......@@ -43,7 +43,7 @@
#define CAN_STB_MCU RTE_GPIO_PORT05_PIN02
#define HighBeam_MCU RTE_GPIO_PORT05_PIN03
#define L_FuelSender_OUT RTE_GPIO_PORT05_PIN04
#define KEY_OK_MCU RTE_GPIO_PORT05_PIN05
#define SWITCH_MCU RTE_GPIO_PORT05_PIN05
#define IIC_SCL_24G16 RTE_GPIO_PORT06_PIN00
#define IIC_SDA_24G16 RTE_GPIO_PORT06_PIN01
......
......@@ -157,11 +157,10 @@ void Amt630hInit(void)
LcdSoundParamterData.LcdVideoInputValid = 0;
LcdSoundParamterData.Ark7116ResetPin = 0;
LcdSoundParamterData.LcdInterfaceType = LCD_INTERFACE_LVDS;
LcdSoundParamterData.LcdWiringMode = LCD_WIRING_MODE_BGR;
LcdSoundParamterData.LcdWiringBitOrder = LCD_WIRING_BIT_ORDER_MSB;
LcdSoundParamterData.LcdDotClkReverse = 0; /* NuoMa 50pin TFT */
LcdSoundParamterData.LvdsPanelFormat = LVDS_PANEL_FORMAT_TI;
LcdSoundParamterData.LvdsPanelFormat = LVDS_PANEL_FORMAT_NS;
LcdSoundParamterData.LvdsPanelData = LVDS_PANEL_DATA_8BIT;
LcdSoundParamterData.LcdTimingVBP = 12;
......@@ -257,13 +256,13 @@ void AMT630H_Main(void)
return;
}
AMT630H_AliveCounterMonitor();
// if(AMT630H_Err == 1U)
// {
// AMT630H_Err = 0;
// Amt630hInit();
// AMT630H_Animation_Finish = 1;
// return;
// }
if(AMT630H_Err == 1U)
{
AMT630H_Err = 0;
Amt630hInit();
AMT630H_Animation_Finish = 1;
return;
}
// if(g_sysFlag_Lcdcheck == 1)
// {
// if(AMT630H_FlashCheck.Flag == 0)
......
......@@ -3,24 +3,13 @@
typedef enum
{
PIC_DAYTIME_Main_CH =0 ,//日间主界面
PIC_DAYTIME_CH ,//日间中文
PIC_DAYTIME_CH = 0,//日间中文
PIC_NIGHTTIME_CH , //夜间中文
PIC_DAYTIME_EN, //日间英文
PIC_NIGHTTIME_EN, //夜间英文
PIC_Max,
}_Picture_Mode;
typedef enum
{
MAIN_MENU = 0,
SETTING_MENU ,
}_MENU_MODE;
extern void AMT630H_GUI_DisplayProc(void);
extern void AMT630H_GUI_Background(void);
......
......@@ -96,7 +96,7 @@ static const uint16_t PicIndexData[] = {
Pic_0722, 423, 94, 114, Pic_0723, 85, 379, 149, Pic_0724, 119, 292, 128, Pic_0725, 165, 191, 110, Pic_0726, 198, 138, 111, Pic_0727, 153, 94, 123, Pic_0728, 20, 56, 165, Pic_0729, 7, 118, 95, Pic_0730, 19, 178, 81, Pic_0731, 18, 268, 89,
Pic_0732, 21, 350, 114, Pic_0733, 19, 422, 114, Pic_0734, 18, 498, 114, Pic_0735, 21, 570, 114, Pic_0736, 56, 941, 13, Pic_0737, 44, 875, 23, Pic_0738, 61, 792, 25, Pic_0739, 39, 731, 19, Pic_0740, 28, 682, 21, Pic_0741, 44, 616, 20,
Pic_0742, 50, 544, 22, Pic_0743, 47, 476, 20, Pic_0744, 53, 402, 21, Pic_0745, 39, 341, 21, Pic_0746, 86, 233, 26, Pic_0747, 64, 244, 26, Pic_0748, 16, 194, 26, Pic_0749, 19, 192, 26, Pic_0750, 65, 106, 26, Pic_0751, 56, 111, 30,
Pic_0752, 56, 28, 13, Pic_0753, 809, 109, 331, Pic_0754, 809, 109, 347,
Pic_0752, 56, 28, 13,
};
#define PicIndexData_LEN 14888
//uint32_t PicIndexDataLEN = 0;
......
#ifndef PICBIN_H
#define PICBIN_H
/* Flash Bin Version:20240712 2024-07-12 13:27:08 Compression ratio:70.00% */
/* Flash Bin Version:20240708 2024-07-08 14:30:03 Compression ratio:70.00% */
#define Pic_0001 1
#define Pic_0002 2
#define Pic_0003 3
......@@ -754,8 +754,6 @@
#define Pic_0750 750
#define Pic_0751 751
#define Pic_0752 752
#define Pic_0753 753
#define Pic_0754 754
enum {
Pic_0001_0_0 = 0,
......@@ -1711,10 +1709,8 @@ enum {
Pic_0750_106_26,
Pic_0751_111_30,
Pic_0752_28_13,
Pic_0753_109_331,
Pic_0754_109_347,
};
#define PIC_INDEX_DATA_CRC 0xD1FA96F4
#define PIC_INDEX_DATA_CRC 0xB1B4E2C2
extern void User_PicIndexDataInit(void);
#endif
......@@ -27,8 +27,5 @@
#include "Data_ESpeed.h"
#include "Data_VSpeed.h"
#include "BackLight.h"
#include "RTC\RTE_RTC.h"
#include "CAN_Signal\CAN_Lib.h"
#include "CAN_CH0_CAN_Communication_Matrix.h"
#endif
This diff is collapsed.
......@@ -32,23 +32,36 @@ typedef enum
typedef struct
{
uint16_t Back_Time_Left;
uint16_t Back_Time_Right;
uint8_t Back_Time_Right_Flag;
uint8_t Back_Time_Left_Flag;
uint8_t Dis_Hour_Tenb;
uint8_t Dis_Hour_Bit;
uint8_t Dis_Minute_Tenb;
uint8_t Dis_Minute_Bit;
uint8_t Set_Hour;
uint8_t Set_Minute;
uint8_t Dis_Hour;
uint8_t Dis_Minute;
uint8_t Unit;
uint8_t Language;
uint8_t OdoAndTrip;
uint8_t Bluetooth_Open_Close;
uint8_t Clock_Flash;
}_Menu_Data;
typedef enum
{
Page_Time = 0,
Page_Time_Set_Hour,
Page_Time_Set_Minute,
Page_Max,
}_Page_Type;
extern uint8_t PageType;
extern uint8_t Key_Right_Long_Press_Flag;
extern uint8_t Key_Left_Long_Press_Flag;
extern uint8_t ClearODO_Flag;
// extern uint8_t g_u8Menu_Grade;
extern uint8_t g_u8Cursor_Posittion;
extern uint8_t g_u8Language;
extern uint8_t g_u8Theme;
extern uint8_t g_u8Blue;
extern uint8_t g_u8DVR_Set;
extern uint8_t g_u8Formatting;
extern uint8_t g_u8Factory;
extern _Menu_Infor MenuInfor;
extern RTC_CounterTypeDef counter_val;
extern void Key_KL30_Init_EXample(void);
extern void Key_Wakeup_Init_EXample(void);
......@@ -57,22 +70,13 @@ void Key_Operation_Right(Key_Event_en_t enKeyEvent);
void Key_Operation_Left(Key_Event_en_t enKeyEvent);
Key_Status_en_t Key_Status_Read_Left(void);
Key_Status_en_t Key_Status_Read_Right(void);
void Key_Event_Short_Press_Left(void);
void Key_Event_Short_Press_Right(void);
void KEY_RIGHT_EVENT_NONE_Service(void);
void KEY_LEFT_EVENT_NONE_Service(void);
void Key_Auto_Save(void);
uint8_t Get_Dis_Hour_Time(void);
uint8_t Get_Dis_Minute_Time(void);
uint8_t Get_Current_PageType(void);
void TYW_RESET_ODO(void);
uint8_t Get_Dis_Unit(void);
void Key_TimeOut_Service(void);
void Key_Clear_Time(void);
uint8_t Get_Dis_OdoAndTrip(void);
uint8_t Get_Dis_Bluetooth_Open_Close(void);
uint8_t Get_Dis_Language(void);
void Key_Check_Service(void);
#endif
......@@ -5,156 +5,63 @@
const Line_In_Attribute_st g_stLineInAttribute[LINE_IN_MAX] =
{
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Turn_Left, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Turn_Right, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 60U, 20U, Get_LINE_IN_High_Beam, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 100U, 20U, Get_LINE_IN_Efi_Fault, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_ABS, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Auto_Start_Stop, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Oil_Pressure_Alert, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Voltage, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Fuel_Level_Low, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_E, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_S, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_TurnLeft, },
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_TurnRight, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 60U, 20U, Get_LINE_IN_HighBeam, },
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 100U, 20U, Get_LINE_IN_Auto_Start_Stop, },
};
Linelib_uint8_t Get_LINE_IN_Turn_Left(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
{
ret = 1u;
}
else
{
ret = 0UL;
}
return ret;
}
Linelib_uint8_t Get_LINE_IN_Turn_Right(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
{
ret = 1u;
}
else
{
ret = 0UL;
}
return ret;
}
Linelib_uint8_t Get_LINE_IN_High_Beam(void)
Linelib_uint8_t Get_LINE_IN_TurnLeft(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
//if (RTE_GPIO_Get_Level(LeftTurn_P_In))
{
ret = 1u;
}
else
//else
{
ret = 0UL;
}
return ret;
}
Linelib_uint8_t Get_LINE_IN_Efi_Fault(void)
Linelib_uint8_t Get_LINE_IN_TurnRight(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
//if (RTE_GPIO_Get_Level(RightTurn_P_In))
{
ret = 1u;
}
else
//else
{
ret = 0UL;
}
return ret;
}
Linelib_uint8_t Get_LINE_IN_ABS(void)
Linelib_uint8_t Get_LINE_IN_HighBeam(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
//if (RTE_GPIO_Get_Level(HighBeam_P_In))
{
ret = 1u;
}
else
//else
{
ret = 0UL;
}
return ret;
}
Linelib_uint8_t Get_LINE_IN_Auto_Start_Stop(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
{
ret = 1u;
}
else
{
ret = 0UL;
}
return ret;
}
Linelib_uint8_t Get_LINE_IN_Oil_Pressure_Alert(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
{
ret = 1u;
}
else
{
ret = 0UL;
}
return ret;
}
Linelib_uint8_t Get_LINE_IN_Voltage(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
{
ret = 1u;
}
else
{
ret = 0UL;
}
return ret;
}
Linelib_uint8_t Get_LINE_IN_Fuel_Level_Low(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
{
ret = 1u;
}
else
{
ret = 0UL;
}
return ret;
}
Linelib_uint8_t Get_LINE_IN_E(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
{
ret = 1u;
}
else
{
ret = 0UL;
}
return ret;
}
Linelib_uint8_t Get_LINE_IN_S(void)
{
Linelib_uint8_t ret = 0U;
if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
//if (RTE_GPIO_Get_Level(START_STOP_P_IN))
{
ret = 1u;
}
else
//else
{
ret = 0UL;
}
......@@ -167,7 +74,7 @@ Linelib_uint8_t LINE_IN_Men[LINE_IN_MAX * LINE_IN_BLOCK_SIZE];
static Linelib_uint16_t LINE_GET_PWR(void)
{
Linelib_uint16_t Res;
Res = Common_Get_IG_Sts() & 0x00FFu;
//Res = Common_Get_IG_Sts() & 0x00FFu;
return Res;
}
......
......@@ -5,31 +5,19 @@
typedef enum
{
LINE_IN_Turn_Left,
LINE_IN_Turn_Right,
LINE_IN_High_Beam,
LINE_IN_Efi_Fault,
LINE_IN_ABS,
LINE_IN_Auto_Start_Stop,
LINE_IN_Oil_Pressure_Alert,
LINE_IN_Voltage,
LINE_IN_Fuel_Level_Low,
LINE_IN_E,
LINE_IN_S,
LINE_IN_TurnLeft = 0,
LINE_IN_TurnRight,
LINE_IN_HighBeam,
LINE_IN_Auto_Start_Stop,
LINE_IN_MAX,
} LINE_IN_Enum_t;
extern void LINE_IN_Init(void);
Linelib_uint8_t Get_LINE_IN_Turn_Left(void);
Linelib_uint8_t Get_LINE_IN_Turn_Right(void);
Linelib_uint8_t Get_LINE_IN_High_Beam(void);
Linelib_uint8_t Get_LINE_IN_Efi_Fault(void);
Linelib_uint8_t Get_LINE_IN_ABS(void);
Linelib_uint8_t Get_LINE_IN_TurnLeft(void);
Linelib_uint8_t Get_LINE_IN_TurnRight(void);
Linelib_uint8_t Get_LINE_IN_HighBeam(void);
Linelib_uint8_t Get_LINE_IN_Auto_Start_Stop(void);
Linelib_uint8_t Get_LINE_IN_Oil_Pressure_Alert(void);
Linelib_uint8_t Get_LINE_IN_Voltage(void);
Linelib_uint8_t Get_LINE_IN_Fuel_Level_Low(void);
Linelib_uint8_t Get_LINE_IN_E(void);
Linelib_uint8_t Get_LINE_IN_S(void);
#endif
......@@ -34,87 +34,64 @@ typedef unsigned int Menu_uint32_t;
*/
typedef enum
{
MENU_ITEM_MAIN_ITEM = 0, /*主界面*/
MENU_ITEM_DISPLAY_MODE, /*00 显示模式*/
MENU_ITEM_BACKLIGHT_SETTING, /*04 背光设置*/
MENU_ITEM_BLUETOOTH_CONNECT, /*11 蓝牙连接*/
MENU_ITEM_CLOCK_SETTING, /*15 时钟设置*/
MENU_ITEM_UNIT_SETTING, /*21 单位设置*/
MENU_ITEM_LANGUAGE_SETTING, /*24 语言设置*/
MENU_ITEM_FAULT_INFORMATION, /*27 故障信息*/
MENU_ITEM_PHONE_CONNECT, /*28 手机互联*/
MENU_ITEM_QUIT, /*29 退出*/
MENU_ITEM_BACKLIGHT_SETTING, /*04 背光设置*/
MENU_ITEM_BACKLIGHT_AUTO, /*05 背光自动*/
MENU_ITEM_BACKLIGHT_1, /*06 背光_1*/
MENU_ITEM_BACKLIGHT_2, /*07 背光_2*/
MENU_ITEM_BACKLIGHT_3, /*08 背光_3*/
MENU_ITEM_BACKLIGHT_4, /*09 背光_4*/
MENU_ITEM_BACKLIGHT_5, /*10 背光_5*/
MENU_ITEM_SELECT_DAYTIME, /*01 选中日间*/
MENU_ITEM_SELECT_NIGHTTIME, /*02 选中夜间*/
MENU_ITEM_SELECT_AUTO, /*03 选中自动*/
MENU_ITEM_BLUETOOTH_CONNECT, /*11 蓝牙连接*/
MENU_ITEM_BLUETOOTH_OPEN, /*12 蓝牙_开*/
MENU_ITEM_BLUETOOTH_CLOSE, /*13 蓝牙_关*/
MENU_ITEM_BLUETOOTH_BACK, /*14 蓝牙返回*/
MENU_ITEM_BACKLIGHT_5, /*10 背光_5*/
MENU_ITEM_BACKLIGHT_4, /*09 背光_4*/
MENU_ITEM_BACKLIGHT_3, /*08 背光_3*/
MENU_ITEM_BACKLIGHT_2, /*07 背光_2*/
MENU_ITEM_BACKLIGHT_1, /*06 背光_1*/
MENU_ITEM_BACKLIGHT_AUTO, /*05 背光自动*/
MENU_ITEM_BLUETOOTH_OPEN_CLOSE, /*12 蓝牙_开*/
MENU_ITEM_BLUETOOTH_SYNC, /*13 蓝牙同步联系人*/
MENU_ITEM_BLUETOOTH_BACK, /*14 蓝牙返回*/
MENU_ITEM_CLOCK_SETTING, /*15 时钟设置*/
MENU_ITEM_CLOCK_BACK, /*16 时钟返回*/
MENU_ITEM_CLOCK_MIN_BIT, /*17 时钟分钟个位*/
MENU_ITEM_CLOCK_MIN_TENB, /*18 时钟分钟十位*/
MENU_ITEM_CLOCK_HOUR_BIT, /*19 时钟小时个位*/
MENU_ITEM_CLOCK_HOUR_TENB, /*20 时钟小时十位*/
MENU_ITEM_CLOCK_HOUR_TENB, /*20 时钟小时十位*/
MENU_ITEM_CLOCK_HOUR_BIT, /*19 时钟小时个位*/
MENU_ITEM_CLOCK_MIN_TENB, /*18 时钟分钟十位*/
MENU_ITEM_CLOCK_MIN_BIT, /*17 时钟分钟个位*/
MENU_ITEM_CLOCK_BACK, /*16 时钟返回*/
MENU_ITEM_UNIT_SETTING, /*21 单位设置*/
MENU_ITEM_UNIT_KM, /*22 选中公制*/
MENU_ITEM_UNIT_MILE, /*23 选中英制*/
MENU_ITEM_CLOCK_HOUR_TENB_SET, /*20 时钟小时十位*/
MENU_ITEM_CLOCK_HOUR_BIT_SET, /*19 时钟小时个位*/
MENU_ITEM_CLOCK_MIN_TENB_SET, /*18 时钟分钟十位*/
MENU_ITEM_CLOCK_MIN_BIT_SET, /*17 时钟分钟个位*/
MENU_ITEM_LANGUAGE_SETTING, /*24 语言设置*/
MENU_ITEM_LANGUAGE_CHINESE, /*25 选中中文*/
MENU_ITEM_LANGUAGE_ENGLISH, /*26 选中英文*/
MENU_ITEM_UNIT_KM, /*22 选中公制*/
MENU_ITEM_UNIT_MILE, /*23 选中英制*/
MENU_ITEM_LANGUAGE_CHINESE, /*25 选中中文*/
MENU_ITEM_LANGUAGE_ENGLISH, /*26 选中英文*/
MENU_ITEM_FAULT_INFORMATION, /*27 故障信息*/
MENU_ITEM_PHONE_CONNECT_SET,
MENU_ITEM_PHONE_CONNECT_APP, /*28 手机互联成功*/
MENU_ITEM_MAX,
MENU_ITEM_PHONE_CONNECT, /*28 手机互联*/
MENU_ITEM_PHONE_CONNECT_WIN, /*28 手机互联成功*/
MENU_ITEM_QUIT, /*29 退出*/
MENU_ITEM_MAX,
} Menu_Item_en_t;
/*所有菜单界面的枚举*/
typedef enum
{
MENU_INTF_MAIN_INTF = 0,
MENU_INTF_DISPLAY_MODE = 0U, /*显示模式*/
MENU_INTF_BACKLIGHT_SETTING, /*背光设置*/
MENU_INTF_BLUETOOTH_CONNECT, /*蓝牙连接*/
MENU_INTF_CLOCK_SETTING, /*时钟设置*/
MENU_INTF_UNIT_SETTING, /*单位设置*/
MENU_INTF_LANGUAGE_SETTING, /*语言设置*/
MENU_INTF_MODE,
MENU_INTF_FAULT_INFORMATION, /*故障信息*/
MENU_INTF_DISPLAY_MODE, /*显示模式*/
MENU_INTF_BACKLIGHT_SETTING, /*背光设置*/
MENU_INTF_BLUETOOTH_CONNECT, /*蓝牙连接*/
MENU_INTF_CLOCK_SETTING, /*时钟设置*/
MENU_INTF_PHONE_CONNECT, /*手机互联*/
MENU_INTF_CLOCK_HOUR_TENB_SET,
MENU_INTF_CLOCK_HOUR_BIT_SET,
MENU_INTF_CLOCK_MIN_TENB_SET,
MENU_INTF_CLOCK_MIN_BIT_SET,
MENU_INTF_UNIT_SETTING, /*单位设置*/
MENU_INTF_LANGUAGE_SETTING, /*语言设置*/
MENU_INTF_FAULT_INFORMATION, /*故障信息*/
MENU_INTF_PHONE_CONNECT, /*手机互联*/
MENU_INTF_PHONE_CONNECT_SET,
MENU_INTF_QUIT, /*退出*/
MENU_INTF_QUIT, /*退出*/
MENU_INTERFACE_MAX,
} Menu_Interface_en_t;
/*所有菜单分支*/
......@@ -421,8 +398,6 @@ extern Menu_uint8_t Menu_Item_Select_Get(Menu_Item_en_t enMenuItem);
/*-----------------------------------------------------------------------------------*/
extern Menu_uint8_t u8MenuRamData[MENU_RAM_DATA_LEN];
extern void Menu_Service(Menu_Key_en_t enMenuKey);
void Menu_User_Init(void);
void Menu_User_WAKEUP(void);
/*-----------------------------------------------------------------------------------*/
/*-----------------------------------------------------------------------------------*/
/*-----------------------------------------------------------------------------------*/
......
#ifndef TELLTALES_USER_H
#define TELLTALES_USER_H
typedef enum
{
em_LED_Turn_Left,
em_LED_Turn_Right,
em_LED_High_Beam,
em_LED_Efi_Fault,
em_LED_ABS,
em_LED_Auto_Start_Stop,
em_LED_Oil_Pressure_Alert,
em_LED_TCS,
em_LED_HEV,
em_LED_Voltage,
em_LED_Fuel_Level_Low,
em_LED_Coolant_Temperature,
em_LED_WIFI,
em_LED_Bluetooth,
em_LED_E,
em_LED_S,
LED_Max ,
} LED_Idx_t;
extern Tellib_uint8_t Auto_Start_Stop ;
void Telltales_Init(void);
Tellib_uint8_t Telltales_Voltage_Date(void);
#endif
//#ifndef TELLTALES_USER_H
//#define TELLTALES_USER_H
//typedef enum
//{
// em_LED_High_Beam,
// em_LED_Efi_Fault,
// em_LED_Auto_Start_Stop,
// em_LED_Voltage,
// em_LED_Fuel,
// em_LED_Atmosphere,
//
// LED_Max ,
//} LED_Idx_t;
//extern Tellib_uint8_t Auto_Start_Stop ;
//void Telltales_Init(void);
//Tellib_uint8_t Telltales_Voltage_Date(void);
//#endif
......@@ -11,21 +11,24 @@ uint32_t RTE_SystemCoreClock;
extern uint32_t SystemCoreClock;
void RTE_CLOCK_Select_Start(void)
{
////uint32_t msCnt;
#ifdef USED_FX_FCLK
CGC_Osc_Setting(OSC_OSCILLATOR,OSC_UNDER_10M,OSC_OSCILLATOR,OSC_NORMAL_POWER);
CGC_PLL_Setting(PLL_SR_fMX,PLL_DIV_2,PLL_MUL_16);
CGC_PLL_CFG_AS_FCLK();
delay_init(64000000);
SystemCoreClock = 64000000UL;
/* config clock */
CGC_HSEConfig(OSC_OSCILLATOR,OSC_UNDER_10M);
CGC_PLL_Setting(PLL_SR_fMX,PLL_DIV_2,PLL_MUL_16);
CGC_PLL_CFG_AS_FCLK();
SystemCoreClockUpdate();
RTE_SystemCoreClock = SystemCoreClock;
delay_init(64000000);
SystemCoreClock = 64000000UL;
#endif
#ifdef USED_FHOCO_FCLK
SystemCoreClockUpdate();
msCnt = SystemCoreClock / 1000;
SysTick_Config(msCnt);
delay_init(SystemCoreClock);
#ifdef USED_FHOCO_FCLK
SystemCoreClockUpdate();
msCnt = SystemCoreClock / 1000;
SysTick_Config(msCnt);
delay_init(SystemCoreClock);
#endif
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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