Преглед изворни кода

Merge pull request #106 from ZuluSCSI/log-version-placement

Move platform and firmware version to top of log
Alex Perez пре 2 година
родитељ
комит
167c612cd0
3 измењених фајлова са 10 додато и 2 уклоњено
  1. 3 0
      lib/ZuluSCSI_platform_RP2040/ZuluSCSI_platform.cpp
  2. 1 0
      platformio.ini
  3. 6 2
      src/ZuluSCSI.cpp

+ 3 - 0
lib/ZuluSCSI_platform_RP2040/ZuluSCSI_platform.cpp

@@ -67,6 +67,9 @@ void azplatform_init()
     uart_init(uart0, 1000000);
     mbed_set_error_hook(mbed_error_hook);
 
+    azlog("Platform: ", g_azplatform_name);
+    azlog("FW Version: ", g_azlog_firmwareversion);
+
     azlog("DIP switch settings: debug log ", (int)dbglog, ", termination ", (int)termination);
 
     g_azlog_debug = dbglog;

+ 1 - 0
platformio.ini

@@ -83,3 +83,4 @@ build_flags =
     -DENABLE_DEDICATED_SPI=1
     -DHAS_SDIO_CLASS
     -DUSE_ARDUINO=1
+    -DZULUSCSI_V2_0

+ 6 - 2
src/ZuluSCSI.cpp

@@ -475,6 +475,12 @@ static void reinitSCSI()
 
 extern "C" void zuluscsi_setup(void)
 {
+// V2.0, the RP2040 must log FW Version in azplatform_init to avoid hanging  
+#ifndef ZULUSCSI_V2_0  
+  azlog("Platform: ", g_azplatform_name);
+  azlog("FW Version: ", g_azlog_firmwareversion);
+#endif
+
   azplatform_init();
   azplatform_late_init();
 
@@ -519,8 +525,6 @@ extern "C" void zuluscsi_setup(void)
     reinitSCSI();
   }
 
-  azlog("Platform: ", g_azplatform_name);
-  azlog("FW Version: ", g_azlog_firmwareversion);
   azlog("Initialization complete!");
 
   if (g_sdcard_present)