diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index 6194bfe6..bbc7fdf8 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -33,6 +33,7 @@ jobs:
           - board: m5stack-coreink
           - board: tbeam-s3-core
           - board: tlora-t3s3-v1
+          - board: rak11310
 
     runs-on: ubuntu-latest
     steps:
@@ -103,16 +104,17 @@ jobs:
     with:
       board: ${{ matrix.board }}
 
-  # build-rpi2040:
-  #   strategy:
-  #     fail-fast: false
-  #     max-parallel: 2
-  #     matrix:
-  #       include:
-  #         - board: pico
-  #   uses: ./.github/workflows/build_rpi2040.yml
-  #   with:
-  #     board: ${{ matrix.board }}
+  build-rpi2040:
+    strategy:
+      fail-fast: false
+      max-parallel: 2
+      matrix:
+        include:
+          - board: pico
+          - board: rak11310
+    uses: ./.github/workflows/build_rpi2040.yml
+    with:
+      board: ${{ matrix.board }}
 
   build-native:
     runs-on: ubuntu-latest
@@ -186,7 +188,8 @@ jobs:
 
   gather-artifacts:
     runs-on: ubuntu-latest
-    needs: [build-esp32, build-esp32-s3, build-nrf52, build-native] #, build-rpi2040]
+    needs:
+      [build-esp32, build-esp32-s3, build-nrf52, build-native, build-rpi2040]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
diff --git a/arch/rp2040/rp2040.ini b/arch/rp2040/rp2040.ini
index 6f5449ae..9d102be0 100644
--- a/arch/rp2040/rp2040.ini
+++ b/arch/rp2040/rp2040.ini
@@ -1,7 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#9f8c10e50b5acd18e7bfd32638199c655be73a5b
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#0c33219f53faa035e188925ea1324f472e8b93d2
 extends = arduino_base
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#652f9f9eda0d77efeafebc7c1ff5cd45defc71bf
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -20,4 +21,4 @@ lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
   jgromes/RadioLib@^6.0.0
-  https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b
+  https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b
\ No newline at end of file
diff --git a/boards/wiscore_rak11300.json b/boards/wiscore_rak11300.json
new file mode 100644
index 00000000..19beee74
--- /dev/null
+++ b/boards/wiscore_rak11300.json
@@ -0,0 +1,40 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2E8A",
+        "usb_pid": "0x000A"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-DARDUINO_GENERIC_RP2040 -DRASPBERRY_PI_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      ["0x2E8A", "0x00C0"],
+      ["0x2E8A", "0x000A"]
+    ],
+    "mcu": "rp2040",
+    "variant": "WisBlock_RAK11300_Board"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": ["arduino"],
+  "name": "WisBlock RAK11300",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 2097152,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": ["cmsis-dap", "raspberrypi-swd", "picotool", "picoprobe"]
+  },
+  "url": "https://docs.rakwireless.com/",
+  "vendor": "RAKwireless"
+}
diff --git a/src/SerialConsole.cpp b/src/SerialConsole.cpp
index 91b4e282..e827dcf3 100644
--- a/src/SerialConsole.cpp
+++ b/src/SerialConsole.cpp
@@ -31,7 +31,7 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port), con
                       // setDestination(&noopPrint); for testing, try turning off 'all' debug output and see what leaks
 
     Port.begin(SERIAL_BAUD);
-#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
+#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(ARCH_RP2040)
     time_t timeout = millis();
     while (!Port) {
         if ((millis() - timeout) < 5000) {
diff --git a/src/main.cpp b/src/main.cpp
index 19ed5666..5120cb26 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -447,7 +447,21 @@ void setup()
 
     // Init our SPI controller (must be before screen and lora)
     initSPI();
-#ifndef ARCH_ESP32
+#ifdef ARCH_RP2040
+#ifdef HW_SPI1_DEVICE
+    SPI1.setSCK(RF95_SCK);
+    SPI1.setTX(RF95_MOSI);
+    SPI1.setRX(RF95_MISO);
+    pinMode(RF95_NSS, OUTPUT);
+    digitalWrite(RF95_NSS, HIGH);
+    SPI1.begin(false);
+#else                      // HW_SPI1_DEVICE
+    SPI.setSCK(RF95_SCK);
+    SPI.setTX(RF95_MOSI);
+    SPI.setRX(RF95_MISO);
+    SPI.begin(false);
+#endif                     // HW_SPI1_DEVICE
+#elif !defined(ARCH_ESP32) // ARCH_RP2040
     SPI.begin();
 #else
     // ESP32
@@ -509,9 +523,11 @@ void setup()
     digitalWrite(SX126X_ANT_SW, 1);
 #endif
 
-    // Init LockingHAL first, to use it for radio init
-
+#ifdef HW_SPI1_DEVICE
+    LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI1, spiSettings);
+#else // HW_SPI1_DEVICE
     LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
+#endif
 
     // radio init MUST BE AFTER service.init, so we have our radio config settings (from nodedb init)
 
@@ -718,4 +734,4 @@ void loop()
         mainDelay.delay(delayMsec);
     }
     // if (didWake) LOG_DEBUG("wake!\n");
