From aaf89a1e86dc794a1fe3fdb688249a1d27637571 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Fri, 25 Oct 2024 12:11:56 +0800
Subject: [PATCH] v16.8.1

---
 README.md                   |  2 ++
 usrc/base_service/fpga_if.c | 14 ++++++++++++--
 usrc/main.cpp               |  6 +-----
 usrc/project_configs.h      |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index e76a734..b6b3367 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,8 @@ V6.0.0
         1.兼容新版本硬件
         2.修改设备IDflash格式
 
+V16.8.1
+        添加代码，等待FPGA启动后，系统再启动
 ```
 
 ···
diff --git a/usrc/base_service/fpga_if.c b/usrc/base_service/fpga_if.c
index 71ed2c5..19bd499 100644
--- a/usrc/base_service/fpga_if.c
+++ b/usrc/base_service/fpga_if.c
@@ -20,8 +20,8 @@ void fpga_if_init() {  //
    */
 
   /**
-   * @brief 
-   * 
+   * @brief
+   *
    * CPOL:1
    * CPHA:1
    * LSB-FIRST
@@ -48,6 +48,16 @@ void fpga_if_init() {  //
   xs_delay_ms(10);
   xs_gpio_write(&fpga_if.reset_pin_io, true);
 #endif
+
+  while (true) {
+    ZLOGI(TAG, "waiting for fpga init.....");
+    uint32_t rxdata =0;
+    fpga_if_spi_read_data_02(REGADDOFF__FPGA_INFO, &rxdata);
+    if (rxdata == REGADDOFF__FPGA_INFO) {
+      break;
+    }
+    osDelay(100);
+  }
 }
 void fpga_if_get_timecode(uint32_t *timecode0, uint32_t *timecode1) {
   fpga_if_spi_read_data_02(sys_timecode_data0, timecode0);
diff --git a/usrc/main.cpp b/usrc/main.cpp
index f6ad5bf..754e984 100644
--- a/usrc/main.cpp
+++ b/usrc/main.cpp
@@ -137,11 +137,6 @@ void umain() {
    */
   fpga_if_init();
   /**
-   * @brief report_generator init
-   */
-  ReportGeneratorService_init(fpga_if_get_instance()->timecode_irq_pin, fpga_if_get_instance()->camera_sync_code_irq_pin);
-
-  /**
    * @brief reg_manager init
    */
   reg_manager_init();
@@ -152,6 +147,7 @@ void umain() {
    */
   osDelay(1000);
   extern_if_service_init();
+  ReportGeneratorService_init(fpga_if_get_instance()->timecode_irq_pin, fpga_if_get_instance()->camera_sync_code_irq_pin);
   MX_IWDG_Init();
 
   ZLOGI(TAG, "system init done");
diff --git a/usrc/project_configs.h b/usrc/project_configs.h
index 1eaf37f..3b72467 100644
--- a/usrc/project_configs.h
+++ b/usrc/project_configs.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 0)
+#define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 1)
 #define PC_VERSION              VERSION(6, 0, 0)
 #define VERSION_MAIN            (PC_VERSION >> 16)
 #define VERSION_SUB             ((PC_VERSION >> 8) & 0xff)