From 5cf1dfbadbc168be2a0bf4321675dd024faa2d18 Mon Sep 17 00:00:00 2001 From: 95384 <664090429@qq.com> Date: Wed, 11 Dec 2024 13:05:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9Fheap=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=8D=A1=E6=AD=BBBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Src/anemometer_dev.c | 2 +- Core/Inc/FreeRTOSConfig.h | 2 +- Core/Src/freertos.c | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/App/Src/anemometer_dev.c b/App/Src/anemometer_dev.c index 433914c..061b6fd 100644 --- a/App/Src/anemometer_dev.c +++ b/App/Src/anemometer_dev.c @@ -132,7 +132,7 @@ float32_t RSSI; float32_t buf[ADC_VAL_LEN]; float32_t buf2[ADC_VAL_LEN]; /*****************滤波器BUFF**********/ -float32_t cal_tof(q15_t* x,uint32_t len, int16_t *maxVal) +float32_t cal_tof(q15_t* x,uint32_t len, uint16_t *maxVal) // float32_t cal_tof(q15_t* x,uint32_t len) { q15_t max_val,dc_offset; diff --git a/Core/Inc/FreeRTOSConfig.h b/Core/Inc/FreeRTOSConfig.h index 844246a..30b0ea4 100644 --- a/Core/Inc/FreeRTOSConfig.h +++ b/Core/Inc/FreeRTOSConfig.h @@ -64,7 +64,7 @@ #define configTICK_RATE_HZ ((TickType_t)40) #define configMAX_PRIORITIES ( 7 ) #define configMINIMAL_STACK_SIZE ((uint16_t)128) -#define configTOTAL_HEAP_SIZE ((size_t)8000) +#define configTOTAL_HEAP_SIZE ((size_t)20*1024) #define configMAX_TASK_NAME_LEN ( 16 ) #define configUSE_16_BIT_TICKS 0 #define configUSE_MUTEXES 1 diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c index df89c56..d415c51 100644 --- a/Core/Src/freertos.c +++ b/Core/Src/freertos.c @@ -115,17 +115,17 @@ void MX_FREERTOS_Init(void) { /* Create the thread(s) */ /* definition and creation of defaultTask */ - osThreadDef(defaultTask, StartDefaultTask, osPriorityRealtime, 0, 512);//ͨѶ + osThreadDef(defaultTask, StartDefaultTask, osPriorityRealtime, 0, 2048);//ͨѶ defaultTaskHandle = osThreadCreate(osThread(defaultTask), NULL); - osThreadDef(ledTask, LEDTask, osPriorityIdle, 0, 32);//LED + osThreadDef(ledTask, LEDTask, osPriorityIdle, 0, 128);//LED ledTaskHandle = osThreadCreate(osThread(ledTask), NULL); /* USER CODE BEGIN RTOS_THREADS */ - osThreadDef(anemometer, wind_task, osPriorityHigh, 0, 256);// ·çËÙ·çÏò + osThreadDef(anemometer, wind_task, osPriorityHigh, 0, 2048);// ·çËÙ·çÏò anemometerHandle = osThreadCreate(osThread(anemometer), NULL); - osThreadDef(temhum_update_task, tem_hum_update_task, osPriorityAboveNormal, 0, 256);//ÎÂʪ¶È£¬´óÆøѹ¸üР+ osThreadDef(temhum_update_task, tem_hum_update_task, osPriorityAboveNormal, 0, 1024);//ÎÂʪ¶È£¬´óÆøѹ¸üРtemhum_update_taskHandle = osThreadCreate(osThread(temhum_update_task), NULL); // osThreadDef(sensorTask, SensorTask, osPriorityRealtime, 0, 128); @@ -195,7 +195,6 @@ void LEDTask(void const * argument) { osDelay(1000); HAL_GPIO_TogglePin(GPIOC,GPIO_LED_CTRL_Pin); - } /* USER CODE END StartDefaultTask */ }