-}
+}
\ No newline at end of file
diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp
index bce6b8a9..a74d4109 100644
--- a/src/mesh/RadioLibInterface.cpp
+++ b/src/mesh/RadioLibInterface.cpp
@@ -406,4 +406,4 @@ void RadioLibInterface::startSend(meshtastic_MeshPacket *txp)
         // bits
         enableInterrupt(isrTxLevel0);
     }
-}
+}
\ No newline at end of file
diff --git a/variants/rak11310/pins_arduino.h b/variants/rak11310/pins_arduino.h
new file mode 100644
index 00000000..626bed1d
--- /dev/null
+++ b/variants/rak11310/pins_arduino.h
@@ -0,0 +1,68 @@
+#pragma once
+
+// Pin definitions taken from:
+//    https://datasheets.raspberrypi.org/pico/pico-datasheet.pdf
+
+static const uint8_t WB_IO1 = 6;  // SLOT_A SLOT_B
+static const uint8_t WB_IO2 = 22; // SLOT_A SLOT_B
+static const uint8_t WB_IO3 = 7;  // SLOT_C
+static const uint8_t WB_IO4 = 28; // SLOT_C
+static const uint8_t WB_IO5 = 9;  // SLOT_D
+static const uint8_t WB_IO6 = 8;  // SLOT_D
+static const uint8_t WB_A0 = 26;  // IO_SLOT
+static const uint8_t WB_A1 = 27;  // IO_SLOT
+
+#define PIN_A0 (26u)
+#define PIN_A1 (27u)
+#define PIN_A2 (28u)
+#define PIN_A3 (29u)
+
+static const uint8_t A0 = PIN_A0;
+static const uint8_t A1 = PIN_A1;
+static const uint8_t A2 = PIN_A2;
+static const uint8_t A3 = PIN_A3;
+
+// LEDs
+#define PIN_LED (23u)
+#define PIN_LED1 PIN_LED
+#define PIN_LED2 (24u)
+#define LED_BUILTIN PIN_LED
+
+#define ADC_RESOLUTION 12
+
+// Serial
+#define PIN_SERIAL1_TX (0ul)
+#define PIN_SERIAL1_RX (1ul)
+
+#define PIN_SERIAL2_TX (4ul)
+#define PIN_SERIAL2_RX (5ul)
+
+// SPI
+#define PIN_SPI0_MISO (12u)
+#define PIN_SPI0_MOSI (11u)
+#define PIN_SPI0_SCK (10u)
+#define PIN_SPI0_SS (13u)
+
+#define PIN_SPI1_MISO (16u)
+#define PIN_SPI1_MOSI (19u)
+#define PIN_SPI1_SCK (18u)
+#define PIN_SPI1_SS (17u)
+
+// Wire
+#define PIN_WIRE0_SDA (2u)
+#define PIN_WIRE0_SCL (3u)
+
+#define PIN_WIRE1_SDA (20u)
+#define PIN_WIRE1_SCL (21u)
+
+#define SERIAL_HOWMANY (3u)
+#define SPI_HOWMANY (2u)
+#define WIRE_HOWMANY (2u)
+
+static const uint8_t SS = PIN_SPI0_SS;
+static const uint8_t MOSI = PIN_SPI0_MOSI;
+static const uint8_t MISO = PIN_SPI0_MISO;
+static const uint8_t SCK = PIN_SPI0_SCK;
+
+static const uint8_t SDA = PIN_WIRE0_SDA;
+static const uint8_t SCL = PIN_WIRE0_SCL;
\ No newline at end of file
diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini
new file mode 100644
index 00000000..c4ff35d4
--- /dev/null
+++ b/variants/rak11310/platformio.ini
@@ -0,0 +1,15 @@
+[env:rak11310]
+extends = rp2040_base
+board = wiscore_rak11300
+board_level = extra
+upload_protocol = picotool
+
+# add our variants files to the include and src paths
+build_flags = ${rp2040_base.build_flags} 
+  -DPRIVATE_HW
+  -Ivariants/rak11310
+  -DDEBUG_RP2040_PORT=Serial
+  -DUSE_TINYUSB
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
+lib_deps =
+  ${rp2040_base.lib_deps}
\ No newline at end of file
diff --git a/variants/rak11310/variant.h b/variants/rak11310/variant.h
new file mode 100644
index 00000000..7bb61fc2
--- /dev/null
+++ b/variants/rak11310/variant.h
@@ -0,0 +1,55 @@
+// #define RADIOLIB_CUSTOM_ARDUINO 1
+// #define RADIOLIB_TONE_UNSUPPORTED 1
+// #define RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED 1
+
+#define ARDUINO_ARCH_AVR
+
+#undef CBC
+#define CBC 0
+#undef CTR
+#define CTR 1
+#undef ECB
+#define ECB 0
+
+#undef GPS_SERIAL_NUM
+
+#define LED_CONN PIN_LED2
+
+#define BUTTON_PIN 9
+#define BUTTON_NEED_PULLUP
+// #define EXT_NOTIFY_OUT 4
+
+#define BATTERY_PIN 26
+// ratio of voltage divider = 3.0 (R17=200k, R18=100k)
+#define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic
+
+#define USE_SX1262
+
+#undef RF95_SCK
+#undef RF95_MISO
+#undef RF95_MOSI
+#undef RF95_NSS
+
+// RAK BSP somehow uses SPI1 instead of SPI0
+#define HW_SPI1_DEVICE
+#define RF95_SCK PIN_SPI0_SCK
+#define RF95_MOSI PIN_SPI0_MOSI
+#define RF95_MISO PIN_SPI0_MISO
+#define RF95_NSS PIN_SPI0_SS
+
+#define LORA_DIO0 RADIOLIB_NC
+#define LORA_RESET 14
+#define LORA_DIO1 29
+#define LORA_DIO2 15
+#define LORA_DIO3 RADIOLIB_NC
+
+#ifdef USE_SX1262
+#define SX126X_CS RF95_NSS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_POWER_EN 25
+#define SX126X_E22 // DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
+#endif
+
+#include <Adafruit_TinyUSB.h>
\ No newline at end of file
diff --git a/variants/rpipico/platformio.ini b/variants/rpipico/platformio.ini
index a169e8a9..c9852a4b 100644
--- a/variants/rpipico/platformio.ini
+++ b/variants/rpipico/platformio.ini
@@ -8,11 +8,9 @@ upload_protocol = picotool
 build_flags = ${rp2040_base.build_flags} 
   -DPRIVATE_HW
   -Ivariants/rpipico
