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

Merge branch 'master' into rain

This commit is contained in:
95384 2025-05-17 11:54:22 +08:00
parent a44cfc0cc6 3d800becda
commit fa0a586fa2
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
App/Src/anemometer_dev.c
View File

@ -1079,6 +1079,7 @@ static void getTempHumiPress(void)
//置错误标志位 //置错误标志位
g_error_log.temp_error_HP203B = 1; g_error_log.temp_error_HP203B = 1;
//错误处理 //错误处理
g_stMcs_Para.pressure = 0;
} }
else else
{ {

2
Core/Src/freertos.c
View File

@ -151,7 +151,7 @@ void MX_FREERTOS_Init(void) {
void StartDefaultTask(void const * argument) void StartDefaultTask(void const * argument)
{ {
/* USER CODE BEGIN StartDefaultTask */ /* USER CODE BEGIN StartDefaultTask */
osDelay(2000); osDelay(5000);
/* Infinite loop */ /* Infinite loop */
for(;;) for(;;)
{ {

9
Drivers/MS5607/ms5607.c
View File

@ -178,9 +178,9 @@ static HAL_StatusTypeDef MS56XX_GetPressureTemp(float *Temp, float *Press) //
MS56XX_Temperature=-6000; MS56XX_Temperature=-6000;
return HAL_ERROR; return HAL_ERROR;
} }
if(MS56XX_Temperature>8500) if(MS56XX_Temperature>9000)
{ {
MS56XX_Temperature=8500; MS56XX_Temperature=9000;
return HAL_ERROR; return HAL_ERROR;
} }
if(Tmp_Pressure<1000) if(Tmp_Pressure<1000)
@ -226,11 +226,16 @@ HAL_StatusTypeDef MS56XX_GetPressure(float *Press)
ret_falt++; ret_falt++;
pressure_buff[i] = 0; pressure_buff[i] = 0;
} }
osDelay(15);//转换时间
} }
if(ret_falt >= COLLECT_DATA_NUM) if(ret_falt >= COLLECT_DATA_NUM)
{ {
return HAL_ERROR; return HAL_ERROR;
} }
*Press = calculateAverage( pressure_buff,COLLECT_DATA_NUM - ret_falt); *Press = calculateAverage( pressure_buff,COLLECT_DATA_NUM - ret_falt);
// if(MS56XX_GetPressureTemp(&temp_buff, Press) != HAL_OK)
// {
// return HAL_ERROR;
// }
return HAL_OK; return HAL_OK;
} }