Commit 8ffeb956 authored by 何锐's avatar 何锐

feat:老化架程序

parent d7223c34
...@@ -73,17 +73,13 @@ void MENU_CHECK_STEP_ADD(void) ...@@ -73,17 +73,13 @@ void MENU_CHECK_STEP_ADD(void)
{ {
MENU_CHECK_STEP++; MENU_CHECK_STEP++;
if(MENU_CHECK_STEP > 14) if(MENU_CHECK_STEP > 9)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
// if((guangganflag == 2 || guangganflag == 1 ) && guangganflag != 3) if(MENU_CHECK_STEP == 1)
// {
// MENU_CHECK_STEP = 3;
// }
if(CurrentWrong == 1)
{ {
MENU_CHECK_STEP = 1; MENU_CHECK_STEP = 2;
} }
} }
void MENU_CHECK_STEP_SUB(void) void MENU_CHECK_STEP_SUB(void)
......
...@@ -4584,48 +4584,48 @@ void HW_Static_Current_Check(uint32_t cmd) ...@@ -4584,48 +4584,48 @@ void HW_Static_Current_Check(uint32_t cmd)
// } // }
} }
} }
uint8_t CurrentWrong = 1; uint8_t CurrentWrong = 0;
void Get_static_Current(void) void Get_static_Current(void)
{ {
static uint32_t loc_Timer = 0; // static uint32_t loc_Timer = 0;
static uint32_t loc_ret = 0; // static uint32_t loc_ret = 0;
if(MENU_CHECK_STEP == 1) // if(MENU_CHECK_STEP == 1)
{ // {
loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE); // loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
loc_ret += loc_Current_0; // loc_ret += loc_Current_0;
loc_Timer++; // loc_Timer++;
if ( loc_Timer >= Sampling_NUM ) // if ( loc_Timer >= Sampling_NUM )
{ // {
loc_Timer = 0; // loc_Timer = 0;
loc_ret /= Sampling_NUM; // loc_ret /= Sampling_NUM;
// loc_ret *= 1000;//单位0.001毫伏 // // loc_ret *= 1000;//单位0.001毫伏
// loc_ret /= 100;//转化为电流,单位0.001毫安 // // loc_ret /= 100;//转化为电流,单位0.001毫安
loc_ret /= 10;//单位0.1毫安 // loc_ret /= 10;//单位0.1毫安
loc_ret1 = loc_ret; // loc_ret1 = loc_ret;
} // }
if(loc_ret1 != 0) // if(loc_ret1 != 0)
{ // {
TFT_LCD_Draw_Bmp(190, 60, ( uint8_t * )gImage_Number_15_white_PiontX0_Y0); // TFT_LCD_Draw_Bmp(190, 60, ( uint8_t * )gImage_Number_15_white_PiontX0_Y0);
GUI_General_Digit_Display(loc_ret1, Num_15, 3, 0, CurrentDigitNum09PosX, 60); // GUI_General_Digit_Display(loc_ret1, Num_15, 3, 0, CurrentDigitNum09PosX, 60);
if(loc_ret1 >= 10) // if(loc_ret1 >= 10)
{ // {
MENU_CHECK_STEP = 1;
CurrentWrong = 1;
}
else
{
CurrentWrong = 0;
}
loc_ret1 = 0;
}
else
{
// MENU_CHECK_STEP = 1; // MENU_CHECK_STEP = 1;
// CurrentWrong = 1; // CurrentWrong = 1;
} // }
} // else
// {
// CurrentWrong = 0;
// }
// loc_ret1 = 0;
// }
// else
// {
// // MENU_CHECK_STEP = 1;
// // CurrentWrong = 1;
// }
// }
} }
const uint16_t testNum[] = {200,190,180}; const uint16_t testNum[] = {200,190,180};
...@@ -4902,7 +4902,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4902,7 +4902,7 @@ void Display_Version_Info(uint32_t ON_OFF)
// TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比 // TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //% // TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号 TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [7] = {2,5,1,1,2,5,0xff}; uint8_t mbuff [7] = {2,5,1,1,2,7,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
...@@ -19,10 +19,6 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步 ...@@ -19,10 +19,6 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步
zhenduanflag = Data_Mode_Dot; zhenduanflag = Data_Mode_Dot;
memset(erweima, 0, 64); memset(erweima, 0, 64);
memset(barcode_Msg, 0, 64); memset(barcode_Msg, 0, 64);
saomafinish = 4;
}
else if(saomafinish == 4)
{
MENU_CHECK_STEP_ADD( ); MENU_CHECK_STEP_ADD( );
} }
} }
......
...@@ -105,6 +105,15 @@ void Sys_Run_Mode_50ms_Tasks_Group(void) ...@@ -105,6 +105,15 @@ void Sys_Run_Mode_50ms_Tasks_Group(void)
/*============================================================================== /*==============================================================================
100ms����ִ������ ��0�� 100ms����ִ������ ��0��
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
uint8_t MENU_CHECK_STEPLAST;
void BluetoothAutoDisConnect(void)
{
if((MENU_CHECK_STEPLAST == 8) && ((MENU_CHECK_STEP == 7) || (MENU_CHECK_STEP == 9)))
{
BlueTooth = 0;
}
MENU_CHECK_STEPLAST = MENU_CHECK_STEP;
}
uint16_t u16LJSText; uint16_t u16LJSText;
uint32_t AutoTime = 160; uint32_t AutoTime = 160;
uint32_t ONOFFtime = 450; uint32_t ONOFFtime = 450;
...@@ -116,10 +125,11 @@ uint8_t querendelay = 0; ...@@ -116,10 +125,11 @@ uint8_t querendelay = 0;
void Sys_Run_Mode_100ms_Tasks_Group(void) void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
ProcessBluetoothDeviceNameWithLock(); ProcessBluetoothDeviceNameWithLock();
AutoClearCounterAfterAllLit(); // AutoClearCounterAfterAllLit();
TimeDelay_3s(); TimeDelay_3s();
PasswordUnlock(); PasswordUnlock();
BTEnableDelayPowerReset(); BTEnableDelayPowerReset();
BluetoothAutoDisConnect();
static uint32_t loc_timer = 0; static uint32_t loc_timer = 0;
loc_timer++; loc_timer++;
......
...@@ -126,12 +126,12 @@ void Sys_Startup_Init(void) ...@@ -126,12 +126,12 @@ void Sys_Startup_Init(void)
EN_5V_CUT_ENABLE = 1; EN_5V_CUT_ENABLE = 1;
Display_TFT_Clear(); // Display_TFT_Clear();
GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size); // GUI_Display_Version_Code_Service(25, 20, "Please Scan The Code ", Letter_Num_11, PCodeText_Space_size);
/*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2,saomafinish = 3;打开上面两行的注释即可*/ /*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2,saomafinish = 3;打开上面两行的注释即可*/
// firstpowerflag = 2; firstpowerflag = 2;
// saomafinish = 3; saomafinish = 3;
} }
/*********************************************************************** /***********************************************************************
......
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