Allow for SPI1 port to be used on Feather RP2040 Adalogger

adafruit · Feb 26, 2025 · 8d261ec · 8d261ec
1 parent 835b601
commit 8d261ec
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h
@@ -208,6 +208,7 @@
 #define USE_STATUS_NEOPIXEL
 #define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL
 #define STATUS_NEOPIXEL_NUM 1
+#define SD_USE_SPI_1
 #else
 #warning "Board type not identified within Wippersnapper_Boards.h!"
 #endif

diff --git a/src/Wippersnapper_demo.ino b/src/Wippersnapper_demo.ino
@@ -11,17 +11,15 @@
 #include "ws_adapters.h"
 ws_adapter_wifi wipper;
 // Uncomment the following line to use the offline adapter for Pico
-// ws_adapter_offline wipper;
-
+//ws_adapter_offline wipper;
 #define WS_DEBUG // Enable debug output!
 
 void setup() {
   Serial.begin(115200);
-  while (!Serial) delay(10);
+  while (!Serial)
+    delay(10);
   wipper.provision();
   wipper.connect();
 }
 
-void loop() {
-  wipper.run();
-}
+void loop() { wipper.run(); }
diff --git a/src/provisioning/sdcard/ws_sdcard.cpp b/src/provisioning/sdcard/ws_sdcard.cpp
@@ -20,7 +20,11 @@
 */
 /**************************************************************************/
 ws_sdcard::ws_sdcard()
+#ifdef SD_USE_SPI_1
+    : _sd_spi_cfg(WsV2.pin_sd_cs, DEDICATED_SPI, SPI_SD_CLOCK, &SPI1) {
+#else
     : _sd_spi_cfg(WsV2.pin_sd_cs, DEDICATED_SPI, SPI_SD_CLOCK) {
+#endif
   is_mode_offline = false;
   _use_test_data = false;
   _is_soft_rtc = false;
@@ -38,6 +42,7 @@ ws_sdcard::ws_sdcard()
     is_mode_offline = false;
     return;
   }
+
   // Card initialized - calculate file limits
   is_mode_offline = true;
   calculateFileLimits();

diff --git a/src/provisioning/sdcard/ws_sdcard.h b/src/provisioning/sdcard/ws_sdcard.h
@@ -25,6 +25,9 @@
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2)
 #define SPI_SD_CLOCK                                                           \
   SD_SCK_MHZ(25) ///< For ESP32/Pico silicon rev 3.0, we clock at 25MHz
+#elif defined(ARDUINO_ADAFRUIT_FEATHER_RP2040_ADALOGGER)
+#define SPI_SD_CLOCK                                                           \
+  SD_SCK_MHZ(16) ///< For the RP2040 adalogger, we clock at 16MHz
 #else
 #define SPI_SD_CLOCK SD_SCK_MHZ(50) ///< Default SPI clock speed
 #endif