Skip to content

H
haoJin750TFT
Commit 67e2db5a authored by wangxuhui's avatar wangxuhui
Browse files
Options

Merge branch 'dev' into 'release' 

Dev

See merge request !98
parents 3bdf9153 d0c44957
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1946 additions and 556 deletions
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx
View file @ 67e2db5a
......@@ -738,6 +738,16 @@
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\BlueTooth.h</FilePath>
</File>
<File>
<FileName>Hysteresis.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Application\Hysteresis.h</FilePath>
</File>
<File>
<FileName>Hysteresis_V10_239.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\Source\Application\Hysteresis_V10_239.lib</FilePath>
</File>
</Files>
</Group>
<Group>
......@@ -978,16 +988,6 @@
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath>
</File>
<File>
<FileName>kei_S1.0.6_20240827.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\kei_S1.0.6_20240827.lib</FilePath>
</File>
<File>
<FileName>UartProtocol.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\UartProtocol.h</FilePath>
</File>
<File>
<FileName>AMT630H_Datas.c</FileName>
<FileType>1</FileType>
......@@ -1018,6 +1018,16 @@
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.h</FilePath>
</File>
<File>
<FileName>keil_S1.0.8_20240924.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\keil_S1.0.8_20240924.lib</FilePath>
</File>
<File>
<FileName>UartProtocol.h</FileName>
<FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\UartProtocol.h</FilePath>
</File>
</Files>
</Group>
<Group>
......
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/system_BAT32A279.c
View file @ 67e2db5a
......@@ -94,7 +94,7 @@ const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".AR
// </e>
// </e>
// </h>
0x7E,
0x7C,
/**
* @brief LVD Control BYTE (C1H)
......
Firmware/Source/Application/BlueTooth.c
View file @ 67e2db5a
......@@ -11,8 +11,9 @@ uint16_t LastPhoneBookTotalCount = 0;
_PICID_Struct PicObj;
_QRCODE_RECT QRCode_Rect;
const uint8_t HJBlueToothName[9]= {"HJ750"};
uint8_t UUIDConfigBuf[22] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
//"600032023120100000995"
uint8_t UUIDConfigBuf[21] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
//007502024092400000002
//0x30,0x30,0x37,0x35,0x30,0x32,0x30,0x32,0x34,0x30,0x39,0x32,0x34,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x31
uint8_t SetBluetoothCloseCount = 0;
uint8_t OSVersionASCLLList[20] =
{
......@@ -97,7 +98,11 @@ void BlueToothService(void)
}
}
SetUUIDData((char *)UUIDConfigBuf, 22);
for (uint8_t i = 0; i < 21; i++)
{
UUIDConfigBuf[i] = Diag_Write_Data.DID_5000[i];
}
SetUUIDData((char *)UUIDConfigBuf, 21);
if (OTA_Update_Flag == 1)
{
QRCode_Rect.x = 650;
......@@ -135,7 +140,7 @@ void BlueToothService(void)
}
OTA_Update_Count_Open=0;
}
SetTaskbarHeight(150);
SetTaskbarHeight(130);
SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
TextService();
}
......@@ -157,7 +162,7 @@ TEXT_STRUCT TextPara[TEXT_NUM_TOTAL] =
{TEXT_NUM_PHONE_NUMBER_TOTAL, 0x4011, 0},
{TEXT_NUM_INFORMATION_MCUVER, 0x4012, 0},
{TEXT_NUM_INFORMATION_SWVERSION, 0x4013, 0},
{TEXT_NUM_INFORMATION_HW, 0x4014, 0}, //23F 23E
{TEXT_NUM_INFORMATION_UUID, 0x4014, 0},
{TEXT_NUM_INFORMATION_OS, 0x4015, 0},
{TEXT_NUM_INFORMATION_MCU, 0x4016, 0},
{TEXT_NUM_FAUULT_CODE, 0x4022, 0},
......@@ -174,6 +179,8 @@ uint8_t PhoneNumberTotal[20];
uint8_t InformationOSVersion[20];
uint8_t InformationMCUVersion[26];
uint8_t TextFaultCodeNum[10];
uint8_t UUIDDisplay[42];
uint8_t LastUUIDDisplay[21];
void TextService(void)
{
......@@ -217,6 +224,8 @@ void TextService(void)
memset(LastBlueToothName, 0, sizeof(LastBlueToothName));
memset(PhoneNumberTotal, 0, sizeof(PhoneNumberTotal));
memset(TextFaultCodeNum, 0, sizeof(TextFaultCodeNum));
memset(LastUUIDDisplay, 0, sizeof(LastUUIDDisplay));
memset(UUIDDisplay, 0, sizeof(UUIDDisplay));
for (uint8_t i = 0; i < sizeof(OSVersionASCLLList); i++)
{
......@@ -342,7 +351,40 @@ void TextService(void)
}
TextPara[TEXT_NUM_FAUULT_CODE].Vaild = 0x01;
}
if (((memcmp(LastUUIDDisplay, UUIDConfigBuf, sizeof(LastUUIDDisplay))) != 0))
{
for (uint8_t i = 0; i < (sizeof(UUIDConfigBuf)); i++)
{
UUIDDisplay[i * 2] = UUIDConfigBuf[i];
UUIDDisplay[(i * 2) + 1] = 0x00;
}
memcpy(LastUUIDDisplay, UUIDConfigBuf, sizeof(LastUUIDDisplay));
TextPara[TEXT_NUM_INFORMATION_UUID].Vaild = 0X01;
}
}
uint8_t Get_Talking_PhoneBookValid(void)
{
for(uint8_t i=0;i<100;i++)
{
if(CurBlueToothPhoneName[i]!=0)
{
return 1;
}
}
return 0;
}
uint8_t Get_UUID_UDSStatus(void)
{
for(uint8_t i=0;i<21;i++)
{
if(UUIDConfigBuf[i]!=0xFF)
{
return 1;
}
}
return 0;
}
Firmware/Source/Application/BlueTooth.h
View file @ 67e2db5a
......@@ -10,7 +10,7 @@ typedef enum {
TEXT_NUM_PHONE_NUMBER_TOTAL,
TEXT_NUM_INFORMATION_MCUVER,
TEXT_NUM_INFORMATION_SWVERSION,
TEXT_NUM_INFORMATION_HW,
TEXT_NUM_INFORMATION_UUID,
TEXT_NUM_INFORMATION_OS,
TEXT_NUM_INFORMATION_MCU,
TEXT_NUM_FAUULT_CODE,
......@@ -23,7 +23,7 @@ typedef struct {
uint16_t Vaild;
}TEXT_STRUCT;
#define INFORMATION_VERSION_DATE "20240915"
#define INFORMATION_VERSION_DATE "20241015"
#define SW_EXTERNAL_VERSION "100"
static const uint8_t DATA_Version[8] = {INFORMATION_VERSION_DATE};
......@@ -39,6 +39,8 @@ static const uint8_t SW_Version[3] = {SW_EXTERNAL_VERSION};
extern void BlueToothService(void);
extern uint8_t Get_Talking_PhoneBookValid(void);
extern uint8_t Get_UUID_UDSStatus(void);
extern _PICID_Struct PicObj;
extern _QRCODE_RECT QRCode_Rect;
extern uint8_t PhoneNumber[40];
......@@ -48,6 +50,7 @@ extern uint8_t PhoneNumberTotal[20];
extern uint8_t InformationOSVersion[20];
extern uint8_t InformationMCUVersion[26];
extern uint8_t TextFaultCodeNum[10];
extern uint8_t UUIDDisplay[42];
extern TEXT_STRUCT TextPara[];
#endif
\ No newline at end of file
Firmware/Source/Application/Can_User.c
View file @ 67e2db5a
......@@ -188,7 +188,7 @@ void COM_CAN_Init(void)
// CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
}
uint8_t u8BusoffRecoverFlag = 0U;
/**
* @brief Buff恢复函数
* @param deltaTime 调用时间 单位ms 10MS调用
......@@ -197,6 +197,7 @@ void Can_BusOff_Recover(uint8_t deltaTime)
{
if (get_can_busoff(CAN_CH_0) == 2)
{
u8BusoffRecoverFlag = 1U;
if (RSCAN0Busoff.Status == RSCAN0_BUS_STABLE)
{
RSCAN0Busoff.Status = RSCAN0_BUS_OFF_LV1;
......@@ -236,6 +237,11 @@ void Can_BusOff_Recover(uint8_t deltaTime)
}
else /* 总线正常,没有Bus-off发生*/
{
if(u8BusoffRecoverFlag == 1U)//从bussoff恢复后，只调用一次Can_RX_Apply_Buff
{
u8BusoffRecoverFlag = 0U;
Can_RX_Apply_Buff();
}
}
}
......
Firmware/Source/Application/Data_Coolant.c
View file @ 67e2db5a
This diff is collapsed.
Firmware/Source/Application/Data_Coolant.h
View file @ 67e2db5a
#ifndef DATA_COOLANT_H
#define DATA_COOLANT_H
#include "stdint.h"
#include "Components.h"
typedef enum{
CoolantSensorNormal = 0,
CoolantSensorShortCircuit,
CoolantSensorOpenCircuit,
}CoolantSensorSts_t;
#define Coolant_LEN 17
extern void Coolant_KL15_Init(void);
extern void Coolant_KL30_Init(void);
extern void Coolant_Cal_Sevice(uint8_t deltaTime);
extern uint8_t Get_CurCoolantSetp(void);
extern CoolantSensorSts_t Get_Coolant_Sensor_State(void);
void Coolant_R_Cal(uint8_t deltaTime);
typedef unsigned int INT16U;
/*** 控制结构 ***/
typedef struct
{
uint8_t u8_DestSeg;
uint8_t u8_CurSeg;
}DataCoolantTempDisStruct;
extern DataCoolantTempDisStruct DataCoolantTemp_Dis;
typedef struct
{
uint16_t Temp_Value;
uint8_t Symbol;
uint16_t u16Can_Actual;
uint8_t u8Can_Valid;
uint16_t u16Res_Actual;
uint16_t u16Res_ADValue;
uint8_t u8Res_Valid;
uint8_t u8Res_ADValid;
uint8_t u8Res_Flashtimer ;
uint8_t TEMPSetp;
uint8_t TEMPMode;
uint16_t TEMP_Fastime ;
uint8_t u8_ResStatus //
}DataCoolantTempStruct; //水温数据结构
typedef struct
{
uint32_t Buffer[5];
uint8_t Cnt;
uint8_t time;
uint16_t ResOpen_ActTimer;
uint16_t ResOpen_InActTimer;
}DataCoolantTempSamplerStruct;
void Common_SelfCheckTime_Init(void);
void Common_SelfCheckTime(void);
void Data_Coolant_Temp_Processing_Service(void);
uint16_t Get_Coolant_Res_To_Temp(uint16_t Temp_Res);
void Get_Coolant_Temp_Seg(uint16_t Temp_Value);
void Data_Coolant_Temp_Display ( void );
extern uint16_t GET_DataCollantTempSegValid(void);
extern uint16_t GET_DataCollantTempSegStatus(void);
extern void TEMP_KL30_Init ( void );
extern void TEMP_KL15_Init ( void );
extern uint8_t GET_DataCoolantTempSegDisp(void);
void TEMP_Gauges_Cal(void);
uint16_t Get_Res_To_Temp(uint16_t *ResBoard, uint16_t *TempBoard, uint8_t Len, uint16_t input);
extern DataCoolantTempStruct DataCoolantTemp ;
#endif
Firmware/Source/Application/GpioUser.c
View file @ 67e2db5a
......@@ -25,7 +25,7 @@ void Gpio_Init(_GpioUser_Enum InitMode)
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN02, GpioOut_Low); //TXD-ESP-IN-MCU
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN03, RTE_GPIO_DIR_IN);
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN04, RTE_GPIO_DIR_IN); //SCL-IIC---
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN05, GpioOut_High); //SDA-IIC---
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN05, GpioOut_Low); //SDA-IIC---
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN06, RTE_GPIO_DIR_IN);
RTE_GPIO_Config(RTE_GPIO_PORT01_PIN07, RTE_GPIO_DIR_IN);
......@@ -53,8 +53,8 @@ void Gpio_Init(_GpioUser_Enum InitMode)
RTE_GPIO_Config(RTE_GPIO_PORT05_PIN04, GpioOut_High);
RTE_GPIO_Config(RTE_GPIO_PORT05_PIN05, RTE_GPIO_DIR_IN);
RTE_GPIO_Config(RTE_GPIO_PORT06_PIN00, GpioOut_Low); //存储SCL
RTE_GPIO_Config(RTE_GPIO_PORT06_PIN01, GpioOut_Low); //存储SDA
RTE_GPIO_Config(RTE_GPIO_PORT06_PIN00, RTE_GPIO_DIR_IN); //存储SCL
RTE_GPIO_Config(RTE_GPIO_PORT06_PIN01, RTE_GPIO_DIR_IN); //存储SDA
RTE_GPIO_Config(RTE_GPIO_PORT06_PIN02, GpioOut_Low); //SCL_MCU
RTE_GPIO_Config(RTE_GPIO_PORT06_PIN03, GpioOut_Low); //SDA_MCU
......
Firmware/Source/Application/Hysteresis.h 0 → 100644
View file @ 67e2db5a
#ifndef HYSTERESIS_H__
#define HYSTERESIS_H__
// #define HYS_PLATFORM_16BIT
#ifdef HYS_PLATFORM_16BIT
typedef unsigned char Hys_uint8_t;
typedef unsigned int Hys_uint16_t;
typedef unsigned long Hys_uint32_t;
#else
typedef unsigned char Hys_uint8_t;
typedef unsigned short Hys_uint16_t;
typedef unsigned int Hys_uint32_t;
typedef unsigned long long Hys_uint64_t;
#endif
/*所有需要处理的物理量枚举*/
typedef enum
{
HYS_TEMP = 0U, /*水温*/
HYS_PWM, /*..*/
HYS_NUM_MAX,
} HYS_Num_en_t;
/***************************Do not modify the following*********************************/
/***************************Do not modify the following*********************************/
/***************************Do not modify the following*********************************/
/*当前文件版本号*/
#define HYS_VERSION_NUM 0X10U
#define HYS_RAM_DATA_LEN (HYS_NUM_MAX * 2U)
/*操作函数返回状态*/
typedef enum
{
HYS_OPERATE_SUCCESS = 0UL, /*函数操作成功*/
HYS_OPERATE_FAIL, /*函数操作失败*/
} HYS_Operate_Type_en_t;
typedef struct
{
/*该段的下限值*/
Hys_uint16_t u16HYSSegLow;
/*该段的上限值*/
Hys_uint16_t u16HYSSegHigh;
} HYS_Seg_Table_st_t;
typedef struct
{
/*参数分段属性表*/
const HYS_Seg_Table_st_t *pstHYSSegTable;
/*默认填0U即可*/
Hys_uint16_t u16HYSReserved;
/*分段属性表长度*/
Hys_uint8_t u8HYSSegTableLen;
/*1U:正序 0U:降序*/
Hys_uint8_t u8HYSSortBy;
} HYS_Attribute_st_t;
typedef struct
{
/*物理量数量，也就是 HYS_NUM_MAX */
Hys_uint8_t u8HYSNum;
} HYS_Init_st_t;
/************************************************************************/
/*30初始化，所有状态重新开始计算*/
void HYS_KL30_Init(Hys_uint8_t *pu8HYSRamData, const HYS_Attribute_st_t *pstHYSAttribute, HYS_Init_st_t *pstHYSInit);
/*唤醒初始化，会保持休眠唤醒前的状态*/
void HYS_Wakeup_Init(Hys_uint8_t *pu8HYSRamData, const HYS_Attribute_st_t *pstHYSAttribute, HYS_Init_st_t *pstHYSInit);
/*输入对应索引的物理量参数*/
HYS_Operate_Type_en_t HYS_Physical_Quantity_Input(HYS_Num_en_t enHYSIndex, Hys_uint16_t u16HYSPhysValue);
/*获取分段结果，返回0xFF表示无效*/
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
Firmware/Source/Component/AMT630H/AMT630H.c
View file @ 67e2db5a
......@@ -48,131 +48,84 @@ static uint16_t AMT630H_Animation_DispPic = 0;
static uint16_t AMT630H_Animation_RefreshTime = 0;
static uint32_t AMT630H_Animation_RefreshTime_default = 0;
static const uint16_t BootAnimationList[AMT630H_ANIMATION_PIC_NUM] = {
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0859_0_0,
Pic_0859_0_0,
Pic_0859_0_0,
Pic_0859_0_0,
Pic_0858_0_0,
Pic_0857_0_0,
Pic_0856_0_0,
Pic_0855_0_0,
Pic_0854_0_0,
Pic_0853_0_0,
Pic_0852_0_0,
Pic_0851_0_0,
Pic_0850_0_0,
Pic_0849_0_0,
Pic_0848_0_0,
Pic_0847_0_0,
Pic_0846_0_0,
Pic_0845_0_0,
Pic_0844_0_0,
Pic_0843_0_0,
Pic_0842_0_0,
Pic_0841_0_0,
Pic_0840_0_0,
Pic_0839_0_0,
Pic_0838_0_0,
Pic_0837_0_0,
Pic_0836_0_0,
Pic_0835_0_0,
Pic_0834_0_0,
Pic_0833_0_0,
Pic_0832_0_0,
Pic_0831_0_0,
Pic_0830_0_0,
Pic_0829_0_0,
Pic_0828_0_0,
Pic_0827_0_0,
Pic_0826_0_0,
Pic_0825_0_0,
Pic_0824_0_0,
Pic_0823_0_0,
Pic_0822_0_0,
Pic_0821_0_0,
Pic_0820_0_0,
Pic_0819_0_0,
Pic_0818_0_0,
Pic_0817_0_0,
Pic_0816_0_0,
Pic_0815_0_0,
Pic_0814_0_0,
Pic_0813_0_0,
Pic_0812_0_0,
Pic_0811_0_0,
Pic_0810_0_0,
Pic_0809_0_0,
Pic_0808_0_0,
Pic_0807_0_0,
Pic_0806_0_0,
Pic_0805_0_0,
Pic_0804_0_0,
Pic_0803_0_0,
Pic_0802_0_0,
Pic_0801_0_0,
Pic_0800_0_0,
Pic_0799_0_0,
Pic_0798_0_0,
Pic_0797_0_0,
Pic_0796_0_0,
Pic_0795_0_0,
Pic_0794_0_0,
Pic_0793_0_0,
Pic_0792_0_0,
Pic_0791_0_0,
Pic_0790_0_0,
Pic_0789_0_0,
Pic_0788_0_0,
Pic_0787_0_0,
Pic_0786_0_0,
Pic_0785_0_0,
Pic_0784_0_0,
Pic_0783_0_0,
Pic_0782_0_0,
Pic_0781_0_0,
Pic_0780_0_0,
Pic_0779_0_0,
Pic_0778_0_0,
Pic_0777_0_0,
Pic_0776_0_0,
Pic_0775_0_0,
Pic_0774_0_0,
Pic_0773_0_0,
Pic_0772_0_0,
Pic_0771_0_0,
Pic_0770_0_0,
Pic_0769_0_0,
Pic_0768_0_0,
Pic_0767_0_0,
Pic_0766_0_0,
Pic_0765_0_0,
Pic_0764_0_0,
Pic_0763_0_0,
Pic_0762_0_0,
Pic_0761_0_0,
Pic_0760_0_0,
Pic_0759_0_0,
Pic_0758_0_0,
Pic_0001_0_0
Pic_1055_0_0,
Pic_1056_0_0,
Pic_1057_0_0,
Pic_1058_0_0,
Pic_1059_0_0,
Pic_1060_0_0,
Pic_1061_0_0,
Pic_1062_0_0,
Pic_1063_0_0,
Pic_1064_0_0,
Pic_1065_0_0,
Pic_1066_0_0,
Pic_1067_0_0,
Pic_1068_0_0,
Pic_1069_0_0,
Pic_1070_0_0,
Pic_1071_0_0,
Pic_1072_0_0,
Pic_1073_0_0,
Pic_1074_0_0,
Pic_1075_0_0,
Pic_1076_0_0,
Pic_1077_0_0,
Pic_1078_0_0,
Pic_1079_0_0,
Pic_1080_0_0,
Pic_1081_0_0,
Pic_1082_0_0,
Pic_1083_0_0,
Pic_1084_0_0,
Pic_1085_0_0,
Pic_1086_0_0,
Pic_1087_0_0,
Pic_1088_0_0,
Pic_1089_0_0,
Pic_1090_0_0,
Pic_1091_0_0,
Pic_1092_0_0,
Pic_1093_0_0,
Pic_1094_0_0,
Pic_1095_0_0,
Pic_1096_0_0,
Pic_1097_0_0,
Pic_1098_0_0,
Pic_1099_0_0,
Pic_1100_0_0,
Pic_1101_0_0,
Pic_1102_0_0,
Pic_1103_0_0,
Pic_1104_0_0,
Pic_1105_0_0,
Pic_1106_0_0,
Pic_1107_0_0,
Pic_1108_0_0,
Pic_1109_0_0,
Pic_1110_0_0,
Pic_1111_0_0,
Pic_1112_0_0,
Pic_1113_0_0,
Pic_1114_0_0,
Pic_1115_0_0,
Pic_1116_0_0,
Pic_1117_0_0,
Pic_1118_0_0,
Pic_1119_0_0,
Pic_1120_0_0,
Pic_1121_0_0,
Pic_1122_0_0,
Pic_1123_0_0,
Pic_1124_0_0,
Pic_1125_0_0,
Pic_1125_0_0,
Pic_1125_0_0,
Pic_1125_0_0,
Pic_1125_0_0,
Pic_1125_0_0,
Pic_1125_0_0,
};
void AMT630H_Animation_PlayProc(uint16_t PicIndex)
{
......@@ -254,12 +207,12 @@ void AMT630H_RstCtrl(void)
RTE_GPIO_Set_Level(VCC1V2_AMT_EN, 1);
Delay_Time_Ctrl(15);
RTE_GPIO_Set_Level(VCC_33_EN_MCU, 1);
Delay_Time_Ctrl(30);
RTE_GPIO_Set_Level(x1530_EN_MCU, 1);//1530
Delay_Time_Ctrl(10);
Delay_Time_Ctrl(45);
RTE_GPIO_Set_Level(MCU_RSTB_LCD, 1);
Delay_Time_Ctrl(15);
RTE_GPIO_Set_Level(STBYB_LCD_MCU, 1);
Delay_Time_Ctrl(10);
RTE_GPIO_Set_Level(x1530_EN_MCU, 1);//1530
}
void Amt630hInit(void)
......@@ -460,7 +413,7 @@ void AMT630H_Main(void)
{
AMT630H_Animation_RefreshTime = 0;
AMT630H_Animation_PlayProc(BootAnimationList[AMT630H_Animation_DispPic]);
AMT630H_Animation_DispPic++;
AMT630H_Animation_DispPic--;
if(AMT630H_Animation_DispPic >= AMT630H_ANIMATION_PIC_NUM)
{
AMT630H_Animation_Finish = 1;
......@@ -499,7 +452,7 @@ unsigned char AMT630H_isInitFinish(void)
void AMT630H_Animation_IGON(void)
{
AMT630H_Animation_Finish = 0;
AMT630H_Animation_DispPic = 0;
AMT630H_Animation_DispPic = 76;
}
unsigned char AMT630H_Animation_Finish_Flage(void)
{
......
Firmware/Source/Component/AMT630H/AMT630H.h
View file @ 67e2db5a
......@@ -21,7 +21,7 @@ typedef struct
#define AMT630H_REFRESH_TIME 50U
#define AMT630H_ANIMATION_TIME 4000U //ms
#define AMT630H_ANIMATION_PIC_NUM 125U
#define AMT630H_ANIMATION_PIC_NUM 77U
#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))
......
Firmware/Source/Component/AMT630H/PicBin.c
View file @ 67e2db5a
......@@ -119,7 +119,30 @@ static const uint16_t PicIndexData[] = {
Pic_0898, 14, 637, 293, Pic_0897, 15, 637, 292, Pic_0919, 11, 640, 293, Pic_0920, 12, 639, 293, Pic_0921, 14, 638, 293, Pic_0922, 14, 638, 292, Pic_0923, 14, 638, 293, Pic_0924, 15, 637, 293, Pic_0925, 221, 501, 160, Pic_0926, 50, 619, 240,
Pic_0926, 50, 619, 175, Pic_0927, 50, 619, 240, Pic_0927, 50, 619, 175, Pic_0928, 75, 894, 310, Pic_0929, 75, 894, 310, Pic_0930, 64, 612, 240, Pic_0930, 64, 612, 175, Pic_0931, 64, 612, 240, Pic_0931, 64, 612, 175, Pic_0932, 777, 124, 85,
Pic_0933, 317, 101, 210, Pic_0934, 209, 102, 260, Pic_0935, 461, 36, 367, Pic_0936, 350, 92, 367, Pic_0937, 323, 564, 521, Pic_0938, 41, 62, 399, Pic_0939, 41, 62, 401, Pic_0940, 155, 53, 498, Pic_0941, 1521, 0, 470, Pic_0942, 46, 634, 551,
Pic_0943, 28, 751, 555,
Pic_0943, 28, 751, 555, Pic_0944, 124, 53, 462, Pic_0945, 1024, 0, 0, Pic_0946, 52, 632, 551, Pic_0947, 12, 709, 533, Pic_0948, 12, 967, 533, Pic_0949, 133, 786, 561, Pic_0950, 228, 485, 251, Pic_0951, 78, 761, 50, Pic_0414, 27, 932, 536,
Pic_0952, 1521, 0, 470, Pic_0953, 106, 103, 570, Pic_0954, 30, 63, 554, Pic_0954, 30, 33, 554, Pic_0955, 10, 73, 554, Pic_0956, 28, 64, 554, Pic_0957, 26, 65, 554, Pic_0958, 32, 62, 554, Pic_0959, 28, 64, 554, Pic_0960, 28, 64, 554,
Pic_0961, 30, 63, 554, Pic_0962, 30, 63, 554, Pic_0963, 28, 64, 554, Pic_0964, 6, 75, 582, Pic_0965, 22, 67, 568, Pic_0954, 30, 250, 553, Pic_0954, 30, 280, 553, Pic_0966, 7, 315, 562, Pic_0954, 30, 327, 553, Pic_0954, 30, 357, 553,
Pic_0955, 10, 367, 553, Pic_0956, 28, 358, 553, Pic_0957, 26, 359, 553, Pic_0958, 32, 356, 553, Pic_0959, 28, 358, 553, Pic_0960, 28, 358, 553, Pic_0961, 30, 357, 553, Pic_0962, 30, 357, 553, Pic_0963, 28, 358, 553, Pic_0964, 6, 369, 581,
Pic_0965, 22, 361, 567, Pic_0967, 52, 632, 551, Pic_0968, 46, 634, 551, Pic_0969, 56, 424, 510, Pic_0969, 56, 484, 510, Pic_0969, 56, 544, 510, Pic_0969, 56, 454, 510, Pic_0969, 56, 514, 510, Pic_0970, 20, 502, 509, Pic_0971, 54, 485, 509,
Pic_0972, 52, 486, 509, Pic_0973, 62, 481, 509, Pic_0974, 56, 484, 509, Pic_0975, 54, 485, 509, Pic_0976, 58, 483, 509, Pic_0977, 56, 484, 509, Pic_0978, 54, 485, 509, Pic_0979, 12, 506, 563, Pic_0980, 42, 491, 536, Pic_0981, 12, 314, 533,
Pic_0982, 234, 74, 533, Pic_0983, 234, 74, 533, Pic_0984, 21, 26, 529, Pic_0985, 12, 709, 533, Pic_0982, 234, 727, 533, Pic_0983, 234, 727, 533, Pic_0986, 30, 981, 528, Pic_0987, 133, 786, 561, Pic_0988, 11, 847, 561, Pic_0989, 10, 848, 561,
Pic_0990, 11, 847, 561, Pic_0991, 11, 847, 561, Pic_0992, 11, 847, 561, Pic_0993, 11, 847, 561, Pic_0994, 11, 847, 561, Pic_0995, 11, 847, 561, Pic_0996, 11, 847, 561, Pic_0997, 11, 847, 561, Pic_0998, 3, 851, 575, Pic_0999, 7, 849, 571,
Pic_1000, 13, 717, 516, Pic_1001, 11, 683, 516, Pic_1001, 11, 693, 516, Pic_1002, 3, 704, 526, Pic_1001, 11, 707, 516, Pic_1000, 13, 712, 516, Pic_1001, 11, 688, 516, Pic_1002, 3, 699, 526, Pic_1001, 11, 702, 516, Pic_1003, 4, 692, 516,
Pic_1004, 10, 689, 516, Pic_1005, 9, 689, 516, Pic_1006, 11, 688, 516, Pic_1007, 10, 689, 516, Pic_1008, 9, 689, 516, Pic_1009, 11, 688, 516, Pic_1010, 11, 688, 516, Pic_1011, 9, 689, 516, Pic_1002, 3, 692, 526, Pic_1012, 8, 690, 521,
Pic_1013, 1024, 0, 0, Pic_1014, 163, 178, 130, Pic_1015, 49, 188, 310, Pic_1016, 11, 242, 313, Pic_1017, 3, 255, 326, Pic_1016, 11, 260, 313, Pic_1017, 3, 272, 326, Pic_1016, 11, 277, 313, Pic_1017, 3, 289, 326, Pic_1016, 11, 294, 313,
Pic_1016, 11, 253, 313, Pic_1017, 3, 266, 326, Pic_1016, 11, 271, 313, Pic_1016, 11, 282, 313, Pic_1017, 3, 295, 326, Pic_1016, 11, 300, 313, Pic_1016, 11, 311, 313, Pic_1017, 3, 324, 326, Pic_1016, 11, 329, 313, Pic_1016, 11, 340, 313,
Pic_1018, 9, 295, 313, Pic_1019, 11, 294, 313, Pic_1020, 11, 294, 313, Pic_1021, 11, 294, 313, Pic_1022, 11, 294, 313, Pic_1023, 10, 295, 313, Pic_1024, 10, 295, 313, Pic_1025, 11, 294, 313, Pic_1026, 11, 294, 313, Pic_1017, 3, 298, 326,
Pic_1027, 7, 296, 322, Pic_1028, 49, 188, 343, Pic_1029, 61, 243, 344, Pic_1030, 62, 242, 344, Pic_1031, 302, 410, 144, Pic_1032, 274, 655, 197, Pic_1033, 233, 410, 197, Pic_1034, 228, 485, 251, Pic_1035, 71, 411, 252, Pic_1036, 21, 32, 15,
Pic_1037, 19, 66, 16, Pic_1038, 17, 67, 15, Pic_1039, 19, 66, 16, Pic_1040, 3, 508, 22, Pic_1041, 9, 485, 17, Pic_1041, 9, 497, 17, Pic_1041, 9, 513, 17, Pic_1041, 9, 525, 17, Pic_1042, 9, 525, 17, Pic_1043, 10, 524, 17,
Pic_1044, 10, 524, 17, Pic_1045, 11, 524, 17, Pic_1046, 10, 524, 17, Pic_1047, 10, 525, 17, Pic_1048, 10, 525, 17, Pic_1049, 11, 524, 17, Pic_1050, 10, 524, 17, Pic_1051, 3, 528, 30, Pic_1052, 5, 527, 26, Pic_1053, 37, 955, 14,
Pic_1054, 29, 958, 18, Pic_1055, 1040, 0, 0, Pic_1056, 1040, 0, 0, Pic_1057, 1040, 0, 0, Pic_1058, 1040, 0, 0, Pic_1059, 1040, 0, 0, Pic_1060, 1040, 0, 0, Pic_1061, 1040, 0, 0, Pic_1062, 1040, 0, 0, Pic_1063, 1040, 0, 0,
Pic_1064, 1040, 0, 0, Pic_1065, 1040, 0, 0, Pic_1066, 1040, 0, 0, Pic_1067, 1040, 0, 0, Pic_1068, 1040, 0, 0, Pic_1069, 1040, 0, 0, Pic_1070, 1040, 0, 0, Pic_1071, 1040, 0, 0, Pic_1072, 1040, 0, 0, Pic_1073, 1040, 0, 0,
Pic_1074, 1040, 0, 0, Pic_1075, 1040, 0, 0, Pic_1076, 1040, 0, 0, Pic_1077, 1040, 0, 0, Pic_1078, 1040, 0, 0, Pic_1079, 1040, 0, 0, Pic_1080, 1040, 0, 0, Pic_1081, 1040, 0, 0, Pic_1082, 1040, 0, 0, Pic_1083, 1040, 0, 0,
Pic_1084, 1040, 0, 0, Pic_1085, 1040, 0, 0, Pic_1086, 1040, 0, 0, Pic_1087, 1040, 0, 0, Pic_1088, 1040, 0, 0, Pic_1089, 1040, 0, 0, Pic_1090, 1040, 0, 0, Pic_1091, 1040, 0, 0, Pic_1092, 1040, 0, 0, Pic_1093, 1040, 0, 0,
Pic_1094, 1040, 0, 0, Pic_1095, 1040, 0, 0, Pic_1096, 1040, 0, 0, Pic_1097, 1040, 0, 0, Pic_1098, 1040, 0, 0, Pic_1099, 1040, 0, 0, Pic_1100, 1040, 0, 0, Pic_1101, 1040, 0, 0, Pic_1102, 1040, 0, 0, Pic_1103, 1040, 0, 0,
Pic_1104, 1040, 0, 0, Pic_1105, 1040, 0, 0, Pic_1106, 1040, 0, 0, Pic_1107, 1040, 0, 0, Pic_1108, 1040, 0, 0, Pic_1109, 1040, 0, 0, Pic_1110, 1040, 0, 0, Pic_1111, 1040, 0, 0, Pic_1112, 1040, 0, 0, Pic_1113, 1040, 0, 0,
Pic_1114, 1040, 0, 0, Pic_1115, 1040, 0, 0, Pic_1116, 1040, 0, 0, Pic_1117, 1040, 0, 0, Pic_1118, 1040, 0, 0, Pic_1119, 1040, 0, 0, Pic_1120, 1040, 0, 0, Pic_1121, 1040, 0, 0, Pic_1122, 1040, 0, 0, Pic_1123, 1040, 0, 0,
Pic_1124, 1040, 0, 0, Pic_1125, 1040, 0, 0,
};
#define PicIndexData_LEN 14888
//uint32_t PicIndexDataLEN = 0;
......
Firmware/Source/Component/AMT630H/PicBin.h
View file @ 67e2db5a
#ifndef PICBIN_H
#define PICBIN_H
/* Flash Bin Version:20240924 2024-09-24 11:37:38 Compression ratio:70.00% */
/* Flash Bin Version:20241014 2024-10-14 11:24:42 Compression ratio:70.00% */
#define Pic_0001 1
#define Pic_0002 2
#define Pic_0003 3
......@@ -945,6 +945,188 @@
#define Pic_0941 941
#define Pic_0942 942
#define Pic_0943 943
#define Pic_0944 944
#define Pic_0945 945
#define Pic_0946 946
#define Pic_0947 947
#define Pic_0948 948
#define Pic_0949 949
#define Pic_0950 950
#define Pic_0951 951
#define Pic_0952 952
#define Pic_0953 953
#define Pic_0954 954
#define Pic_0955 955
#define Pic_0956 956
#define Pic_0957 957
#define Pic_0958 958
#define Pic_0959 959
#define Pic_0960 960
#define Pic_0961 961
#define Pic_0962 962
#define Pic_0963 963
#define Pic_0964 964
#define Pic_0965 965
#define Pic_0966 966
#define Pic_0967 967
#define Pic_0968 968
#define Pic_0969 969
#define Pic_0970 970
#define Pic_0971 971
#define Pic_0972 972
#define Pic_0973 973
#define Pic_0974 974
#define Pic_0975 975
#define Pic_0976 976
#define Pic_0977 977
#define Pic_0978 978
#define Pic_0979 979
#define Pic_0980 980
#define Pic_0981 981
#define Pic_0982 982
#define Pic_0983 983
#define Pic_0984 984
#define Pic_0985 985
#define Pic_0986 986
#define Pic_0987 987
#define Pic_0988 988
#define Pic_0989 989
#define Pic_0990 990
#define Pic_0991 991
#define Pic_0992 992
#define Pic_0993 993
#define Pic_0994 994
#define Pic_0995 995
#define Pic_0996 996
#define Pic_0997 997
#define Pic_0998 998
#define Pic_0999 999
#define Pic_1000 1000
#define Pic_1001 1001
#define Pic_1002 1002
#define Pic_1003 1003
#define Pic_1004 1004
#define Pic_1005 1005
#define Pic_1006 1006
#define Pic_1007 1007
#define Pic_1008 1008
#define Pic_1009 1009
#define Pic_1010 1010
#define Pic_1011 1011
#define Pic_1012 1012
#define Pic_1013 1013
#define Pic_1014 1014
#define Pic_1015 1015
#define Pic_1016 1016
#define Pic_1017 1017
#define Pic_1018 1018
#define Pic_1019 1019
#define Pic_1020 1020
#define Pic_1021 1021
#define Pic_1022 1022
#define Pic_1023 1023
#define Pic_1024 1024
#define Pic_1025 1025
#define Pic_1026 1026
#define Pic_1027 1027
#define Pic_1028 1028
#define Pic_1029 1029
#define Pic_1030 1030
#define Pic_1031 1031
#define Pic_1032 1032
#define Pic_1033 1033
#define Pic_1034 1034
#define Pic_1035 1035
#define Pic_1036 1036
#define Pic_1037 1037
#define Pic_1038 1038
#define Pic_1039 1039
#define Pic_1040 1040
#define Pic_1041 1041
#define Pic_1042 1042
#define Pic_1043 1043
#define Pic_1044 1044
#define Pic_1045 1045
#define Pic_1046 1046
#define Pic_1047 1047
#define Pic_1048 1048
#define Pic_1049 1049
#define Pic_1050 1050
#define Pic_1051 1051
#define Pic_1052 1052
#define Pic_1053 1053
#define Pic_1054 1054
#define Pic_1055 1055
#define Pic_1056 1056
#define Pic_1057 1057
#define Pic_1058 1058
#define Pic_1059 1059
#define Pic_1060 1060
#define Pic_1061 1061
#define Pic_1062 1062
#define Pic_1063 1063
#define Pic_1064 1064
#define Pic_1065 1065
#define Pic_1066 1066
#define Pic_1067 1067
#define Pic_1068 1068
#define Pic_1069 1069
#define Pic_1070 1070
#define Pic_1071 1071
#define Pic_1072 1072
#define Pic_1073 1073
#define Pic_1074 1074
#define Pic_1075 1075
#define Pic_1076 1076
#define Pic_1077 1077
#define Pic_1078 1078
#define Pic_1079 1079
#define Pic_1080 1080
#define Pic_1081 1081
#define Pic_1082 1082
#define Pic_1083 1083
#define Pic_1084 1084
#define Pic_1085 1085
#define Pic_1086 1086
#define Pic_1087 1087
#define Pic_1088 1088
#define Pic_1089 1089
#define Pic_1090 1090
#define Pic_1091 1091
#define Pic_1092 1092
#define Pic_1093 1093
#define Pic_1094 1094
#define Pic_1095 1095
#define Pic_1096 1096
#define Pic_1097 1097
#define Pic_1098 1098
#define Pic_1099 1099
#define Pic_1100 1100
#define Pic_1101 1101
#define Pic_1102 1102
#define Pic_1103 1103
#define Pic_1104 1104
#define Pic_1105 1105
#define Pic_1106 1106
#define Pic_1107 1107
#define Pic_1108 1108
#define Pic_1109 1109
#define Pic_1110 1110
#define Pic_1111 1111
#define Pic_1112 1112
#define Pic_1113 1113
#define Pic_1114 1114
#define Pic_1115 1115
#define Pic_1116 1116
#define Pic_1117 1117
#define Pic_1118 1118
#define Pic_1119 1119
#define Pic_1120 1120
#define Pic_1121 1121
#define Pic_1122 1122
#define Pic_1123 1123
#define Pic_1124 1124
#define Pic_1125 1125
enum {
Pic_0001_0_0 = 0,
......@@ -2133,10 +2315,247 @@ enum {
Pic_0941_0_470,
Pic_0942_634_551,
Pic_0943_751_555,
Pic_0944_53_462,
Pic_0945_0_0,
Pic_0946_632_551,
Pic_0947_709_533,
Pic_0948_967_533,
Pic_0949_786_561,
Pic_0950_485_251,
Pic_0951_761_50,
Pic_0414_932_536,
Pic_0952_0_470,
Pic_0953_103_570,
Pic_0954_63_554,
Pic_0954_33_554,
Pic_0955_73_554,
Pic_0956_64_554,
Pic_0957_65_554,
Pic_0958_62_554,
Pic_0959_64_554,
Pic_0960_64_554,
Pic_0961_63_554,
Pic_0962_63_554,
Pic_0963_64_554,
Pic_0964_75_582,
Pic_0965_67_568,
Pic_0954_250_553,
Pic_0954_280_553,
Pic_0966_315_562,
Pic_0954_327_553,
Pic_0954_357_553,
};
enum {
Pic_0955_367_553 = 1200,
Pic_0956_358_553,
Pic_0957_359_553,
Pic_0958_356_553,
Pic_0959_358_553,
Pic_0960_358_553,
Pic_0961_357_553,
Pic_0962_357_553,
Pic_0963_358_553,
Pic_0964_369_581,
Pic_0965_361_567,
Pic_0967_632_551,
Pic_0968_634_551,
Pic_0969_424_510,
Pic_0969_484_510,
Pic_0969_544_510,
Pic_0969_454_510,
Pic_0969_514_510,
Pic_0970_502_509,
Pic_0971_485_509,
Pic_0972_486_509,
Pic_0973_481_509,
Pic_0974_484_509,
Pic_0975_485_509,
Pic_0976_483_509,
Pic_0977_484_509,
Pic_0978_485_509,
Pic_0979_506_563,
Pic_0980_491_536,
Pic_0981_314_533,
Pic_0982_74_533,
Pic_0983_74_533,
Pic_0984_26_529,
Pic_0985_709_533,
Pic_0982_727_533,
Pic_0983_727_533,
Pic_0986_981_528,
Pic_0987_786_561,
Pic_0988_847_561,
Pic_0989_848_561,
Pic_0990_847_561,
Pic_0991_847_561,
Pic_0992_847_561,
Pic_0993_847_561,
Pic_0994_847_561,
Pic_0995_847_561,
Pic_0996_847_561,
Pic_0997_847_561,
Pic_0998_851_575,
Pic_0999_849_571,
Pic_1000_717_516,
Pic_1001_683_516,
Pic_1001_693_516,
Pic_1002_704_526,
Pic_1001_707_516,
Pic_1000_712_516,
Pic_1001_688_516,
Pic_1002_699_526,
Pic_1001_702_516,
Pic_1003_692_516,
Pic_1004_689_516,
Pic_1005_689_516,
Pic_1006_688_516,
Pic_1007_689_516,
Pic_1008_689_516,
Pic_1009_688_516,
Pic_1010_688_516,
Pic_1011_689_516,
Pic_1002_692_526,
Pic_1012_690_521,
Pic_1013_0_0,
Pic_1014_178_130,
Pic_1015_188_310,
Pic_1016_242_313,
Pic_1017_255_326,
Pic_1016_260_313,
Pic_1017_272_326,
Pic_1016_277_313,
Pic_1017_289_326,
Pic_1016_294_313,
Pic_1016_253_313,
Pic_1017_266_326,
Pic_1016_271_313,
Pic_1016_282_313,
Pic_1017_295_326,
Pic_1016_300_313,
Pic_1016_311_313,
Pic_1017_324_326,
Pic_1016_329_313,
Pic_1016_340_313,
Pic_1018_295_313,
Pic_1019_294_313,
Pic_1020_294_313,
Pic_1021_294_313,
Pic_1022_294_313,
Pic_1023_295_313,
Pic_1024_295_313,
Pic_1025_294_313,
Pic_1026_294_313,
Pic_1017_298_326,
Pic_1027_296_322,
Pic_1028_188_343,
Pic_1029_243_344,
Pic_1030_242_344,
Pic_1031_410_144,
Pic_1032_655_197,
Pic_1033_410_197,
Pic_1034_485_251,
Pic_1035_411_252,
Pic_1036_32_15,
Pic_1037_66_16,
Pic_1038_67_15,
Pic_1039_66_16,
Pic_1040_508_22,
Pic_1041_485_17,
Pic_1041_497_17,
Pic_1041_513_17,
Pic_1041_525_17,
Pic_1042_525_17,
Pic_1043_524_17,
Pic_1044_524_17,
Pic_1045_524_17,
Pic_1046_524_17,
Pic_1047_525_17,
Pic_1048_525_17,
Pic_1049_524_17,
Pic_1050_524_17,
Pic_1051_528_30,
Pic_1052_527_26,
Pic_1053_955_14,
Pic_1054_958_18,
Pic_1055_0_0,
Pic_1056_0_0,
Pic_1057_0_0,
Pic_1058_0_0,
Pic_1059_0_0,
Pic_1060_0_0,
Pic_1061_0_0,
Pic_1062_0_0,
Pic_1063_0_0,
Pic_1064_0_0,
Pic_1065_0_0,
Pic_1066_0_0,
Pic_1067_0_0,
Pic_1068_0_0,
Pic_1069_0_0,
Pic_1070_0_0,
Pic_1071_0_0,
Pic_1072_0_0,
Pic_1073_0_0,
Pic_1074_0_0,
Pic_1075_0_0,
Pic_1076_0_0,
Pic_1077_0_0,
Pic_1078_0_0,
Pic_1079_0_0,
Pic_1080_0_0,
Pic_1081_0_0,
Pic_1082_0_0,
Pic_1083_0_0,
Pic_1084_0_0,
Pic_1085_0_0,
Pic_1086_0_0,
Pic_1087_0_0,
Pic_1088_0_0,
Pic_1089_0_0,
Pic_1090_0_0,
Pic_1091_0_0,
Pic_1092_0_0,
Pic_1093_0_0,
Pic_1094_0_0,
Pic_1095_0_0,
Pic_1096_0_0,
Pic_1097_0_0,
Pic_1098_0_0,
Pic_1099_0_0,
Pic_1100_0_0,
Pic_1101_0_0,
Pic_1102_0_0,
Pic_1103_0_0,
Pic_1104_0_0,
Pic_1105_0_0,
Pic_1106_0_0,
Pic_1107_0_0,
Pic_1108_0_0,
Pic_1109_0_0,
Pic_1110_0_0,
Pic_1111_0_0,
Pic_1112_0_0,
Pic_1113_0_0,
Pic_1114_0_0,
Pic_1115_0_0,
Pic_1116_0_0,
Pic_1117_0_0,
Pic_1118_0_0,
Pic_1119_0_0,
Pic_1120_0_0,
Pic_1121_0_0,
Pic_1122_0_0,
Pic_1123_0_0,
};
enum {
Pic_1124_0_0 = 1400,
Pic_1125_0_0,
};
#define PIC_INDEX_DATA_CRC 0x8509F1BE
#define PIC_INDEX_DATA_CRC 0xC0A4A9AD
extern void User_PicIndexDataInit(void);
#endif
Firmware/Source/Component/AMT630H/UartProtocol.h
View file @ 67e2db5a
......@@ -458,7 +458,7 @@ typedef struct
uint8_t BlueToothPhoneName[100];
char PhoneNumber[20];
uint16_t PhoneBookTotalCount;
char BlueToothName[20];
char BlueToothName[30];
}_BlueToothPhoneData;
typedef struct
......@@ -517,9 +517,9 @@ extern uint8_t GetPhoneMirrorst(void) ;
extern void PackedTransfer_EasyNavigation(uint8_t data);
extern void GerProgramVer(uint8_t * bufdata);
extern uint8_t GetErrorInfo();
extern uint8_t GetBACKUUIDSTATE();
extern uint8_t GetBlueToothPowerSTATE();
extern uint8_t GetErrorInfo(void);
extern uint8_t GetBACKUUIDSTATE(void);
extern uint8_t GetBlueToothPowerSTATE(void);
extern void SetBluetoothTurnXX(uint8_t data);
extern void SetScreenType(uint8_t ntype,_QRCODE_RECT rect_st);
......
Firmware/Source/Component/Components.h
View file @ 67e2db5a
......@@ -28,6 +28,7 @@
#include "Data_VSpeed.h"
#include "Data_Coolant.h"
#include "Data_Fuel.h"
#include "Hysteresis.h"
#include "Mileage\Services_Mileage_User.h"
#include "BackLight.h"
#include "RTC\RTE_RTC.h"
......@@ -37,6 +38,7 @@
#include "Telltales\Telltales_Lib.h"
#include "Application\BlueTooth.h"
#include "cgc.h"
#include "UDS\UDS_ISO14229_Services.h"
#endif
Firmware/Source/Component/Key/Key_user.c
View file @ 67e2db5a
......@@ -352,7 +352,7 @@ void TYW_RESET_ODO(void)
{
if(ClearODO_Flag < 1)
{
if((Get_DispVechileSpeed() >= 1500)&&(Get_DispEngineSpeed() >= 12000))
if((Get_DispVechileSpeed() >= 1990)&&(Get_DispEngineSpeed() >= 12000))
{
ClearODO_Flag = 1;
Data_Mileage_Clear();
......
Firmware/Source/Component/Line_In/Line_In_user.c
View file @ 67e2db5a
......@@ -7,12 +7,12 @@ const Line_In_Attribute_st g_stLineInAttribute[LINE_IN_MAX] =
{
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Turn_Left, },/*P10*/
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Turn_Right, },/*P9*/
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 60U, 20U, Get_LINE_IN_High_Beam, },/*P18*/
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 100U, 20U, Get_LINE_IN_Efi_Fault, },/*P15*/
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_ABS, },/*P7*/
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Auto_Start_Stop, },/*P12*/
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Oil_Pressure_Alert, },/*P21*/
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 20U, 20U, Get_LINE_IN_Coolant_Temperature }, /*P11*/
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 40U, 20U, Get_LINE_IN_High_Beam, },/*P18*/
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 125U, 20U, Get_LINE_IN_Efi_Fault, },/*P15*/
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 125U, 0U, Get_LINE_IN_ABS, },/*P7*/
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 125U, 20U, Get_LINE_IN_Auto_Start_Stop, },/*P12*/
{LEVEL_HIGH, LEVEL_LOW, LINE_IN_IG_ON, 2000U, 20U, Get_LINE_IN_Oil_Pressure_Alert, },/*P21*/
{LEVEL_LOW, LEVEL_HIGH, LINE_IN_IG_ON, 125U, 20U, Get_LINE_IN_Coolant_Temperature }, /*P11*/
};
Linelib_uint8_t Get_LINE_IN_Turn_Left(void)
{
......
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @ 67e2db5a
......@@ -72,6 +72,7 @@ static void Power_KL30_Init(void)
RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN, Trigger_Rising);
FaultCode_Init();
TEMP_KL30_Init();
}
static void Power_Wakeup_Init(void)
......@@ -106,6 +107,7 @@ static void Power_Wakeup_Init(void)
Protocol_KL30_Wakeup_Init();
RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN, Trigger_Rising);
FaultCode_Init();
TEMP_KL30_Init();
}
static void Power_LVP_Init(void)
......@@ -129,8 +131,10 @@ static void Power_IG_ON_Init(void)
Line_In_KL15_ON_Init();
Telltales_KL15_Init();
Fuel_KL15_Init();
TEMP_KL15_Init();
//RTE_GPIO_Set_Level(Blacklight_PWM, 1);
FaultCode_Init();
mwAmt630hUartSendDatainit();
AMT630H_Animation_IGON();
// Amt630hInit();
AMT630H_GUI_SELFCHECK_STS_INIT();
......@@ -184,7 +188,7 @@ static Power_Status_em Power_Stay_OFF(void)
}
else
{
if ((Common_GetIgnOffTime() < 3000))
if ((Common_GetIgnOffTime() < 5000))
{
u8PowerSts = EM_IGN_OFF;
}
......
Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/CAN/rte_can.c
View file @ 67e2db5a
......@@ -34,7 +34,7 @@ static void can_recv_handler(void)
CAN_Receive_IT(CAN0, &CanBufList);
Read_RingBuff(&CAN_RecvMsg);
CAN_Receive(CAN0,&CAN_RecvMsg,100);
// CAN_Receive(CAN0,&CAN_RecvMsg,100);
if (can_rx_handler != NULL)
{
can_rx_handler(&CAN_RecvMsg);
......@@ -107,7 +107,7 @@ uint8_t rte_can_init(can_config_st_t *config)
// ISR_Register(CAN0TRX_IRQn, can_tx_handler);
ISR_Register(CAN0ERR_IRQn, can_error_handler);
// ISR_Register(CAN0ERR_IRQn, can_error_handler);/*进入bussoff后，不使用驱动给的错误中断*/
// ISR_DisRegister(CAN0REC_IRQn, can_recv_handler);
......
Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/UART/RTE_UART.c
View file @ 67e2db5a
......@@ -321,6 +321,15 @@ void mwAmt630hUartSendIsr(void)
mwAmt630hSerialSendValid = 0;
}
}
void mwAmt630hUartSendDatainit(void)
{
memset(mwAmt630hSerialSendBuffer,00,sizeof(mwAmt630hSerialSendBuffer));
mwAmt630hSerialDataIndex = 0;
mwAmt630hSerialSendCnts = 0;
mwAmt630hSerialSendFillCnts = 0;
mwAmt630hSerialSendValid = 0;
}
/*
Data：要发送数据的指针，
请确认是全局变量的指针，且指向的数据在发送完成之前不会被改变。
......
Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/UART/RTE_UART.h
View file @ 67e2db5a
......@@ -59,5 +59,6 @@ extern uint32_t RTE_UART_Init(UART_Channel_en_t enUARTCh, UART_Channel_Config_st
extern void RTE_UART_Sleep_Init(UART_Channel_en_t enUARTCh);
extern void mwAmt630hUartSendData(uint8_t *data, uint32_t length);
extern void mwAmt630hUartSendIsr(void);
extern void mwAmt630hUartSendDatainit(void);
#endif
Firmware/Source/System/Sys_Task_List.c
View file @ 67e2db5a
......@@ -33,6 +33,7 @@ void Sys_5ms_Tasks(void)
void Sys_10ms_Tasks(void)
{
Can_BusOff_Recover(10);
FaultCode_Service(10u);
Line_In_Debounce_Service(10u);
My_Key_Service();
......@@ -40,7 +41,6 @@ void Sys_10ms_Tasks(void)
Key_Clear_Time();
Key_TimeOut_Service();
Fuel_R_Cal(10u);
Coolant_R_Cal(10u);
Data_Light_Res_service(10);
BackLight_Process();
}
......@@ -49,6 +49,7 @@ void Sys_20ms_Tasks(void)
{
Data_Vehicle_Speed_Processing_Service();
Data_Engine_Speed_Processing_Service();
Data_Coolant_Temp_Processing_Service();
}
void Sys_50ms_Tasks(void)
......@@ -82,7 +83,6 @@ void Sys_100ms_Tasks(void)
S3_ServerCNTT();
Get_DisTime_Service();
Fuel_Cal_Sevice(100u);
Coolant_Cal_Sevice(100u);
Services_Mileage_Callback();
// Data_Mileage_Clear();
RTE_GPIO_Config(RTE_GPIO_PORT05_PIN04, GpioOut_High);
......
Firmware/Source/UDS/UDS_ISO14229_Services.h
View file @ 67e2db5a
......@@ -29,12 +29,12 @@
/******************************************************************************
program version
*******************************************************************************/
#define SWV 0x106 // 0x100 = 1.00 software version 软件版本号
#define SWV 0x108 // 0x100 = 1.00 software version 软件版本号
#define HWV 0x110 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x104 // 0x100 = 1.00 bootloader version boot程序版本号
#define internal_version (106UL) /* 内部版本号 105 -> 1.05 */
#define internal_date (20240915UL) /* 内部版本日期 20240805 -> 2024.08.05 */
#define internal_version (108UL) /* 内部版本号 105 -> 1.05 */
#define internal_date (20241015UL) /* 内部版本日期 20240805 -> 2024.08.05 */
/**
*DFlash
......@@ -348,6 +348,7 @@ typedef struct
// uint8_t fill_data[17]; /* 用于保证该结构体长度是4的倍数 */
} Diag_Write_Data_t;
extern Diag_Write_Data_t Diag_Write_Data;
extern void UDS_Service_10_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A_Data);
extern void UDS_Service_11_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A_Data);
......
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