diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c index 205b38c..0de0897 100644 --- a/Core/Src/freertos.c +++ b/Core/Src/freertos.c @@ -164,20 +164,7 @@ void start_tcp_task(void const *argument) /* Infinite loop */ for (;;) { - // osThreadTerminate(NULL); - // if (tcp_send_flags_hart1 == 1) - // { - // user_send_data_hart1(hart1_uart5.rx_data, hart1_uart5.rx_num); - // tcp_send_flags_hart1 = 0; - // } - // if (tcp_send_flags_hart2 == 1) - // { - // user_send_data_hart2(hart2_uart2.rx_data, hart2_uart2.rx_num); - // tcp_send_flags_hart2 = 0; - // } - - vTaskDelay(1); - // osDelay(1); + osThreadTerminate(NULL); } /* USER CODE END start_tcp_task */ } @@ -272,7 +259,7 @@ void start_gpio_di_do_task(void const *argument) /* Infinite loop */ for (;;) { - vTaskDelay(500); + osThreadTerminate(NULL); } /* USER CODE END start_gpio_di_do_task */ } @@ -292,7 +279,7 @@ void start_ec11_task(void const *argument) { direction = __HAL_TIM_IS_TIM_COUNTING_DOWN(&htim1); encode_num = (short)__HAL_TIM_GET_COUNTER(&htim1); - osDelay(1); + vTaskDelay(100); } /* USER CODE END start_ec11_task */ } diff --git a/MDK-ARM/semi-finished_product_testing.uvoptx b/MDK-ARM/semi-finished_product_testing.uvoptx index 94fddf6..358794c 100644 --- a/MDK-ARM/semi-finished_product_testing.uvoptx +++ b/MDK-ARM/semi-finished_product_testing.uvoptx @@ -173,7 +173,42 @@ 4 1 - encode_num + encode_num,0x0A + + + 5 + 1 + htim1,0x0A + + + 6 + 1 + lwip_taskHandle + + + 7 + 1 + led_taskHandle + + + 8 + 1 + dac_taskHandle + + + 9 + 1 + adc_taskHandle + + + 10 + 1 + gpio_di_do_taskHandle + + + 11 + 1 + ec11_taskHandle