v16.8.1

README.md

@@ -43,6 +43,8 @@ V6.0.0
         1.兼容新版本硬件
         2.修改设备IDflash格式
 
+V16.8.1
+        添加代码，等待FPGA启动后，系统再启动
 ```
 
 ···

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);

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");

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)