v604

.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-907953644781375129" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1524404577309665261" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-911459675315752296" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1495411429557430046" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

README.md

@@ -46,11 +46,10 @@ V6.0.1
         1.修改灯闪烁颜色未连接黄色闪烁连接绿色常
 V6.0.2
         1.修改SN码中高低位顺序   
-<<<<<<< HEAD
 V6.0.3
         1.添加等待FPGA启动代码
-=======
->>>>>>> origin/master
+v6.0.4
+        1.修复6.0.3版本引入的BUG
 ```
   
 ···

usrc/base_service/fpga_if.c

@@ -50,12 +50,16 @@ void fpga_if_init() {  //
 #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) {
+    uint32_t rxdata = 0;
+    /**
+     * @brief 
+     * 0x100是 FPGA中 TTLIN 模块的地址，该地址的数值和其地址是一样的数值
+     */
+    fpga_if_spi_read_data_02(0x0100, &rxdata);
+    if (rxdata == 0x0100) {
       break;
     }
+    ZLOGI(TAG, "waiting for fpga init..... %x, %x", 0x0100, rxdata);
     osDelay(50);
   }
 }

usrc/project_configs.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 0)
-#define PC_VERSION              VERSION(6, 0, 3)
+#define PC_VERSION              VERSION(6, 0, 4)
 #define VERSION_MAIN            (PC_VERSION >> 16)
 #define VERSION_SUB             ((PC_VERSION >> 8) & 0xff)
 #define VERSION_FIX             (PC_VERSION & 0xff)