Add support for new SD/RTC and SubGHz boards (#663)

README.md

@@ -28,6 +28,8 @@ See https://arduino-pico.readthedocs.io/en/latest/ along with the examples for m
 * Invector Labs Challenger NB RP2040 WiFi
 * Invector Labs Challenger RP2040 LTE
 * Invector Labs Challenger RP2040 LoRa
+* Invector Labs Challenger RP2040 SubGHz
+* Invector Labs Challenger RP2040 SD/RTC
 * Invector Labs RPICO32
 * Melopero Shake RP2040
 * Seeed XIAO RP2040

package/package_pico_index.template.json

@@ -59,6 +59,9 @@
                   {
                      "name": "iLabs Challenger 2040 LoRa"
                   },
+                  {
+                     "name": "iLabs Challenger 2040 SubGHz"
+                  },
                   {
                      "name": "iLabs Challenger 2040 WiFi"
                   },
@@ -71,6 +74,9 @@
                   {
                      "name": "iLabs Challenger NB 2040 WiFi"
                   },
+                  {
+                     "name": "iLabs Challenger 2040 SD/RTC"
+                  },
                   {
                      "name": "iLabs RPICO32"
                   },

tools/json/challenger_2040_sdrtc.json

+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x102d"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_CHALLENGER_NB_2040_SDRTC_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "challenger_2040_sdrtc"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Challenger 2040 SD/RTC",
+  "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": "iLabs"
+}

tools/json/challenger_2040_subghz.json

+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2e8a",
+        "usb_pid": "0x1032"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_CHALLENGER_2040_SUBGHZ_RP2040 -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "challenger_2040_subghz"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Challenger 2040 SubGHz",
+  "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": "iLabs"
+}

tools/makeboards.py

