From 8f36bdb628bdfa82902b0308465f9590eb2e42e0 Mon Sep 17 00:00:00 2001
From: GUVWAF <thijs@havinga.eu>
Date: Sun, 28 May 2023 14:18:05 +0200
Subject: [PATCH] Move RAK11310 to <32 and merge RPi Pico (W)

---
 meshtastic/mesh.proto | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index aaf1823..6cc8467 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -310,6 +310,11 @@ enum HardwareModel {
    */
   STATION_G1 = 25;
 
+  /*
+   * RAK11310 (RP2040 + SX1262)
+   */
+  RAK11310 = 26;
+
   /*
    * ---------------------------------------------------------------------------
    * Less common/prototype boards listed here (needs one more byte over the air)
@@ -388,20 +393,10 @@ enum HardwareModel {
   BETAFPV_900_NANO_TX = 46;
 
   /*
-   * Raspberry Pi Pico (with Waveshare SX1262 LoRa Node Module)
+   * Raspberry Pi Pico (W) with Waveshare SX1262 LoRa Node Module
    */
   RPI_PICO = 47;
 
-  /*
-   * Raspberry Pi Pico W (with Waveshare SX1262 LoRa Node Module)
-   */
-  RPI_PICO_W = 48;
-
-  /*
-   * RAK11310 (RP2040 + SX1262)
-   */
-  RAK11310 = 49;
-
   /*
    * ------------------------------------------------------------------------------------------------------------------------------------------
    * Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.