Преглед на файлове

Fix runtime network detection

Eric Helgeson преди 5 месеца
родител
ревизия
048335e18b
променени са 2 файла, в които са добавени 14 реда и са изтрити 11 реда
  1. 2 1
      lib/BlueSCSI_platform_RP2MCU/BlueSCSI_platform.cpp
  2. 12 10
      src/BlueSCSI.cpp

+ 2 - 1
lib/BlueSCSI_platform_RP2MCU/BlueSCSI_platform.cpp

@@ -588,7 +588,8 @@ void platform_late_init()
 // This should turn on the LED for Pico 1/2 W devices early in the init process
 // It should help indicate to the user that interface is working and the board is ready for DaynaPORT
 #if  defined(BLUESCSI_NETWORK) && ! defined(BLUESCSI_RM2)
-    platform_network_iface_check();
+    if (platform_network_supported())
+        platform_network_iface_check();
 #endif
 
 

+ 12 - 10
src/BlueSCSI.cpp

@@ -851,17 +851,19 @@ static void reinitSCSI()
   scsiInit();
 
 #ifdef BLUESCSI_NETWORK
-  if (scsiDiskCheckAnyNetworkDevicesConfigured() && platform_network_supported())
-  {
-    platform_network_init(scsiDev.boardCfg.wifiMACAddress);
-    if (scsiDev.boardCfg.wifiSSID[0] != '\0')
-      platform_network_wifi_join(scsiDev.boardCfg.wifiSSID, scsiDev.boardCfg.wifiPassword);
+  if (platform_network_supported()) {
+    if (scsiDiskCheckAnyNetworkDevicesConfigured())
+    {
+      platform_network_init(scsiDev.boardCfg.wifiMACAddress);
+      if (scsiDev.boardCfg.wifiSSID[0] != '\0')
+        platform_network_wifi_join(scsiDev.boardCfg.wifiSSID, scsiDev.boardCfg.wifiPassword);
+      else
+        logmsg("No Wi-Fi SSID or Password found. Use the BlueSCSI Wi-Fi DA to configure the network.");
+    }
     else
-      logmsg("No Wi-Fi SSID or Password found. Use the BlueSCSI Wi-Fi DA to configure the network.");
-  }
-  else
-  {
-    platform_network_deinit();
+    {
+      platform_network_deinit();
+    }
   }
 #endif // BLUESCSI_NETWORK
   logmsg("");