merge

.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="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">
+			<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">
 				<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="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">
+			<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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

README.md

@@ -42,11 +42,14 @@ V5.0.0
 V6.0.0
         1.兼容新版本硬件
         2.修改设备IDflash格式
-
 V6.0.1
-        添加代码，等待FPGA启动后，系统再启动
+        1.修改灯闪烁颜色未连接黄色闪烁连接绿色常
+V6.0.2
+        1.修改SN码中高低位顺序   
+V6.0.3
+        1.添加等待FPGA启动代码
 ```
-
+  
 ···
 旧版本格式 设备ID写在芯片的 
 0x080E0000,0x080E0004,0x080E0008

iflytop_xsync

@@ -1 +1 @@
-Subproject commit 280a6b62027ac3a0c8ee59e675b9c35425a85fbe
+Subproject commit a9104693ffc69444c3f6dd536f22a6202e1e2460

usrc/main.cpp

@@ -42,14 +42,14 @@ xs_gpio_t m_power_led1;
 xs_gpio_t m_power_led2;
 
 void power_light_init() {
-  xs_gpio_init_as_output(&m_power_led0, PB6, kxs_gpio_nopull, false, true);  // r
-  xs_gpio_init_as_output(&m_power_led1, PB7, kxs_gpio_nopull, false, true);  // g
-  xs_gpio_init_as_output(&m_power_led2, PB8, kxs_gpio_nopull, false, true);  // b
+  xs_gpio_init_as_output(&m_power_led0, PB6, kxs_gpio_nopull, true, false);  // r
+  xs_gpio_init_as_output(&m_power_led1, PB7, kxs_gpio_nopull, true, false);  // g
+  xs_gpio_init_as_output(&m_power_led2, PB8, kxs_gpio_nopull, true, false);  // y
 }
-void power_light_ctrl(bool state) {
+void power_light_ctrl(int green, int yellow) {
   xs_gpio_write(&m_power_led0, 0);
-  xs_gpio_write(&m_power_led1, state);
-  xs_gpio_write(&m_power_led2, state);
+  xs_gpio_write(&m_power_led1, green);
+  xs_gpio_write(&m_power_led2, yellow);
 }
 
 extern "C" {
@@ -59,13 +59,13 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) { ReportGeneratorService_irq_trig
 void debug_light_ctrl() {
   static uint32_t lastcall     = 0;
   static bool     light_status = false;
-  if (xs_has_passedms(lastcall) > 80) {
+  if (xs_has_passedms(lastcall) > 200) {
     light_status = !light_status;
     xs_gpio_write(&m_debug_led, light_status);
     if (network_service_network_is_ready()) {
-      power_light_ctrl(1);
+      power_light_ctrl(1,0);
     } else {
-      power_light_ctrl(light_status);
+      power_light_ctrl(0,light_status);
     }
     lastcall = xs_get_ticket();
   }
@@ -91,9 +91,9 @@ void factory_reset_key_detect() {
 
         // m_power_led
         while (xs_gpio_read(&m_factory_reset_key)) {
-          power_light_ctrl(false);
+          power_light_ctrl(false,false);
           osDelay(1000);
-          power_light_ctrl(true);
+          power_light_ctrl(true,false);
           osDelay(1000);
         }
         ZLOGI(TAG, "system reset");

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, 1)
+#define PC_VERSION              VERSION(6, 0, 3)
 #define VERSION_MAIN            (PC_VERSION >> 16)
 #define VERSION_SUB             ((PC_VERSION >> 8) & 0xff)
 #define VERSION_FIX             (PC_VERSION & 0xff)
@@ -30,4 +30,4 @@
 // =====================================================================
 
 #define FACTORY_RESET_KEY PB1
-#define POWER_LED_PIN     PB2
+#define POWER_LED_PIN     PB2