@@ -273,10 +273,12 @@ MakeBoard("dfrobot_beetle_rp2040", "DFRobot", "Beetle RP2040", "0x3343", "0x4253
 
 # iLabs
 MakeBoard("challenger_2040_lora", "iLabs", "Challenger 2040 LoRa", "0x2e8a", "0x1023", 250, "CHALLENGER_2040_LORA_RP2040", 8, "boot2_w25q080_2_padded_checksum")
+MakeBoard("challenger_2040_subghz", "iLabs", "Challenger 2040 SubGHz", "0x2e8a", "0x1032", 250, "CHALLENGER_2040_SUBGHZ_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("challenger_2040_wifi", "iLabs", "Challenger 2040 WiFi", "0x2e8a", "0x1006", 250, "CHALLENGER_2040_WIFI_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("challenger_2040_lte", "iLabs", "Challenger 2040 LTE", "0x2e8a", "0x100b", 500, "CHALLENGER_2040_LTE_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("challenger_2040_wifi_ble", "iLabs", "Challenger 2040 WiFi/BLE", "0x2e8a", "0x102C", 500, "CHALLENGER_2040_WIFI_BLE_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("challenger_nb_2040_wifi", "iLabs", "Challenger NB 2040 WiFi", "0x2e8a", "0x100b", 500, "CHALLENGER_NB_2040_WIFI_RP2040", 8, "boot2_w25q080_2_padded_checksum")
+MakeBoard("challenger_2040_sdrtc", "iLabs", "Challenger 2040 SD/RTC", "0x2e8a", "0x102d", 250, "CHALLENGER_NB_2040_SDRTC_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("ilabs_rpico32", "iLabs", "RPICO32", "0x2e8a", "0x1010", 250, "ILABS_2040_RPICO32_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 
 # Melopera

variants/challenger_2040_sdrtc/pins_arduino.h

+#pragma once
+
+#define PINS_COUNT              (26u)
+#define NUM_DIGITAL_PINS        (26u)
+#define NUM_ANALOG_INPUTS       (4u)
+#define NUM_ANALOG_OUTPUTS      (0u)
+#define ADC_RESOLUTION          (12u)
+
+// LEDs
+#define PIN_LED                 (24u)
+
+// Serial
+#define PIN_SERIAL1_TX          (16u)
+#define PIN_SERIAL1_RX          (17u)
+
+// SPI
+#define PIN_SPI0_MISO           (20u)
+#define PIN_SPI0_MOSI           (23u)
+#define PIN_SPI0_SCK            (22u)
+#define PIN_SPI0_SS             (21u)
+
+// Connected to SD card reader
+#define PIN_SPI1_MISO           (12u)
+#define PIN_SPI1_MOSI           (11u)
+#define PIN_SPI1_SCK            (10u)
+#define PIN_SPI1_SS             (9u)
+#define SD_SS                   PIN_SPI1_SS
+#define SS                      SD_SS
+#define SD_SPI                  SPI1
+#define SD_CARD_DETECT          (13u)
+#define EXTERNAL_FLASH_USE_SPI  SD_SPI
+#define EXTERNAL_FLASH_USE_CS   SD_SS
+#define SDCARD_CS_PIN           SD_SS
+
+// Wire
+#define PIN_WIRE0_SDA           (0u)
+#define PIN_WIRE0_SCL           (1u)
+
+// Not pinned out
+#define PIN_WIRE1_SDA           (31u)
+#define PIN_WIRE1_SCL           (31u)
+#define PIN_SERIAL2_RX          (31u)
+#define PIN_SERIAL2_TX          (31u)
+
+#define SERIAL_HOWMANY          (1u)
+#define SPI_HOWMANY             (2u)
+#define WIRE_HOWMANY            (1u)
+
+#define LED_BUILTIN             PIN_LED
+
+static const uint8_t D0 =       (16u);
+static const uint8_t D1 =       (17u);
+static const uint8_t D2 =       (20u);
+static const uint8_t D3 =       (23u);
+static const uint8_t D4 =       (22u);
+static const uint8_t D5 =       (2u);
+static const uint8_t D6 =       (3u);
+static const uint8_t D7 =       (0u);
+static const uint8_t D8 =       (1u);
+static const uint8_t D9 =       (4u);
+static const uint8_t D10 =      (5u);
+static const uint8_t D11 =      (6u);
+static const uint8_t D12 =      (7u);
+static const uint8_t D13 =      (8u);
+static const uint8_t D14 =      (13u);
+static const uint8_t D18 =      (24u);
+
+static const uint8_t A0 =       (26u);
+static const uint8_t A1 =       (27u);
+static const uint8_t A2 =       (28u);
+static const uint8_t A3 =       (29u);
+static const uint8_t A4 =       (19u);
+static const uint8_t A5 =       (21u);

variants/challenger_2040_subghz/pins_arduino.h

+#pragma once
+
+#define PINS_COUNT          (25u)
+#define NUM_DIGITAL_PINS    (25u)
+#define NUM_ANALOG_INPUTS   (4u)
+#define NUM_ANALOG_OUTPUTS  (0u)
+#define ADC_RESOLUTION      (12u)
+
+// LEDs
+#define PIN_LED             (24u)
+
+// Serial
+#define PIN_SERIAL1_TX      (16u)
+#define PIN_SERIAL1_RX      (17u)
+
+// SPI
+#define PIN_SPI0_MISO       (20u)
+#define PIN_SPI0_MOSI       (23u)
+#define PIN_SPI0_SCK        (22u)
+#define PIN_SPI0_SS         (21u)
+
+// Connected to sub GHz radio module
+#define PIN_SPI1_MISO       (12u)
+#define PIN_SPI1_MOSI       (11u)
+#define PIN_SPI1_SCK        (10u)
+#define PIN_SPI1_SS         (9u)
+#define RFM69HCW_SS         (9u)
+#define RFM69HCW_DIO0       (14u)
+#define RFM69HCW_DIO1       (15u)
+#define RFM69HCW_DIO2       (18u)
+#define RFM69HCW_RST        (13u)
+#define RFM69HCW_SPI        SPI1
+
+// Wire
+#define PIN_WIRE0_SDA       (0u)
+#define PIN_WIRE0_SCL       (1u)
+
+// Not pinned out
+#define PIN_WIRE1_SDA       (31u)
+#define PIN_WIRE1_SCL       (31u)
+#define PIN_SERIAL2_RX      (31u)
+#define PIN_SERIAL2_TX      (31u)
+
+#define SERIAL_HOWMANY      (1u)
+#define SPI_HOWMANY         (2u)
+#define WIRE_HOWMANY        (1u)
+
+#define LED_BUILTIN         PIN_LED
+
+static const uint8_t D0 =   (16u);
+static const uint8_t D1 =   (17u);
+static const uint8_t D2 =   (20u);
+static const uint8_t D3 =   (23u);
+static const uint8_t D4 =   (22u);
+static const uint8_t D5 =   (2u);
+static const uint8_t D6 =   (3u);
+static const uint8_t D7 =   (0u);
+static const uint8_t D8 =   (1u);
+static const uint8_t D9 =   (4u);
+static const uint8_t D10 =  (5u);
+static const uint8_t D11 =  (6u);
+static const uint8_t D12 =  (7u);
+static const uint8_t D13 =  (8u);
+static const uint8_t D14 = (13u);
+static const uint8_t D15 = (14u);
+static const uint8_t D16 = (15u);
+static const uint8_t D17 = (18u);
+static const uint8_t D18 = (24u);
+
+static const uint8_t A0 = (26u);
+static const uint8_t A1 = (27u);
+static const uint8_t A2 = (28u);
+static const uint8_t A3 = (29u);
+static const uint8_t A4 = (19u);
+static const uint8_t A5 = (21u);