Merge branch 'master' into userid_coerce

This commit is contained in:
Ben Meadors 2025-05-28 08:15:46 -05:00 committed by GitHub
commit 4d8cd76804
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit 022ea79bad79b70d0bee286cd9184916ab47c1b1
Subproject commit 24c7a3d287a4bd269ce191827e5dabd8ce8f57a7

View File

@ -252,10 +252,10 @@ typedef enum _meshtastic_HardwareModel {
meshtastic_HardwareModel_LINK_32 = 98,
/* *
Seeed Tracker L1 */
meshtastic_HardwareModel_SEEED_TRACKER_L1 = 99,
meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1 = 99,
/* *
Seeed Tracker L1 EINK driver */
meshtastic_HardwareModel_SEEED_TRACKER_L1_EINK = 100,
meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1_EINK = 100,
/* Reserved ID for future and past use */
meshtastic_HardwareModel_QWANTZ_TINY_ARMS = 101,
/* ------------------------------------------------------------------------------------------------------------------------------------------