Skip to content

H
haoJin750TFT
Commit 6f299668 authored by 时昊's avatar 时昊
Browse files
Options

Merge branch 'shihao' into 'dev' 

Shihao

See merge request !3
parents 93d3f63c 0863b27f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3745 additions and 16212 deletions
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx
View file @ 6f299668
......@@ -623,6 +623,16 @@
<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>
......
Firmware/Source/Application/GpioUser.h
View file @ 6f299668
......@@ -35,7 +35,7 @@
#define SWDIO_JTMS RTE_GPIO_PORT04_PIN00
#define Start_stop_MCU RTE_GPIO_PORT04_PIN01
#define Select_button_MCU RTE_GPIO_PORT04_PIN02
#define KEY_SELECT_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 SWITCH_MCU RTE_GPIO_PORT05_PIN05
#define KEY_OK_MCU RTE_GPIO_PORT05_PIN05
#define IIC_SCL_24G16 RTE_GPIO_PORT06_PIN00
#define IIC_SDA_24G16 RTE_GPIO_PORT06_PIN01
......
Firmware/Source/Component/Components.h
View file @ 6f299668
......@@ -27,5 +27,6 @@
#include "Data_ESpeed.h"
#include "Data_VSpeed.h"
#include "BackLight.h"
#include "RTC\RTE_RTC.h"
#endif
Firmware/Source/Component/Key/Key_user.c
View file @ 6f299668
This diff is collapsed.
Firmware/Source/Component/Key/Key_user.h
View file @ 6f299668
......@@ -32,36 +32,23 @@ typedef enum
typedef struct
{
uint8_t Set_Hour;
uint8_t Set_Minute;
uint8_t Dis_Hour;
uint8_t Dis_Minute;
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 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);
......@@ -70,13 +57,22 @@ 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_Check_Service(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);
#endif
Firmware/Source/Component/Menu/Menu.h
View file @ 6f299668
......@@ -34,64 +34,87 @@ typedef unsigned int Menu_uint32_t;
*/
typedef enum
{
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_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_BLUETOOTH_CONNECT, /*11 蓝牙连接*/
MENU_ITEM_BLUETOOTH_OPEN, /*12 蓝牙_开*/
MENU_ITEM_BLUETOOTH_CLOSE, /*13 蓝牙_关*/
MENU_ITEM_BLUETOOTH_BACK, /*14 蓝牙返回*/
MENU_ITEM_SELECT_DAYTIME, /*01 选中日间*/
MENU_ITEM_SELECT_NIGHTTIME, /*02 选中夜间*/
MENU_ITEM_SELECT_AUTO, /*03 选中自动*/
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_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_BLUETOOTH_OPEN_CLOSE, /*12 蓝牙_开*/
MENU_ITEM_BLUETOOTH_SYNC, /*13 蓝牙同步联系人*/
MENU_ITEM_BLUETOOTH_BACK, /*14 蓝牙返回*/
MENU_ITEM_UNIT_SETTING, /*21 单位设置*/
MENU_ITEM_UNIT_KM, /*22 选中公制*/
MENU_ITEM_UNIT_MILE, /*23 选中英制*/
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_LANGUAGE_SETTING, /*24 语言设置*/
MENU_ITEM_LANGUAGE_CHINESE, /*25 选中中文*/
MENU_ITEM_LANGUAGE_ENGLISH, /*26 选中英文*/
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_FAULT_INFORMATION, /*27 故障信息*/
MENU_ITEM_UNIT_KM, /*22 选中公制*/
MENU_ITEM_UNIT_MILE, /*23 选中英制*/
MENU_ITEM_LANGUAGE_CHINESE, /*25 选中中文*/
MENU_ITEM_LANGUAGE_ENGLISH, /*26 选中英文*/
MENU_ITEM_PHONE_CONNECT, /*28 手机互联*/
MENU_ITEM_PHONE_CONNECT_WIN, /*28 手机互联成功*/
MENU_ITEM_QUIT, /*29 退出*/
MENU_ITEM_MAX,
MENU_ITEM_PHONE_CONNECT_SET,
MENU_ITEM_PHONE_CONNECT_APP, /*28 手机互联成功*/
MENU_ITEM_MAX,
} Menu_Item_en_t;
/*所有菜单界面的枚举*/
typedef enum
{
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_MAIN_INTF = 0,
MENU_INTF_FAULT_INFORMATION, /*故障信息*/
MENU_INTF_MODE,
MENU_INTF_PHONE_CONNECT, /*手机互联*/
MENU_INTF_DISPLAY_MODE, /*显示模式*/
MENU_INTF_BACKLIGHT_SETTING, /*背光设置*/
MENU_INTF_BLUETOOTH_CONNECT, /*蓝牙连接*/
MENU_INTF_CLOCK_SETTING, /*时钟设置*/
MENU_INTF_QUIT, /*退出*/
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_INTERFACE_MAX,
} Menu_Interface_en_t;
/*所有菜单分支*/
......@@ -398,6 +421,8 @@ 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);
/*-----------------------------------------------------------------------------------*/
/*-----------------------------------------------------------------------------------*/
/*-----------------------------------------------------------------------------------*/
......
Firmware/Source/Component/PowerManagement/PowerManag_user.c
View file @ 6f299668
#include "PowerManagement.h"
#include "Components.h"
//RTC_Information_st_t g_stRTCInformation;
RTC_Information_st_t g_stRTCInformation;
static void Power_KL30_Init(void);
static void Power_Wakeup_Init(void);
......@@ -10,14 +10,11 @@ static void Power_OVP_Init(void);
static void Power_IG_OFF_Init(void);
static void Power_IG_ON_Init(void);
static void Power_Sleep_Init(void);
static Power_Status_em Power_Stay_ON(void);
static Power_Status_em Power_Stay_OFF(void);
static Power_Status_em Power_Stay_Protect(void);
static Power_Status_em Power_Stay_Sleep(void);
static const st_PowerGroup g_stPwrTasks = {
Power_KL30_Init,
Power_IG_OFF_Init,
......@@ -56,20 +53,19 @@ static void Power_KL30_Init(void)
Data_User_Mileage_KL30Init();
Fuel_KL30_Init();
Amt630hInit();
//Telltales_Init();
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
// g_stRTCInformation.u8RTCSecond = 0;
// g_stRTCInformation.u8RTCMinute = 0;
// g_stRTCInformation.u8RTCHour = 0;
// g_stRTCInformation.u8RTCDayOfMonth = 1;
// g_stRTCInformation.u8RTCMonth = 1;
// g_stRTCInformation.u8RTCYear = 20;
// RTE_RTC_Init(g_stRTCInformation);
// RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
g_stRTCInformation.u8RTCSecond = 0;
g_stRTCInformation.u8RTCMinute = 0;
g_stRTCInformation.u8RTCHour = 0;
g_stRTCInformation.u8RTCDayOfMonth = 1;
g_stRTCInformation.u8RTCMonth = 1;
g_stRTCInformation.u8RTCYear = 20;
//RTE_RTC_Init(g_stRTCInformation);
Menu_User_Init();
Protocol_KL30_Wakeup_Init();
RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN, Trigger_Rising);
}
//extern uint32_t PowerIgnOffTimeLine;
static void Power_Wakeup_Init(void)
......@@ -77,24 +73,24 @@ static void Power_Wakeup_Init(void)
// PowerIgnOffTimeLine = 0;
Gpio_Init(Gpio_WakeUp_Init);
eeprom_StoreInfo_Init();
Analog_Signal_Conv_Init();
Data_User_Mileage_WakeupInit();
Sys_WakeUp_Init();
Data_Vehicle_Speed_KL30_Wakeup_Init();
Data_Engine_Speed_KL30_Wakeup_Init();
LINE_IN_Init();
Key_Wakeup_Init_EXample();
Line_In_KL15_ON_Init();
Fuel_KL30_Init();
Amt630hInit();
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
//Telltales_Init();
// RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
Sys_WakeUp_Init();
Data_Vehicle_Speed_KL30_Wakeup_Init();
Data_Engine_Speed_KL30_Wakeup_Init();
LINE_IN_Init();
Key_Wakeup_Init_EXample();
Line_In_KL15_ON_Init();
Fuel_KL30_Init();
Amt630hInit();
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
//Telltales_Init();
Key_KL30_Init_EXample();
Menu_User_WAKEUP();
Protocol_KL30_Wakeup_Init();
RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN, Trigger_Rising);
}
static void Power_LVP_Init(void)
......@@ -109,7 +105,6 @@ static void Power_OVP_Init(void)
static void Power_IG_OFF_Init(void)
{
Line_In_KL15_OFF_Init();
}
static void Power_IG_ON_Init(void)
......@@ -123,19 +118,15 @@ static void Power_IG_ON_Init(void)
static void Power_Sleep_Init(void)
{
TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 0);
// //RTC_Stop();
// rte_can_deinit(CAN_CH_0);
rte_can_deinit(CAN_CH_0);
TMM0_Stop();
TMM1_Stop();
TMM_All_Stop();
RTE_ADC_DeInit();
// //CGC->CSC = 1 ; //HIOSTOP = 1
RTE_ADC_DeInit();
Gpio_Init(Gpio_Sleep_Init);
AMT630H_Sleep();
Analog_Signal_Conv_Stop();
// RTE_DEEPSLEEP_Enable();
Analog_Signal_Conv_Stop();
RTE_DEEPSLEEP_Enable();
}
static Power_Status_em Power_Stay_ON(void)
......@@ -160,66 +151,75 @@ static Power_Status_em Power_Stay_OFF(void)
Power_Status_em u8PowerSts;
u8PowerSts = EM_IGN_OFF;
if (SYS_OPR_STAT_IGN_ON)
{
u8PowerSts = EM_IGN_ON_Init;
}
else
{
if ((Common_GetIgnOffTime() < 20000))
{
u8PowerSts = EM_IGN_OFF;
}
else
{
u8PowerSts = EM_IGN_Sleep_Init;
}
}
if (SYS_OPR_STAT_IGN_ON)
{
u8PowerSts = EM_IGN_ON_Init;
}
else
{
if ((Common_GetIgnOffTime() < 1000))
{
u8PowerSts = EM_IGN_OFF;
}
else
{
//igoff大于1s且下15电才进休眠,否则一直保持在igoff状态
if(Sys_Read_KL15_Voltage() < 5000)
{
u8PowerSts = EM_IGN_Sleep_Init;
}
}
}
return u8PowerSts;
}
static Power_Status_em Power_Stay_Protect(void)
{
Power_Status_em u8PowerSts;
Power_Status_em u8PowerSts;
// static uint8_t i;
static uint8_t Delaycnt;
static uint8_t Delaycnt;
/* 关闭所有外设，坪保留AD采集，电溝状思切�? */
{
/* 关闭所有外设，坪保留AD采集，电溝状思切�? */
{
TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0);
}
u8PowerSts = EM_IGN_OFF_Init;
/* 电溝模弝正常 */
for ( ;; )
{
RTE_WDT_Clear();
Gen_TimeDelay(2000u, 50u);
Analog_Signal_Conv_Service();
Sys_Status_Update_Service();
if ( SYS_OPR_STAT_RUN )
{
return u8PowerSts;
}
}
}
u8PowerSts = EM_IGN_OFF_Init;
/* 电溝模弝正常 */
for ( ;; )
{
RTE_WDT_Clear();
Gen_TimeDelay(2000u, 50u);
Analog_Signal_Conv_Service();
Sys_Status_Update_Service();
if ( SYS_OPR_STAT_RUN )
{
return u8PowerSts;
}
//进入异常电压,电源库里直接将15电等于0,则直接退出,状态是igoff,下15则进入休眠
if ( SYS_OPR_STAT_IGN_OFF )
{
break;
}
}
}
static Power_Status_em Power_Stay_Sleep(void)
{
Power_Status_em u8PowerSts = EM_IGN_Sleep;
while (1)
{
RTE_WDT_Clear();
if (RTE_GPIO_Get_Level(KL15_AD_IN))/* KL15 */
{
u8PowerSts = EM_IGN_Wakeup;
break;
}
}
while (1)
{
RTE_WDT_Clear();
if (RTE_GPIO_Get_Level(KL15_AD_IN))/* KL15 */
{
u8PowerSts = EM_IGN_Wakeup;
break;
}
}
return u8PowerSts;
}
......
Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/RTC/RTE_RTC.c
View file @ 6f299668
......@@ -151,7 +151,7 @@ void RTE_RTC_Init(RTC_Information_st_t g_stRTCInformation)
RTC_InitStructure.RTC_Date.RTC_WeekDay = g_stRTCInformation.u8RTCDayOfWeek;//????
RTC_InitStructure.RTC_Date.RTC_Month = g_stRTCInformation.u8RTCMonth; //5??
RTC_InitStructure.RTC_Date.RTC_Year = g_stRTCInformation.u8RTCYear; //2022?��
RTC_InitStructure.RTC_Period = One_Second; //RTC ????????1s?��?��???��????????
RTC_InitStructure.RTC_Period = Period_None; //RTC ????????1s?��?��???��????????
RTC_InitStructure.RTC_Alarm_Onoff = RTC_Alarm_Off;
RTC_InitStructure.RTC_Alarm.Alarm_Minute = 0;
......
Firmware/Source/Device/Cmsemicon/BAT32A279/RTE/UART/RTE_UART.c
View file @ 6f299668
......@@ -12,8 +12,8 @@ void RTE_UART_Sleep_Init(UART_Channel_en_t enUARTCh);
/*******************************************************/
typedef struct
{
uint8_t u8UARTCount; /*发送计数*/
uint8_t u8UARTLEN; /*发送数据总长*/
uint32_t u32UARTCount; /*发送计数*/
uint32_t u32UARTLEN; /*发送数据总长*/
uint8_t u8UARTTXBusyFlag; /*发送是否忙标志 0:idle 1:busy */
uint8_t *pu8UARTDataBuf; /*要发送数据的指针*/
} UART_Ctr_st_t;
......@@ -33,8 +33,8 @@ static UART_Channel_Config_st_t stUARTCh2Cfg;
static void RTE_UART_Variate_Init(void);
static void RTE_UART_Variate_Init(void)
{
stUARTCtr0.u8UARTCount = 0U;
stUARTCtr0.u8UARTLEN = 0U;
stUARTCtr0.u32UARTCount = 0U;
stUARTCtr0.u32UARTLEN = 0U;
stUARTCtr0.u8UARTTXBusyFlag = 0U;
stUARTCtr0.pu8UARTDataBuf = 0U;
......@@ -43,8 +43,8 @@ static void RTE_UART_Variate_Init(void)
stUARTCh0Cfg.pfnUARTConfirmCallBack = 0U;
stUARTCh0Cfg.pfnUARTReadMsgCallBack = 0U;
stUARTCtr1.u8UARTCount = 0U;
stUARTCtr1.u8UARTLEN = 0U;
stUARTCtr1.u32UARTCount = 0U;
stUARTCtr1.u32UARTLEN = 0U;
stUARTCtr1.u8UARTTXBusyFlag = 0U;
stUARTCtr1.pu8UARTDataBuf = 0U;
......@@ -53,8 +53,8 @@ static void RTE_UART_Variate_Init(void)
stUARTCh1Cfg.pfnUARTConfirmCallBack = 0U;
stUARTCh1Cfg.pfnUARTReadMsgCallBack = 0U;
stUARTCtr2.u8UARTCount = 0U;
stUARTCtr2.u8UARTLEN = 0U;
stUARTCtr2.u32UARTCount = 0U;
stUARTCtr2.u32UARTLEN = 0U;
stUARTCtr2.u8UARTTXBusyFlag = 0U;
stUARTCtr2.pu8UARTDataBuf = 0U;
......@@ -288,8 +288,8 @@ void UART_Ch0_Send_Multiple_Byte(uint8_t *Data, uint8_t Len)
{
if ( UART_Ch0_Get_TX_Busy_Flag( ) == 0U )
{
stUARTCtr0.u8UARTCount = 1U;
stUARTCtr0.u8UARTLEN = Len;
stUARTCtr0.u32UARTCount = 1U;
stUARTCtr0.u32UARTLEN = Len;
stUARTCtr0.u8UARTTXBusyFlag = 1U;
stUARTCtr0.pu8UARTDataBuf = Data;
UART0_TX = stUARTCtr0.pu8UARTDataBuf [ 0U ];
......@@ -299,8 +299,8 @@ void UART_Ch1_Send_Multiple_Byte(uint8_t *Data, uint8_t Len)
{
if ( UART_Ch1_Get_TX_Busy_Flag( ) == 0U )
{
stUARTCtr1.u8UARTCount = 1U;
stUARTCtr1.u8UARTLEN = Len;
stUARTCtr1.u32UARTCount = 1U;
stUARTCtr1.u32UARTLEN = Len;
stUARTCtr1.u8UARTTXBusyFlag = 1U;
stUARTCtr1.pu8UARTDataBuf = Data;
UART1_TX = stUARTCtr1.pu8UARTDataBuf [ 0U ];
......@@ -310,8 +310,8 @@ void UART_Ch2_Send_Multiple_Byte(uint8_t *Data, uint8_t Len)
{
if ( UART_Ch2_Get_TX_Busy_Flag( ) == 0U )
{
stUARTCtr2.u8UARTCount = 1U;
stUARTCtr2.u8UARTLEN = Len;
stUARTCtr2.u32UARTCount = 1U;
stUARTCtr2.u32UARTLEN = Len;
stUARTCtr2.u8UARTTXBusyFlag = 1U;
stUARTCtr2.pu8UARTDataBuf = Data;
UART2_TX = stUARTCtr2.pu8UARTDataBuf [ 0U ];
......@@ -419,9 +419,9 @@ void UART_CH3_RX_ISR(void)
void UART_CH0_TX_ISR(void)
{
INTC_ClearPendingIRQ(ST0_IRQn);
if ( stUARTCtr0.u8UARTCount < stUARTCtr0.u8UARTLEN )
if ( stUARTCtr0.u32UARTCount < stUARTCtr0.u32UARTLEN )
{
UART0_TX = stUARTCtr0.pu8UARTDataBuf [ stUARTCtr0.u8UARTCount++ ];
UART0_TX = stUARTCtr0.pu8UARTDataBuf [ stUARTCtr0.u32UARTCount++ ];
}
else
{
......@@ -435,9 +435,9 @@ void UART_CH0_TX_ISR(void)
void UART_CH1_TX_ISR(void)
{
INTC_ClearPendingIRQ(ST1_IRQn);
if ( stUARTCtr1.u8UARTCount < stUARTCtr1.u8UARTLEN )
if ( stUARTCtr1.u32UARTCount < stUARTCtr1.u32UARTLEN )
{
UART1_TX = stUARTCtr1.pu8UARTDataBuf [ stUARTCtr1.u8UARTCount++ ];
UART1_TX = stUARTCtr1.pu8UARTDataBuf [ stUARTCtr1.u32UARTCount++ ];
}
else
{
......@@ -451,9 +451,9 @@ void UART_CH1_TX_ISR(void)
void UART_CH2_TX_ISR(void)
{
INTC_ClearPendingIRQ(ST2_IRQn);
if ( stUARTCtr2.u8UARTCount < stUARTCtr2.u8UARTLEN )
if ( stUARTCtr2.u32UARTCount < stUARTCtr2.u32UARTLEN )
{
UART2_TX = stUARTCtr2.pu8UARTDataBuf [ stUARTCtr2.u8UARTCount++ ];
UART2_TX = stUARTCtr2.pu8UARTDataBuf [ stUARTCtr2.u32UARTCount++ ];
}
else
{
......
Firmware/Source/System/Sys_Task_List.c
View file @ 6f299668
......@@ -24,6 +24,9 @@ void Sys_5ms_Tasks(void)
void Sys_10ms_Tasks(void)
{
Key_Service();
Key_Clear_Time();
Key_TimeOut_Service();
Fuel_R_Cal(10u);
}
......@@ -35,26 +38,13 @@ void Sys_20ms_Tasks(void)
void Sys_50ms_Tasks(void)
{
g_u8Cursor_Posittion = Menu_Get_Current_Cursor_Information();
}
uint32_t g_u32LEDFlag = 0UL;
//uint8_t ljsuartsend[2] = { 0x55, 0x66};
void Sys_100ms_Tasks(void)
{
if (g_u32LEDFlag)
{
g_u32LEDFlag = 0UL;
//RTE_GPIO_Set_Level(RTE_GPIO_ANALOG_PORT0_PIN15, 0x01U);
}
else
{
g_u32LEDFlag = 1UL;
//RTE_GPIO_Set_Level(RTE_GPIO_ANALOG_PORT0_PIN15, 0x00U);
}
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)
......
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