Prechádzať zdrojové kódy

Merge pull request #518 from ZuluSCSI/fix/ordering-of-speed-grades

Fix ordering of speed grades
Alex Perez 9 mesiacov pred
rodič
commit
bb7e8efa09

+ 0 - 11
lib/ZuluSCSI_platform_RP2MCU/timings_RP2MCU.c

@@ -267,24 +267,13 @@ static zuluscsi_timings_t  predefined_timings[]  = {
             .total_delay_adjust = 1,
             .max_sync = 50,
         },
-#ifdef ZULUSCSI_PICO_2
         .sdio =
         {
             .clk_div_1mhz = 30, // set by trail and error
-            .clk_div_pio = 6, // SDIO at 41.7MHz
-            .delay0 = 4 - 1, // subtract one for the instruction delay
-            .delay1 = 2 - 1  // clk_div_pio - delay0 and subtract one for the instruction delay
-        }
-#else
-        .sdio =
-        {
-            .clk_div_1mhz = 50, // = 250MHz clk / clk_div_pio
             .clk_div_pio = 5, // SDIO at 50MHz
             .delay0 = 4 - 1, // subtract one for the instruction delay
             .delay1 = 1 - 1  // clk_div_pio - delay0 and subtract one for the instruction delay
         }
-
-#endif
     },
 };
     zuluscsi_timings_t  current_timings;

+ 1 - 1
src/ZuluSCSI_settings.cpp

@@ -43,10 +43,10 @@ const char * const speed_grade_strings[7] =
     "Default",
     "TurboMax",
     "Custom",
+    "Audio",
     "TurboA",
     "TurboB",
     "TurboC",
-    "Audio"
 };
 
 // Helper function for case-insensitive string compare