Add Feather RP2040 RFM, fix pins in SCORPIO, DVI board defs (#1333)

package/package_pico_index.template.json

@@ -35,6 +35,9 @@
                   {
                      "name": "Adafruit Feather RP2040 DVI"
                   },
+                  {
+                     "name": "Adafruit Feather RP2040 RFM"
+                  },
                   {
                      "name": "Adafruit ItsyBitsy RP2040"
                   },

tools/json/adafruit_feather_rfm.json

+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239A",
+        "usb_pid": "0x812D"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_RFM -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x812D"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "adafruit_feather_rfm"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Feather RP2040 RFM",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": [
+      "cmsis-dap",
+      "jlink",
+      "raspberrypi-swd",
+      "picotool",
+      "picoprobe"
+    ]
+  },
+  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+  "vendor": "Adafruit"
+}

tools/makeboards.py

@@ -339,6 +339,7 @@ MakeBoard("0xcb_helios", "0xCB", "Helios", "0x1209", "0xCB74", 500, "0XCB_HELIOS
 MakeBoard("adafruit_feather", "Adafruit", "Feather RP2040", "0x239a", "0x80f1", 250, "ADAFRUIT_FEATHER_RP2040", 8, "boot2_w25x10cl_4_padded_checksum")
 MakeBoard("adafruit_feather_scorpio", "Adafruit", "Feather RP2040 SCORPIO", "0x239a", "0x8121", 250, "ADAFRUIT_FEATHER_RP2040_SCORPIO", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_feather_dvi", "Adafruit", "Feather RP2040 DVI", "0x239a", "0x8127", 250, "ADAFRUIT_FEATHER_RP2040_DVI", 8, "boot2_w25q080_2_padded_checksum")
+MakeBoard("adafruit_feather_rfm", "Adafruit", "Feather RP2040 RFM", "0x239a", "0x812D", 250, "ADAFRUIT_FEATHER_RP2040_RFM", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_itsybitsy", "Adafruit", "ItsyBitsy RP2040", "0x239a", "0x80fd", 250, "ADAFRUIT_ITSYBITSY_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_qtpy", "Adafruit", "QT Py RP2040", "0x239a", "0x80f7", 250, "ADAFRUIT_QTPY_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_stemmafriend", "Adafruit", "STEMMA Friend RP2040", "0x239a", "0x80e3", 250, "ADAFRUIT_STEMMAFRIEND_RP2040", 8, "boot2_w25q080_2_padded_checksum")

variants/adafruit_feather_dvi/pins_arduino.h

@@ -12,6 +12,16 @@
 // 'Boot0' button also on GPIO #7
 #define PIN_BUTTON     (7u)
 
+// DVI connector
+#define PIN_CKN (16u)
+#define PIN_CKP (17u)
+#define PIN_D0N (18u)
+#define PIN_D0P (19u)
+#define PIN_D1N (20u)
+#define PIN_D1P (21u)
+#define PIN_D2N (22u)
+#define PIN_D2P (23u)
+
 // Serial
 #define PIN_SERIAL1_TX (0u)
 #define PIN_SERIAL1_RX (1u)

variants/adafruit_feather_rfm/pins_arduino.h

+#pragma once
+
+// Pin definitions taken from:
+//    https://learn.adafruit.com/assets/100337
+
+// LEDs
+#define PIN_LED        (13u)
+
+// NeoPixel
+#define PIN_NEOPIXEL   (4u)
+
+// 'Boot0' button also on GPIO #7
+#define PIN_BUTTON     (7u)
+
+// RFM transceiver module
+#define PIN_RFM_CS   (16u)
+#define PIN_RFM_RST  (17u)
+#define PIN_RFM_DIO5 (18u)
+#define PIN_RFM_DIO3 (19u)
+#define PIN_RFM_DIO4 (20u)
+#define PIN_RFM_DIO0 (21u)
+#define PIN_RFM_DIO1 (22u)
+#define PIN_RFM_DIO2 (23u)
+
+// Serial
+#define PIN_SERIAL1_TX (0u)
+#define PIN_SERIAL1_RX (1u)
+
+// Not pinned out
+#define PIN_SERIAL2_TX (31u)
+#define PIN_SERIAL2_RX (31u)
+
+// SPI
+#define PIN_SPI0_MISO  (8u)
+#define PIN_SPI0_MOSI  (15u)
+#define PIN_SPI0_SCK   (14u)
+#define PIN_SPI0_SS    (13u)
+#define __SPI0_DEVICE  spi1
+
+// Not pinned out
+#define PIN_SPI1_MISO  (31u)
+#define PIN_SPI1_MOSI  (31u)
+#define PIN_SPI1_SCK   (31u)
+#define PIN_SPI1_SS    (31u)
+#define __SPI1_DEVICE  spi0
+
+// Wire
+#define PIN_WIRE0_SDA  (2u)
+#define PIN_WIRE0_SCL  (3u)
+#define __WIRE0_DEVICE i2c1
+
+#define PIN_WIRE1_SDA  (31u)
+#define PIN_WIRE1_SCL  (31u)
+#define __WIRE1_DEVICE i2c0
+
+#define SERIAL_HOWMANY (2u)
+#define SPI_HOWMANY    (1u)
+#define WIRE_HOWMANY   (1u)
+
+#include "../generic/common.h"

variants/adafruit_feather_scorpio/pins_arduino.h

@@ -9,6 +9,19 @@
 // NeoPixel
 #define PIN_NEOPIXEL   (4u)
 
+// 'Boot0' button also on GPIO #7
+#define PIN_BUTTON     (7u)
+
+// SCORPIO end connector (level-shifted I/O)
+#define PIN_NEOPIXEL0 (16u)
+#define PIN_NEOPIXEL1 (17u)
+#define PIN_NEOPIXEL2 (18u)
+#define PIN_NEOPIXEL3 (19u)
+#define PIN_NEOPIXEL4 (20u)
+#define PIN_NEOPIXEL5 (21u)
+#define PIN_NEOPIXEL6 (22u)
+#define PIN_NEOPIXEL7 (23u)
+
 // Serial
 #define PIN_SERIAL1_TX (0u)
 #define PIN_SERIAL1_RX (1u)
@@ -22,18 +35,23 @@
 #define PIN_SPI0_MOSI  (15u)
 #define PIN_SPI0_SCK   (14u)
 #define PIN_SPI0_SS    (13u)
+#define __SPI0_DEVICE  spi1
 
 // Not pinned out
 #define PIN_SPI1_MISO  (31u)
 #define PIN_SPI1_MOSI  (31u)
 #define PIN_SPI1_SCK   (31u)
 #define PIN_SPI1_SS    (31u)
+#define __SPI1_DEVICE  spi0
 
 // Wire
-#define PIN_WIRE0_SDA (24u)
-#define PIN_WIRE0_SCL (25u)
-#define PIN_WIRE1_SDA (2u)
-#define PIN_WIRE1_SCL (3u)
+#define PIN_WIRE0_SDA  (2u)
+#define PIN_WIRE0_SCL  (3u)
+#define __WIRE0_DEVICE i2c1
+
+#define PIN_WIRE1_SDA  (31u)
+#define PIN_WIRE1_SCL  (31u)
+#define __WIRE1_DEVICE i2c0
 
 #define SERIAL_HOWMANY (2u)
 #define SPI_HOWMANY    (1u)