update to Fruit Jam rev D, address #2510 review

Author: dhalbert

src/boards/include/boards/adafruit_fruit_jam.h

@@ -11,7 +11,7 @@
 
 // This header may be included by other board headers as "boards/adafruit_fruit_jam.h"
 
-// pico_cmake_set PICO_PLATFORM=rp2350
+pico_board_cmake_set(PICO_PLATFORM, rp2350)
 
 #ifndef _BOARDS_ADAFRUIT_FRUIT_JAM_H
 #define _BOARDS_ADAFRUIT_FRUIT_JAM_H
@@ -32,7 +32,7 @@
 // On JST PH connector.
 #define ADAFRUIT_FRUIT_JAM_A0_PIN 40
 
-// On header.
+// A1-A5 and D6-D10 are on 2x16 socket header.
 #define ADAFRUIT_FRUIT_JAM_A1_PIN 41
 #define ADAFRUIT_FRUIT_JAM_A2_PIN 42
 #define ADAFRUIT_FRUIT_JAM_A3_PIN 43
@@ -45,13 +45,21 @@
 #define ADAFRUIT_FRUIT_JAM_D9_PIN 9
 #define ADAFRUIT_FRUIT_JAM_D10_PIN 10
 
+// Buttons
 #define ADAFRUIT_FRUIT_JAM_BOOT_BUTTON_PIN 0
 #define ADAFRUIT_FRUIT_JAM_BUTTON1_PIN 0
 #define ADAFRUIT_FRUIT_JAM_BUTTON2_PIN 4
 #define ADAFRUIT_FRUIT_JAM_BUTTON3_PIN 5
 
-#define ADAFRUIT_FRUIT_JAM_ESP_CS_PIN 46
+// ESP32-C6 co-processor
+#define ADAFRUIT_FRUIT_JAM_WIFI_SCK_PIN 30
+#define ADAFRUIT_FRUIT_JAM_WIFI_MOSI_PIN 31
+#define ADAFRUIT_FRUIT_JAM_WIFI_MISO_PIN 28
+#define ADAFRUIT_FRUIT_JAM_WIFI_CS_PIN 46
+#define ADAFRUIT_FRUIT_JAM_WIFI_ACK_PIN 3
+#define ADAFRUIT_FRUIT_JAM_WIFI_RESET_PIN 22
 
+// HSTX header
 #define ADAFRUIT_FRUIT_JAM_DVI_CKN_PIN 12
 #define ADAFRUIT_FRUIT_JAM_DVI_CKP_PIN 13
 #define ADAFRUIT_FRUIT_JAM_DVI_D0N_PIN 14
@@ -61,14 +69,18 @@
 #define ADAFRUIT_FRUIT_JAM_DVI_D2N_PIN 18
 #define ADAFRUIT_FRUIT_JAM_DVI_D2P_PIN 19
 
+// Reset for ESP32-C6 and TLV320DAC3100
 #define ADAFRUIT_FRUIT_JAM_PERIPH_RESET_PIN 22
 
-#define ADAFRUIT_FRUIT_JAM_I2S_MCLK_PIN 27
-#define ADAFRUIT_FRUIT_JAM_I2S_BCLK_PIN 26
-#define ADAFRUIT_FRUIT_JAM_I2S_WS_PIN 25
+#define ADAFRUIT_FRUIT_JAM_I2S_ESP_IRQ_PIN 23
+
+// I2S to TLV320DAC3100
 #define ADAFRUIT_FRUIT_JAM_I2S_DIN_PIN 24
-#define ADAFRUIT_FRUIT_JAM_I2S_GPIO1_PIN 23
+#define ADAFRUIT_FRUIT_JAM_I2S_MCLK_PIN 25
+#define ADAFRUIT_FRUIT_JAM_I2S_BCLK_PIN 26
+#define ADAFRUIT_FRUIT_JAM_I2S_WS_PIN 27
 
+// SD and SDIO
 #define ADAFRUIT_FRUIT_JAM_SD_SCK_PIN 34
 #define ADAFRUIT_FRUIT_JAM_SDIO_CLOCK_PIN 34
 
@@ -90,13 +102,25 @@
 #define ADAFRUIT_FRUIT_JAM_USB_HOST_DATA_MINUS_PIN 2
 #define ADAFRUIT_FRUIT_JAM_USB_HOST_5V_POWER_PIN 11
 
-// no PICO_DEFAULT_UART
+// --- UART ---
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 1
+#endif
+
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 8
+#endif
+
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 9
+#endif
 
 // --- LED ---
 #ifndef PICO_DEFAULT_LED_PIN
 #define PICO_DEFAULT_LED_PIN 29
 #endif
 
+// --- RGB (NeoPixel) LED
 #ifndef PICO_DEFAULT_WS2812_PIN
 #define PICO_DEFAULT_WS2812_PIN 32
 #endif
@@ -113,31 +137,34 @@
 #endif
 
 // --- SPI ---
+// Default SPI is also the SPI for the SD card.
 #ifndef PICO_DEFAULT_SPI
-#define PICO_DEFAULT_SPI 1
+#define PICO_DEFAULT_SPI 0
 #endif
 #ifndef PICO_DEFAULT_SPI_SCK_PIN
-#define PICO_DEFAULT_SPI_SCK_PIN 30
+#define PICO_DEFAULT_SPI_SCK_PIN ADAFRUIT_FRUIT_JAM_SD_SCK_PIN
 #endif
 #ifndef PICO_DEFAULT_SPI_TX_PIN
-#define PICO_DEFAULT_SPI_TX_PIN 31
+#define PICO_DEFAULT_SPI_TX_PIN ADAFRUIT_FRUIT_JAM_SD_MOSI_PIN
 #endif
 #ifndef PICO_DEFAULT_SPI_RX_PIN
-#define PICO_DEFAULT_SPI_RX_PIN 28
+#define PICO_DEFAULT_SPI_RX_PIN ADAFRUIT_FRUIT_JAM_SD_MISO_PIN
 #endif
 
 // --- FLASH ---
+// Winbond W25Q128 (16MB) flash
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
 
 #ifndef PICO_FLASH_SPI_CLKDIV
 #define PICO_FLASH_SPI_CLKDIV 2
 #endif
 
-// pico_cmake_set_default PICO_FLASH_SIZE_BYTES = (16 * 1024 * 1024)
+pico_board_cmake_set_default(PICO_FLASH_SIZE_BYTES, (16 * 1024 * 1024))
 #ifndef PICO_FLASH_SIZE_BYTES
 #define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
 #endif
 
-// pico_cmake_set_default PICO_RP2350_A2_SUPPORTED = 1
+pico_board_cmake_set_default(PICO_RP2350_A2_SUPPORTED, 1)
 #ifndef PICO_RP2350_A2_SUPPORTED
 #define PICO_RP2350_A2_SUPPORTED 1
 #endif