dengcy
/
micro_climate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加操作系统heap，修复卡死BUG

This commit is contained in:
95384 2024-12-11 13:05:41 +08:00
parent 063027c072
commit 5cf1dfbadb
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App/Src/anemometer_dev.c
View File

@ -132,7 +132,7 @@ float32_t RSSI;
float32_t buf[ADC_VAL_LEN]; float32_t buf[ADC_VAL_LEN];
float32_t buf2[ADC_VAL_LEN]; float32_t buf2[ADC_VAL_LEN];
/*****************滤波器BUFF**********/ /*****************滤波器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) // float32_t cal_tof(q15_t* x,uint32_t len)
{ {
q15_t max_val,dc_offset; q15_t max_val,dc_offset;

2
Core/Inc/FreeRTOSConfig.h
View File

@ -64,7 +64,7 @@
#define configTICK_RATE_HZ ((TickType_t)40) #define configTICK_RATE_HZ ((TickType_t)40)
#define configMAX_PRIORITIES ( 7 ) #define configMAX_PRIORITIES ( 7 )
#define configMINIMAL_STACK_SIZE ((uint16_t)128) #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 configMAX_TASK_NAME_LEN ( 16 )
#define configUSE_16_BIT_TICKS 0 #define configUSE_16_BIT_TICKS 0
#define configUSE_MUTEXES 1 #define configUSE_MUTEXES 1

9
Core/Src/freertos.c
View File

@ -115,17 +115,17 @@ void MX_FREERTOS_Init(void) {
/* Create the thread(s) */ /* Create the thread(s) */
/* definition and creation of defaultTask */ /* definition and creation of defaultTask */
osThreadDef(defaultTask, StartDefaultTask, osPriorityRealtime, 0, 512);//通讯 osThreadDef(defaultTask, StartDefaultTask, osPriorityRealtime, 0, 2048);//通讯
defaultTaskHandle = osThreadCreate(osThread(defaultTask), NULL); defaultTaskHandle = osThreadCreate(osThread(defaultTask), NULL);
osThreadDef(ledTask, LEDTask, osPriorityIdle, 0, 32);//LED osThreadDef(ledTask, LEDTask, osPriorityIdle, 0, 128);//LED
ledTaskHandle = osThreadCreate(osThread(ledTask), NULL); ledTaskHandle = osThreadCreate(osThread(ledTask), NULL);
/* USER CODE BEGIN RTOS_THREADS */ /* USER CODE BEGIN RTOS_THREADS */
osThreadDef(anemometer, wind_task, osPriorityHigh, 0, 256);// 风速风向 osThreadDef(anemometer, wind_task, osPriorityHigh, 0, 2048);// 风速风向
anemometerHandle = osThreadCreate(osThread(anemometer), NULL); 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); temhum_update_taskHandle = osThreadCreate(osThread(temhum_update_task), NULL);
// osThreadDef(sensorTask, SensorTask, osPriorityRealtime, 0, 128); // osThreadDef(sensorTask, SensorTask, osPriorityRealtime, 0, 128);
@ -195,7 +195,6 @@ void LEDTask(void const * argument)
{ {
osDelay(1000); osDelay(1000);
HAL_GPIO_TogglePin(GPIOC,GPIO_LED_CTRL_Pin); HAL_GPIO_TogglePin(GPIOC,GPIO_LED_CTRL_Pin);
} }
/* USER CODE END StartDefaultTask */ /* USER CODE END StartDefaultTask */
} }