Fix platformio.ini build script for pico sdks, weird and hardcoded

Author: brentru

platformio.ini

@@ -126,19 +126,14 @@ lib_compat_mode = strict
 lib_archive = no ; debug timer issues see https://community.platformio.org/t/choose-usb-stack-as-tiny-usb/22451/5
 lib_ignore = OneWire, USBHost
 
-[common:rp2040]
+; Common build environment for Arduino-Pico platforms
+[common:arduinopico]
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git#develop
-; platform_packages =
-;    framework-arduinopico @ symlink:///Users/tyeth/Projects/arduino-pico
-;    framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#master
-board = rpipicow
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git
 framework = arduino
 board_build.core = earlephilhower
-board_build.filesystem_size = 0.5m
-build_flags = -DUSE_TINYUSB
-; Once https://github.com/platformio/platformio-core > 6.1.11 these can be removed
 lib_ignore = WiFiNINA, WiFi101, Adafruit Zero DMA Library, OneWire
-lib_compat_mode = soft  ; can be strict once pio detects SleepyDog on RP2040
+lib_compat_mode = soft  ; can be stricter once pio detects SleepyDog on RP2040
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Individual Board Definitions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -546,16 +541,18 @@ board_build.partitions = min_spiffs.csv
 
 
 [env:raspberypi_picow]
-extends = common:rp2040
+extends = common:arduinopico
+board = rpipicow
 
 [env:raspberypi_picow_debug_port_only]
-extends = common:rp2040
+extends = common:arduinopico
+board = rpipicow
 build_flags =
     -DUSE_TINYUSB
     -DDEBUG_RP2040_PORT=Serial
 
 [env:raspberypi_picow_debug]
-extends = common:rp2040
+extends = common:arduinopico
 ; platform = https://github.com/maxgerhardt/platform-raspberrypi.git
 ; platform_packages =
 ;    framework-arduinopico @ symlink:///Users/tyeth/Projects/arduino-pico
@@ -597,7 +594,8 @@ build_flags =
 
 
 [env:raspberypi_pico2w]
-extends = common:rp2040
+extends = common:arduinopico
+boards = rpipico2w
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git#develop
 platform_packages =
    framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git
@@ -610,11 +608,7 @@ build_flags =
     ; -DPICO_CYW43_SUPPORTED=1
 
 [env:raspberypi_pico2w_debug]
-extends = common:rp2040
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#develop
-platform_packages =
-   framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git
-; ;    framework-arduinopico @ symlink:///Users/tyeth/Projects/arduino-pico
+extends = common:arduinopico
 board = rpipico2w
 build_type = debug
 framework = arduino
@@ -654,3 +648,14 @@ build_flags =
     ; ; No USB stack
     ; build_flags = -DPIO_FRAMEWORK_ARDUINO_NO_USB
     ; -DPIO_FRAMEWORK_ARDUINO_ENABLE_IPV6
+
+[env:adafruit_fruitjam]
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#develop
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git
+board = adafruit_fruitjam
+framework = arduino
+board_build.core = earlephilhower
+board_build.filesystem_size = 0.5m
+lib_ignore = WiFiNINA, WiFi101, Adafruit Zero DMA Library, OneWire
+lib_compat_mode = soft
+build_flags = -DUSE_TINYUSB

src/Wippersnapper_Boards.h

@@ -223,6 +223,13 @@
 #define USE_TINYUSB
 #define USE_STATUS_LED
 #define STATUS_LED_PIN LED_BUILTIN
+#elif defined(ADAFRUIT_FRUITJAM_RP2350)
+#define BOARD_ID "fruitjam"
+#define USE_TINYUSB
+#define USE_STATUS_NEOPIXEL
+#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL
+#define STATUS_NEOPIXEL_NUM 5
+#define USE_PSRAM
 #else
 #warning "Board type not identified within Wippersnapper_Boards.h!"
 #endif

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -28,7 +28,9 @@
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) ||                        \
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) ||                        \
     defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2) ||                             \
-    defined(ARDUINO_XIAO_ESP32S3)
+    defined(ARDUINO_XIAO_ESP32S3) || \
+    defined(ADAFRUIT_FRUITJAM_RP2350)
+
 #include "Wippersnapper_FS.h"
 #include "print_dependencies.h"
 // On-board external flash (QSPI or SPI) macros should already