Commit 4aca84f1 authored by 何锐's avatar 何锐

feat:上下电程序

parent 547c70f6
......@@ -35,7 +35,7 @@ uint8_t timenum = 0;
uint8_t firstflag = 0;
uint8_t RS485_data[64];
uint8_t checknumwrong = 3;
uint8_t zhenduanflag = Data_Mode_Dot;
uint8_t zhenduanflag = 4;
uint8_t clearOdoFlag = 0;
uint8_t connectbleFlag = 0;
uint8_t Auto_ONOFF = 0;
......
......@@ -226,6 +226,7 @@ uint8_t erweima[64] ;
uint32_t loc_Type = 0;
uint8_t blnamedisplay[4];
uint8_t blenamedisplay[5];
const uint16_t ODODigitNum09PosX1 [] = {165,155,145,135,125,115};
void Total_Check(void)
{
......@@ -422,10 +423,10 @@ uint8_t yibiaoshuju[34];
// Buzzer_Warning();
break;
// case 4:
// break;
case 4:
GUI_General_Digit_Display(IGONOFFCount, Num_15, 6, 5, ODODigitNum09PosX1, 40);
break;
......@@ -721,23 +722,23 @@ void Function_Check_Ctrl(uint32_t cmd)
{
case 0:
{
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
}
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
name1= (devicename) & 0xFF;
name2 = (devicename >> 8) & 0xFF;
RightturnSignal = 0;
LeftturnSignal = 0;
Bluetoothlight = 0;
Positionlight = 0;
highbeam = 0;
Lowbeam = 0;
// if(Auto_ONOFF == 0)
// {
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_04 = 1;
// }
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1;
// name1= (devicename) & 0xFF;
// name2 = (devicename >> 8) & 0xFF;
// RightturnSignal = 0;
// LeftturnSignal = 0;
// Bluetoothlight = 0;
// Positionlight = 0;
// highbeam = 0;
// Lowbeam = 0;
break;
}
......
......@@ -3909,9 +3909,9 @@ uint32_t Get_Display_Type(void)
{
return 0;
}
else
else if(zhenduanflag == 4)
{
return 1;
return 4;
}
}
......
......@@ -157,11 +157,11 @@ static void Key_Process(Key_Num_en_t enKeyIndex)
/*10ms����һ��*/
void Key_Service(void)
{
uint8_t i = 0U;
for ( i = 0U; i < KEY_NUM_MAX; i++ )
{
Key_Process(( Key_Num_en_t )i); /*Key_Num_en_t*/
}
// uint8_t i = 0U;
// for ( i = 0U; i < KEY_NUM_MAX; i++ )
// {
// Key_Process(( Key_Num_en_t )i); /*Key_Num_en_t*/
// }
}
/*�״��ϵ�ʱ����һ�μ���*/
void Key_Init(void)
......
......@@ -112,8 +112,32 @@ uint8_t bleuarttime = 0;
uint8_t querendelay = 0;
uint8_t clesrodoauto = 0;
uint8_t clesrodookauto = 0;
uint8_t IGONOFFTime;
uint32_t IGONOFFCount;
void Sys_Run_Mode_100ms_Tasks_Group(void)
{
IGONOFFTime++;
if(LINE_OUT_NEG_04 == 1)
{
if(IGONOFFTime >= 15)
{
IGONOFFTime = 0;
LINE_OUT_NEG_04 = 0;
if(IGONOFFCount <= 1000000)
{
IGONOFFCount++;
}
}
}
else if(LINE_OUT_NEG_04 == 0)
{
if(IGONOFFTime >= 5)
{
IGONOFFTime = 0;
LINE_OUT_NEG_04 = 1;
}
}
if(MENU_CHECK_STEP == 9)
{
if(clesrodoauto >= 50)
......@@ -154,6 +178,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
{
loc_timer = 0;
Recv_Byte1();
Recv_Byte2();
}
Display_PageNum();
......
......@@ -8,6 +8,7 @@ extern uint32_t devicename;
extern uint8_t upkeyflag;
extern uint8_t downkeyflag;
extern uint8_t Confirmkeyflag;
extern uint32_t IGONOFFCount;
// extern uint8_t Openble[20];
void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void);
void Sys_Run_Mode_2ms_Tasks_Group(void);
......
......@@ -112,6 +112,12 @@ void Sys_Startup_Init(void)
loc_config.pfnUARTErrHandleCallBack = 0;
loc_config.pfnUARTReadMsgCallBack = UART_Put2;
UART_Init(UART_RLIN32, &loc_config);
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
......
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