Merge branch 'meshtastic:master' into master

variants/heltec_v3/variant.h

@@ -1,7 +1,5 @@
 #define LED_PIN LED
 
-#define HAS_GPS 0
-
 #define RESET_OLED RST_OLED
 #define I2C_SDA SDA_OLED // I2C pins for this board
 #define I2C_SCL SCL_OLED
@@ -29,4 +27,4 @@
 #define SX126X_DIO1     LORA_DIO1
 #define SX126X_BUSY     LORA_DIO2
 #define SX126X_RESET    LORA_RESET
-#define SX126X_E22
+#define SX126X_E22