pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-20 00:31:09 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'meshtastic:master' into master

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/lilygo_techo_bootloader-0.6.1.zip Normal file
View File

Binary file not shown.

BIN
bin/update-lilygo_techo_bootloader-0.6.1_nosd.uf2 Normal file
View File

Binary file not shown.

2
protobufs

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

8
src/mesh/generated/meshtastic/mesh.pb.h
View File

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

2
src/platform/esp32/architecture.h
View File

@ -106,7 +106,7 @@
#elif defined(HELTEC_WSL_V3) #elif defined(HELTEC_WSL_V3)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WSL_V3 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WSL_V3
#elif defined(HELTEC_WIRELESS_TRACKER) #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) #elif defined(HELTEC_WIRELESS_PAPER_V1_0)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER_V1_0 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER_V1_0
#elif defined(HELTEC_WIRELESS_PAPER) #elif defined(HELTEC_WIRELESS_PAPER)