diff --git a/ECU_APP/rscan_driver/RL78_RCAN.c b/ECU_APP/rscan_driver/RL78_RCAN.c index f1686a6..5f432ad 100644 --- a/ECU_APP/rscan_driver/RL78_RCAN.c +++ b/ECU_APP/rscan_driver/RL78_RCAN.c @@ -44,7 +44,7 @@ const uint16_t g_rxrule_table[CAN_RX_RULE_NUM][6] = { /* IDL IDH IDL_MASK IDH_MASK Store data filter */ { 0x0741U, 0x0000U, 0xFFFFU, 0xDFFFU, 0x8002U, 0x8001U }, { 0x07DFU, 0x0000U, 0xFFFFU, 0xDFFFU, 0x8102U, 0x8002U }, - { 0x0403U, 0x0000U, 0xFFFFU, 0xDFFFU, 0x8202U, 0x8003U }, + { 0x0189U, 0x0000U, 0xFFFFU, 0xDFFFU, 0x8202U, 0x8003U }, { 0x026DU, 0x0000U, 0xFFFFU, 0xDFFFU, 0x8302U, 0x8004U }, { 0x0400U, 0x0000U, 0x0000U, 0xD480U, 0x8402U, 0x8005U }, //NW PDU diff --git a/ECU_APP/rscan_driver/r_rl78_can_irq.c b/ECU_APP/rscan_driver/r_rl78_can_irq.c index fb73018..68f7093 100644 --- a/ECU_APP/rscan_driver/r_rl78_can_irq.c +++ b/ECU_APP/rscan_driver/r_rl78_can_irq.c @@ -94,12 +94,11 @@ void __near RSCAN_INTCANGRECC_interrupt(void) ucNwNetIdelCheck = 1; //网络空闲检测 300ms如果没有置位 默认为空闲 } - if (RxCanMessage.IDL == 0x0403) + if (RxCanMessage.IDL == 0x0189) { - if (App28sTxRxStatus & 0x02 != 0) // Rx enable { - //Copy_Array_to_Array(CAN_403.Msg_Byte, RxCanMessage.DB, 8); + Copy_Array_to_Array(CAN_189.Msg_Byte, RxCanMessage.DB, 8); } } if (RxCanMessage.IDL == 0x026D) diff --git a/ECU_APP/user/PINdef.h b/ECU_APP/user/PINdef.h index 555f742..9f8a5b9 100644 --- a/ECU_APP/user/PINdef.h +++ b/ECU_APP/user/PINdef.h @@ -5,7 +5,7 @@ #define CAN_STB P1_bit.no2 -//#define O_IND_CTRL P3_bit.no0 + #define O_IND1_CTRL P1_bit.no5 #define O_IND2_CTRL P1_bit.no6 #define O_IND3_CTRL P1_bit.no7 @@ -22,7 +22,7 @@ typedef enum { SIGID_SW_LOCK_IN, SIGID_SW_L_IN, - SIGID_SW_RE1, + SIGID_SW_P_IN, SIGID_SW_RE2, SIG_NUM, }SIGID_type; diff --git a/ECU_APP/user/appTask.c b/ECU_APP/user/appTask.c index 2490a97..6831592 100644 --- a/ECU_APP/user/appTask.c +++ b/ECU_APP/user/appTask.c @@ -40,7 +40,7 @@ unsigned char BusoffFlag; uint16_t VehicleSpeedRaw,VehicleSpeed; uint8_t nouse;//Relocation value is odd number -uint8_t lock_state,lkey_state,re1key_state,re2key_state; +uint8_t lock_state,lkey_state,Pkey_state,re2key_state; #define LOCK_STATE_LOCKED 0 #define LOCK_STATE_UNLOCKED 1 static uint8_t g_lh_state,g_fnr_state; @@ -48,14 +48,18 @@ uint8_t g_f_op,g_n_op,g_r_op; static uint8_t PowerUpDetect_flag; static uint8_t PowerUp_FNR_Error_flag,OperationFault_flag; static uint8_t err_counter; +static uint8_t P_light_rcv; #define FNR_ERROR_HL_POS 0 #define FNR_ERROR_F_POS 1 #define FNR_ERROR_N_POS 2 #define FNR_ERROR_R_POS 3 +#define FNR_ERROR_P_POS 4 void IND_task(void); void HD_task(void); void PowerUpDetect(void); +void P_light_task(void); + void Apply_task(void) { @@ -80,7 +84,7 @@ void Apply_task(void) BusOff_Detect(); } KeyScan(); - + P_light_task(); //IGN_Detect(); //CanNwHandle(); @@ -108,7 +112,6 @@ void Apply_task(void) { PowerUpDetect(); } - } if (Timer_20ms_flag == 1) @@ -284,8 +287,11 @@ void PowerUpDetect(void)//10ms PowerUp_FNR_Error_flag = 0; - errbit = GetIOState(SIGID_SW_L_IN); - PowerUp_FNR_Error_flag |= errbit<