Compare commits
No commits in common. "be0a717887ffda5fe63d0c0ec7cc346484aebd1a" and "a44cfc0cc62a54f0ea05e730217551470c730454" have entirely different histories.
be0a717887
...
a44cfc0cc6
|
@ -32,9 +32,8 @@ typedef enum
|
||||||
FRT_REGISTER_HUMIDITY = 7, /* 大气湿度 */
|
FRT_REGISTER_HUMIDITY = 7, /* 大气湿度 */
|
||||||
FRT_REGISTER_PRESSURE = 8, /* 大气压 */
|
FRT_REGISTER_PRESSURE = 8, /* 大气压 */
|
||||||
FRT_REGISTER_RAIN = 9, /* 雨量 */
|
FRT_REGISTER_RAIN = 9, /* 雨量 */
|
||||||
FRT_REGISTER_IRRADIANCE = 10, /* 光辐射 */
|
FRT_REGISTER_LIGHT_INTENSITY_HIGH = 10, /* 光照强度高位 */
|
||||||
// FRT_REGISTER_LIGHT_INTENSITY_HIGH = 10, /* 光照强度高位 */
|
FRT_REGISTER_LIGHT_INTENSITY_LOW = 11, /* 光照强度低位 */
|
||||||
// FRT_REGISTER_LIGHT_INTENSITY_LOW = 11, /* 光照强度低位 */
|
|
||||||
FRT_REGISTER_THROUGH_WIND_DIRECTION = 12, /* 极小风向 */
|
FRT_REGISTER_THROUGH_WIND_DIRECTION = 12, /* 极小风向 */
|
||||||
FRT_REGISTER_INSTANTANEOUS_WIND_DIRECTION = 13, /* 瞬时风向 */
|
FRT_REGISTER_INSTANTANEOUS_WIND_DIRECTION = 13, /* 瞬时风向 */
|
||||||
FRT_REGISTER_PEAK_WIND_DIRECTION = 14, /* 极大风向 */
|
FRT_REGISTER_PEAK_WIND_DIRECTION = 14, /* 极大风向 */
|
||||||
|
|
|
@ -1079,7 +1079,6 @@ 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
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,11 +32,8 @@ static u_int16_t FRT_ReadRegTemperature(void *pMsg);
|
||||||
static u_int16_t FRT_ReadRegHumidity(void *pMsg);
|
static u_int16_t FRT_ReadRegHumidity(void *pMsg);
|
||||||
static u_int16_t FRT_ReadRegPressure(void *pMsg);
|
static u_int16_t FRT_ReadRegPressure(void *pMsg);
|
||||||
static u_int16_t FRT_ReadRegRain(void *pMsg);
|
static u_int16_t FRT_ReadRegRain(void *pMsg);
|
||||||
|
static u_int16_t FRT_ReadRegLightHigh(void *pMsg);
|
||||||
static u_int16_t FRT_ReadRegirradiance(void *pMsg);
|
static u_int16_t FRT_ReadRegLightLow(void *pMsg);
|
||||||
|
|
||||||
//static u_int16_t FRT_ReadRegLightHigh(void *pMsg);
|
|
||||||
//static u_int16_t FRT_ReadRegLightLow(void *pMsg);
|
|
||||||
/* 读 */
|
/* 读 */
|
||||||
static u_int16_t FRT_ReadRegDeviceAddr(void *pMsg);
|
static u_int16_t FRT_ReadRegDeviceAddr(void *pMsg);
|
||||||
static u_int16_t FRT_ReadRegCommuBaudRate(void *pMsg);
|
static u_int16_t FRT_ReadRegCommuBaudRate(void *pMsg);
|
||||||
|
@ -134,9 +131,8 @@ FRT_RegProcTable_s g_RegTbl[] =
|
||||||
{ FRT_REGISTER_HUMIDITY, FRT_ReadRegHumidity }, /* 大气湿度 */
|
{ FRT_REGISTER_HUMIDITY, FRT_ReadRegHumidity }, /* 大气湿度 */
|
||||||
{ FRT_REGISTER_PRESSURE, FRT_ReadRegPressure }, /* 大气压 */
|
{ FRT_REGISTER_PRESSURE, FRT_ReadRegPressure }, /* 大气压 */
|
||||||
{ FRT_REGISTER_RAIN, FRT_ReadRegRain }, /* 雨量 */
|
{ FRT_REGISTER_RAIN, FRT_ReadRegRain }, /* 雨量 */
|
||||||
{ FRT_REGISTER_IRRADIANCE, FRT_ReadRegirradiance }, /* 光辐射 */
|
{ FRT_REGISTER_LIGHT_INTENSITY_HIGH, FRT_ReadRegLightHigh }, /* 光照高位 */
|
||||||
// { FRT_REGISTER_LIGHT_INTENSITY_HIGH, FRT_ReadRegLightHigh }, /* 光照高位 */
|
{ FRT_REGISTER_LIGHT_INTENSITY_LOW, FRT_ReadRegLightLow }, /* 光照低位 */
|
||||||
// { FRT_REGISTER_LIGHT_INTENSITY_LOW, FRT_ReadRegLightLow }, /* 光照低位 */
|
|
||||||
{ FRT_REGISTER_DEVICE_ADDR, FRT_ReadRegDeviceAddr }, /* 设备地址 */
|
{ FRT_REGISTER_DEVICE_ADDR, FRT_ReadRegDeviceAddr }, /* 设备地址 */
|
||||||
{ FRT_REGISTER_COMMU_BAUDRATE, FRT_ReadRegCommuBaudRate }, /* 波特率 */
|
{ FRT_REGISTER_COMMU_BAUDRATE, FRT_ReadRegCommuBaudRate }, /* 波特率 */
|
||||||
{ FRT_REGISTER_SPEED_AVERAGE_TIME, FRT_ReadRegSpeedAverageTime }, /* 风速平均时间 */
|
{ FRT_REGISTER_SPEED_AVERAGE_TIME, FRT_ReadRegSpeedAverageTime }, /* 风速平均时间 */
|
||||||
|
@ -416,37 +412,26 @@ static u_int16_t FRT_ReadRegRain(void *pMsg)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief 读光辐射寄存器值
|
* @brief 读光照高位寄存器值
|
||||||
* @param
|
* @param
|
||||||
* @retval
|
* @retval
|
||||||
*/
|
*/
|
||||||
static u_int16_t FRT_ReadRegirradiance(void *pMsg)
|
static u_int16_t FRT_ReadRegLightHigh(void *pMsg)
|
||||||
{
|
{
|
||||||
u_int16_t value = g_stMcs_Para.lightIntensity/10.0f;
|
u_int16_t value=(u_int16_t)(g_stMcs_Para.lightIntensity>>16);
|
||||||
return FRT_swap_endian_16(value);
|
return FRT_swap_endian_16(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
///**
|
/**
|
||||||
// * @brief 读光照高位寄存器值
|
* @brief 读光照低位寄存器值
|
||||||
// * @param
|
* @param
|
||||||
// * @retval
|
* @retval
|
||||||
// */
|
*/
|
||||||
//static u_int16_t FRT_ReadRegLightHigh(void *pMsg)
|
static u_int16_t FRT_ReadRegLightLow(void *pMsg)
|
||||||
//{
|
{
|
||||||
// u_int16_t value=(u_int16_t)(g_stMcs_Para.lightIntensity>>16);
|
u_int16_t value=(u_int16_t)(g_stMcs_Para.lightIntensity);
|
||||||
// return FRT_swap_endian_16(value);
|
return FRT_swap_endian_16(value);
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
///**
|
|
||||||
// * @brief 读光照低位寄存器值
|
|
||||||
// * @param
|
|
||||||
// * @retval
|
|
||||||
// */
|
|
||||||
//static u_int16_t FRT_ReadRegLightLow(void *pMsg)
|
|
||||||
//{
|
|
||||||
// u_int16_t value=(u_int16_t)(g_stMcs_Para.lightIntensity);
|
|
||||||
// return FRT_swap_endian_16(value);
|
|
||||||
//}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief 读设备地址寄存器值
|
* @brief 读设备地址寄存器值
|
||||||
|
|
|
@ -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(5000);
|
osDelay(2000);
|
||||||
/* Infinite loop */
|
/* Infinite loop */
|
||||||
for(;;)
|
for(;;)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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>9000)
|
if(MS56XX_Temperature>8500)
|
||||||
{
|
{
|
||||||
MS56XX_Temperature=9000;
|
MS56XX_Temperature=8500;
|
||||||
return HAL_ERROR;
|
return HAL_ERROR;
|
||||||
}
|
}
|
||||||
if(Tmp_Pressure<1000)
|
if(Tmp_Pressure<1000)
|
||||||
|
@ -226,16 +226,11 @@ 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;
|
||||||
}
|
}
|
Loading…
Reference in New Issue