Merge branch 'meshtastic:master' into master

This commit is contained in:
Mictronics 2024-02-12 17:07:54 +01:00 committed by GitHub
commit bc4bbbb290
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 4 deletions

Binary file not shown.

Binary file not shown.

@ -1 +1 @@
Subproject commit 20f2783e196da1429de4b0fcf05c7ffea98d7901
Subproject commit 388fd79bf78df2c59dd0bdd029a382fa91b1cd88

View File

@ -109,8 +109,9 @@ typedef enum _meshtastic_HardwareModel {
meshtastic_HardwareModel_BETAFPV_900_NANO_TX = 46,
/* Raspberry Pi Pico (W) with Waveshare SX1262 LoRa Node Module */
meshtastic_HardwareModel_RPI_PICO = 47,
/* Heltec Wireless Tracker with ESP32-S3 CPU, built-in GPS, and TFT */
meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER = 48,
/* Heltec Wireless Tracker with ESP32-S3 CPU, built-in GPS, and TFT
Newer V1.1, version is written on the PCB near the display. */
meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER_V1_1 = 48,
/* Heltec Wireless Paper with ESP32-S3 CPU and E-Ink display */
meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER = 49,
/* LilyGo T-Deck with ESP32-S3 CPU, Keyboard and IPS display */
@ -135,6 +136,9 @@ typedef enum _meshtastic_HardwareModel {
Tab on the screen protector is RED
Flex connector marking is FPC-7528B */
meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER_V1_0 = 57,
/* Heltec Wireless Tracker with ESP32-S3 CPU, built-in GPS, and TFT
Older "V1.0" Variant */
meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER_V1_0 = 58,
/* ------------------------------------------------------------------------------------------------------------------------------------------
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.
------------------------------------------------------------------------------------------------------------------------------------------ */

View File

@ -106,7 +106,7 @@
#elif defined(HELTEC_WSL_V3)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WSL_V3
#elif defined(HELTEC_WIRELESS_TRACKER)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_TRACKER_V1_1
#elif defined(HELTEC_WIRELESS_PAPER_V1_0)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER_V1_0
#elif defined(HELTEC_WIRELESS_PAPER)