Bladeren bron

Revert "Initiator Mode: Disable LED on Pico W, it's causing issues for an unknown reason"

This reverts commit 93d7736469658f0d74f9cd7a4f1ddcf57844c1bd.
Eric Helgeson 1 jaar geleden
bovenliggende
commit
df709dda12
3 gewijzigde bestanden met toevoegingen van 6 en 25 verwijderingen
  1. 0 6
      lib/BlueSCSI_platform_RP2040/BlueSCSI_platform_gpio.h
  2. 1 1
      src/BlueSCSI.cpp
  3. 5 18
      src/BlueSCSI_initiator.cpp

+ 0 - 6
lib/BlueSCSI_platform_RP2040/BlueSCSI_platform_gpio.h

@@ -59,12 +59,6 @@
 #define LED_ON()     platform_network_supported() ? cyw43_gpio_set(&cyw43_state, 0, true) : sio_hw->gpio_set = 1 << LED_PIN
 #define LED_OFF()    platform_network_supported() ? cyw43_gpio_set(&cyw43_state, 0, false) : sio_hw->gpio_clr = 1 << LED_PIN
 
-#define STANDARD_LED_ON 	sio_hw->gpio_set = 1 << LED_PIN
-#define STANDARD_LED_OFF 	sio_hw->gpio_clr = 1 << LED_PIN
-
-#define W_LED_ON 	cyw43_gpio_set(&cyw43_state, 0, true)
-#define W_LED_OFF 	cyw43_gpio_set(&cyw43_state, 0, false)
-
 // SDIO and SPI block
 #define SD_SPI_SCK   10
 #define SDIO_CLK 10

+ 1 - 1
src/BlueSCSI.cpp

@@ -678,7 +678,7 @@ extern "C" void bluescsi_main_loop(void)
   platform_network_poll();
   
 #ifdef PLATFORM_HAS_INITIATOR_MODE
-  if (unlikely(platform_is_initiator_mode_enabled()))
+  if (platform_is_initiator_mode_enabled())
   {
     scsiInitiatorMainLoop();
     save_logfile();

+ 5 - 18
src/BlueSCSI_initiator.cpp

@@ -113,15 +113,11 @@ static void scsiInitiatorUpdateLed()
 
     if (phase <= duty)
     {
-        if (!platform_network_supported()) {
-            STANDARD_LED_ON;
-        }
+        LED_ON();
     }
     else
     {
-        if (!platform_network_supported()) {
-            STANDARD_LED_OFF;
-        }
+        LED_OFF();
     }
 }
 
@@ -160,10 +156,7 @@ void scsiInitiatorMainLoop()
 
             uint8_t inquiry_data[36];
 
-            if (!platform_network_supported()) {
-                STANDARD_LED_ON;
-            }
-
+            LED_ON();
             bool startstopok =
                 scsiTestUnitReady(g_initiator_state.target_id) &&
                 scsiStartStopUnit(g_initiator_state.target_id, true);
@@ -175,10 +168,7 @@ void scsiInitiatorMainLoop()
 
             bool inquiryok = startstopok &&
                 scsiInquiry(g_initiator_state.target_id, inquiry_data);
-
-            if (!platform_network_supported()) {
-                STANDARD_LED_OFF;
-            }
+            LED_OFF();
 
             uint64_t total_bytes = 0;
             if (readcapok)
@@ -276,10 +266,7 @@ void scsiInitiatorMainLoop()
         {
             scsiStartStopUnit(g_initiator_state.target_id, false);
             log("Finished imaging drive with id ", g_initiator_state.target_id);
-
-            if (!platform_network_supported()) {
-                STANDARD_LED_OFF;
-            }
+            LED_OFF();
 
             if (g_initiator_state.sectorcount != g_initiator_state.sectorcount_all)
             {