From 71ddf865e37fe53ea9797069cc10ec30bc55e253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=95=E6=98=8E=E6=B1=9F?= <246462502@qq.com>
Date: Sat, 23 Mar 2024 16:53:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=9B=BE=E5=83=8F?=
 =?UTF-8?q?=E5=89=8D=E7=9E=BB=E7=82=B9=E7=94=A8=E8=8F=9C=E5=8D=95=E5=8F=AF?=
 =?UTF-8?q?=E8=B0=83=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/gl_state.c          |  3 +++
 app/gl_state.h          |  6 +++---
 app/gl_tracking.c       |  6 +++---
 app/jj_param.c          | 23 +++++------------------
 app/jj_param.h          |  7 +++----
 app/page/page.c         |  2 +-
 app/page/page_sparam1.c |  2 +-
 7 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/app/gl_state.c b/app/gl_state.c
index 04f94c8..b6365de 100644
--- a/app/gl_state.c
+++ b/app/gl_state.c
@@ -2,3 +2,6 @@
 #include "gl_headfile.h"
 
 enum state_type_e state_type =0;
+float cricle_aim=0.2f;
+float cross_aim=0.49f;
+float common_aim=0.35f; 
\ No newline at end of file
diff --git a/app/gl_state.h b/app/gl_state.h
index 8753a57..e3a1cca 100644
--- a/app/gl_state.h
+++ b/app/gl_state.h
@@ -21,8 +21,8 @@ enum state_type_e {
 };
 
 extern enum state_type_e state_type;
-
-#define CROSS_AIM  (0.49f)
-#define COMMON_AIM (0.35f)
+extern float cricle_aim;
+extern float cross_aim;
+extern float common_aim;
 
 #endif /* STATE_H_ */
diff --git a/app/gl_tracking.c b/app/gl_tracking.c
index b4ff355..a3c22e8 100644
--- a/app/gl_tracking.c
+++ b/app/gl_tracking.c
@@ -25,11 +25,11 @@ void tracking()
 void aim_distance_select(void)
 {
     if (cross_type != CROSS_NONE) {
-        aim_distance = 0.49f;
+        aim_distance = cricle_aim;
     } else if (circle_type != CIRCLE_NONE) {
-        aim_distance = 0.2f;
+        aim_distance = cross_aim;
     } else {
-        aim_distance = COMMON_AIM;
+        aim_distance = common_aim;
     }
 }
 
diff --git a/app/jj_param.c b/app/jj_param.c
index c018880..777ecb3 100644
--- a/app/jj_param.c
+++ b/app/jj_param.c
@@ -2,21 +2,13 @@
 #include "./page/page_ui_widget.h"
 #include "./page/page.h"
 #include "gl_tracking.h"
+#include "gl_state.h"
 #include "zf_common_headfile.h"
 PARAM_INFO Param_Data[DATA_NUM];
 soft_iic_info_struct eeprom_param;
 TYPE_UNION iic_buffer[DATA_IN_FLASH_NUM];
 TYPE_UNION tiny_frame_param[20];
 uint32_t *addre[2];
-float data0 = 1.0f;
-float data1 = 1.05f;
-float data2 = 10.0f;
-float data3 = 100.0f;
-float data4 = 4.0f;
-float data5 = 66.0f;
-float data6 = 13.130f;
-float data7 = 10.0f;
-float data8 = 0.0f;
 /**
  * @brief 参数初始化注册
  *
@@ -24,15 +16,10 @@ float data8 = 0.0f;
 void jj_param_eeprom_init(void)
 {
     soft_iic_init(&eeprom_param, K24C02_DEV_ADDR, K24C02_SOFT_IIC_DELAY, K24C02_SCL_PIN, K24C02_SDA_PIN); // eeprom初始化
-    PARAM_REG(angle_Kp, &data0, EFLOAT, 1, "an_P:");                                                      // 注冊
-    PARAM_REG(angle_Ki, &data1, EFLOAT, 1, "an_I:");                                                      // 注冊
-    PARAM_REG(angle_Kd, &data2, EFLOAT, 1, "an_D:");                                                      // 注冊
-    PARAM_REG(imgax_Kp, &data3, EFLOAT, 1, "im_P:");                                                      // 注冊
-    PARAM_REG(imgax_Ki, &data4, EFLOAT, 1, "im_I:");                                                      // 注冊
-    PARAM_REG(imgax_Kd, &data5, EFLOAT, 1, "im_D:");
-    PARAM_REG(other   , &data6, EFLOAT, 1, "add:");
-    PARAM_REG(delta_x , &pure_angle, EFLOAT, 2, "far:");
-    PARAM_REG(delta_y , &dx_near, EFLOAT, 0, "near:");
+    PARAM_REG(aim_cross, &cross_aim, EFLOAT, 1, "cros:");                                                      // 注冊
+    PARAM_REG(aim_cricle, &cricle_aim, EFLOAT, 1, "cric:");                                                      // 注冊
+    PARAM_REG(aim_common, &common_aim, EFLOAT, 1, "comm:");                                                      // 注冊
+
     jj_param_read(); // 注冊
 }
 /**
diff --git a/app/jj_param.h b/app/jj_param.h
index 9abf6ff..e744b5c 100644
--- a/app/jj_param.h
+++ b/app/jj_param.h
@@ -18,10 +18,9 @@ typedef enum {
 
     Page1_head=0,
    
-    angle_Kp=Page1_head,
-    angle_Ki,
-    angle_Kd,
-    other,
+    aim_common=Page1_head,
+    aim_cross,
+    aim_cricle,
 
     Page2_head,
     // 第二页参数
diff --git a/app/page/page.c b/app/page/page.c
index c05a1c9..90c663b 100644
--- a/app/page/page.c
+++ b/app/page/page.c
@@ -129,7 +129,7 @@ void Page_Init(void)
 {
     PAGE_REG(page_menu, "main");
     PAGE_REG(page_rtcam, "rtcam");
-    PAGE_REG(page_param1, "Param1");
+    PAGE_REG(page_param1, "aim_param");
     PAGE_REG(page_param2, "param2");
     PAGE_REG(page_dparam, "dparam");
     PAGE_REG(page_reset, "reset");
diff --git a/app/page/page_sparam1.c b/app/page/page_sparam1.c
index fe425ab..f29e936 100644
--- a/app/page/page_sparam1.c
+++ b/app/page/page_sparam1.c
@@ -29,7 +29,7 @@ static void Setup()
     if (Get_new_page() == page_param1) {
         pafrist = 0;
         paend   = Page2_head;
-        ips200_show_string(0, 0, "Param1");
+        ips200_show_string(0, 0, "aim_param");
     } else if (Get_new_page() == page_param2) {
         pafrist = Page2_head;
         paend   = Page3_head;