From e699427bfc69a86585c35e98be4961a4ba2fb41b Mon Sep 17 00:00:00 2001
From: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Date: Sun, 28 May 2023 17:30:54 +0200
Subject: [PATCH] RP2040: Enable telemetry and update HW models (#2525)

---
 src/platform/rp2040/architecture.h | 16 ++++++++++++++--
 variants/rak11310/platformio.ini   |  2 +-
 variants/rpipico/platformio.ini    |  2 +-
 variants/rpipicow/platformio.ini   |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/platform/rp2040/architecture.h b/src/platform/rp2040/architecture.h
index c5a2ecdec..772e4b1af 100644
--- a/src/platform/rp2040/architecture.h
+++ b/src/platform/rp2040/architecture.h
@@ -2,6 +2,18 @@
 
 #define ARCH_RP2040
 
-#if defined(PRIVATE_HW)
-#define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
+#ifndef HAS_TELEMETRY
+#define HAS_TELEMETRY 1
+#endif
+#ifndef HAS_SENSOR
+#define HAS_SENSOR 1
+#endif
+#ifndef HAS_RADIO
+#define HAS_RADIO 1
+#endif
+
+#if defined(RPI_PICO)
+#define HW_VENDOR meshtastic_HardwareModel_RPI_PICO
+#elif defined(RAK11310)
+#define HW_VENDOR meshtastic_HardwareModel_RAK11310
 #endif
\ No newline at end of file
diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini
index 89c657fe0..a69b18c1a 100644
--- a/variants/rak11310/platformio.ini
+++ b/variants/rak11310/platformio.ini
@@ -5,7 +5,7 @@ upload_protocol = picotool
 
 # add our variants files to the include and src paths
 build_flags = ${rp2040_base.build_flags} 
-  -DPRIVATE_HW
+  -DRAK11310
   -Ivariants/rak11310
   -DDEBUG_RP2040_PORT=Serial
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
diff --git a/variants/rpipico/platformio.ini b/variants/rpipico/platformio.ini
index 08f7bb2ba..727a1cab6 100644
--- a/variants/rpipico/platformio.ini
+++ b/variants/rpipico/platformio.ini
@@ -5,7 +5,7 @@ upload_protocol = picotool
 
 # add our variants files to the include and src paths
 build_flags = ${rp2040_base.build_flags} 
-  -DPRIVATE_HW
+  -DRPI_PICO
   -Ivariants/rpipico
   -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE
diff --git a/variants/rpipicow/platformio.ini b/variants/rpipicow/platformio.ini
index b032d63d5..3228e4c24 100644
--- a/variants/rpipicow/platformio.ini
+++ b/variants/rpipicow/platformio.ini
@@ -6,7 +6,7 @@ upload_protocol = picotool
 
 # add our variants files to the include and src paths
 build_flags = ${rp2040_base.build_flags} 
-  -DPRIVATE_HW
+  -DRPI_PICO
   -Ivariants/rpipicow
   -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE