Skip to content

J
jiancetai
Commit 3ac9e3bd authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:完成打点模式

parent a7fb0332
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 199 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 3ac9e3bd
......@@ -294,8 +294,9 @@ void can_submit(void)
switch (MENU_CHECK_STEP)
{
case 0:
data2[0] = 0x00;
init_CAN_Frame(&m_msg2, 0xA10FFE0, 8, 1, data2);
/* 发动机 */
data12[0] = 0x00;
init_CAN_Frame(&m_msg12, 0xA18FFE0, 8, 1, data12);
break;
case 1:
/* 车速 */
......@@ -608,9 +609,9 @@ void can_submit(void)
data10[7] = 0x01;
init_CAN_Frame(&m_msg10, 0xA37FFE3, 8, 1, data10);
/* GMS */
data11[0] = 0x00;
init_CAN_Frame(&m_msg11, 0xA32FFE4, 8, 1, data11);
// /* GMS */
// data11[0] = 0x00;
// init_CAN_Frame(&m_msg11, 0xA32FFE4, 8, 1, data11);
/* 并联信号 */
data12[0] = 0x00;
......@@ -709,16 +710,16 @@ void can_submit(void)
init_CAN_Frame(&m_msg8, 0xA30FFE3, 8, 1, data8);
/* 无GPS信号 */
data9[0] = 0x00;
data9[0] = 0x01;
init_CAN_Frame(&m_msg9, 0xA32FFE4, 8, 1, data9);
/* 来电提醒 */
data10[7] = 0x01;
init_CAN_Frame(&m_msg10, 0xA37FFE3, 8, 1, data10);
/* GMS */
data11[0] = 0x01;
init_CAN_Frame(&m_msg11, 0xA32FFE4, 8, 1, data11);
// /* GMS */
// data11[0] = 0x01;
// init_CAN_Frame(&m_msg11, 0xA32FFE4, 8, 1, data11);
/* 并联信号 */
data12[0] = 0x00;
......@@ -817,16 +818,16 @@ void can_submit(void)
init_CAN_Frame(&m_msg8, 0xA30FFE3, 8, 1, data8);
/* 无GPS信号 */
data9[0] = 0x02;
data9[0] = 0x03;
init_CAN_Frame(&m_msg9, 0xA32FFE4, 8, 1, data9);
/* 来电提醒 */
data10[7] = 0x00;
init_CAN_Frame(&m_msg10, 0xA37FFE3, 8, 1, data10);
/* GMS */
data11[0] = 0x01;
init_CAN_Frame(&m_msg11, 0xA32FFE4, 8, 1, data11);
// /* GMS */
// data11[0] = 0x01;
// init_CAN_Frame(&m_msg11, 0xA32FFE4, 8, 1, data11);
/* 并联信号 */
data12[0] = 0x01;
......@@ -859,13 +860,13 @@ void can_submit(void)
can_mid(m_msg8);
can_mid(m_msg9);
can_mid(m_msg10);
can_mid(m_msg11);
// can_mid(m_msg11);
can_mid(m_msg12);
can_mid(m_msg13);
}
else if(MENU_CHECK_STEP == 0)
{
can_mid(m_msg2);
can_mid(m_msg12);
}
}
uint8_t u8get714msg[8];
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 3ac9e3bd
......@@ -4439,45 +4439,45 @@ uint8_t CurrentWrong = 0;
uint16_t CurrentWrongfks = 0;
void Get_static_Current(void)
{
// static uint32_t loc_Timer = 0;
// static uint32_t loc_ret = 0;
// if(MENU_CHECK_STEP == 11)
// {
// loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
// loc_ret += loc_Current_0;
// loc_Timer++;
static uint32_t loc_Timer = 0;
static uint32_t loc_ret = 0;
if(MENU_CHECK_STEP == 11)
{
loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
loc_ret += loc_Current_0;
loc_Timer++;
// if ( loc_Timer >= Sampling_NUM )
// {
// loc_Timer = 0;
// loc_ret /= Sampling_NUM;
if ( loc_Timer >= Sampling_NUM )
{
loc_Timer = 0;
loc_ret /= Sampling_NUM;
// // loc_ret *= 1000;//单位0.001毫伏
// // loc_ret /= 100;//转化为电流，单位0.001毫安
// loc_ret /= 10;//单位0.1毫安
// loc_ret1 = loc_ret;
// }
// if(loc_ret1 != 0)
// {
// 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);
// // if(loc_ret1 > 10)
// // {
// // MENU_CHECK_STEP = 14;
// // CurrentWrong = 1;
// // }
// // else
// // {
// // CurrentWrong = 0;
// // }
// loc_ret1 = 0;
// }
// else
// {
// MENU_CHECK_STEP = 11;
// // CurrentWrong = 1;
// }
// }
// loc_ret *= 1000;//单位0.001毫伏
// loc_ret /= 100;//转化为电流，单位0.001毫安
loc_ret /= 10;//单位0.1毫安
loc_ret1 = loc_ret;
}
if(loc_ret1 != 0)
{
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);
// if(loc_ret1 > 10)
// {
// MENU_CHECK_STEP = 14;
// CurrentWrong = 1;
// }
// else
// {
// CurrentWrong = 0;
// }
loc_ret1 = 0;
}
else
{
MENU_CHECK_STEP = 11;
// CurrentWrong = 1;
}
}
}
const uint16_t testNum[] = {200,190,180};
......@@ -5090,36 +5090,36 @@ void Display_Send_Vspead(uint8_t menu)
ESpeed_val = 12000;
TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_15X0_Y0);
break;
case 11:
VSpeed_val = 199;
ESpeed_val = 12000;
TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_16X0_Y0);
break;
case 12:
VSpeed_val = 199;
ESpeed_val = 12000;
TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_17X0_Y0);
break;
case 13:
VSpeed_val = 199;
ESpeed_val = 12000;
TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_18X0_Y0);
break;
case 14:
VSpeed_val = 199;
ESpeed_val = 12000;
TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_19X0_Y0);
break;
case 15:
VSpeed_val = 199;
ESpeed_val = 12000;
TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_JCT_26X0_Y0);
// case 11:
// VSpeed_val = 199;
// ESpeed_val = 12000;
// TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_16X0_Y0);
// break;
// case 12:
// VSpeed_val = 199;
// ESpeed_val = 12000;
// TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_17X0_Y0);
// break;
// case 13:
// VSpeed_val = 199;
// ESpeed_val = 12000;
// TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_18X0_Y0);
// break;
// case 14:
// VSpeed_val = 199;
// ESpeed_val = 12000;
// TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_19X0_Y0);
// break;
// case 15:
// VSpeed_val = 199;
// ESpeed_val = 12000;
// TFT_LCD_Draw_Bmp(3, 165, ( uint8_t * )gImage_JCT_26X0_Y0);
break;
default:
// MENU_CHECK_STEP = 0;
break;
}
if(menu < 16 && menu != 0)
if(menu < 11 && menu != 0)
{
GUI_General_Digit_Display(VSpeed_val, Num_15, 3, 2, ODODigitNum09PosX, 40);
GUI_General_Digit_Display(ESpeed_val, Num_15, 5, 3, ODODigitNum09PosX, 80);
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ 3ac9e3bd
......@@ -56,9 +56,9 @@
#define PWM_FMQ GPIO_OUT_PORT10_PIN11
#define NEG_1_Ctrl GPIO_OUT_PORT09_PIN06
#define NEG_2_Ctrl GPIO_OUT_PORT09_PIN05
#define NEG_3_Ctrl GPIO_OUT_PORT09_PIN04
#define NEG_1_Ctrl GPIO_OUT_PORT09_PIN06 //负控1
#define NEG_2_Ctrl GPIO_OUT_PORT09_PIN05 //负控2
#define NEG_3_Ctrl GPIO_OUT_PORT09_PIN04 //负控3
#define NEG_4_Ctrl GPIO_OUT_PORT09_PIN03
#define NEG_5_Ctrl GPIO_OUT_PORT09_PIN02
#define NEG_6_Ctrl GPIO_OUT_PORT09_PIN01
......
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