Skip to content

J
jiancetai
Commit 4fe2c2c0 authored by 李鑫3's avatar 李鑫3
Browse files
Options

🐞 fix:虬龙检测台（14步）

parent 5fd62e48
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1475 additions and 716 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 4fe2c2c0
......@@ -9,6 +9,7 @@
#include "COM_CAN.h"
#include "GenDelay.h"
#include "CAN_APP.h"
#include "Task.h"
uint32_t NO_IPK_EXIST_Status;
uint32_t NO_IPK_EXIST;
//uint32_t NO_IPK_EXIST_Back;
......@@ -70,7 +71,7 @@ void Function_Check_Ctrl(uint32_t cmd);
extern uint8_t PNFlag;
void MENU_CHECK_STEP_ADD(void)
{
if(MENU_CHECK_STEP > 6)
if(MENU_CHECK_STEP > 13)
{
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
......@@ -606,7 +607,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0;
set=0;
SETTT=0;
break;
}
......@@ -638,37 +639,55 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_03=1;
break;
}
// case 4:
// {
// LINE_OUT_POS_02=0;
// break;
// }
// case 5:
// {
// break;
// }
// case 6:
// {
// LINE_OUT_POS_03=0;
// break;
// }
// case 7:
// {
// break;
// }
// case 8:
// {
// break;
// }
// case 9:
// {
// break;
// }
case 4:
{
LINE_OUT_NEG_01=0;
LINE_OUT_POS_01=0;
LINE_OUT_POS_02=0;
LINE_OUT_POS_03=0;
break;
}
case 5:
{
LINE_OUT_NEG_01=0;
LINE_OUT_POS_01=0;
LINE_OUT_POS_02=0;
LINE_OUT_POS_03=0;
break;
}
case 6:
{
LINE_OUT_NEG_01=0;
LINE_OUT_POS_01=0;
LINE_OUT_POS_02=0;
LINE_OUT_POS_03=0;
break;
}
case 7:
{
LINE_OUT_NEG_01=0;
LINE_OUT_POS_01=0;
LINE_OUT_POS_02=0;
LINE_OUT_POS_03=0;
break;
}
case 8:
{
LINE_OUT_NEG_01=0;
LINE_OUT_POS_01=0;
LINE_OUT_POS_02=0;
LINE_OUT_POS_03=0;
break;
}
case 9:
{
LINE_OUT_NEG_01=0;
LINE_OUT_POS_01=0;
LINE_OUT_POS_02=0;
LINE_OUT_POS_03=0;
break;
}
case 10:
{
LINE_OUT_NEG_01=1;
LINE_OUT_POS_01=1;
......@@ -676,20 +695,21 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_POS_03=1;
break;
}
case 5:
case 11:
{
// LINE_OUT_NEG_01=1;
// LINE_OUT_POS_01=1;
// LINE_OUT_POS_02=1;
// LINE_OUT_POS_03=1;
LINE_OUT_NEG_01=0;
LINE_OUT_POS_01=0;
LINE_OUT_POS_02=0;
LINE_OUT_POS_03=0;
if(SETTT==0)
{
set=1;
ODO_Clear=1;
SETTT=1;
}
break;
}
default:
break;
}
......
YueJin_test_bench/source/Appliciation/Key.h
View file @ 4fe2c2c0
......@@ -80,4 +80,8 @@ extern Key_Set_en_t Key_Parameter_Set_Short_Press_Time(uint16_t u16Time);
extern Key_Set_en_t Key_Parameter_Set_Long_Press_Time(uint16_t u16Time);
extern Key_Set_en_t Key_Parameter_Set_Super_Long_Press_Time(uint32_t u32Time);
extern uint8_t upflag2;
extern uint8_t downflag2;
extern uint8_t setflag2;
#endif
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 4fe2c2c0
......@@ -5,12 +5,17 @@
#include "CAN_APP.h"
#include "Task.h"
extern uint8_t resetflag;
uint8_t upflag2=0;
uint8_t downflag2=0;
uint8_t setflag2=0;
void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
// Display_Add( );
// Display_TFT_Clear( );
if(MENU_CHECK_STEP == 0)
{
Display_TFT_Clear_UID();
if((change > 2) && (change <14))
{
......@@ -22,10 +27,19 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
change = 13;
UUIDX = 120;
}
}
else if(MENU_CHECK_STEP ==9)
{
upflag2=1;
}
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
if(MENU_CHECK_STEP ==9)
{
upflag2=2;
}
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
......@@ -48,6 +62,8 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(MENU_CHECK_STEP == 0)
{
if((change>4) &&(change<14))
{
......@@ -71,6 +87,12 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
HWBUFF[change-2]=0;
}
}
}
else if(MENU_CHECK_STEP==9)
{
downflag2=1;
}
// if ( (LED_Waring == 1) || (UDS_Warning_Voltage ==1))
// {
......@@ -85,18 +107,13 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
if ( (LED_Waring == 1) || (UDS_Warning_Voltage == 1))
if(MENU_CHECK_STEP==9)
{
;
downflag2=2;
}
else
{
// Display_Sub( );
// Display_TFT_Clear( );
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
}
......@@ -108,7 +125,6 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
uint8_t s=1;
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
......@@ -125,7 +141,6 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
uint8_t s=1;
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
......@@ -141,11 +156,15 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(MENU_CHECK_STEP==0)
{
writeflag = 1;
writebeing = 1;
idflag=1;
Display_TFT_Clear_UID2();
}
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
......@@ -190,11 +209,21 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
/*清零ODO*/
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(MENU_CHECK_STEP == 0)
{
Key3_flag=1;
}
else if(MENU_CHECK_STEP==9)
{
setflag2=1;
}
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
if(MENU_CHECK_STEP==9)
{
setflag2=2;
}
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ 4fe2c2c0
......@@ -57,11 +57,11 @@
#define NEG_1_Ctrl GPIO_OUT_PORT09_PIN06
//set
//set负控2
#define NEG_2_Ctrl GPIO_OUT_PORT09_PIN05
//xia
//xia负控3
#define NEG_3_Ctrl GPIO_OUT_PORT09_PIN04
//shang
//shang负控4
#define NEG_4_Ctrl GPIO_OUT_PORT09_PIN03
#define NEG_5_Ctrl GPIO_OUT_PORT09_PIN02
#define NEG_6_Ctrl GPIO_OUT_PORT09_PIN01
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 4fe2c2c0
......@@ -31,7 +31,7 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
// DoCAN_Communication_Service( );
// UDS_Server_Application_Service( );
TFT_LCD_Display_Update_Service( );
Get_PN_msg();
// Get_PN_msg();
}
/*============================================================================*/
......@@ -68,7 +68,6 @@ extern uint8_t fuelreset1;
extern uint8_t fuelreset2;
extern uint8_t fuelreset3;
extern uint8_t fuelreset4;
uint8_t setflag = 0;
uint8_t set=0;
uint8_t idflag=0;
uint8_t Writef=0;
......@@ -76,7 +75,7 @@ uint8_t uid_new=0;
uint8_t uid_last=0;
uint8_t uid_delay=0;
uint8_t Key3_flag=0;
uint8_t shuiwenflag=0;
void Sys_Run_Mode_10ms_Tasks_Group(void)
{
uid_last=UIDStep;
......@@ -167,6 +166,11 @@ else
send0x714time = 0;
}
// if(ABS_Flag==1)
// {
// // ABSWrite();
// }
can_submit();
......@@ -286,10 +290,10 @@ uint8_t set_flag2=0;
uint8_t set_flag3=0;
uint8_t set_flag4=0;
uint8_t set_flag5=0;
uint8_t set2=1;
uint8_t PowerDown=0;
uint8_t set2=0;
uint8_t set3=0;
uint8_t ODO_Clear=0;
void Sys_Run_Mode_100ms_Tasks_Group(void)
{
static uint32_t loc_timer = 0;
......@@ -299,153 +303,153 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
loc_timer = 0;
// HW_CHECK_IPK_EXIST( );
}
// if(time300ms < 20)
// {
// time300ms++;
// }
// else
// {
// time300ms = 0;
// }
// Get_ID_0x794_Msg();
// Display_PageNum();
//硬线车速输出懒得改名了
Buzzer_Start();
Total_Check( );
//u16LJSText = TFT_LCD_REQ_FIFO_MAX_DEPTH;
if(MENU_CHECK_STEP == 5)
//上建
if(upflag2 == 1)
{
set_flag=0;
set_flag2=0;
if(set==1)
{
NEG_2_Ctrl=1;
setflag ++;
if(setflag==20)
NEG_4_Ctrl=1;
set_flag ++;
if(set_flag==8)
{
NEG_2_Ctrl=0;
setflag=0;
set=2;
NEG_4_Ctrl=0;
upflag2=0;
set_flag=0;
}
}
else if(set==2)
else if(upflag2 == 2)
{
setflag ++;
if(setflag==5)
NEG_4_Ctrl=1;
set_flag ++;
if(set_flag==20)
{
NEG_2_Ctrl=1;
NEG_4_Ctrl=0;
set_flag=0;
upflag2=0;
}
else if(setflag==8)
}
//下键
if(downflag2 == 1)
{
NEG_2_Ctrl=0;
set=3;
setflag=0;
NEG_3_Ctrl=1;
set_flag4 ++;
if(set_flag4==8)
{
NEG_3_Ctrl=0;
downflag2=0;
set_flag4=0;
}
}
else if (set==3)
else if(downflag2 == 2)
{
setflag ++;
NEG_3_Ctrl=1;
if(setflag==30)
set_flag4 ++;
if(set_flag4==20)
{
NEG_3_Ctrl=0;
setflag=0;
set=0;
}
set_flag4=0;
downflag2=0;
}
}
if((MENU_CHECK_STEP==0) && (set_flag==0))
{
if(set2==1)
//set键
if(setflag2 == 2)
{
NEG_2_Ctrl=1;
set_flag4 ++;
if(set_flag4==40)
set_flag3 ++;
if(set_flag3==20)
{
NEG_2_Ctrl=0;
set_flag4=0;
set2=2;
set_flag3=0;
setflag2=0;
}
}
else if(set2==2)
{
set_flag4 ++;
if(set_flag4==5)
else if(setflag2 == 1)
{
NEG_4_Ctrl=1;
}
else if(set_flag4==8)
NEG_2_Ctrl=1;
set_flag3 ++;
if(set_flag3==8)
{
NEG_4_Ctrl=0;
set2=3;
set_flag4=0;
NEG_2_Ctrl=0;
set_flag3=0;
setflag2=0;
}
}
else if (set2==3)
if((MENU_CHECK_STEP == 0) && (shuiwenflag == 1))
{
set_flag4 ++;
if(set_flag4==5)
set++;
if(set==30)
{
NEG_2_Ctrl=1;
NEG_3_Ctrl=1;
}
else if(set_flag4==8)
else if(set==50)
{
NEG_2_Ctrl=0;
set_flag4=0;
set2=1;
set_flag=1;
}
}
NEG_3_Ctrl=0;
}
if((MENU_CHECK_STEP==0) &&(set_flag==1))
else if(set==60)
{
set_flag5 ++;
NEG_2_Ctrl=0;
if(set_flag5==300)
NEG_3_Ctrl=1;
}
else if(set==80)
{
NEG_2_Ctrl=1;
set_flag5=0;
NEG_3_Ctrl=0;
set=0;
shuiwenflag=0;
}
}
if((MENU_CHECK_STEP==1) &&(set_flag2==0))
if((MENU_CHECK_STEP ==11) && (ODO_Clear == 1))
{
if(set3==0)
set++;
if(set==30)
{
NEG_2_Ctrl=1;
set_flag3 ++;
if(set_flag3==20)
}
else if(set==50)
{
NEG_2_Ctrl=0;
set_flag3=0;
set3=1;
}
}
else if(set3==1)
else if(set==60)
{
NEG_2_Ctrl=1;
set_flag3 ++;
if(set_flag3==20)
}
else if(set==68)
{
NEG_2_Ctrl=0;
set_flag3=0;
set3=0;
set_flag2=1;
}
else if(set == 78)
{
NEG_3_Ctrl=1;
}
else if(set==100)
{
NEG_3_Ctrl=0;
set=0;
ODO_Clear=0;
}
}
if((MENU_CHECK_STEP == 12) && (PowerDown == 0))
{
set++;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u;
if(set==50)
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u;
set=0;
PowerDown=1;
}
}
//硬线车速输出懒得改名了
Buzzer_Start();
Total_Check( );
}
/*=================================================================*/
......
YueJin_test_bench/source/Appliciation/Task.h
View file @ 4fe2c2c0
......@@ -17,7 +17,8 @@ void Sys_Enter_Sleep_Mode(void);
uint16_t Sys_Get_ms_Rolling_Counter(void);
extern uint8_t idflag;
extern uint8_t Key3_flag;
extern uint8_t shuiwenflag;
extern uint8_t ODO_Clear;
#endif
......
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