Skip to content

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

🐞 fix:根据建雅仪表故障码修改，更新检测台程序，屏蔽无用部分

parent 06f65803
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 38 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ a969132c
...@@ -642,7 +642,8 @@ void can_submit(void) ...@@ -642,7 +642,8 @@ void can_submit(void)
init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x322, 8, 1, data4);
/* 故障码TCU指示灯 */ /* 故障码TCU指示灯 */
data5[1] = 0x01; data5[0] = 0x0F;
data5[1] = 0xA1;
init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x323, 8, 1, data5);
/* D档 */ /* D档 */
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ a969132c
...@@ -4439,45 +4439,45 @@ uint8_t CurrentWrong = 0; ...@@ -4439,45 +4439,45 @@ uint8_t CurrentWrong = 0;
uint16_t CurrentWrongfks = 0; uint16_t CurrentWrongfks = 0;
void Get_static_Current(void) void Get_static_Current(void)
{ {
static uint32_t loc_Timer = 0; // static uint32_t loc_Timer = 0;
static uint32_t loc_ret = 0; // static uint32_t loc_ret = 0;
if(MENU_CHECK_STEP == 11) // if(MENU_CHECK_STEP == 11)
{ // {
loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE); // loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
loc_ret += loc_Current_0; // loc_ret += loc_Current_0;
loc_Timer++; // loc_Timer++;
if ( loc_Timer >= Sampling_NUM ) // if ( loc_Timer >= Sampling_NUM )
{ // {
loc_Timer = 0; // loc_Timer = 0;
loc_ret /= Sampling_NUM; // loc_ret /= Sampling_NUM;
// loc_ret *= 1000;//单位0.001毫伏 // // loc_ret *= 1000;//单位0.001毫伏
// loc_ret /= 100;//转化为电流，单位0.001毫安 // // loc_ret /= 100;//转化为电流，单位0.001毫安
loc_ret /= 10;//单位0.1毫安 // loc_ret /= 10;//单位0.1毫安
loc_ret1 = loc_ret; // loc_ret1 = loc_ret;
} // }
if(loc_ret1 != 0) // if(loc_ret1 != 0)
{ // {
TFT_LCD_Draw_Bmp(190, 60, ( uint8_t * )gImage_Number_15_white_PiontX0_Y0); // 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); // GUI_General_Digit_Display(loc_ret1, Num_15, 3, 0, CurrentDigitNum09PosX, 60);
// if(loc_ret1 > 10) // // if(loc_ret1 > 10)
// { // // {
// MENU_CHECK_STEP = 14; // // MENU_CHECK_STEP = 14;
// CurrentWrong = 1; // // CurrentWrong = 1;
// } // // }
// else // // else
// { // // {
// CurrentWrong = 0; // // CurrentWrong = 0;
// } // // }
loc_ret1 = 0; // loc_ret1 = 0;
} // }
else // else
{ // {
MENU_CHECK_STEP = 11; // MENU_CHECK_STEP = 11;
// CurrentWrong = 1; // // CurrentWrong = 1;
} // }
} // }
} }
const uint16_t testNum[] = {200,190,180}; const uint16_t testNum[] = {200,190,180};
......
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