Skip to content

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

🐞 fix:修改阻值并联

parent 2fd051f9
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 60 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ bf31e02b
......@@ -597,8 +597,8 @@ void Function_Check_Ctrl(uint32_t cmd)
//5格
FUEL_RES_1=0;
FUEL_RES_2=0;
FUEL_RES_3=0;
FUEL_RES_4=1;
FUEL_RES_3=1;
FUEL_RES_4=0;
break;
}
......@@ -608,10 +608,10 @@ void Function_Check_Ctrl(uint32_t cmd)
YOUZHUAN=1;
ZUOZHUAN=1;
YUANGUANG=0;
FUEL_RES_1=1;
FUEL_RES_2=1;
FUEL_RES_1=0;
FUEL_RES_2=0;
FUEL_RES_3=1;
FUEL_RES_4=1;
FUEL_RES_4=0;
break;
}
......@@ -622,8 +622,8 @@ void Function_Check_Ctrl(uint32_t cmd)
ZUOZHUAN=0;
YUANGUANG=1;
//3
FUEL_RES_1=1;
FUEL_RES_2=1;
FUEL_RES_1=0;
FUEL_RES_2=0;
FUEL_RES_3=0;
FUEL_RES_4=1;
break;
......@@ -637,7 +637,7 @@ void Function_Check_Ctrl(uint32_t cmd)
//2格
FUEL_RES_1=1;
FUEL_RES_2=1;
FUEL_RES_3=1;
FUEL_RES_3=0;
FUEL_RES_4=0;
break;
}
......@@ -648,7 +648,7 @@ void Function_Check_Ctrl(uint32_t cmd)
ZUOZHUAN=0;
YUANGUANG=0;
FUEL_RES_1=1;
FUEL_RES_2=1;
FUEL_RES_2=0;
FUEL_RES_3=0;
FUEL_RES_4=0;
break;
......@@ -659,8 +659,8 @@ void Function_Check_Ctrl(uint32_t cmd)
YOUZHUAN=0;
ZUOZHUAN=0;
YUANGUANG=0;
FUEL_RES_1=1;
FUEL_RES_2=0;
FUEL_RES_1=0;
FUEL_RES_2=1;
FUEL_RES_3=0;
FUEL_RES_4=0;
break;
......@@ -671,7 +671,7 @@ void Function_Check_Ctrl(uint32_t cmd)
YOUZHUAN=0;
ZUOZHUAN=0;
YUANGUANG=0;
FUEL_RES_1=1;
FUEL_RES_1=0;
FUEL_RES_2=1;
FUEL_RES_3=0;
FUEL_RES_4=0;
......@@ -683,15 +683,15 @@ void Function_Check_Ctrl(uint32_t cmd)
YOUZHUAN=1;
ZUOZHUAN=1;
YUANGUANG=1;
FUEL_RES_1=1;
FUEL_RES_2=0;
FUEL_RES_1=0;
FUEL_RES_2=1;
FUEL_RES_3=0;
FUEL_RES_4=0;
break;
}
case 8:
{
SETTT=1;
// SETTT=1;
break;
}
default:
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ bf31e02b
......@@ -4475,7 +4475,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(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [7] = {2,6,0,1,3,0,0xff};
uint8_t mbuff [7] = {2,6,0,4,0,6,0xff};
// uint8_t HWbuff[4] = {0x48,0x57,0x3A,0xFF};
// General_Number_Disp(HWBUFF,10,146);
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ bf31e02b
......@@ -11,23 +11,23 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
{
// Display_Add( );
// Display_TFT_Clear( );
Display_TFT_Clear_UID();
if((change > 0) && (change!=11))
{
change--;
UUIDX =UUIDX-10;
}
else if(change==11)
{
change=8;
UUIDX=90;
// Display_TFT_Clear_UID();
// if((change > 0) && (change!=11))
// {
// change--;
// UUIDX =UUIDX-10;
// }
// else if(change==11)
// {
// change=8;
// UUIDX=90;
}
else
{
change = 20;
UUIDX = 200;
}
// }
// else
// {
// change = 20;
// UUIDX = 200;
// }
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
......@@ -55,28 +55,28 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if((change>11) &&(change<21))
{
if(UIDNumber2[change-12] < 9)
{
UIDNumber2[change-12]++;
}
else
{
UIDNumber2[change-12] = 0;
}
}
else if((change>0) && (change<9) && (change!=6) && (change!=5)&&(change!=1))
{
if(HWBUFF[change-1]<9)
{
HWBUFF[change-1]++;
}
else
{
HWBUFF[change-1]=0;
}
}
// if((change>11) &&(change<21))
// {
// if(UIDNumber2[change-12] < 9)
// {
// UIDNumber2[change-12]++;
// }
// else
// {
// UIDNumber2[change-12] = 0;
// }
// }
// else if((change>0) && (change<9) && (change!=6) && (change!=5)&&(change!=1))
// {
// if(HWBUFF[change-1]<9)
// {
// HWBUFF[change-1]++;
// }
// else
// {
// HWBUFF[change-1]=0;
// }
// }
// if ( (LED_Waring == 1) || (UDS_Warning_Voltage ==1))
// {
......@@ -148,9 +148,9 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
writeflag = 1;
writebeing = 1;
idflag=1;
// writeflag = 1;
// writebeing = 1;
// idflag=1;
Display_TFT_Clear_UID2();
}
......@@ -197,7 +197,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
Key3_flag=1;
// Key3_flag=1;
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ bf31e02b
......@@ -172,7 +172,7 @@ else
if(writeflag == 1)
{
UIDWrite();
// UIDWrite();
}
else if((writeflag==0) &&(idflag==1))
{
......@@ -212,7 +212,7 @@ else
if(Key3_flag==1)
{
UIDRead();
// UIDRead();
}
// if(getmsgfinish == 0)
// {
......
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