From c34c80a85bb0d6ea555a683453bf73837be79f2a Mon Sep 17 00:00:00 2001
From: blckmn <blckmn@betaflight.com>
Date: Thu, 5 Jun 2025 20:13:41 +1000
Subject: [PATCH] Updated following merge from master

---
 .../PICO/{platform_mcu.h => include/platform/platform.h}      | 4 +++-
 src/platform/PICO/target/RP2350A/.uf2                         | 0
 src/platform/PICO/target/RP2350A/target.h                     | 3 +++
 src/platform/PICO/target/RP2350B/.uf2                         | 0
 src/platform/PICO/target/RP2350B/target.h                     | 3 +++
 5 files changed, 9 insertions(+), 1 deletion(-)
 rename src/platform/PICO/{platform_mcu.h => include/platform/platform.h} (97%)
 delete mode 100644 src/platform/PICO/target/RP2350A/.uf2
 delete mode 100644 src/platform/PICO/target/RP2350B/.uf2

diff --git a/src/platform/PICO/platform_mcu.h b/src/platform/PICO/include/platform/platform.h
similarity index 97%
rename from src/platform/PICO/platform_mcu.h
rename to src/platform/PICO/include/platform/platform.h
index cb7d34f55f..65663b063c 100644
--- a/src/platform/PICO/platform_mcu.h
+++ b/src/platform/PICO/include/platform/platform.h
@@ -37,7 +37,9 @@
 
 typedef enum {DISABLE = 0, ENABLE = !DISABLE} FunctionalState;
 
-#define I2C_TypeDef          i2c0_hw
+#define I2C_TypeDef          I2C0_Type
+#define I2C_INST(i2c) ((i2c_inst_t *)(i2c))
+
 //#define I2C_HandleTypeDef
 #define GPIO_TypeDef         io_bank0_hw_t
 //#define GPIO_InitTypeDef
diff --git a/src/platform/PICO/target/RP2350A/.uf2 b/src/platform/PICO/target/RP2350A/.uf2
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/platform/PICO/target/RP2350A/target.h b/src/platform/PICO/target/RP2350A/target.h
index 1ce5f13b82..14864a5312 100644
--- a/src/platform/PICO/target/RP2350A/target.h
+++ b/src/platform/PICO/target/RP2350A/target.h
@@ -246,6 +246,9 @@ SPARE3          P47
 #define SPIDEV_COUNT 2
 #define MAX_SPI_PIN_SEL 4
 
+#define I2CDEV_COUNT 2
+#define MAX_I2C_PIN_SEL 4
+
 #define UART_RX_BUFFER_SIZE 1024
 #define UART_TX_BUFFER_SIZE 1024
 
diff --git a/src/platform/PICO/target/RP2350B/.uf2 b/src/platform/PICO/target/RP2350B/.uf2
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/platform/PICO/target/RP2350B/target.h b/src/platform/PICO/target/RP2350B/target.h
index 1bc17dfee1..e8701b52f5 100644
--- a/src/platform/PICO/target/RP2350B/target.h
+++ b/src/platform/PICO/target/RP2350B/target.h
@@ -242,6 +242,9 @@ SPARE3          P47
 #define SPIDEV_COUNT 2
 #define MAX_SPI_PIN_SEL 6
 
+#define I2CDEV_COUNT 2
+#define MAX_I2C_PIN_SEL 6
+
 #define UART_RX_BUFFER_SIZE 1024
 #define UART_TX_BUFFER_SIZE 1024