Browse Source

删除optional模块,优化变量命名,不与老代码重复

master
Lizongdi 3 days ago
parent
commit
fcfe48d1fd
  1. 4
      CMakePresets.json
  2. 12
      Core/Src/stm32h7xx_it.c
  3. 2
      robot

4
CMakePresets.json

@ -39,7 +39,6 @@
"name": "paint_robot_new", "name": "paint_robot_new",
"inherits": "rb-core", "inherits": "rb-core",
"cacheVariables": { "cacheVariables": {
"BUILD_OPTIONAL": "ON",
"BUILD_MOTOR": "ON", "BUILD_MOTOR": "ON",
"BUILD_PAINT_ROBOT_NEW": "ON", "BUILD_PAINT_ROBOT_NEW": "ON",
"USE_LUA_ST": true, "USE_LUA_ST": true,
@ -47,7 +46,8 @@
"USE_LWIP": true, "USE_LWIP": true,
"USE_PRINT": true, "USE_PRINT": true,
"PRINT_ID": "3", "PRINT_ID": "3",
"USE_FREERTOS": true "USE_FREERTOS": true,
"RD_VERSION": "paint_robot_new v1.0"
} }
} }
] ]

12
Core/Src/stm32h7xx_it.c

@ -349,7 +349,7 @@ void TIM3_IRQHandler(void)
void USART1_IRQHandler(void) void USART1_IRQHandler(void)
{ {
/* USER CODE BEGIN USART1_IRQn 0 */ /* USER CODE BEGIN USART1_IRQn 0 */
UART_DMA_RX_IRQHandler(g_ptRS485_1); UART_DMA_RX_IRQHandler(g_ptrs485_1);
/* USER CODE END USART1_IRQn 0 */ /* USER CODE END USART1_IRQn 0 */
HAL_UART_IRQHandler(&huart1); HAL_UART_IRQHandler(&huart1);
/* USER CODE BEGIN USART1_IRQn 1 */ /* USER CODE BEGIN USART1_IRQn 1 */
@ -363,7 +363,7 @@ void USART1_IRQHandler(void)
void USART2_IRQHandler(void) void USART2_IRQHandler(void)
{ {
/* USER CODE BEGIN USART2_IRQn 0 */ /* USER CODE BEGIN USART2_IRQn 0 */
UART_DMA_RX_IRQHandler(g_ptLTE_7S0); UART_DMA_RX_IRQHandler(g_ptlte_7S0);
/* USER CODE END USART2_IRQn 0 */ /* USER CODE END USART2_IRQn 0 */
HAL_UART_IRQHandler(&huart2); HAL_UART_IRQHandler(&huart2);
/* USER CODE BEGIN USART2_IRQn 1 */ /* USER CODE BEGIN USART2_IRQn 1 */
@ -380,7 +380,7 @@ void USART3_IRQHandler(void)
#ifdef USE_PRINT #ifdef USE_PRINT
UART_DMA_RX_IRQHandler(g_ptUartCtrl); UART_DMA_RX_IRQHandler(g_ptUartCtrl);
#else #else
UART_DMA_RX_IRQHandler(g_ptRS485_2); UART_DMA_RX_IRQHandler(g_ptrs485_2);
#endif #endif
/* USER CODE END USART3_IRQn 0 */ /* USER CODE END USART3_IRQn 0 */
HAL_UART_IRQHandler(&huart3); HAL_UART_IRQHandler(&huart3);
@ -437,7 +437,7 @@ void UART4_IRQHandler(void)
void UART5_IRQHandler(void) void UART5_IRQHandler(void)
{ {
/* USER CODE BEGIN UART5_IRQn 0 */ /* USER CODE BEGIN UART5_IRQn 0 */
UART_DMA_RX_IRQHandler(g_ptE28_SBUS); UART_DMA_RX_IRQHandler(g_ptSbus);
/* USER CODE END UART5_IRQn 0 */ /* USER CODE END UART5_IRQn 0 */
HAL_UART_IRQHandler(&huart5); HAL_UART_IRQHandler(&huart5);
/* USER CODE BEGIN UART5_IRQn 1 */ /* USER CODE BEGIN UART5_IRQn 1 */
@ -563,7 +563,7 @@ void DMA2_Stream5_IRQHandler(void)
void USART6_IRQHandler(void) void USART6_IRQHandler(void)
{ {
/* USER CODE BEGIN USART6_IRQn 0 */ /* USER CODE BEGIN USART6_IRQn 0 */
UART_DMA_RX_IRQHandler(g_ptRS485_3); UART_DMA_RX_IRQHandler(g_ptrs485_3);
/* USER CODE END USART6_IRQn 0 */ /* USER CODE END USART6_IRQn 0 */
HAL_UART_IRQHandler(&huart6); HAL_UART_IRQHandler(&huart6);
/* USER CODE BEGIN USART6_IRQn 1 */ /* USER CODE BEGIN USART6_IRQn 1 */
@ -577,7 +577,7 @@ void USART6_IRQHandler(void)
void UART7_IRQHandler(void) void UART7_IRQHandler(void)
{ {
/* USER CODE BEGIN UART7_IRQn 0 */ /* USER CODE BEGIN UART7_IRQn 0 */
UART_DMA_RX_IRQHandler(g_ptRS485_4); UART_DMA_RX_IRQHandler(g_ptrs485_4);
/* USER CODE END UART7_IRQn 0 */ /* USER CODE END UART7_IRQn 0 */
HAL_UART_IRQHandler(&huart7); HAL_UART_IRQHandler(&huart7);
/* USER CODE BEGIN UART7_IRQn 1 */ /* USER CODE BEGIN UART7_IRQn 1 */

2
robot

@ -1 +1 @@
Subproject commit 4049fe84af279899df5cf4adb1aa86b73b2cd5f1 Subproject commit 692c8a031cd1bc64f7e052b58357d3cc80cdf765
Loading…
Cancel
Save