rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 18:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into crowpanelV2

Browse Source
This commit is contained in:
Manuel
2025-10-01 18:06:45 +02:00
committed by GitHub
parent bc82cd803c b08e4efb78
commit f94043e4f2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
protobufs

Submodule protobufs updated: 082bb7cfeb...5fa4c44d91

2
src/input/ButtonThread.cpp
View File

@@ -279,7 +279,7 @@ int32_t ButtonThread::runOnce()
if (!userButton.isIdle() || waitingForLongPress) { if (!userButton.isIdle() || waitingForLongPress) {
return 50; return 50;
} }
return INT32_MAX; return 100; // FIXME: Why can't we rely on interrupts and use INT32_MAX here?
} }
/* /*

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

@@ -253,8 +253,8 @@ typedef enum _meshtastic_HardwareModel {
meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1 = 99, meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1 = 99,
/* Seeed Tracker L1 EINK driver */ /* Seeed Tracker L1 EINK driver */
meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1_EINK = 100, meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1_EINK = 100,
/* Reserved ID for future and past use */ /* Muzi Works R1 Neo */
meshtastic_HardwareModel_QWANTZ_TINY_ARMS = 101, meshtastic_HardwareModel_MUZI_R1_NEO = 101,
/* Lilygo T-Deck Pro */ /* Lilygo T-Deck Pro */
meshtastic_HardwareModel_T_DECK_PRO = 102, meshtastic_HardwareModel_T_DECK_PRO = 102,
/* Lilygo TLora Pager */ /* Lilygo TLora Pager */