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

app/main.c

@@ -57,16 +57,15 @@ 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();
+    jj_bt_init();
+    jj_param_eeprom_init();
 
     Page_Init();
-
-    // pit_ms_init(TIM6_PIT, 2);
-    // pit_ms_init(TIM1_PIT, 2);
+  
+     pit_ms_init(TIM1_PIT, 1);
 
     by_tiny_frame_init();
     printf("start running\r\n");
@@ -79,7 +78,7 @@ int main(void)
 
     frame_now.cmd      = 0x06;
     frame_now.data     = 0x19260817;
-    frame_now.reg_addr = 0x4059;
+    frame_now.reg_addr = 0x00;
     frame_now.slave_id = 0x0D;
     /** 测试完成后移除 **/
 
@@ -87,13 +86,11 @@ int main(void)
     by_tiny_frame_read(0x0D, 0x4059, &data_test);
     while (1) {
         Page_Run();
-        by_buzzer_run();
+       // by_buzzer_run();
 
         /** 测试完成后移除 **/
-        by_tiny_frame_run();
-        // by_tiny_frame_pack_send(&frame_now);
+        by_tiny_frame_pack_send(&frame_now);
         system_delay_ms(10);
-        by_tiny_frame_parse_timer_handle();
         /** 测试完成后移除 **/
 
         if (mt9v03x_finish_flag) {
@@ -103,14 +100,15 @@ int main(void)
             // ips200_show_gray_image(0, 0, mt9v03x_image_copy[0], MT9V03X_W, MT9V03X_H, MT9V03X_W, MT9V03X_H, 0);
             mt9v03x_finish_flag = 0;
             by_led_info_blink();
-            state_type = COMMON_STATE;
-            img_processing();
-            get_corners();
-            aim_distance = COMMON_AIM;
-            tracking();
-            ElementJudge();
-            ElementRun();
-            MidLineTrack();
+            // state_type = COMMON_STATE;
+            // img_processing();
+            // get_corners();
+            // aim_distance = COMMON_AIM;
+            // tracking();
+            // ElementJudge();
+            // ElementRun();
+            // MidLineTrack();
+            
         }
     }
 }