Merge branch 'master' of http://git.brisky.space:441/btl143/firmware_clover

app/jj_param.h

@@ -6,23 +6,34 @@
 #include "zf_driver_soft_iic.h"
 /**
  * @brief 注册需调参数
- * 
+ *
  */
-#define PARAM_REG(_data_tag_, _p_data_, _type_, _cmd_,_text_) \
-    Param_Data[_data_tag_].p_data = (void *)_p_data_;  \
-    Param_Data[_data_tag_].type   = _type_;            \
-    Param_Data[_data_tag_].cmd    = _cmd_;             \
+#define PARAM_REG(_data_tag_, _p_data_, _type_, _cmd_, _text_) \
+    Param_Data[_data_tag_].p_data = (void *)_p_data_;          \
+    Param_Data[_data_tag_].type   = _type_;                    \
+    Param_Data[_data_tag_].cmd    = _cmd_;                     \
     Param_Data[_data_tag_].text   = _text_;
-    
+
 typedef enum {
-    DATA_HEAD = -1,
-    angle_Kp,
+
+    Page1_head=0,
+   
+    angle_Kp=Page1_head,
     angle_Ki,
     angle_Kd,
-    imgax_Kp,
+    other,
+
+    Page2_head,
+    // 第二页参数
+    imgax_Kp=Page2_head,
     imgax_Ki,
     imgax_Kd,
+
+    Page3_head,
     DATA_IN_FLASH_NUM,
+
+    delta_x,
+    delta_y,
     DATA_NUM,
 } data_tag_t;
 
@@ -30,26 +41,27 @@ typedef enum {
     EUINT32,
     EINT32,
     EFLOAT,
-}ENUM_TYPE;
+} ENUM_TYPE;
 
-typedef union{
+typedef union {
     uint32_t u32;
     int32_t s32;
     float f32;
     uint8_t u8;
-}TYPE_UNION;
+} TYPE_UNION;
 
 typedef struct {
     void *p_data;
     ENUM_TYPE type;
-    uint8_t cmd;
+    uint8_t cmd;//01:仅存储 00：仅显示 02：传输并显示
     char *text;
-}PARAM_INFO;
-
+} PARAM_INFO;
+extern uint32_t * addre[2];
 extern soft_iic_info_struct eeprom_param;
 extern PARAM_INFO Param_Data[DATA_NUM];
 extern TYPE_UNION iic_buffer[DATA_IN_FLASH_NUM];
-void jj_param_eeprom_init();
-void jj_param_update();
-void jj_param_show();
+void jj_param_eeprom_init(void);
+void jj_param_write(void);
+void jj_param_read(void);
+extern float data7;
 #endif