Merge branch 'master' into crowpanelV2

This commit is contained in:
Manuel
2025-10-01 18:06:45 +02:00
committed by GitHub
3 changed files with 4 additions and 4 deletions

View File

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

View File

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