Skip to content

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

✨ feat:添加清大计下电策略

parent 6ad02c2d
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 124 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ c8d2b170
......@@ -868,104 +868,6 @@ void send_0x714_fuc()
switch (zhenduanstep)
{
case 0:
data7[0] = 0x02;
data7[1] = 0x10;
data7[2] = 0x03;
data7[3] = 0xAA;
data7[4] = 0xAA;
data7[5] = 0xAA;
data7[6] = 0xAA;
data7[7] = 0xAA;
init_CAN_Frame(&m_msg7, 0x714, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
break;
case 1:
data7[0] = 0x02;
data7[1] = 0x27;
data7[2] = 0x01;
data7[3] = 0xAA;
data7[4] = 0xAA;
data7[5] = 0xAA;
data7[6] = 0xAA;
data7[7] = 0xAA;
init_CAN_Frame(&m_msg7, 0x714, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
break;
case 2:
if(u8_get_seed_msg() == 1)
{
zhenduanstep++;
}
break;
case 3:
data7[0] = 0x06;
data7[1] = 0x27;
data7[2] = 0x02;
data7[3] = u8_seedresult[0];
data7[4] = u8_seedresult[1];
data7[5] = u8_seedresult[2];
data7[6] = u8_seedresult[3];
data7[7] = 0xAA;
init_CAN_Frame(&m_msg7, 0x714, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
break;
case 4:
data7[0] = 0x10;
data7[1] = 0x17;
data7[2] = 0x2E;
data7[3] = 0xF1;
data7[4] = 0x87;
data7[5] = 0x39;
data7[6] = 0x44;
data7[7] = 0x52;
init_CAN_Frame(&m_msg7, 0x714, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
break;
case 5:
data7[0] = 0x21;
data7[1] = 0x56;
data7[2] = 0x2D;
data7[3] = 0x31;
data7[4] = 0x37;
data7[5] = 0x31;
data7[6] = 0x30;
data7[7] = 0x30;
init_CAN_Frame(&m_msg7, 0x714, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
break;
case 6:
data7[0] = 0x22;
data7[1] = 0x30;
data7[2] = 0x2D;
data7[3] = 0x31;
data7[4] = 0x34;
data7[5] = 0x30;
data7[6] = 0x30;
data7[7] = 0x30;
init_CAN_Frame(&m_msg7, 0x714, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
break;
case 7:
data7[0] = 0x23;
data7[1] = 0x20;
data7[2] = 0x20;
data7[3] = 0x20;
data7[4] = 0xAA;
data7[5] = 0xAA;
data7[6] = 0xAA;
data7[7] = 0xAA;
init_CAN_Frame(&m_msg7, 0x714, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
break;
case 8:
data7[0] = 0x03;
data7[1] = 0x22;
data7[2] = 0xF1;
......@@ -976,9 +878,9 @@ void send_0x714_fuc()
data7[7] = 0xAA;
init_CAN_Frame(&m_msg7, 0x714, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
// zhenduanstep++;
break;
case 9:
case 1:
data7[0] = 0x30;
data7[1] = 0x00;
data7[2] = 0x00;
......@@ -989,17 +891,14 @@ void send_0x714_fuc()
data7[7] = 0xAA;
init_CAN_Frame(&m_msg7, 0x714, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
Get_SW_msg();
// zhenduanstep++;
// Get_SW_msg();
break;
case 10:
case 2:
Get_SW_msg();
zhenduanstep++;
break;
case 11:
case 3:
data7[0] = 0x03;
data7[1] = 0x22;
data7[2] = 0xF1;
......@@ -1010,9 +909,8 @@ void send_0x714_fuc()
data7[7] = 0xAA;
init_CAN_Frame(&m_msg7, 0x714, 8, 1, data7);
can_mid(m_msg7);
zhenduanstep++;
break;
case 12:
case 4:
data7[0] = 0x30;
data7[1] = 0x00;
data7[2] = 0x00;
......@@ -1025,11 +923,10 @@ void send_0x714_fuc()
can_mid(m_msg7);
zhenduanstep++;
break;
case 13:
Get_HW_msg();
case 5:
zhenduanstep++;
break;
case 14:
case 6:
data7[0] = 0x03;
data7[1] = 0x22;
data7[2] = 0xF1;
......@@ -1042,7 +939,7 @@ void send_0x714_fuc()
can_mid(m_msg7);
zhenduanstep++;
break;
case 15:
case 7:
Get_PN_msg();
data7[0] = 0x30;
data7[1] = 0x00;
......@@ -1057,16 +954,12 @@ void send_0x714_fuc()
zhenduanstep++;
Get_PN_msg();
break;
case 16:
case 8:
Get_PN_msg();
// if(PNtestresult == 1)
// {
zhenduanstep++;
// }
break;
default:
zhenduanstep = 8;
zhenduanstep = 0;
cycleflag = 0;
getmsgfinish = 1;
send0x714time = 0;
......
YueJin_test_bench/source/Appliciation/CAN_APP.h
View file @ c8d2b170
......@@ -56,4 +56,8 @@ void change_UDS_DID(void);
void resetchangeUDSfuc(void);
void resetpowerfuel(void);
uint32_t Get_ODO_Value(void);
extern uint8_t zhenduanstep;
extern uint8_t ruanjianbanbenhao[8];
extern uint8_t yingjianbanbenhao[8];
#endif
YueJin_test_bench/source/Appliciation/Task.c
View file @ c8d2b170
......@@ -72,10 +72,10 @@ void Sys_Run_Mode_5ms_Tasks_Group(void)
/*==============================================================================
10ms����ִ������ ��0��
------------------------------------------------------------------------------*/
uint32_t ODOvalue=0;
void Sys_Run_Mode_10ms_Tasks_Group(void)
{
uint32_t ODOvalue = Get_ODO_Value();
ODOvalue = Get_ODO_Value();
if(ODOvalue > 0 && MENU_CHECK_STEP == 0 && ODOclearflag == 0)
{
ODOclearflag = 1;
......@@ -114,6 +114,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
Key_Service( );
}
if()
resetchangeUDSfuc();
......@@ -226,6 +227,8 @@ void Sys_Run_Mode_50ms_Tasks_Group(void)
------------------------------------------------------------------------------*/
uint16_t u16LJSText;
uint8_t time300ms;
uint8_t delay_1=0;
uint8_t ODOFlag=0;
void Sys_Run_Mode_100ms_Tasks_Group(void)
{
static uint32_t loc_timer = 0;
......@@ -261,6 +264,34 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
}
Total_Check( );
if((ODOvalue>0) && ( MENU_CHECK_STEP==13))
{
LINE_OUT_POS_05=1;
}
else
{
LINE_OUT_POS_05=0;
}
if((ODOvalue==0) && (ODOFlag==0) && ( MENU_CHECK_STEP==13))
{
delay_1++;
{
if(delay_1==20)
{
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
POWER_CTRL_KL30_Current=0;
delay_1=0;
ODOFlag=1;
}
}
}
//u16LJSText = TFT_LCD_REQ_FIFO_MAX_DEPTH;
}
/*=================================================================*/
......
YueJin_test_bench/source/Driver/CAN/RSCAN.c
View file @ c8d2b170
......@@ -7,7 +7,9 @@
#include "rh850_macros.h"
#include "RSCAN.h"
#include "RSCAN_Table.h"
#include "CAN_APP.h"
#include "CAN_Communication_Matrix.h"
#include "Display_Info.h"
#define RSCAN_CKSCLK_IPERI2_CLKC 40000000UL /*PPLLCLK2*/
#define RSCAN_CKSCLK_ICANOSC_CLK_XIN_CAN 8000000UL /*MainOSC*/
#define RSCAN_F_CAN RSCAN_CKSCLK_IPERI2_CLKC
......@@ -787,11 +789,62 @@ void RSCAN0_CH3_Receive(CAN_Frame_st_t *pstCANFrame)
g_stRSCAN0Config.stRSCANCh3.pfnRSCANReadMsgCallBack(pstCANFrame->u32CANID, pstCANFrame->u8CANLEN, pstCANFrame->unCANData.u8CANData);
}
}
uint8_t getbanbenhao[8];
uint8_t read=0;
void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
{
if (g_stRSCAN0Config.stRSCANCh4.pfnRSCANReadMsgCallBack)
{
g_stRSCAN0Config.stRSCANCh4.pfnRSCANReadMsgCallBack(pstCANFrame->u32CANID, pstCANFrame->u8CANLEN, pstCANFrame->unCANData.u8CANData);
getbanbenhao[0] = Get_CAN_CH0_ID_794_byte0_Sig();
getbanbenhao[1] = Get_CAN_CH0_ID_794_byte1_Sig();
getbanbenhao[2] = Get_CAN_CH0_ID_794_byte2_Sig();
getbanbenhao[3] = Get_CAN_CH0_ID_794_byte3_Sig();
getbanbenhao[4] = Get_CAN_CH0_ID_794_byte4_Sig();
getbanbenhao[5] = Get_CAN_CH0_ID_794_byte5_Sig();
getbanbenhao[6] = Get_CAN_CH0_ID_794_byte6_Sig();
getbanbenhao[7] = Get_CAN_CH0_ID_794_byte7_Sig();
if((getbanbenhao[0]==0x10) && (getbanbenhao[4]==0X95) && (read==0))
{
ruanjianbanbenhao[0]=getbanbenhao[5];
ruanjianbanbenhao[1]=getbanbenhao[6];
ruanjianbanbenhao[2]=getbanbenhao[7];
zhenduanstep=1;
read=1;
}
else if((getbanbenhao[0] == 0x21) && (read==1))
{
ruanjianbanbenhao[3]=getbanbenhao[1];
ruanjianbanbenhao[4]=getbanbenhao[2];
ruanjianbanbenhao[5]=getbanbenhao[3];
ruanjianbanbenhao[6]=getbanbenhao[4];
ruanjianbanbenhao[7]=0xFF;
General_Number_Disp(ruanjianbanbenhao, 105, 25);
zhenduanstep=3;
read=2;
}
else if((getbanbenhao[0]==0x10) && (getbanbenhao[4]==0X93) && (read==2))
{
yingjianbanbenhao[0] =getbanbenhao[5];
yingjianbanbenhao[1]=getbanbenhao[6];
yingjianbanbenhao[2]=getbanbenhao[7];
zhenduanstep=4;
read=3;
}
else if((getbanbenhao[0] == 0x21) && (read==3))
{
yingjianbanbenhao[3]=getbanbenhao[1];
yingjianbanbenhao[4]=getbanbenhao[2];
yingjianbanbenhao[5]=getbanbenhao[3];
yingjianbanbenhao[6]=getbanbenhao[4];
yingjianbanbenhao[7]=0xFF;
General_Number_Disp(yingjianbanbenhao, 105, 50);
zhenduanstep=5;
read=0;
}
}
}
void RSCAN0_CH5_Receive(CAN_Frame_st_t *pstCANFrame)
......
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