Merge remote-tracking branch 'origin/2.6' into backup-restore

This commit is contained in:
Ben Meadors
2025-02-27 06:16:26 -06:00
20 changed files with 88 additions and 60 deletions

View File

@@ -571,7 +571,8 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
resetRadioConfig();
strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);
#if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(INDICATOR)) && HAS_TFT
#if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR)) && \
HAS_TFT
// switch BT off by default; use TFT programming mode or hotkey to enable
config.bluetooth.enabled = false;
#else