diff --git a/assets/User_code/bsp/fdcan/fdcan.c b/assets/User_code/bsp/fdcan/fdcan.c index 6c6221f..481548d 100644 --- a/assets/User_code/bsp/fdcan/fdcan.c +++ b/assets/User_code/bsp/fdcan/fdcan.c @@ -21,19 +21,19 @@ #define FDCAN1_FILTER_CONFIG_TABLE(X) \ X(0, FDCAN_STANDARD_ID, FDCAN_FILTER_MASK, 0x000 , 0x000 , 0) \ X(1, FDCAN_EXTENDED_ID, FDCAN_FILTER_MASK, 0x00000000, 0x00000000, 0) - #define FDCAN1_GLOBAL_FILTER FDCAN_REJECT, FDCAN_REJECT, FDCAN_FILTER_REMOTE, FDCAN_FILTER_REMOTE/* 全局过滤器参数(用于 HAL_FDCAN_ConfigGlobalFilter) */ + #define FDCAN1_GLOBAL_FILTER FDCAN_ACCEPT_IN_RX_FIFO0, FDCAN_ACCEPT_IN_RX_FIFO0, FDCAN_FILTER_REMOTE, FDCAN_FILTER_REMOTE #endif #ifdef FDCAN2_EN #define FDCAN2_FILTER_CONFIG_TABLE(X) \ X(0, FDCAN_STANDARD_ID, FDCAN_FILTER_MASK, 0x000 , 0x000 , 0) \ X(1, FDCAN_EXTENDED_ID, FDCAN_FILTER_MASK, 0x00000000, 0x00000000, 0) - #define FDCAN2_GLOBAL_FILTER FDCAN_REJECT, FDCAN_REJECT, FDCAN_FILTER_REMOTE, FDCAN_FILTER_REMOTE/* 全局过滤器参数(用于 HAL_FDCAN_ConfigGlobalFilter) */ + #define FDCAN2_GLOBAL_FILTER FDCAN_ACCEPT_IN_RX_FIFO1, FDCAN_ACCEPT_IN_RX_FIFO1, FDCAN_FILTER_REMOTE, FDCAN_FILTER_REMOTE #endif #ifdef FDCAN3_EN #define FDCAN3_FILTER_CONFIG_TABLE(X) \ X(0, FDCAN_STANDARD_ID, FDCAN_FILTER_MASK, 0x000 , 0x000 , 0) \ X(1, FDCAN_EXTENDED_ID, FDCAN_FILTER_MASK, 0x00000000, 0x00000000, 0) - #define FDCAN3_GLOBAL_FILTER FDCAN_REJECT, FDCAN_REJECT, FDCAN_FILTER_REMOTE, FDCAN_FILTER_REMOTE/* 全局过滤器参数(用于 HAL_FDCAN_ConfigGlobalFilter) */ + #define FDCAN3_GLOBAL_FILTER FDCAN_ACCEPT_IN_RX_FIFO1, FDCAN_ACCEPT_IN_RX_FIFO1, FDCAN_FILTER_REMOTE, FDCAN_FILTER_REMOTE #endif /* ====宏展开实现==== */ diff --git a/assets/User_code/component/limiter/limiter.c b/assets/User_code/component/limiter/limiter.c index 71e4bf1..b7e8138 100644 --- a/assets/User_code/component/limiter/limiter.c +++ b/assets/User_code/component/limiter/limiter.c @@ -105,3 +105,8 @@ float HeatLimit_ShootFreq(float heat, float heat_limit, float cooling_rate, else return (heat_percent > 0.7f) ? stable_freq : 3.0f * stable_freq; } + + +/* USER CODE BEGIN */ + +/* USER CODE END */ \ No newline at end of file diff --git a/assets/User_code/component/limiter/limiter.h b/assets/User_code/component/limiter/limiter.h index d0aa92a..5853c73 100644 --- a/assets/User_code/component/limiter/limiter.h +++ b/assets/User_code/component/limiter/limiter.h @@ -61,3 +61,7 @@ float PowerLimit_TargetPower(float power_limit, float power_buffer); */ float HeatLimit_ShootFreq(float heat, float heat_limit, float cooling_rate, float heat_increase, bool is_big); + +/* USER CODE BEGIN */ + +/* USER CODE END */ \ No newline at end of file