diff --git a/.trunk/configs/.clang-tidy b/.trunk/configs/.clang-tidy
deleted file mode 100644
index e4bd819fa..000000000
--- a/.trunk/configs/.clang-tidy
+++ /dev/null
@@ -1,39 +0,0 @@
-Checks: >-
-  bugprone-*,
-  cppcoreguidelines-*,
-  google-*,
-  misc-*,
-  modernize-*,
-  performance-*,
-  readability-*,
-  -bugprone-lambda-function-name,
-  -bugprone-reserved-identifier,
-  -cppcoreguidelines-avoid-goto,
-  -cppcoreguidelines-avoid-magic-numbers,
-  -cppcoreguidelines-avoid-non-const-global-variables,
-  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-  -cppcoreguidelines-pro-type-vararg,
-  -google-readability-braces-around-statements,
-  -google-readability-function-size,
-  -misc-no-recursion,
-  -modernize-return-braced-init-list,
-  -modernize-use-nodiscard,
-  -modernize-use-trailing-return-type,
-  -performance-unnecessary-value-param,
-  -readability-magic-numbers,
-
-CheckOptions:
-  - key: readability-function-cognitive-complexity.Threshold
-    value: 100
-  - key: readability-function-cognitive-complexity.IgnoreMacros
-    value: true
-  # Set naming conventions for your style below (there are dozens of naming settings possible):
-  # See https://clang.llvm.org/extra/clang-tidy/checks/readability/identifier-naming.html
-  # - key: readability-identifier-naming.ClassCase
-  #   value: CamelCase
-  # - key: readability-identifier-naming.NamespaceCase
-  #   value: lower_case
-  # - key: readability-identifier-naming.PrivateMemberSuffix
-  #   value: _
-  # - key: readability-identifier-naming.StructCase
-  #   value: CamelCase
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 78fdb8e45..f3cb3d354 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -30,7 +30,6 @@ lint:
     - git-diff-check
     - gitleaks@8.24.0
     - clang-format@16.0.3
-    - clang-tidy@16.0.3
   ignore:
     - linters: [ALL]
       paths:
diff --git a/bin/config.d/lora-raxda-rock2f-starter-edition-hat.yaml b/bin/config.d/lora-raxda-rock2f-starter-edition-hat.yaml
new file mode 100644
index 000000000..ea86a3728
--- /dev/null
+++ b/bin/config.d/lora-raxda-rock2f-starter-edition-hat.yaml
@@ -0,0 +1,49 @@
+Lora:
+
+### Raxda Rock 2F running Armbian Linux 6.1.99-vendor-rk35xx
+### https://github.com/markbirss/rock-2f
+### https://github.com/markbirss/lora-starter-edition-sx1262-i2c
+### https://github.com/radxa-pkg/radxa-overlays/blob/main/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-spidev.dts
+### Require install of https://github.com/radxa-pkg/radxa-overlays and rk3528-spi0-cs1-spidev.dtbo copied to /boot/dtb/rockchip/overlay and enabled 
+### in  /boot/armbianEnv.txt - overlays=rk3528-spi0-cs1-spidev
+### The Radxa Rock 2F employs multiple gpio chips.
+### Each gpio pin must be unique, but can be assigned to a specific gpio chip and line.
+### In case solely a no. is given, the default gpio chip and pin == line will be employed.
+###
+  Module: sx1262  # Radxa Rock 2F + Starter Edition SX1262 HAT by Mark Birss
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: 1.8
+  spidev: spidev0.1
+  CS:             # NSS     PIN_24 -> chip 4, line 14
+    pin: 24
+    gpiochip: 4
+    line: 14
+  SCK:            # SCK     PIN_23 -> chip 4, line 12
+    pin: 23
+    gpiochip: 4
+    line: 12
+  Busy:           # BUSY    PIN_7 -> chip 4, line 6
+    pin: 7
+    gpiochip: 4
+    line: 6
+  MOSI:           # MOSI    PIN_19 -> chip 4, line 10
+    pin: 19
+    gpiochip: 4
+    line: 10
+  MISO:           # MISO    PIN_21 -> chip 4, line 11
+    pin: 21
+    gpiochip: 4
+    line: 11
+  Reset:          # NRST    PIN_12 -> chip 1, line 13
+    pin: 12
+    gpiochip: 1
+    line: 13
+  IRQ:            # DIO1    PIN_15 -> chip 4, line 22
+    pin: 15
+    gpiochip: 4
+    line: 22
+#  RXen:           # RXEN    PIN_22 -> chip 3!, line 17
+#    pin: 22
+#    gpiochip: 3
+#    line: 17
+#  TXen: RADIOLIB_NC # TXEN   no PIN, no line, fallback to default gpio chip
diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini
index d1da962ca..6dab54893 100644
--- a/variants/rak11310/platformio.ini
+++ b/variants/rak11310/platformio.ini
@@ -4,7 +4,7 @@ board = wiscore_rak11300
 upload_protocol = picotool
 # keep an old SDK to use less memory.
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git#v1.2.0-gcc12
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#3.7.2
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.0.1
 
 # add our variants files to the include and src paths
 build_flags = ${rp2040_base.build_flags} 
diff --git a/variants/rak11310/variant.h b/variants/rak11310/variant.h
index bc8d2d71b..2400d56a7 100644
--- a/variants/rak11310/variant.h
+++ b/variants/rak11310/variant.h
@@ -4,6 +4,12 @@
 
 #define ARDUINO_ARCH_AVR
 
+// Define I2C pins to ensure correct usage of both ports
+#define I2C_SDA 20
+#define I2C_SCL 21
+#define I2C_SDA1 2
+#define I2C_SCL1 3
+
 #define LED_CONN PIN_LED2
 #define LED_PIN LED_BUILTIN
 #define ledOff(pin) pinMode(pin, INPUT)