From 79f03ae6b47d76a92d972c1a275e82f1b7241b33 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, 2 Mar 2024 18:17:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=9A=E4=BF=A1bug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=8A=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/jj_param.c                       |  1 +
 app/jj_param.h                       |  2 +-
 app/main.c                           | 34 +++++++---------------------
 app/tiny_frame/by_tiny_frame.c       |  1 +
 app/tiny_frame/by_tiny_frame_parse.h |  1 +
 5 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/app/jj_param.c b/app/jj_param.c
index 27befa7..05dbe4b 100644
--- a/app/jj_param.c
+++ b/app/jj_param.c
@@ -5,6 +5,7 @@
 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;
diff --git a/app/jj_param.h b/app/jj_param.h
index 2e78fdc..9abf6ff 100644
--- a/app/jj_param.h
+++ b/app/jj_param.h
@@ -56,10 +56,10 @@ typedef struct {
     uint8_t cmd;//01:仅存储 00：仅显示 02：传输并显示
     char *text;
 } 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];
+extern TYPE_UNION tiny_frame_param[20];
 void jj_param_eeprom_init(void);
 void jj_param_write(void);
 void jj_param_read(void);
diff --git a/app/main.c b/app/main.c
index 1d65726..4d96157 100644
--- a/app/main.c
+++ b/app/main.c
@@ -46,7 +46,6 @@ void test(by_tf_parse_frame_t frame_s, uint8_t status)
         printf("hhhhhhok\r\n");
     }
 }
-
 int main(void)
 {
 
@@ -57,42 +56,26 @@ int main(void)
     ips200_init(IPS200_TYPE_SPI);
 
     by_led_init();
-   // by_buzzer_init();
+    // by_buzzer_init();
     by_button_init();
 
     jj_bt_init();
     jj_param_eeprom_init();
 
     Page_Init();
-  
-     pit_ms_init(TIM1_PIT, 1);
+
+    pit_ms_init(TIM1_PIT, 1);
 
     by_tiny_frame_init();
     printf("start running\r\n");
-
-    /** 测试完成后移除 **/
-    // by_tiny_frame_parse_handle_register(test);
-    // by_tiny_frame_parse_start_listen();
-
-    by_tf_pack_frame_t frame_now;
-
-    frame_now.cmd      = 0x06;
-    frame_now.data     = 0x19260817;
-    frame_now.reg_addr = 0x00;
-    frame_now.slave_id = 0x0D;
-    /** 测试完成后移除 **/
-
-    // by_tiny_frame_write(0x0D, 0x4059, 0x19260817);
-    by_tiny_frame_read(0x0D, 0x4059, &data_test);
+    tiny_frame_param[0].f32 = 100.5f;
+    // by_tiny_frame_read(0x0D, 0x4059, &data_test);
     while (1) {
         Page_Run();
-       // by_buzzer_run();
-
-        /** 测试完成后移除 **/
-        by_tiny_frame_pack_send(&frame_now);
+        // by_buzzer_run();
+        by_tiny_frame_write(0x0D, 0x0000, tiny_frame_param[0].u32);
+        by_tiny_frame_run();
         system_delay_ms(10);
-        /** 测试完成后移除 **/
-
         if (mt9v03x_finish_flag) {
             // 该操作消耗大概 1970 个 tick，折合约 110us
             memcpy(mt9v03x_image_copy[0], mt9v03x_image[0], (sizeof(mt9v03x_image_copy) / sizeof(uint8_t)));
@@ -108,7 +91,6 @@ int main(void)
             // ElementJudge();
             // ElementRun();
             // MidLineTrack();
-            
         }
     }
 }
diff --git a/app/tiny_frame/by_tiny_frame.c b/app/tiny_frame/by_tiny_frame.c
index 86acd75..e682f71 100644
--- a/app/tiny_frame/by_tiny_frame.c
+++ b/app/tiny_frame/by_tiny_frame.c
@@ -18,6 +18,7 @@ void by_tiny_frame_init(void)
     uart_rx_interrupt(BY_TF_UART_INDEX, ENABLE);
 
     by_tiny_frame_parse_init();
+    by_tiny_frame_pack_init();
 
 #if defined(BY_TF_DEVICE_SLAVE)
     by_tiny_frame_parse_handle_register(by_tiny_frame_read_write_handle);
diff --git a/app/tiny_frame/by_tiny_frame_parse.h b/app/tiny_frame/by_tiny_frame_parse.h
index 4ac6c0e..1dcb0a5 100644
--- a/app/tiny_frame/by_tiny_frame_parse.h
+++ b/app/tiny_frame/by_tiny_frame_parse.h
@@ -22,6 +22,7 @@ typedef void (*by_tf_parse_done_handle_func)(by_tf_parse_frame_t, uint8_t);
 
 extern void by_tiny_frame_parse_init(void);
 extern void by_tiny_frame_parse_uart_handle(uint8_t buff);
+extern void by_tiny_frame_parse_timer_handle(void);
 extern void by_tiny_frame_parse_run(void);
 extern uint8_t by_tiny_frame_parse_crc(by_tf_parse_frame_t *frame_s);
 extern void by_tiny_frame_parse_handle_register(by_tf_parse_done_handle_func func);