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

按汇源协议添加光辐射寄存器

This commit is contained in:
95384 2025-05-17 14:26:29 +08:00
parent fa0a586fa2
commit be0a717887
2 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
App/Inc/frt_protocol.h
View File

@ -32,8 +32,9 @@ 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_LIGHT_INTENSITY_HIGH = 10, /* 光照强度高位 */ FRT_REGISTER_IRRADIANCE = 10, /* 光辐射 */
FRT_REGISTER_LIGHT_INTENSITY_LOW = 11, /* 光照强度低位 */ // FRT_REGISTER_LIGHT_INTENSITY_HIGH = 10, /* 光照强度高位 */
// 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, /* 极大风向 */

49
App/Src/frt_protocol.c
View File

@ -32,8 +32,11 @@ 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_ReadRegLightLow(void *pMsg); static u_int16_t FRT_ReadRegirradiance(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);
@ -131,8 +134,9 @@ 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_LIGHT_INTENSITY_HIGH, FRT_ReadRegLightHigh }, /* 光照高位 */ { FRT_REGISTER_IRRADIANCE, FRT_ReadRegirradiance }, /* 光辐射 */
{ FRT_REGISTER_LIGHT_INTENSITY_LOW, FRT_ReadRegLightLow }, /* 光照低位 */ // { FRT_REGISTER_LIGHT_INTENSITY_HIGH, FRT_ReadRegLightHigh }, /* 光照高位 */
// { 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 }, /* 风速平均时间 */
@ -412,26 +416,37 @@ static u_int16_t FRT_ReadRegRain(void *pMsg)
} }
/** /**
* @brief 读光照高位寄存器值 * @brief 读光辐射寄存器值
* @param * @param
* @retval * @retval
*/ */
static u_int16_t FRT_ReadRegLightHigh(void *pMsg) static u_int16_t FRT_ReadRegirradiance(void *pMsg)
{ {
u_int16_t value=(u_int16_t)(g_stMcs_Para.lightIntensity>>16); u_int16_t value = g_stMcs_Para.lightIntensity/10.0f;
return FRT_swap_endian_16(value); return FRT_swap_endian_16(value);
} }
/** ///**
* @brief 读光照低位寄存器值 // * @brief 读光照高位寄存器值
* @param // * @param
* @retval // * @retval
*/ // */
static u_int16_t FRT_ReadRegLightLow(void *pMsg) //static u_int16_t FRT_ReadRegLightHigh(void *pMsg)
{ //{
u_int16_t value=(u_int16_t)(g_stMcs_Para.lightIntensity); // 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 读光照低位寄存器值
// * @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 读设备地址寄存器值