Commit 04b8e674 authored by hu's avatar hu

调整BOOTid,调整T10绿灯点亮条件

parent f959d331
...@@ -821,7 +821,7 @@ uint8_t Get_ID_18F0010B_Sig_ASR_Brake_Control_Active(void) ...@@ -821,7 +821,7 @@ uint8_t Get_ID_18F0010B_Sig_ASR_Brake_Control_Active(void)
uint8_t Get_ID_18F0010B_Sig_HSAGreen_Sta(void) uint8_t Get_ID_18F0010B_Sig_HSAGreen_Sta(void)
{ {
return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 0u) >> 4u) & 0x03u)); return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 2u) >> 4u) & 0x03u));
} }
uint8_t Get_ID_18F0010B_Sig_ASR_Offroad_Switch(void) uint8_t Get_ID_18F0010B_Sig_ASR_Offroad_Switch(void)
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#ifndef _DIAG_ID_DEF_H_ #ifndef _DIAG_ID_DEF_H_
#define _DIAG_ID_DEF_H_ #define _DIAG_ID_DEF_H_
#define DIAG_ID_Tx 0x0113 /*发送ID*/ #define DIAG_ID_Tx 0x7F8 /*发送ID*/
#define DIAG_ID_Rx_PHY 0x0112 /*接收ID,物理寻址*/ #define DIAG_ID_Rx_PHY 0x7F0 /*接收ID,物理寻址*/
#define DIAG_ID_Rx_FUN 0x0111 /*接收ID,功能寻址*/ #define DIAG_ID_Rx_FUN 0x7F0 /*接收ID,功能寻址*/
#endif #endif
\ No newline at end of file
...@@ -42,6 +42,6 @@ const RSCANFD_Filter_st_t CANFD_RX_RULE_TABLE_LIST[CANFD0_RX_RULE_SIZE] = ...@@ -42,6 +42,6 @@ const RSCANFD_Filter_st_t CANFD_RX_RULE_TABLE_LIST[CANFD0_RX_RULE_SIZE] =
{0x000007E8ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 1*/ {0x000007E8ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 1*/
{0x00000111ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 2*/ {0x000007F0ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 2*/
{0x00000112ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 3*/ //{0x00000112ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 3*/
}; };
\ No newline at end of file
...@@ -13,7 +13,7 @@ typedef struct ...@@ -13,7 +13,7 @@ typedef struct
#define CANFD0_CH0_RX_RULE_SIZE 24u #define CANFD0_CH0_RX_RULE_SIZE 24u
#define CANFD0_CH1_RX_RULE_SIZE 0U #define CANFD0_CH1_RX_RULE_SIZE 0U
#define CANFD0_CH2_RX_RULE_SIZE 3U #define CANFD0_CH2_RX_RULE_SIZE 2U
#define CANFD0_RX_RULE_SIZE (CANFD0_CH0_RX_RULE_SIZE + \ #define CANFD0_RX_RULE_SIZE (CANFD0_CH0_RX_RULE_SIZE + \
......
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