Merge pull request #319 from meshtastic/caveman99-patch-1

Move the G1 Explorer up to the 'core' devices

meshtastic/mesh.proto

@@ -302,6 +302,11 @@ enum HardwareModel {
    * TODO: REPLACE
    */
   TLORA_T3_S3 = 16;
+  
+  /*
+   * B&Q Consulting Nano G1 Explorer: https://wiki.uniteng.com/en/meshtastic/nano-g1-explorer
+   */
+  NANO_G1_EXPLORER = 17;
 
   /*
    * B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station
@@ -309,7 +314,9 @@ enum HardwareModel {
   STATION_G1 = 25; 
   
   /*
+   * ---------------------------------------------------------------------------
    * Less common/prototype boards listed here (needs one more byte over the air)
+   * ---------------------------------------------------------------------------
    */
   LORA_RELAY_V1 = 32;
 
@@ -381,15 +388,12 @@ enum HardwareModel {
   /*
    * BetaFPV ExpressLRS "Nano" TX Module 900MHz with ESP32 CPU
    */
-   BETAFPV_900_NANO_TX = 46;
+  BETAFPV_900_NANO_TX = 46;
   
   /*
-   * B&Q Consulting Nano G1 Explorer: https://wiki.uniteng.com/en/meshtastic/nano-g1-explorer
-   */
-  NANO_G1_EXPLORER = 47;
-
-  /*
+   * ------------------------------------------------------------------------------------------------------------------------------------------
    * 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.
+   * ------------------------------------------------------------------------------------------------------------------------------------------
    */
   PRIVATE_HW = 255;
 }
@@ -1425,4 +1429,4 @@ message Compressed {
    * Device hardware model
    */
   HardwareModel hw_model = 9;
-}
+}