From c68ab61d45bc0ef2e65e0c9c423fe6bb1c41d82a Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Sat, 30 Nov 2024 11:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E7=9A=84=E6=8F=92=E5=80=BC=E7=82=B9=E4=B8=8D=E6=98=AF=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Src/frt_protocol.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/App/Src/frt_protocol.c b/App/Src/frt_protocol.c
index 632b5e3..953dabd 100644
--- a/App/Src/frt_protocol.c
+++ b/App/Src/frt_protocol.c
@@ -627,6 +627,7 @@ static u_int16_t FRT_ReadRegWindC(void *pMsg)
   */
 static u_int16_t FRT_ReadRegPoint_1X(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_point_1_x;
     return FRT_swap_endian_16(value);
 }
@@ -638,6 +639,7 @@ static u_int16_t FRT_ReadRegPoint_1X(void *pMsg)
   */
 static u_int16_t FRT_ReadRegPoint_2X(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_point_2_x;
     return FRT_swap_endian_16(value);
 }
@@ -649,6 +651,7 @@ static u_int16_t FRT_ReadRegPoint_2X(void *pMsg)
   */
 static u_int16_t FRT_ReadRegPoint_3X(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_point_3_x;
     return FRT_swap_endian_16(value);
 }
@@ -660,6 +663,7 @@ static u_int16_t FRT_ReadRegPoint_3X(void *pMsg)
   */
 static u_int16_t FRT_ReadRegPoint_4X(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_point_4_x;
     return FRT_swap_endian_16(value);
 }
@@ -671,6 +675,7 @@ static u_int16_t FRT_ReadRegPoint_4X(void *pMsg)
   */
 static u_int16_t FRT_ReadRegPoint_5X(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_point_5_x;
     return FRT_swap_endian_16(value);
 }
@@ -682,6 +687,7 @@ static u_int16_t FRT_ReadRegPoint_5X(void *pMsg)
   */
 static u_int16_t FRT_ReadRegPoint_1Y(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_point_1_y;
     return FRT_swap_endian_16(value);
 }
@@ -693,6 +699,7 @@ static u_int16_t FRT_ReadRegPoint_1Y(void *pMsg)
   */
 static u_int16_t FRT_ReadRegPoint_2Y(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_point_2_y;
     return FRT_swap_endian_16(value);
 }
@@ -704,6 +711,7 @@ static u_int16_t FRT_ReadRegPoint_2Y(void *pMsg)
   */
 static u_int16_t FRT_ReadRegPoint_3Y(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_point_3_y;
     return FRT_swap_endian_16(value);
 }
@@ -715,6 +723,7 @@ static u_int16_t FRT_ReadRegPoint_3Y(void *pMsg)
   */
 static u_int16_t FRT_ReadRegPoint_4Y(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_point_4_y;
     return FRT_swap_endian_16(value);
 }
@@ -726,6 +735,7 @@ static u_int16_t FRT_ReadRegPoint_4Y(void *pMsg)
   */
 static u_int16_t FRT_ReadRegPoint_5Y(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_point_5_y;
     return FRT_swap_endian_16(value);
 }
@@ -737,6 +747,7 @@ static u_int16_t FRT_ReadRegPoint_5Y(void *pMsg)
   */
 static u_int16_t FRT_ReadRegLinearEnable(void *pMsg)
 {
+    read_config_info();
     u_int16_t value=g_stConfigInfo.linear_enable;
     return FRT_swap_endian_16(value);
 }
@@ -831,7 +842,7 @@ static u_int16_t FRT_WriteRegPoint_1Y(void *pMsg)
 //    获取此时XY数据
     uint16_t *pMsgPointY = (uint16_t *)pMsg;
     uint16_t PointY = *pMsgPointY;
-    uint16_t PointX = g_stMcs_Para.average_wind_speed * 10;
+    uint16_t PointX = g_stMcs_Para.instantaneous_wind_speed * 10;
         
 //    写入Flash
     g_stConfigInfo.linear_point_1_x = PointX;
@@ -851,7 +862,7 @@ static u_int16_t FRT_WriteRegPoint_2Y(void *pMsg)
 //    获取此时XY数据
     uint16_t *pMsgPointY = (uint16_t *)pMsg;
     uint16_t PointY = *pMsgPointY;
-    uint16_t PointX = g_stMcs_Para.average_wind_speed * 10;
+    uint16_t PointX = g_stMcs_Para.instantaneous_wind_speed * 10;
         
 //    写入Flash
     g_stConfigInfo.linear_point_2_x = PointX;
@@ -871,7 +882,7 @@ static u_int16_t FRT_WriteRegPoint_3Y(void *pMsg)
 //    获取此时XY数据
     uint16_t *pMsgPointY = (uint16_t *)pMsg;
     uint16_t PointY = *pMsgPointY;
-    uint16_t PointX = g_stMcs_Para.average_wind_speed * 10;
+    uint16_t PointX = g_stMcs_Para.instantaneous_wind_speed * 10;
         
 //    写入Flash
     g_stConfigInfo.linear_point_3_x = PointX;
@@ -891,7 +902,7 @@ static u_int16_t FRT_WriteRegPoint_4Y(void *pMsg)
 //    获取此时XY数据
     uint16_t *pMsgPointY = (uint16_t *)pMsg;
     uint16_t PointY = *pMsgPointY;
-    uint16_t PointX = g_stMcs_Para.average_wind_speed * 10;
+    uint16_t PointX = g_stMcs_Para.instantaneous_wind_speed * 10;
         
 //    写入Flash
     g_stConfigInfo.linear_point_4_x = PointX;
@@ -911,7 +922,7 @@ static u_int16_t FRT_WriteRegPoint_5Y(void *pMsg)
 //    获取此时XY数据
     uint16_t *pMsgPointY = (uint16_t *)pMsg;
     uint16_t PointY = *pMsgPointY;
-    uint16_t PointX = g_stMcs_Para.average_wind_speed * 10;
+    uint16_t PointX = g_stMcs_Para.instantaneous_wind_speed * 10;
         
 //    写入Flash
     g_stConfigInfo.linear_point_5_x = PointX;