Merge branch 'master' into ch341-mac

This commit is contained in:
Jonathan Bennett 2024-12-30 23:11:46 -06:00 committed by GitHub
commit 6faacf589c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -409,6 +409,13 @@ bool NodeDB::resetRadioConfig(bool factory_reset)
rebootAtMsec = millis() + (5 * 1000);
}
#if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3)) && defined(HAS_TFT)
// as long as PhoneAPI shares BT and TFT app switch BT off
config.bluetooth.enabled = false;
if (moduleConfig.external_notification.nag_timeout == 60)
moduleConfig.external_notification.nag_timeout = 0;
#endif
return didFactoryReset;
}