Commit 35802083 authored by 何锐's avatar 何锐

feat:残影测试程序增加车速掉线按键

parent 7f7f4604
...@@ -4925,7 +4925,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4925,7 +4925,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,6,0,1,2,3,0xff}; uint8_t mbuff [7] = {2,6,0,2,0,9,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
...@@ -26,6 +26,14 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步 ...@@ -26,6 +26,14 @@ void Key_Operation_SW5(Key_Event_en_t enKeyEvent) //下一步
// MENU_CHECK_STEP_ADD( ); // MENU_CHECK_STEP_ADD( );
// } // }
// } // }
if(testflag == 1)
{
testflag = 0;
}
else
{
testflag = 1;
}
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -128,7 +136,7 @@ void Key_Operation_SW9(Key_Event_en_t enKeyEvent) ...@@ -128,7 +136,7 @@ void Key_Operation_SW9(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) //下移位 if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) //下移位
{ {
// downkeyflag = 1; downkeyflag = 1;
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) //P2P模式 else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) //P2P模式
{ {
...@@ -204,7 +212,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent) ...@@ -204,7 +212,7 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) //上移位 if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) //上移位
{ {
// upkeyflag = 1; upkeyflag = 1;
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) //AP模式 else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) //AP模式
{ {
......
...@@ -502,6 +502,7 @@ uint8_t getbanbenhaoflag = 0; ...@@ -502,6 +502,7 @@ uint8_t getbanbenhaoflag = 0;
uint32_t send80time = 0; uint32_t send80time = 0;
uint8_t BlueTooth = 0; uint8_t BlueTooth = 0;
uint8_t dianliangflag = 0; uint8_t dianliangflag = 0;
uint8_t testflag;
uint8_t RS485_User_Tx_Data(void) uint8_t RS485_User_Tx_Data(void)
{ {
uint32_t sendfinishflag = 0; uint32_t sendfinishflag = 0;
...@@ -569,6 +570,8 @@ uint8_t RS485_User_Tx_Data(void) ...@@ -569,6 +570,8 @@ uint8_t RS485_User_Tx_Data(void)
break; break;
case RS485_Tx_IDD2_Idx: case RS485_Tx_IDD2_Idx:
if(testflag == 0)
{
sendfinishflag = R485_Send_0xD2(); sendfinishflag = R485_Send_0xD2();
RS485_TX_finish = 1; RS485_TX_finish = 1;
if(sendfinishflag == 0) if(sendfinishflag == 0)
...@@ -580,6 +583,12 @@ uint8_t RS485_User_Tx_Data(void) ...@@ -580,6 +583,12 @@ uint8_t RS485_User_Tx_Data(void)
{ {
RS485_TxControl.sendIndex ++; RS485_TxControl.sendIndex ++;
} }
}
else
{
RS485_TxControl.sendIndex ++;
}
break; break;
case RS485_Tx_IDD3_Idx: case RS485_Tx_IDD3_Idx:
......
...@@ -78,6 +78,7 @@ extern uint8_t RS485_TX_finish; ...@@ -78,6 +78,7 @@ extern uint8_t RS485_TX_finish;
extern uint8_t BlueTooth; extern uint8_t BlueTooth;
extern uint8_t dianliangflag; extern uint8_t dianliangflag;
extern uint8_t sendmsgAll[8]; extern uint8_t sendmsgAll[8];
extern uint8_t testflag;
extern uint32_t R485_Send(const uint16_t cmdID, const uint8_t* pData, uint8_t len); extern uint32_t R485_Send(const uint16_t cmdID, const uint8_t* pData, uint8_t len);
extern uint16_t Yadi_CAL_Data_Sum(uint8_t* pu8LinData, uint8_t u8LinLen); extern uint16_t Yadi_CAL_Data_Sum(uint8_t* pu8LinData, uint8_t u8LinLen);
extern uint8_t RS485_User_Tx_Data(void); extern uint8_t RS485_User_Tx_Data(void);
......
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