Commit 15c5566f authored by 何锐's avatar 何锐

feat:电量标定程序

parent b87e4d9e
...@@ -16,7 +16,6 @@ uint32_t NO_IPK_EXIST; ...@@ -16,7 +16,6 @@ uint32_t NO_IPK_EXIST;
//uint32_t NO_IPK_EXIST_Back; //uint32_t NO_IPK_EXIST_Back;
uint32_t NO_IPK_EXIST_TIMER; uint32_t NO_IPK_EXIST_TIMER;
const unsigned char gImage_cuo12[] = {24, 24,0X00,0X00,0X00,0X00,0X30,0X70,0XE0,0XC0,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X80,0XC0,0X70,0X30,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X83,0XC7,0X66,0X38,0X38,0X7C,0XE6,0XC3,0X81,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0C,0X0C,0X06,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X03,0X07,0X0E,0X0C,0X00,0X00,0X00,0X00,}; const unsigned char gImage_cuo12[] = {24, 24,0X00,0X00,0X00,0X00,0X30,0X70,0XE0,0XC0,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X80,0XC0,0X70,0X30,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X83,0XC7,0X66,0X38,0X38,0X7C,0XE6,0XC3,0X81,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0C,0X0C,0X06,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X03,0X07,0X0E,0X0C,0X00,0X00,0X00,0X00,};
const unsigned char gImage_dui12[] = {24, 24,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X80,0XC0,0XE0,0X40,0X00,0X00,0X00,0X00,0X08,0X18,0X30,0X70,0XC0,0X80,0X00,0X00,0X80,0XC0,0XE0,0X70,0X38,0X1C,0X0E,0X07,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X03,0X07,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,};
uint8_t InterNal_Version [ 128 ]; uint8_t InterNal_Version [ 128 ];
uint8_t SW_Version [ 128 ]; uint8_t SW_Version [ 128 ];
uint8_t HW_Version [ 128 ]; uint8_t HW_Version [ 128 ];
......
...@@ -4412,6 +4412,8 @@ void Display_Send_ODO(uint8_t fuel) ...@@ -4412,6 +4412,8 @@ void Display_Send_ODO(uint8_t fuel)
uint8_t CHECK_Value = 0; uint8_t CHECK_Value = 0;
uint8_t DIS_VALUE = 0; uint8_t DIS_VALUE = 0;
const uint16_t Volatile[] = {90,80}; const uint16_t Volatile[] = {90,80};
uint8_t ONEKEYlock;
const unsigned char gImage_dui12[] = {24, 24,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X80,0XC0,0XE0,0X40,0X00,0X00,0X00,0X00,0X08,0X18,0X30,0X70,0XC0,0X80,0X00,0X00,0X80,0XC0,0XE0,0X70,0X38,0X1C,0X0E,0X07,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0X03,0X07,0X03,0X01,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,};
void Display_Send_Vspead(uint8_t menu) void Display_Send_Vspead(uint8_t menu)
{ {
uint8_t fuel_val = 0; uint8_t fuel_val = 0;
...@@ -4434,13 +4436,27 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4434,13 +4436,27 @@ void Display_Send_Vspead(uint8_t menu)
switch (menu) switch (menu)
{ {
case 0: //显示ACC电压 case 0: //显示ACC电压
// Voltage_ACC = ADC_Read_Signal(ADC_CH_ACC1_VOLTAGE); Voltage_ACC = ADC_Read_Signal(ADC_CH_ACC1_VOLTAGE);
// Voltage_left = Voltage_ACC/1000; Voltage_left = Voltage_ACC/1000;
// Voltage_right = (Voltage_ACC/10)%10; Voltage_right = (Voltage_ACC/100)%10;
// uint8_t mLRbuff [3] = {0x2E,Voltage_right,0xff}; uint8_t mLRbuff [3] = {0x2E,Voltage_right,0xff};
// General_Number_Disp(mLRbuff, 175, 160); General_Number_Disp(mLRbuff, 175, 160);
// GUI_General_Digit_Display(Voltage_left, Num_15, 2, 1, ODODigitNum09PosX, 160); GUI_General_Digit_Display(Voltage_left, Num_15, 2, 1, ODODigitNum09PosX, 160);
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Dyy_words_19X224_Y166); //单位:V TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Dyy_words_19X224_Y166); //单位:V
if(delayreault == 1)
{
if(((Voltage_left == 59) && (Voltage_right == 9)) || ((Voltage_left == 60) && (Voltage_right <= 1)))
{
if(ONEKEYlock == 0)
{
ONEKEYlock = 1;
ONEKEYFlag = 1;
TFT_LCD_Draw_Bmp(200, 90+40, ( uint8_t * )gImage_dui12 );
}
}
}
break; break;
case 1: case 1:
...@@ -4591,7 +4607,7 @@ void ONE_KEY_Display(void) ...@@ -4591,7 +4607,7 @@ void ONE_KEY_Display(void)
if(ONEKEYFlag == 1) if(ONEKEYFlag == 1)
{ {
if(ONEKEYLongTime <= 24) if(ONEKEYLongTime <= 40)
{ {
ONEKEYLongTime++; ONEKEYLongTime++;
ONE_KEY = 0; ONE_KEY = 0;
......
...@@ -130,7 +130,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent) ...@@ -130,7 +130,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
MENU_CHECK_STEP_ADD(); // MENU_CHECK_STEP_ADD();
// if(BCMLED.Sig.AutoLamp) // if(BCMLED.Sig.AutoLamp)
// { // {
// BCMLED.Sig.AutoLamp = 0x00; // BCMLED.Sig.AutoLamp = 0x00;
......
...@@ -1107,21 +1107,9 @@ uint32_t R485_Send_test(void) ...@@ -1107,21 +1107,9 @@ uint32_t R485_Send_test(void)
{ {
case 0: case 0:
// BCMLED.Sig.Lamp = 0x01; //左转 BCMLED.Sig.Lamp = 0x01; //左转
// BCMLED.Sig.FlickerFrequency = 0x05; //频率 BCMLED.Sig.FlickerFrequency = 0x05; //频率
// if((Key_Mode == 4) || (Key_Mode == 5))
// {
// BCMLED.Sig.HLLamp = 0x03; //远近光
// BCMLED.Sig.AutoLamp = 0x01; //自动大灯
// }
// else
// {
// BCMLED.Sig.HLLamp = 0x00;
// }
// Dashboard.Sig.textbit2 = 0x0A; //车速
// Dashboard.Sig.textbit7 = 0x7F; //P档
// u32sendendflag = R485_Send(0x04, Dashboard.Msg, sizeof(Dashboard.Msg));
break; break;
case 1: case 1:
......
...@@ -353,6 +353,21 @@ void KeyBackServic(void) ...@@ -353,6 +353,21 @@ void KeyBackServic(void)
FanHui = 0; FanHui = 0;
} }
} }
uint8_t delaytime;
uint8_t delayreault;
void delay_5s(void)
{
if(delaytime <= 50)
{
delaytime++;
}
else
{
delayreault = 1;
}
}
void Sys_Run_Mode_100ms_Tasks_Group(void) void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
// Aima_SLF(1,1,1,1); // Aima_SLF(1,1,1,1);
...@@ -362,6 +377,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -362,6 +377,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
BCDD_MCU_Service(); BCDD_MCU_Service();
KeyBackServic(); KeyBackServic();
RotationSet(); RotationSet();
delay_5s();
// DefenseModeSettings(); // DefenseModeSettings();
if(CHECK_Ctrl_delay < 200) if(CHECK_Ctrl_delay < 200)
{ {
...@@ -405,7 +421,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -405,7 +421,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
} }
else else
{ {
MENU_CHECK_STEP_ADD( ); // MENU_CHECK_STEP_ADD( );
if(MENU_CHECK_STEP == 0) if(MENU_CHECK_STEP == 0)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
......
...@@ -25,5 +25,6 @@ void Sys_Exact_50us_Tasks(void); ...@@ -25,5 +25,6 @@ void Sys_Exact_50us_Tasks(void);
void Sys_Exact_100ms_Tasks(void); void Sys_Exact_100ms_Tasks(void);
void Sys_Enter_Sleep_Mode(void); void Sys_Enter_Sleep_Mode(void);
uint16_t Sys_Get_ms_Rolling_Counter(void); uint16_t Sys_Get_ms_Rolling_Counter(void);
extern void delay_5s(void);
extern uint8_t delayreault;
#endif #endif
\ No newline at end of file
...@@ -111,7 +111,7 @@ void Sys_Startup_Init(void) ...@@ -111,7 +111,7 @@ void Sys_Startup_Init(void)
loc_config.pfnUARTReadMsgCallBack = UART_Put2; loc_config.pfnUARTReadMsgCallBack = UART_Put2;
UART_Init(UART_RLIN32, &loc_config); UART_Init(UART_RLIN32, &loc_config);
RELAY_VBAT_MCU = 1; RELAY_VBAT_MCU = 1;
RELAY_KEY_MCU = 0; RELAY_KEY_MCU = 1;
ONE_KEY = 1; ONE_KEY = 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