Skip to content

H
haoJin750TFT
Commit fa0f7a76 authored by 郑萍's avatar 郑萍
Browse files
Options

Merge branch 'shihao' of http://tyw-server.synology.me:12345/shihao/haojin750tft into zhengping

parents 59809d7a b931f608
Expand all Show whitespace changes
Inline Side-by-side
Showing with 9832 additions and 21103 deletions
.gitignore
View file @ fa0f7a76
...@@ -14,3 +14,9 @@ Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RunTong.uvoptx ...@@ -14,3 +14,9 @@ Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RunTong.uvoptx
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Listings/HaoJin.map Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Listings/HaoJin.map
/Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Objects /Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Objects
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvguix.tyw05
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvguix.tyw05
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvoptx
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Listings/HaoJin750TFT.map
/Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvguix.tyw05
/Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Listings/HaoJin750TFT.map
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvguix.tyw05 deleted 100644 → 0
View file @ 59809d7a
This source diff could not be displayed because it is too large. You can view the blob instead.
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx
View file @ fa0f7a76
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</Flash1> </Flash1>
<bUseTDR>1</bUseTDR> <bUseTDR>1</bUseTDR>
<Flash2>BIN\UL2CM3.DLL</Flash2> <Flash2>BIN\UL2CM3.DLL</Flash2>
<Flash3></Flash3> <Flash3>"" ()</Flash3>
<Flash4></Flash4> <Flash4></Flash4>
<pFcarmOut></pFcarmOut> <pFcarmOut></pFcarmOut>
<pFcarmGrp></pFcarmGrp> <pFcarmGrp></pFcarmGrp>
...@@ -668,6 +668,26 @@ ...@@ -668,6 +668,26 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\Protocol_User.c</FilePath> <FilePath>..\..\..\..\Source\Application\Protocol_User.c</FilePath>
</File> </File>
<File>
<FileName>Data_ESpeed.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\Data_ESpeed.c</FilePath>
</File>
<File>
<FileName>Data_ESpeed.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\Data_ESpeed.h</FilePath>
</File>
<File>
<FileName>Data_VSpeed.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Application\Data_VSpeed.c</FilePath>
</File>
<File>
<FileName>Data_VSpeed.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\Data_VSpeed.h</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
...@@ -853,26 +873,6 @@ ...@@ -853,26 +873,6 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\..\..\..\Source\Component\Simulated_IIC_master\Simulated_IIC_master_Porting.c</FilePath> <FilePath>..\..\..\..\Source\Component\Simulated_IIC_master\Simulated_IIC_master_Porting.c</FilePath>
</File> </File>
<File>
<FileName>System_Monitor.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor.h</FilePath>
</File>
<File>
<FileName>System_Monitor.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor.lib</FilePath>
</File>
<File>
<FileName>System_Monitor_User.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.c</FilePath>
</File>
<File>
<FileName>System_Monitor_User.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.h</FilePath>
</File>
<File> <File>
<FileName>Telltales_Lib.h</FileName> <FileName>Telltales_Lib.h</FileName>
<FileType>5</FileType> <FileType>5</FileType>
...@@ -903,6 +903,71 @@ ...@@ -903,6 +903,71 @@
<FileType>4</FileType> <FileType>4</FileType>
<FilePath>..\..\..\..\Source\Component\PowerManagement\PowerManagement.lib</FilePath> <FilePath>..\..\..\..\Source\Component\PowerManagement\PowerManagement.lib</FilePath>
</File> </File>
<File>
<FileName>AMT630H.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\AMT630H.c</FilePath>
</File>
<File>
<FileName>AMT630H.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\AMT630H.h</FilePath>
</File>
<File>
<FileName>GraphicsFunc.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\GraphicsFunc.c</FilePath>
</File>
<File>
<FileName>PicBin.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.c</FilePath>
</File>
<File>
<FileName>PicBin.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath>
</File>
<File>
<FileName>UartProtocol.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\UartProtocol.h</FilePath>
</File>
<File>
<FileName>UartProtocol_V1.32_BAT32A239.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\UartProtocol_V1.32_BAT32A239.lib</FilePath>
</File>
<File>
<FileName>AMT630H_Datas.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\AMT630H_Datas.c</FilePath>
</File>
<File>
<FileName>AMT630H_Datas.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\AMT630H_Datas.h</FilePath>
</File>
<File>
<FileName>System_Monitor.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor.c</FilePath>
</File>
<File>
<FileName>System_Monitor.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor.h</FilePath>
</File>
<File>
<FileName>System_Monitor_User.c</FileName>
<FileType>1</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.c</FilePath>
</File>
<File>
<FileName>System_Monitor_User.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.h</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
......
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Listings/HaoJin750TFT.map deleted 100644 → 0
View file @ 59809d7a
This source diff could not be displayed because it is too large. You can view the blob instead.
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Listings/startup_bat32a279.lst
View file @ fa0f7a76
...@@ -464,12 +464,12 @@ ARM Macro Assembler Page 8 ...@@ -464,12 +464,12 @@ ARM Macro Assembler Page 8
00000000 00000000
Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M0+ --apcs=inter Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M0+ --apcs=inter
work --depend=.\objects\startup_bat32a279.d -o.\objects\startup_bat32a279.o -I. work --depend=.\objects\startup_bat32a279.d -o.\objects\startup_bat32a279.o -I.
\RTE\Device\BAT32A279KM64FB -I.\RTE\_HaoJin750TFT -IC:\Users\Administrator\AppD \RTE\Device\BAT32A279KM64FB -I.\RTE\_HaoJin750TFT -IC:\Users\tyw05\AppData\Loca
ata\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include -IC:\Users\Administrator l\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include -IC:\Users\tyw05\AppData\Local\A
\AppData\Local\Arm\Packs\Cmsemicon\BAT32A279\1.0.4\Device\Include --predefine=" rm\Packs\Cmsemicon\BAT32A279\1.0.4\Device\Include --predefine="__MICROLIB SETA
__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 535" --predefine="_RTE_ 1" --predefine="__UVISION_VERSION SETA 535" --predefine="_RTE_ SETA 1" --predef
SETA 1" --predefine="_RTE_ SETA 1" --list=.\listings\startup_bat32a279.lst RTE\ ine="_RTE_ SETA 1" --list=.\listings\startup_bat32a279.lst RTE\Device\BAT32A279
Device\BAT32A279KM64FB\startup_BAT32A279.s KM64FB\startup_BAT32A279.s
......
Firmware/Source/Application/BackLight.c
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Application/BackLight.h
View file @ fa0f7a76
#ifndef _BACKLIGHT_H_ #ifndef _BACKLIGHT_H_
#define _BACKLIGHT_H_ #define _BACKLIGHT_H_
#include "common.h"
typedef struct
{
uint16_t Light_Auto;
} _Light;
extern _Light g_Light;
void BackLight_Init(void); #ifdef Platform_16Bit
void BackLight_Process(void); #define Light_uint8_t unsigned char
#define Light_uint16_t unsigned int
#define Light_uint32_t unsigned long
#else
#define Light_uint8_t unsigned char
#define Light_uint16_t unsigned short
#define Light_uint32_t unsigned int
#define Light_uint64_t unsigned long long
#endif #endif
#ifndef Backlight_NULL
#define Backlight_NULL ( void * )0u
#endif /* NULL */
void Backlight_KL30_Wakeup_Init(void);
#endif
\ No newline at end of file
Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c 0 → 100644
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.h 0 → 100644
View file @ fa0f7a76
#ifndef CAN_CH0_CAN_COMMUNICATION_MATRIX_H_
#define CAN_CH0_CAN_COMMUNICATION_MATRIX_H_
#include "Components.h"
#include "CAN_Signal\CAN_Lib.h"
extern st_CanMsgOp CAN_CH0_CanMsgOp;
extern st_CanMsgTxOp CAN_CH0_CanMsgTxOp;
typedef enum
{
CAN_CH0_ID_CH0_101_Msg_Count,
CAN_CH0_ID_CH0_111_Msg_Count,
CAN_CH0_ID_CH0_401_Msg_Count,
CAN_CH0_ID_CH0_402_Msg_Count,
CAN_CH0_ID_CH0_37B_Msg_Count,
CAN_CH0_ID_CH0_12B_Msg_Count,
CAN_CH0_ID_CH0_450_Msg_Count,
CAN_CH0_ID_TOTAL_MAX,
} CAN_CH0_CAN_MSG_ID_t;
typedef enum
{
TEST,
CAN_CH0_ID_SEND_TOTAL,
} CAN_CH0_CAN_MSG_SEND_ID_t;
extern const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] ;
extern const st_CAN_SendAttribute CAN_CH0_CANSendAttr[CAN_CH0_ID_SEND_TOTAL] ;
#define CAN_CH0_ID_CH0_101_Msg 0x101ul
#define CAN_CH0_ID_CH0_111_Msg 0x111ul
#define CAN_CH0_ID_CH0_401_Msg 0x401ul
#define CAN_CH0_ID_CH0_402_Msg 0x402ul
#define CAN_CH0_ID_CH0_37B_Msg 0x37Bul
#define CAN_CH0_ID_CH0_12B_Msg 0x12Bul
#define CAN_CH0_ID_CH0_450_Msg 0x450ul
extern uint8_t Get_CAN_CH0_ID_101_Sig_ECU_101_Checksum(void);
extern uint8_t Get_CAN_CH0_ID_101_Sig_ECU_101_Livecounter(void);
extern uint8_t Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature_State(void);
extern uint8_t Get_CAN_CH0_ID_101_Sig_ECU_Throttle_Position_State(void);
extern uint8_t Get_CAN_CH0_ID_101_Sig_ECU_Vehicle_Speed_State(void);
extern uint8_t Get_CAN_CH0_ID_101_Sig_ECU_Engine_Speed_State(void);
extern uint16_t Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature(void);
extern uint8_t Get_CAN_CH0_ID_101_Sig_ECU_Throttle_Position(void);
extern uint8_t Get_CAN_CH0_ID_101_Sig_ECU_Vehicle_Speed(void);
extern uint16_t Get_CAN_CH0_ID_101_Sig_ECU_Engine_Speed(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_111_Checksum(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_111_Livecounter(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_Tair_Enable(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_Power_Enable(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_SideStand(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_Power(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_Ready(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_Batt(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_Engine_Autostop_State(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_Engine_InjIgn_Cutoff_State(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_Engine_Autostop(void);
extern uint8_t Get_CAN_CH0_ID_111_Sig_ISG_Engine_InjIgn_Cutoff(void);
extern uint8_t Get_CAN_CH0_ID_401_Sig_ECU_401_Checksum(void);
extern uint8_t Get_CAN_CH0_ID_401_Sig_ECU_401_Livecounter(void);
extern uint16_t Get_CAN_CH0_ID_401_Sig_ECU_Fuel_Consumption(void);
extern uint8_t Get_CAN_CH0_ID_401_Sig_ECU_Battery_Voltage(void);
extern uint16_t Get_CAN_CH0_ID_401_Sig_ECU_Environment_Presure(void);
extern uint8_t Get_CAN_CH0_ID_402_Sig_ECU_Warning_Lamp(void);
extern uint8_t Get_CAN_CH0_ID_402_Sig_ECU_DTCL2(void);
extern uint8_t Get_CAN_CH0_ID_402_Sig_ECU_DTCM2(void);
extern uint8_t Get_CAN_CH0_ID_402_Sig_ECU_DTCH2(void);
extern uint8_t Get_CAN_CH0_ID_402_Sig_ECU_DTC1Amnt(void);
extern uint8_t Get_CAN_CH0_ID_402_Sig_ECU_DTCL1(void);
extern uint8_t Get_CAN_CH0_ID_402_Sig_ECU_DTCM1(void);
extern uint8_t Get_CAN_CH0_ID_402_Sig_ECU_DTCH1(void);
extern uint8_t Get_CAN_CH0_ID_37B_Sig_TCS_37B_Checksum(void);
extern uint8_t Get_CAN_CH0_ID_37B_Sig_TCS_37B_Livecounter(void);
extern uint8_t Get_CAN_CH0_ID_37B_Sig_TCS_Control(void);
extern uint16_t Get_CAN_CH0_ID_37B_Sig_TCS_Target_Torque(void);
extern uint8_t Get_CAN_CH0_ID_12B_Sig_Abs_warning_lamp(void);
extern uint8_t Get_CAN_CH0_ID_450_Sig_Dashboard_TCSFunSwitch(void);
extern uint8_t Get_CAN_CH0_ID_450_Sig_ABSOFF_Selection(void);
extern uint8_t Co_Can_ConvertSubID_CAN_CH0(uint32_t MsgID);
#endif
Firmware/Source/Application/CommonInterface.c
View file @ fa0f7a76
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "Components.h" #include "Components.h"
static uint32_t PowerIgnOnTimeLine; uint32_t PowerIgnOnTimeLine;
uint32_t PowerIgnOffTimeLine; uint32_t PowerIgnOffTimeLine;
static uint32_t PowerSocTimeLine; static uint32_t PowerSocTimeLine;
......
Firmware/Source/Application/Data_Coolant.c 0 → 100644
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Application/Data_Coolant.h 0 → 100644
View file @ fa0f7a76
#ifndef DATA_COOLANT_H
#define DATA_COOLANT_H
#include "stdint.h"
typedef enum{
FuelSensorNormal = 0,
FuelSensorShortCircuit,
FuelSensorOpenCircuit,
}FuelSensorSts_t;
extern void Fuel_KL15_Init(void);
extern void Fuel_KL30_Init(void);
extern void Fuel_Cal_Sevice(uint8_t deltaTime);
extern uint8_t Get_CurFuelSetp(void);
extern FuelSensorSts_t Get_Fuel_Sensor_State(void);
void Fuel_R_Cal(uint8_t deltaTime);
#endif
Firmware/Source/Application/Data_ESpeed.c 0 → 100644
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Application/Data_ESpeed.h 0 → 100644
View file @ fa0f7a76
#ifndef _Data_Espeed_H_
#define _Data_Espeed_H_
#include "common.h"
/******************************************************************************
发动机转速
******************************************************************************/
/*** 参数设置 ***/
#define DATA_ENGINE_RUNNING_THRESHOLD 400 //发动机运转阈值
#define DATA_ENGINE_STOP_THRESHOLD 300 //发动机停止阈值
#define DATA_ESPEED_DAMPING_FACTOR 4 //阻尼系数
#define DATA_ESPEED_INC_STEP 10 //速度增加时慢加速速度变化步长
#define DATA_ESPEED_DEC_STEP 20 //方向改变时急减速速度变化步长
#define DATA_ESPEED_APPR_SPEED_MIN 10 //最小逼近速度
#define DATA_ESPEED_HYSTERESIS 80 //回差
/*** 控制结构 ***/
typedef struct
{
uint16_t Buffer[5];
uint8_t Cnt;
} DataESpeedSamplerStruct; //转速采样结构
typedef struct
{
uint16_t Speed;
uint16_t Delta;
uint8_t Dir;
} DataESPeedDampingStruct; //转速阻尼结构
typedef struct
{
uint16_t ESpeedBackup;
uint16_t Timer;
uint8_t Mode;
} DataESpeedIdleStruct; //怠速处理结构
/******************************************************************************
函数名：Data_Engine_Speed_KL30_Wakeup_Init
功 能：发动机转速初始化函数
参 数：无
返回值：无
******************************************************************************
注 意：该函数KL30初始化/Wakeup初始化被调用一次
******************************************************************************/
void Data_Engine_Speed_KL30_Wakeup_Init (void);
/******************************************************************************
函数名：Data_Engine_Speed_Processing_Service
功 能：发动机转速数据处理函数
参 数：无
返回值：无
******************************************************************************
注 意：该函数必须每20ms被调用一次
******************************************************************************/
void Data_Engine_Speed_Processing_Service ( void );
uint8_t Get_EngineValid(void);
uint16_t Get_ActualEngineSpeed(void);
uint16_t Get_DispEngineSpeed(void);
#endif
Firmware/Source/Application/Data_VSpeed.c 0 → 100644
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Application/Data_VSpeed.h 0 → 100644
View file @ fa0f7a76
#ifndef _Data_Vspeed_H_
#define _Data_Vspeed_H_
#include "common.h"
/*** 参数设置 ***/
#define DATA_VEHICLE_RUNNING_THRESHOLD 25 //汽车行进阈值
#define DATA_VEHICLE_STOP_THRESHOLD 20 //汽车停止阈值
#define DATA_VSPEED_DAMPING_FACTOR 3 //阻尼系数
#define DATA_VSPEED_INC_STEP 2 //速度增加时慢加速速度变化步长
#define DATA_VSPEED_DEC_STEP 6 //方向改变时急减速速度变化步长
#define DATA_VSPEED_APPR_SPEED_MIN 2 //最小逼近速度
#define DATA_VSPEED_HYSTERESIS 10 //回差
/*** 控制结构 ***/
typedef struct
{
uint16_t Timer;
uint16_t Timer1;
uint16_t Backup;
uint16_t Buffer[3];
uint8_t Cnt;
} DataVSpeedSamplerStruct; //车速采样结构
typedef struct
{
uint16_t Speed;
uint16_t Delta;
uint8_t Dir;
} DataVSPeedDampingStruct; //车速阻尼结构
/******************************************************************************
Data_Vehicle_Speed_KL30_Wakeup_Init
功 能：车速数据KL30_Wakeup_Init
参 数：无
返回值：无
******************************************************************************
注 意：该函数KL30_Wakeup_Init被调用一次
******************************************************************************/
void Data_Vehicle_Speed_KL30_Wakeup_Init(void);
/******************************************************************************
函数名：Data_Vehicle_Speed_Processing_Service
功 能：车速数据处理函数
参 数：无
返回值：无
******************************************************************************
注 意：该函数必须每20ms被调用一次
******************************************************************************/
void Data_Vehicle_Speed_Processing_Service(void);
uint8_t Get_VechileSpeedValid(void);
/*真实的车速，精度10倍,*/
uint16_t Get_ActualVechileSpeed(void);
/*显示车速，精度10倍，取整，舍去小数点*/
uint16_t Get_DispVechileSpeed(void);
uint16_t Get_DispVechileSpeed_Mile(void);
#endif
Firmware/Source/Application/GpioUser.c
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Application/GpioUser.h
View file @ fa0f7a76
...@@ -4,75 +4,75 @@ ...@@ -4,75 +4,75 @@
#define GpioOut_High RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH #define GpioOut_High RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_HIGH
#define GpioOut_Low RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW #define GpioOut_Low RTE_GPIO_DIR_OUT | RTE_GPIO_LEVEL_LOW
/* GPIO映射 */ /* GPIO映射 */
#define L_Fuel_POW RTE_GPIO_PORT00_PIN00 #define ABS_Faulty_lights RTE_GPIO_PORT00_PIN00
#define KL15_AD_IN RTE_GPIO_PORT00_PIN01 #define KL15_AD_IN RTE_GPIO_PORT00_PIN01
#define SD_1 RTE_GPIO_PORT00_PIN02 #define MCU_SPI_MOSI RTE_GPIO_PORT00_PIN02
#define CSB_1 RTE_GPIO_PORT00_PIN03 #define MCU_SPI_MISO RTE_GPIO_PORT00_PIN03
#define SCL_1 RTE_GPIO_PORT00_PIN04 #define MCU_SPI_CLK RTE_GPIO_PORT00_PIN04
#define L_BiasBitSW_100 RTE_GPIO_PORT00_PIN05 #define HighBeam_P_In RTE_GPIO_PORT00_PIN05
#define L_BiasBitSW_10 RTE_GPIO_PORT00_PIN06 #define VSPEED_TEN_OUT RTE_GPIO_PORT00_PIN06
#define Blacklight_PWM RTE_GPIO_PORT01_PIN00 #define Blacklight_PWM RTE_GPIO_PORT01_PIN00 //ljs
#define RXD_ESP_IN_MCU RTE_GPIO_PORT01_PIN01 #define LIN_RXD_ESP RTE_GPIO_PORT01_PIN01
#define TXD_ESP_IN_MCU RTE_GPIO_PORT01_PIN02 #define LIN_TXD_ESP RTE_GPIO_PORT01_PIN02
#define NONE_3 RTE_GPIO_PORT01_PIN03 #define Gears_N_MCU RTE_GPIO_PORT01_PIN03
#define SCL_IIC RTE_GPIO_PORT01_PIN04 #define Low_oil_pressure_MCU RTE_GPIO_PORT01_PIN04
#define SDA_IIC RTE_GPIO_PORT01_PIN05 #define x1530_EN_MCU RTE_GPIO_PORT01_PIN05
#define ESpeed_IOC RTE_GPIO_PORT01_PIN06 #define ESPEED_TEN_IN RTE_GPIO_PORT01_PIN06
#define VSpeed_IOC RTE_GPIO_PORT01_PIN07 #define VSPEED_TEN_IN RTE_GPIO_PORT01_PIN07
#define AVDD RTE_GPIO_PORT02_PIN00 #define AVDD RTE_GPIO_PORT02_PIN00
#define GND RTE_GPIO_PORT02_PIN01 #define GND RTE_GPIO_PORT02_PIN01
#define KL30_AD_MCU_IN RTE_GPIO_PORT02_PIN02 #define KL30_AD_MCU_IN RTE_GPIO_PORT02_PIN02 //ljs
#define KL15_AD_MCU_IN RTE_GPIO_PORT02_PIN03 #define KL15_AD_MCU_IN RTE_GPIO_PORT02_PIN03 //ljs
#define TCS RTE_GPIO_PORT02_PIN04 #define A_NTC_IN RTE_GPIO_PORT02_PIN04
#define Fuel_AD_IN_MCU RTE_GPIO_PORT02_PIN05 #define A_FuelSender_BitSNSR1_IN RTE_GPIO_PORT02_PIN05
#define Water_Temperature RTE_GPIO_PORT02_PIN06 #define A_WaterTemp_IN RTE_GPIO_PORT02_PIN06
#define BiasBitSW_Fuel RTE_GPIO_PORT02_PIN07 #define A_FULESTANDARDBitSW1_IN RTE_GPIO_PORT02_PIN07
#define Diagnosis RTE_GPIO_PORT03_PIN00 #define MAINTENANCE_LAMP_OUT RTE_GPIO_PORT03_PIN00
#define SDB_LED_DRIVER RTE_GPIO_PORT03_PIN01 #define LeftTurn_MUC_OUT RTE_GPIO_PORT03_PIN01
#define SWDIO RTE_GPIO_PORT04_PIN00 #define SWDIO_JTMS RTE_GPIO_PORT04_PIN00
#define Smart_Lock RTE_GPIO_PORT04_PIN01 #define Start_stop_MCU RTE_GPIO_PORT04_PIN01
#define MODE_IN_MCU RTE_GPIO_PORT04_PIN02 #define Select_button_MCU RTE_GPIO_PORT04_PIN02
#define SET_IN_MCU RTE_GPIO_PORT04_PIN03 #define VCC1V2_AMT_EN RTE_GPIO_PORT04_PIN03 //ljs
#define MCU_OUT_2CH_20k RTE_GPIO_PORT05_PIN00 #define CAN_MCU_RXD RTE_GPIO_PORT05_PIN00
#define MCU_OUT_1CH_200 RTE_GPIO_PORT05_PIN01 #define CAN_MCU_TXD RTE_GPIO_PORT05_PIN01
#define Position RTE_GPIO_PORT05_PIN02 #define CAN_STB_MCU RTE_GPIO_PORT05_PIN02
#define Right_Turn RTE_GPIO_PORT05_PIN03 #define HighBeam_MCU RTE_GPIO_PORT05_PIN03
#define Left_Turn RTE_GPIO_PORT05_PIN04 #define L_FuelSender_OUT RTE_GPIO_PORT05_PIN04
#define High_Beam RTE_GPIO_PORT05_PIN05 #define SWITCH_MCU RTE_GPIO_PORT05_PIN05
#define SCL RTE_GPIO_PORT06_PIN00 #define IIC_SCL_24G16 RTE_GPIO_PORT06_PIN00
#define SDA RTE_GPIO_PORT06_PIN01 #define IIC_SDA_24G16 RTE_GPIO_PORT06_PIN01
#define SCL_MCU RTE_GPIO_PORT06_PIN02 #define IIC_SCL_27030 RTE_GPIO_PORT06_PIN02
#define SDA_MCU RTE_GPIO_PORT06_PIN03 #define I243_SDA_27030 RTE_GPIO_PORT06_PIN03
#define SCL_2 RTE_GPIO_PORT07_PIN00 #define SCL_2 RTE_GPIO_PORT07_PIN00
#define CSB_2 RTE_GPIO_PORT07_PIN01 #define CSB_2 RTE_GPIO_PORT07_PIN01
#define SD_2 RTE_GPIO_PORT07_PIN02 #define SD_2 RTE_GPIO_PORT07_PIN02
#define L_BiasBitSW_10000 RTE_GPIO_PORT07_PIN03 #define MCU_RSTB_LCD RTE_GPIO_PORT07_PIN03 //ljs
#define L_BiasBitSW_1000 RTE_GPIO_PORT07_PIN04 #define HighBeam_MUC_OUT RTE_GPIO_PORT07_PIN04
#define ABS RTE_GPIO_PORT07_PIN05 #define STBYB_LCD_MCU RTE_GPIO_PORT07_PIN05 //ljs
#define RXD_2 RTE_GPIO_PORT07_PIN06 #define RXD_2 RTE_GPIO_PORT07_PIN06 //ljs
#define TXD_2 RTE_GPIO_PORT07_PIN07 #define TXD_2 RTE_GPIO_PORT07_PIN07 //ljs
#define L_BiasBitSW_POW RTE_GPIO_PORT12_PIN00 #define L_BiasBitSW_POW RTE_GPIO_PORT12_PIN00
#define X_1 RTE_GPIO_PORT12_PIN01 #define MCU_XI RTE_GPIO_PORT12_PIN01
#define X_2_EXCLK RTE_GPIO_PORT12_PIN02 #define MCU_XO RTE_GPIO_PORT12_PIN02
#define XT_1 RTE_GPIO_PORT12_PIN03 #define X32768_IN RTE_GPIO_PORT12_PIN03
#define XT_2 RTE_GPIO_PORT12_PIN04 #define X32768_OUT RTE_GPIO_PORT12_PIN04
#define NONE_2 RTE_GPIO_PORT13_PIN00 #define MCU_SPI_CS RTE_GPIO_PORT13_PIN00
#define Neutral RTE_GPIO_PORT13_PIN06 #define RESEVER5_OUT_LOW RTE_GPIO_PORT13_PIN06
#define SWCLK RTE_GPIO_PORT13_PIN07 #define SWCLK RTE_GPIO_PORT13_PIN07
#define L_BD433Ctrl_OUT RTE_GPIO_PORT14_PIN00 #define VCC_33_EN_MCU RTE_GPIO_PORT14_PIN00 //ljs
#define L_BiasBitSW_Fuel_OUT RTE_GPIO_PORT14_PIN01 #define RightTurn_MUC_OUT RTE_GPIO_PORT14_PIN01
#define A_Version RTE_GPIO_PORT14_PIN06 #define A_Version RTE_GPIO_PORT14_PIN06
#define NONE_1 RTE_GPIO_PORT14_PIN07 #define Engine_Failure_MCU RTE_GPIO_PORT14_PIN07
typedef enum typedef enum
{ {
......
Firmware/Source/Component/AMT630H/AMT630H.c 0 → 100644
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Component/AMT630H/AMT630H.h 0 → 100644
View file @ fa0f7a76
#ifndef AMT_630H_H
#define AMT_630H_H
#include <stdint.h>
typedef enum
{
EM_FLASH_CHECK_RESULT_NO_ACT = 0,
EM_FLASH_CHECK_RESULT_CHECKING,
EM_FLASH_CHECK_RESULT_SUCCESS,
EM_FLASH_CHECK_RESULT_FAIL,
}EM_FLASH_CHECK_RESULT_T;
typedef struct
{
uint8_t Flag;
uint32_t InquireTime;
uint32_t CheckStateTime;
uint8_t Result;
}s_AMT630H_FlashCheck_t;
#define AMT630H_REFRESH_TIME 50U
#define AMT630H_ANIMATION_TIME 3000U //ms
#define AMT630H_ANIMATION_PIC_NUM 146U
#define AMT630H_ANIMATION_REFRESHTIME_DEF(x) ((AMT630H_ANIMATION_TIME > x) ? \
(((AMT630H_ANIMATION_TIME - x) / AMT630H_ANIMATION_PIC_NUM) - 5) : \
(((AMT630H_ANIMATION_TIME) / AMT630H_ANIMATION_PIC_NUM) - 5))
void AMT630H_Timer(unsigned char Tms);
void Delay_Time_Ctrl(unsigned long Tms);
void Amt630hUartRecvData(uint16_t u16UARTData);
void AMT630H_Animation_PlayProc(uint16_t PicIndex);
void AMT630H_RstCtrl(void);
void Amt630hInit(void);
void AMT630H_Sleep(void);
static void AMT630H_AliveCounterMonitor(void);
void AMT630H_Main(void);
unsigned char AMT630H_isInitFinish(void);
extern uint32_t Amt630hInitTimerCnts ;
#endif
\ No newline at end of file
Firmware/Source/Component/AMT630H/AMT630H_Datas.c 0 → 100644
View file @ fa0f7a76
#include "Components.h"
void AMT630H_GUI_Background()
{
if (SYS_OPR_STAT_IGN_ON)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0058_360_325);
SetPagePic(GRAPHICS_PAGE_0, Pic_0012_22_397);//Pic_0001_0_0白色主题背景
SetPagePic(GRAPHICS_PAGE_0, Pic_0101_728_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0128_429_152);
SetPagePic(GRAPHICS_PAGE_0, Pic_0176_903_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0156_197_485);
SetPagePic(GRAPHICS_PAGE_0, Pic_0211_564_211);
SetPagePic(GRAPHICS_PAGE_0, Pic_0244_360_194);
SetPagePic(GRAPHICS_PAGE_0, Pic_0303_189_486);
SetPagePic(GRAPHICS_PAGE_0, Pic_0385_250_553);
//SetPagePicFree(GRAPHICS_PAGE_0, Pic_0694_54_327, 200,327);//中间显示道路装饰线
//SetPagePic(GRAPHICS_PAGE_0, Pic_0012_0_95);//中间显示光晕
//
//SetPagePic(GRAPHICS_PAGE_0, Pic_0047_264_95);//右侧表盘
//SetPagePic(GRAPHICS_PAGE_0, Pic_0048_610_229);//右侧指针
//SetPagePic(GRAPHICS_PAGE_0, Pic_0052_44_95);//左侧表盘
//SetPagePic(GRAPHICS_PAGE_0, Pic_0053_49_229);//左侧指针
//SetPagePic(GRAPHICS_PAGE_0, Pic_0037_309_380);//功率线条
//SetPagePic(GRAPHICS_PAGE_0, Pic_0045_249_412);//power
//SetPagePic(GRAPHICS_PAGE_0, Pic_0044_454_405);//功率8km
//SetPagePic(GRAPHICS_PAGE_0, Pic_0043_313_405);//功率-3km
}
else
{
//SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
//SetPagePic(GRAPHICS_PAGE_0, Pic_0013_0_57);
//SetPagePic(GRAPHICS_PAGE_0, Pic_0012_0_95);
//SetPagePic(GRAPHICS_PAGE_0, Pic_0047_264_95);
//SetPagePic(GRAPHICS_PAGE_0, Pic_0048_610_229);
//SetPagePic(GRAPHICS_PAGE_0, Pic_0052_44_95);
//SetPagePic(GRAPHICS_PAGE_0, Pic_0053_49_229);
//SetPagePic(GRAPHICS_PAGE_0, Pic_0057_376_336);
}
}
void AMT630H_GUI_DisplayProc(void)
{
SetPageGuid(GRAPHICS_PAGE_0, 1, 1, 1);
AMT630H_GUI_Background();
PackedTransfer_Page();
}
\ No newline at end of file
Firmware/Source/Component/AMT630H/AMT630H_Datas.h 0 → 100644
View file @ fa0f7a76
#ifndef A69FAEFD_36D2_473A_A858_C02318EB402B
#define A69FAEFD_36D2_473A_A858_C02318EB402B
extern void AMT630H_GUI_DisplayProc(void);
extern void AMT630H_GUI_Background(void);
#endif /* A69FAEFD_36D2_473A_A858_C02318EB402B */
Firmware/Source/Component/AMT630H/GraphicsFunc.c 0 → 100644
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Component/AMT630H/PicBin.c 0 → 100644
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Component/AMT630H/PicBin.h 0 → 100644
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Component/AMT630H/UartProtocol.h 0 → 100644
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Component/Components.h
View file @ fa0f7a76
...@@ -17,10 +17,15 @@ ...@@ -17,10 +17,15 @@
#include "GenDelay\GenDelay.h" #include "GenDelay\GenDelay.h"
#include "GpioUser.h" #include "GpioUser.h"
#include "Eeprom\eepromManage.h" #include "Eeprom\eepromManage.h"
#include "CommonInterface.h" #include "Application\CommonInterface.h"
#include "Menu\Menu.h" #include "Menu\Menu.h"
#include "Flash_synchronizer\Flash_synchronizer.h" #include "Flash_synchronizer\Flash_synchronizer.h"
#include "AMT630H\AMT630H.h"
#include "AMT630H\PicBin.h"
#include "AMT630H\UartProtocol.h"
#include "AMT630H\AMT630H_Datas.h"
#include "Data_ESpeed.h"
#include "Data_VSpeed.h"
#include "BackLight.h"
#endif #endif
Firmware/Source/Component/Key/Key_user.c
View file @ fa0f7a76
...@@ -207,10 +207,7 @@ void Key_Auto_Save(void) ...@@ -207,10 +207,7 @@ void Key_Auto_Save(void)
PageType = Page_Time; PageType = Page_Time;
} }
void MenuData_Unit_Init(void)
{
MenuData.Unit = 0;
}
uint8_t ClearODO_Flag = 0; uint8_t ClearODO_Flag = 0;
void TYW_RESET_ODO(void) void TYW_RESET_ODO(void)
......
Firmware/Source/Component/Key/Key_user.h
View file @ fa0f7a76
...@@ -78,5 +78,5 @@ uint8_t Get_Current_PageType(void); ...@@ -78,5 +78,5 @@ uint8_t Get_Current_PageType(void);
void TYW_RESET_ODO(void); void TYW_RESET_ODO(void);
uint8_t Get_Dis_Unit(void); uint8_t Get_Dis_Unit(void);
void Key_Check_Service(void); void Key_Check_Service(void);
void MenuData_Unit_Init(void);
#endif #endif
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @ fa0f7a76
...@@ -39,31 +39,27 @@ void PwrMemInit(void) ...@@ -39,31 +39,27 @@ void PwrMemInit(void)
static void Power_KL30_Init(void) static void Power_KL30_Init(void)
{ {
// ClearODO_Flag = 0; // ClearODO_Flag = 0;
UART_Channel_Config_st_t loc_config;
Gpio_Init(Gpio_KL30_Init);
eeprom_StoreInfo_Init(); eeprom_StoreInfo_Init();
loc_config.u32UARTChEn = 1U;
loc_config.u32UARTbps = 115200U;
loc_config.pfnUARTConfirmCallBack = NULL;
loc_config.pfnUARTReadMsgCallBack = Amt630hUartRecvData;
RTE_UART_Init(UART_CH2, &loc_config);
Analog_Signal_Conv_Init(); Analog_Signal_Conv_Init();
Sys_KL30_Init();
BackLight_Init(); Data_Vehicle_Speed_KL30_Wakeup_Init();
// Sys_KL30_Init(); Data_Engine_Speed_KL30_Wakeup_Init();
// Checkself_Init(); LINE_IN_Init();
//Data_Vehicle_Speed_KL30_Init();
//Data_Engine_Speed_KL30_Init();
// LINE_IN_Init();
Key_KL30_Init_EXample(); Key_KL30_Init_EXample();
//Light_Sensor_Init_Example();//注意顺序1
Data_User_Mileage_KL30Init(); Data_User_Mileage_KL30Init();
Fuel_KL30_Init(); Fuel_KL30_Init();
Amt630hInit();
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000); TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High); TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
// Telltales_Auto_Start_Stop();
// Telltales_Init();
// MenuData_Unit_Init();
// g_stRTCInformation.u8RTCSecond = 0; // g_stRTCInformation.u8RTCSecond = 0;
// g_stRTCInformation.u8RTCMinute = 0; // g_stRTCInformation.u8RTCMinute = 0;
// g_stRTCInformation.u8RTCHour = 0; // g_stRTCInformation.u8RTCHour = 0;
...@@ -73,6 +69,7 @@ static void Power_KL30_Init(void) ...@@ -73,6 +69,7 @@ static void Power_KL30_Init(void)
// RTE_RTC_Init(g_stRTCInformation); // RTE_RTC_Init(g_stRTCInformation);
// RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising); // RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
Protocol_KL30_Wakeup_Init(); Protocol_KL30_Wakeup_Init();
} }
//extern uint32_t PowerIgnOffTimeLine; //extern uint32_t PowerIgnOffTimeLine;
static void Power_Wakeup_Init(void) static void Power_Wakeup_Init(void)
...@@ -85,19 +82,17 @@ static void Power_Wakeup_Init(void) ...@@ -85,19 +82,17 @@ static void Power_Wakeup_Init(void)
Analog_Signal_Conv_Init(); Analog_Signal_Conv_Init();
Data_User_Mileage_WakeupInit(); Data_User_Mileage_WakeupInit();
BackLight_Init(); Sys_WakeUp_Init();
// Sys_WakeUp_Init(); Data_Vehicle_Speed_KL30_Wakeup_Init();
// Data_Vehicle_Speed_KL30_Init(); Data_Engine_Speed_KL30_Wakeup_Init();
// Data_Engine_Speed_KL30_Init(); LINE_IN_Init();
// LINE_IN_Init();
Key_Wakeup_Init_EXample(); Key_Wakeup_Init_EXample();
Line_In_KL15_ON_Init(); Line_In_KL15_ON_Init();
//Light_Sensor_Init_Example();//注意顺序1
Fuel_KL30_Init(); Fuel_KL30_Init();
Amt630hInit();
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000); TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High); TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
// Telltales_Init(); //Telltales_Init();
// RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising); // RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
Protocol_KL30_Wakeup_Init(); Protocol_KL30_Wakeup_Init();
} }
...@@ -114,21 +109,15 @@ static void Power_OVP_Init(void) ...@@ -114,21 +109,15 @@ static void Power_OVP_Init(void)
static void Power_IG_OFF_Init(void) static void Power_IG_OFF_Init(void)
{ {
Line_In_KL15_OFF_Init(); Line_In_KL15_OFF_Init();
// Checkself_Init();
} }
static void Power_IG_ON_Init(void) static void Power_IG_ON_Init(void)
{ {
// ClearODO_Flag = 0; // ClearODO_Flag = 0;
BackLight_Init();
// Checkself_Init();
Line_In_KL15_ON_Init(); Line_In_KL15_ON_Init();
// Telltales_KL15_Init(); Telltales_KL15_Init();
Fuel_KL15_Init(); Fuel_KL15_Init();
// Telltales_Auto_Start_Stop();
// Data_Vehicle_Speed_KL15_Init();
// Data_Engine_Speed_KL15_Init();
} }
static void Power_Sleep_Init(void) static void Power_Sleep_Init(void)
...@@ -143,7 +132,7 @@ static void Power_Sleep_Init(void) ...@@ -143,7 +132,7 @@ static void Power_Sleep_Init(void)
// //CGC->CSC = 1 ; //HIOSTOP = 1 // //CGC->CSC = 1 ; //HIOSTOP = 1
Gpio_Init(Gpio_Sleep_Init); Gpio_Init(Gpio_Sleep_Init);
AMT630H_Sleep();
Analog_Signal_Conv_Stop(); Analog_Signal_Conv_Stop();
// RTE_DEEPSLEEP_Enable(); // RTE_DEEPSLEEP_Enable();
......
Firmware/Source/Component/System_Monitor/System_Monitor.c 0 → 100644
View file @ fa0f7a76
This diff is collapsed.
Firmware/Source/Component/System_Monitor/System_Monitor_User.c
View file @ fa0f7a76
#include "System_Monitor.h" #include "System_Monitor.h"
#include "Components.h" #include "Components.h"
#include "delay.h"
#include "wdt.h"
#define u16Base_Vol 0u #define u16Base_Vol 0u
#define u16ENTER_LOW_N_RANGE 7000U #define u16ENTER_LOW_N_RANGE 7000U
#define u16EXIT_LOW_N_RANGE 8000U #define u16EXIT_LOW_N_RANGE 7500U
#define u16ENTER_LOW_Y_RANGE 9000U #define u16ENTER_LOW_Y_RANGE 9000U
#define u16EXIT_LOW_Y_RANGE 10000U #define u16EXIT_LOW_Y_RANGE 10000U
#define u16EXIT_HIGH_Y_RANGE 15000U #define u16EXIT_HIGH_Y_RANGE 0xffffu
#define u16ENTER_HIGH_Y_RANGE 16000U #define u16ENTER_HIGH_Y_RANGE 0xffffu
#define u16EXIT_HIGH_N_RANGE 18000U #define u16EXIT_HIGH_N_RANGE 0xffffu
#define u16ENTER_HIGH_N_RANGE 19000U #define u16ENTER_HIGH_N_RANGE 0xffffu
#define u16Top_Vol 0xffffu #define u16Top_Vol 0xffffu
void Delay_ms(uint32_t u32Ms); void Delay_ms(uint32_t u32Ms);
// #pragma alignvar(8) // #pragma alignvar(8)
static const monitorlib_uint16_t SysFun_Range[24u] = { static const monitorlib_uint16_t SysFun_Range [ 26u ] = {
u16Base_Vol, u16Base_Vol,
u16ENTER_LOW_N_RANGE, u16ENTER_LOW_N_RANGE,
...@@ -34,8 +35,8 @@ static const monitorlib_uint16_t SysFun_Range[24u] = { ...@@ -34,8 +35,8 @@ static const monitorlib_uint16_t SysFun_Range[24u] = {
u16ENTER_HIGH_N_RANGE, u16ENTER_HIGH_N_RANGE,
u16Top_Vol, u16Top_Vol,
500, /* 进入异常电压时间 1S */ 2500,
50u, /* KL15消抖时间 100ms*/ 50u,
u16Base_Vol, u16Base_Vol,
u16ENTER_LOW_N_RANGE, u16ENTER_LOW_N_RANGE,
...@@ -53,33 +54,36 @@ static const monitorlib_uint16_t SysFun_Range[24u] = { ...@@ -53,33 +54,36 @@ static const monitorlib_uint16_t SysFun_Range[24u] = {
u16Top_Vol, u16Top_Vol,
2u, 2u,
2u, 2u,
2u,
0u,
}; };
monitorlib_uint16_t Sys_Read_KL30_Voltage_F(void) monitorlib_uint16_t Sys_Read_KL30_Voltage_F(void)
{ {
monitorlib_uint16_t u16Voltage; monitorlib_uint16_t u16Voltage;
u16Voltage = ADC_Conv_Single_Channel(ADC_CH_KL30_VOLTAGE); u16Voltage = (monitorlib_uint16_t)ADC_Conv_Single_Channel(ADC_CH_KL30_VOLTAGE);
return u16Voltage; return u16Voltage;
} }
monitorlib_uint16_t Sys_Read_KL15_Voltage_F(void) monitorlib_uint16_t Sys_Read_KL15_Voltage_F(void)
{ {
monitorlib_uint16_t u16Voltage; monitorlib_uint16_t u16Voltage;
u16Voltage = ADC_Conv_Single_Channel(ADC_CH_KL15_VOLTAGE); u16Voltage = (monitorlib_uint16_t)ADC_Conv_Single_Channel(ADC_CH_KL15_VOLTAGE);
return u16Voltage; return u16Voltage;
} }
monitorlib_uint16_t Sys_Read_KL30_Voltage(void) monitorlib_uint16_t Sys_Read_KL30_Voltage(void)
{ {
monitorlib_uint16_t u16Voltage; monitorlib_uint16_t u16Voltage;
u16Voltage = ADC_Read_Signal(ADC_CH_KL30_VOLTAGE); u16Voltage = (monitorlib_uint16_t)ADC_Read_Signal(ADC_CH_KL30_VOLTAGE);
return u16Voltage; return u16Voltage;
} }
monitorlib_uint16_t Sys_Read_KL15_Voltage(void) monitorlib_uint16_t Sys_Read_KL15_Voltage(void)
{ {
monitorlib_uint16_t u16Voltage; monitorlib_uint16_t u16Voltage;
u16Voltage = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE); u16Voltage = (monitorlib_uint16_t)ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
return u16Voltage; return u16Voltage;
} }
...@@ -99,17 +103,20 @@ monitorlib_uint8_t Sys_Read_KL15_Valid(void) ...@@ -99,17 +103,20 @@ monitorlib_uint8_t Sys_Read_KL15_Valid(void)
monitorlib_uint8_t System_LINE_KL15(void) monitorlib_uint8_t System_LINE_KL15(void)
{ {
monitorlib_uint8_t u8KL15 = 0; static monitorlib_uint8_t u8KL15 = 0;
// if (RTE_GPIO_Get_Level(WAKEUP_KL15_In) == 1u )
// {
// u8KL15 = 1u;
// }
// else
// {
// u8KL15 = 0;
// }
if (Sys_Read_KL15_Voltage() >= 5500u )
{
u8KL15 = 1u;
}
else if((Sys_Read_KL15_Voltage() >= 5000u)&&(Sys_Read_KL15_Voltage() < 5500u))
{
;
}
else
{
u8KL15 = 0;
}
return u8KL15; return u8KL15;
} }
...@@ -134,8 +141,8 @@ void Sys_KL30_Init(void) ...@@ -134,8 +141,8 @@ void Sys_KL30_Init(void)
m_st.SysGet_KL15_value_Force = Sys_Read_KL15_Voltage_F; m_st.SysGet_KL15_value_Force = Sys_Read_KL15_Voltage_F;
m_st.SysGet_KL30_value_Force = Sys_Read_KL30_Voltage_F; m_st.SysGet_KL30_value_Force = Sys_Read_KL30_Voltage_F;
m_st.SysMonitorLogic = Sys_LogicProcess; m_st.SysMonitorLogic = Sys_LogicProcess;
System_Monitor_KL30Init();
Sys_Set_Pata(SysFun_Range, &m_st); Sys_Set_Pata(SysFun_Range, &m_st);
System_Monitor_KL30Init( );
} }
void Sys_WakeUp_Init(void) void Sys_WakeUp_Init(void)
...@@ -150,8 +157,8 @@ void Sys_WakeUp_Init(void) ...@@ -150,8 +157,8 @@ void Sys_WakeUp_Init(void)
m_st.SysGet_KL15_value_Force = Sys_Read_KL15_Voltage_F; m_st.SysGet_KL15_value_Force = Sys_Read_KL15_Voltage_F;
m_st.SysGet_KL30_value_Force = Sys_Read_KL30_Voltage_F; m_st.SysGet_KL30_value_Force = Sys_Read_KL30_Voltage_F;
m_st.SysMonitorLogic = Sys_LogicProcess; m_st.SysMonitorLogic = Sys_LogicProcess;
System_Monitor_WakeupInit();
Sys_Set_Pata(SysFun_Range, &m_st); Sys_Set_Pata(SysFun_Range, &m_st);
System_Monitor_WakeupInit( );
} }
void Delay_ms(uint32_t u32Ms) void Delay_ms(uint32_t u32Ms)
...@@ -167,6 +174,6 @@ void Delay_ms(uint32_t u32Ms) ...@@ -167,6 +174,6 @@ void Delay_ms(uint32_t u32Ms)
__NOP(); __NOP();
__NOP(); __NOP();
} }
RTE_WDT_Clear(); WDT_Restart();
} }
} }
Firmware/Source/Component/System_Monitor/System_Monitor_User.h
View file @ fa0f7a76
...@@ -4,5 +4,6 @@ ...@@ -4,5 +4,6 @@
void Sys_KL30_Init(void); void Sys_KL30_Init(void);
void Sys_WakeUp_Init(void); void Sys_WakeUp_Init(void);
monitorlib_uint16_t Sys_Read_KL15_Voltage(void);
#endif #endif
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ fa0f7a76
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
//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 ];
//void Telltales_Init(void) // void Telltales_Init(void)
//{ // {
// TelExtPara m_ExtPara; // TelExtPara m_ExtPara;
// m_ExtPara.TotalLength = LED_Max; // m_ExtPara.TotalLength = LED_Max;
// m_ExtPara.LED_PowerOFF_TimerCbk = Common_GetIgnOffTime; // m_ExtPara.LED_PowerOFF_TimerCbk = Common_GetIgnOffTime;
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
// m_ExtPara.LED_PowerCbk = Common_Get_IG_Sts; // m_ExtPara.LED_PowerCbk = 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);
//} // }
//void Can_ID_401(uint8_t CopyData []) //void Can_ID_401(uint8_t CopyData [])
......
Firmware/Source/Component/Telltales/Telltales_user.h
View file @ fa0f7a76
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
//extern Tellib_uint8_t Auto_Start_Stop ; //extern Tellib_uint8_t Auto_Start_Stop ;
//void Telltales_Init(void); //void Telltales_Init(void);
//void Telltales_Auto_Start_Stop(void);
//void Telltales_Auto_Start_Stop_Setting(void);
//Tellib_uint8_t Telltales_Voltage_Date(void); //Tellib_uint8_t Telltales_Voltage_Date(void);
//#endif //#endif
Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/UART/RTE_UART.c
View file @ fa0f7a76
...@@ -193,6 +193,9 @@ uint32_t RTE_UART_Init(UART_Channel_en_t enUARTCh, UART_Channel_Config_st_t *pen ...@@ -193,6 +193,9 @@ uint32_t RTE_UART_Init(UART_Channel_en_t enUARTCh, UART_Channel_Config_st_t *pen
stUART_InitStruct.bitorder = UART_Bit_LSB; stUART_InitStruct.bitorder = UART_Bit_LSB;
stUART_InitStruct.UART_Mode = UART_Mode_Rx | UART_Mode_Tx; //收发模式 stUART_InitStruct.UART_Mode = UART_Mode_Rx | UART_Mode_Tx; //收发模式
stUARTCh2Cfg.pfnUARTReadMsgCallBack = penUARTCfg->pfnUARTReadMsgCallBack;
ISR_Register(ST2_IRQn, UART_CH2_TX_ISR); //串口2发送中断服务路径注册 ISR_Register(ST2_IRQn, UART_CH2_TX_ISR); //串口2发送中断服务路径注册
ISR_Register(SR2_IRQn, UART_CH2_RX_ISR); //串口2接收中断服务路径注册 ISR_Register(SR2_IRQn, UART_CH2_RX_ISR); //串口2接收中断服务路径注册
break; break;
......
Firmware/Source/System/Sys_Task_List.c
View file @ fa0f7a76
...@@ -14,6 +14,7 @@ void Sys_2ms_Tasks(void) ...@@ -14,6 +14,7 @@ void Sys_2ms_Tasks(void)
Common_Input_Para(); Common_Input_Para();
Sys_Status_Update_Service(); Sys_Status_Update_Service();
Analog_Signal_Conv_Service(); Analog_Signal_Conv_Service();
AMT630H_Main();
} }
void Sys_5ms_Tasks(void) void Sys_5ms_Tasks(void)
...@@ -28,7 +29,8 @@ void Sys_10ms_Tasks(void) ...@@ -28,7 +29,8 @@ void Sys_10ms_Tasks(void)
void Sys_20ms_Tasks(void) void Sys_20ms_Tasks(void)
{ {
Data_Vehicle_Speed_Processing_Service();
Data_Engine_Speed_Processing_Service();
} }
void Sys_50ms_Tasks(void) void Sys_50ms_Tasks(void)
...@@ -37,6 +39,7 @@ void Sys_50ms_Tasks(void) ...@@ -37,6 +39,7 @@ void Sys_50ms_Tasks(void)
} }
uint32_t g_u32LEDFlag = 0UL; uint32_t g_u32LEDFlag = 0UL;
//uint8_t ljsuartsend[2] = { 0x55, 0x66};
void Sys_100ms_Tasks(void) void Sys_100ms_Tasks(void)
{ {
if (g_u32LEDFlag) if (g_u32LEDFlag)
...@@ -50,8 +53,10 @@ void Sys_100ms_Tasks(void) ...@@ -50,8 +53,10 @@ void Sys_100ms_Tasks(void)
//RTE_GPIO_Set_Level(RTE_GPIO_ANALOG_PORT0_PIN15, 0x00U); //RTE_GPIO_Set_Level(RTE_GPIO_ANALOG_PORT0_PIN15, 0x00U);
} }
Fuel_Cal_Sevice(100u); Fuel_Cal_Sevice(100u);
RTE_GPIO_Set_Level(Blacklight_PWM, 1);
//UART_Ch2_Send_Multiple_Byte(ljsuartsend, 2);
} }
static uint16_t task_2ms = 0u;
void Sys_Exact_50us_Tasks(void) void Sys_Exact_50us_Tasks(void)
{ {
static uint32_t task_1ms = 0u; static uint32_t task_1ms = 0u;
...@@ -63,4 +68,11 @@ void Sys_Exact_50us_Tasks(void) ...@@ -63,4 +68,11 @@ void Sys_Exact_50us_Tasks(void)
task_1ms =0U; task_1ms =0U;
eeprom_1ms_timeCount( ); eeprom_1ms_timeCount( );
} }
task_2ms++;
if (task_2ms >= 40)
{
task_2ms = 0;
AMT630H_Timer(2);
}
} }
\ No newline at end of file
Firmware/Source/System/main.c
View file @ fa0f7a76
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