-  -DARDUINO_AVR_NANO_EVERY
-  -DDEBUG_RP2040_WIRE
-  -DDEBUG_RP2040_SPI
-  -DDEBUG_RP2040_CORE
   -DDEBUG_RP2040_PORT=Serial
   -DUSE_TINYUSB
+  -DHW_SPI1_DEVICE
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
\ No newline at end of file
diff --git a/variants/rpipico/variant.h b/variants/rpipico/variant.h
index d620a356..f7fc49d6 100644
--- a/variants/rpipico/variant.h
+++ b/variants/rpipico/variant.h
@@ -4,8 +4,11 @@
 
 #define ARDUINO_ARCH_AVR
 
+#undef CBC
 #define CBC 0
+#undef CTR
 #define CTR 1
+#undef ECB
 #define ECB 0
 
 #define NO_GPS 1
@@ -18,11 +21,12 @@
 #define BUTTON_PIN 17
 #define EXT_NOTIFY_OUT 4
 
+#define LED_PIN PIN_LED
+
 #define BATTERY_PIN 26
 // ratio of voltage divider = 3.0 (R17=200k, R18=100k)
 #define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic
 
-#define USE_RF95
 #define USE_SX1262
 
 #undef RF95_SCK
diff --git a/variants/rpipicow/platformio.ini b/variants/rpipicow/platformio.ini
index 6e5c32a5..a0fd626b 100644
--- a/variants/rpipicow/platformio.ini
+++ b/variants/rpipicow/platformio.ini
@@ -8,11 +8,9 @@ upload_protocol = picotool
 build_flags = ${rp2040_base.build_flags} 
   -DPRIVATE_HW
   -Ivariants/rpipicow
-  -DARDUINO_AVR_NANO_EVERY
-  -DDEBUG_RP2040_WIRE
-  -DDEBUG_RP2040_SPI
-  -DDEBUG_RP2040_CORE
   -DDEBUG_RP2040_PORT=Serial
   -DUSE_TINYUSB
+  -DHW_SPI1_DEVICE
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
\ No newline at end of file
diff --git a/variants/rpipicow/variant.h b/variants/rpipicow/variant.h
index d620a356..4aa0c5a5 100644
--- a/variants/rpipicow/variant.h
+++ b/variants/rpipicow/variant.h
@@ -4,8 +4,11 @@
 
 #define ARDUINO_ARCH_AVR
 
+#undef CBC
 #define CBC 0
+#undef CTR
 #define CTR 1
+#undef ECB
 #define ECB 0
 
 #define NO_GPS 1
@@ -22,7 +25,6 @@
 // ratio of voltage divider = 3.0 (R17=200k, R18=100k)
 #define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic
 
-#define USE_RF95
 #define USE_SX1262
 
 #undef RF95_SCK