protobufs

@@ -1 +1 @@
-Subproject commit 14ec205865592fcfa798065bb001a549fc77b438
+Subproject commit 035a8017b87379f17624f7bba9b6a5b127bc026c

src/gps/GPS.cpp

@@ -1104,16 +1104,12 @@ int32_t GPS::runOnce()
     return (powerState == GPS_ACTIVE) ? GPS_THREAD_INTERVAL : 5000;
 }
 
-// clear the GPS rx/tx buffer as quickly as possible
+// clear the GPS rx buffer as quickly as possible
 void GPS::clearBuffer()
 {
-#ifdef ARCH_ESP32
-    _serial_gps->flush(false);
-#else
     int x = _serial_gps->available();
     while (x--)
         _serial_gps->read();
-#endif
 }
 
 /// Prepare the GPS for the cpu entering deep or light sleep, expect to be gone for at least 100s of msecs

src/mesh/generated/meshtastic/admin.pb.h

@@ -34,7 +34,7 @@ typedef enum _meshtastic_AdminMessage_ConfigType {
     meshtastic_AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6,
     /* TODO: REPLACE */
     meshtastic_AdminMessage_ConfigType_SECURITY_CONFIG = 7,
-    /* Session key config */
+    /*  */
     meshtastic_AdminMessage_ConfigType_SESSIONKEY_CONFIG = 8,
     /* device-ui config */
     meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG = 9

src/mesh/generated/meshtastic/config.pb.h

@@ -374,7 +374,7 @@ typedef struct _meshtastic_Config_PositionConfig {
 /* Power Config\
  See [Power Config](/docs/settings/config/power) for additional power config details. */
 typedef struct _meshtastic_Config_PowerConfig {
-    /* Description: Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio.
+    /* Description: Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio. 
  Don't use this setting if you want to use your device with the phone apps or are using a device without a user button.
  Technical Details: Works for ESP32 devices and NRF52 devices in the Sensor or Tracker roles */
     bool is_power_saving;
@@ -426,7 +426,7 @@ typedef struct _meshtastic_Config_NetworkConfig {
     char wifi_ssid[33];
     /* If set, will be use to authenticate to the named wifi */
     char wifi_psk[65];
-    /* NTP server to use if WiFi is conneced, defaults to `meshtastic.pool.ntp.org` */
+    /* NTP server to use if WiFi is conneced, defaults to `0.pool.ntp.org` */
     char ntp_server[33];
     /* Enable Ethernet */
     bool eth_enabled;

src/mesh/generated/meshtastic/device_ui.pb.h

@@ -53,8 +53,6 @@ typedef enum _meshtastic_Language {
     meshtastic_Language_NORWEGIAN = 14,
     /* Slovenian */
     meshtastic_Language_SLOVENIAN = 15,
-    /* Ukrainian */
-    meshtastic_Language_UKRAINIAN = 16,
     /* Simplified Chinese (experimental) */
     meshtastic_Language_SIMPLIFIED_CHINESE = 30,
     /* Traditional Chinese (experimental) */

src/mesh/generated/meshtastic/mesh.pb.h

@@ -159,7 +159,7 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_TD_LORAC = 60,
     /* CDEBYTE EoRa-S3 board using their own MM modules, clone of LILYGO T3S3 */
     meshtastic_HardwareModel_CDEBYTE_EORA_S3 = 61,
-    /* TWC_MESH_V4
+    /* TWC_MESH_V4 
  Adafruit NRF52840 feather express with SX1262, SSD1306 OLED and NEO6M GPS */
     meshtastic_HardwareModel_TWC_MESH_V4 = 62,
     /* NRF52_PROMICRO_DIY
@@ -228,13 +228,6 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_MESHLINK = 87,
     /* Seeed XIAO nRF52840 + Wio SX1262 kit */
     meshtastic_HardwareModel_XIAO_NRF52_KIT = 88,
-    /* Elecrow ThinkNode M1 & M2
- https://www.elecrow.com/wiki/ThinkNode-M1_Transceiver_Device(Meshtastic)_Power_By_nRF52840.html
- https://www.elecrow.com/wiki/ThinkNode-M2_Transceiver_Device(Meshtastic)_Power_By_NRF52840.html (this actually uses ESP32-S3) */
-    meshtastic_HardwareModel_THINKNODE_M1 = 89,
-    meshtastic_HardwareModel_THINKNODE_M2 = 90,
-    /* Lilygo T-ETH-Elite */
-    meshtastic_HardwareModel_T_ETH_ELITE = 91,
     /* ------------------------------------------------------------------------------------------------------------------------------------------
  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.
  ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -776,7 +769,7 @@ typedef struct _meshtastic_MeshPacket {
     meshtastic_MeshPacket_public_key_t public_key;
     /* Indicates whether the packet was en/decrypted using PKI */
     bool pki_encrypted;
-    /* Last byte of the node number of the node that should be used as the next hop in routing.
+    /* Last byte of the node number of the node that should be used as the next hop in routing. 
  Set by the firmware internally, clients are not supposed to set this. */
     uint8_t next_hop;
     /* Last byte of the node number of the node that will relay/relayed this packet.

src/platform/esp32/architecture.h

@@ -176,8 +176,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_SEEED_XIAO_S3
 #elif defined(MESH_TAB)
 #define HW_VENDOR meshtastic_HardwareModel_MESH_TAB
-#elif defined(T_ETH_ELITE)
-#define HW_VENDOR meshtastic_HardwareModel_T_ETH_ELITE
 #endif
 
 // -----------------------------------------------------------------------------

variants/t-eth-elite/platformio.ini

@@ -4,7 +4,7 @@ board = esp32s3box
 board_check = true
 build_flags = 
   ${esp32s3_base.build_flags}
-  -D T_ETH_ELITE
+  -D PRIVATE_HW
   -I variants/t-eth-elite
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 

variants/t-eth-elite/variant.h

@@ -1,17 +1,12 @@
 #define HAS_SDCARD
 #define SDCARD_USE_SPI1
 
-#define HAS_GPS 1
 #define GPS_RX_PIN 39
 #define GPS_TX_PIN 42
-#define GPS_BAUDRATE_FIXED 1
-#define GPS_BAUDRATE 9600
 
 #define I2C_SDA 17 // I2C pins for this board
 #define I2C_SCL 18
 
-#define HAS_SCREEN 1 // Allow for OLED Screens on I2C Header of shield
-
 #define LED_PIN 38   // If defined we will blink this LED
 #define BUTTON_PIN 0 // If defined, this will be used for user button presses,
 

variants/tlora_v3_3_0_tcxo/platformio.ini

@@ -1,6 +1,7 @@
 [env:tlora-v3-3-0-tcxo]
 extends = esp32_base
 board = ttgo-lora32-v21
+board_level = extra
 build_flags = 
   ${esp32_base.build_flags}
   -D TLORA_V2_1_16