From be0a717887ffda5fe63d0c0ec7cc346484aebd1a Mon Sep 17 00:00:00 2001 From: 95384 <664090429@qq.com> Date: Sat, 17 May 2025 14:26:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=B1=87=E6=BA=90=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=89=E8=BE=90=E5=B0=84=E5=AF=84=E5=AD=98?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Inc/frt_protocol.h | 5 ++-- App/Src/frt_protocol.c | 53 +++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/App/Inc/frt_protocol.h b/App/Inc/frt_protocol.h index 9b7ac9b..32e365f 100644 --- a/App/Inc/frt_protocol.h +++ b/App/Inc/frt_protocol.h @@ -32,8 +32,9 @@ typedef enum FRT_REGISTER_HUMIDITY = 7, /* 大气湿度 */ FRT_REGISTER_PRESSURE = 8, /* 大气压 */ FRT_REGISTER_RAIN = 9, /* 雨量 */ - FRT_REGISTER_LIGHT_INTENSITY_HIGH = 10, /* 光照强度高位 */ - FRT_REGISTER_LIGHT_INTENSITY_LOW = 11, /* 光照强度低位 */ + FRT_REGISTER_IRRADIANCE = 10, /* 光辐射 */ +// FRT_REGISTER_LIGHT_INTENSITY_HIGH = 10, /* 光照强度高位 */ +// FRT_REGISTER_LIGHT_INTENSITY_LOW = 11, /* 光照强度低位 */ FRT_REGISTER_THROUGH_WIND_DIRECTION = 12, /* 极小风向 */ FRT_REGISTER_INSTANTANEOUS_WIND_DIRECTION = 13, /* 瞬时风向 */ FRT_REGISTER_PEAK_WIND_DIRECTION = 14, /* 极大风向 */ diff --git a/App/Src/frt_protocol.c b/App/Src/frt_protocol.c index f7aefd8..c884f6a 100644 --- a/App/Src/frt_protocol.c +++ b/App/Src/frt_protocol.c @@ -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_ReadRegPressure(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_ReadRegCommuBaudRate(void *pMsg); @@ -131,8 +134,9 @@ FRT_RegProcTable_s g_RegTbl[] = { FRT_REGISTER_HUMIDITY, FRT_ReadRegHumidity }, /* 澶ф皵婀垮害 */ { FRT_REGISTER_PRESSURE, FRT_ReadRegPressure }, /* 澶ф皵鍘 */ { FRT_REGISTER_RAIN, FRT_ReadRegRain }, /* 闆ㄩ噺 */ - { FRT_REGISTER_LIGHT_INTENSITY_HIGH, FRT_ReadRegLightHigh }, /* 鍏夌収楂樹綅 */ - { FRT_REGISTER_LIGHT_INTENSITY_LOW, FRT_ReadRegLightLow }, /* 鍏夌収浣庝綅 */ + { FRT_REGISTER_IRRADIANCE, FRT_ReadRegirradiance }, /* 鍏夎緪灏 */ +// { FRT_REGISTER_LIGHT_INTENSITY_HIGH, FRT_ReadRegLightHigh }, /* 鍏夌収楂樹綅 */ +// { FRT_REGISTER_LIGHT_INTENSITY_LOW, FRT_ReadRegLightLow }, /* 鍏夌収浣庝綅 */ { FRT_REGISTER_DEVICE_ADDR, FRT_ReadRegDeviceAddr }, /* 璁惧鍦板潃 */ { FRT_REGISTER_COMMU_BAUDRATE, FRT_ReadRegCommuBaudRate }, /* 娉㈢壒鐜 */ { FRT_REGISTER_SPEED_AVERAGE_TIME, FRT_ReadRegSpeedAverageTime }, /* 椋庨熷钩鍧囨椂闂 */ @@ -412,26 +416,37 @@ static u_int16_t FRT_ReadRegRain(void *pMsg) } /** - * @brief 璇诲厜鐓ч珮浣嶅瘎瀛樺櫒鍊 + * @brief 璇诲厜杈愬皠瀵勫瓨鍣ㄥ * @param * @retval */ -static u_int16_t FRT_ReadRegLightHigh(void *pMsg) -{ - u_int16_t value=(u_int16_t)(g_stMcs_Para.lightIntensity>>16); - return FRT_swap_endian_16(value); +static u_int16_t FRT_ReadRegirradiance(void *pMsg) +{ + u_int16_t value = g_stMcs_Para.lightIntensity/10.0f; + 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 璇诲厜鐓ч珮浣嶅瘎瀛樺櫒鍊 +// * @param +// * @retval +// */ +//static u_int16_t FRT_ReadRegLightHigh(void *pMsg) +//{ +// u_int16_t value=(u_int16_t)(g_stMcs_Para.lightIntensity>>16); +// 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 璇昏澶囧湴鍧瀵勫瓨鍣ㄥ