Deprecate Triple Click Config

This commit is contained in:
Jonathan Bennett 2025-07-22 13:38:52 -05:00
parent d80dcd6afd
commit 1a3ede4bfd
3 changed files with 4 additions and 12 deletions

View File

@ -199,12 +199,10 @@ void ExpressLRSFiveWay::sendKey(input_broker_event key)
void ExpressLRSFiveWay::toggleGPS() void ExpressLRSFiveWay::toggleGPS()
{ {
#if HAS_GPS && !MESHTASTIC_EXCLUDE_GPS #if HAS_GPS && !MESHTASTIC_EXCLUDE_GPS
if (!config.device.disable_triple_click && (gps != nullptr)) { gps->toggleGpsMode();
gps->toggleGpsMode(); screen->startAlert("GPS Toggled");
screen->startAlert("GPS Toggled"); alerting = true;
alerting = true; alertingSinceMs = millis();
alertingSinceMs = millis();
}
#endif #endif
} }

View File

@ -628,11 +628,6 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
#ifdef PIN_GPS_EN #ifdef PIN_GPS_EN
config.position.gps_en_gpio = PIN_GPS_EN; config.position.gps_en_gpio = PIN_GPS_EN;
#endif #endif
#ifdef GPS_POWER_TOGGLE
config.device.disable_triple_click = false;
#else
config.device.disable_triple_click = true;
#endif
#if defined(USERPREFS_CONFIG_GPS_MODE) #if defined(USERPREFS_CONFIG_GPS_MODE)
config.position.gps_mode = USERPREFS_CONFIG_GPS_MODE; config.position.gps_mode = USERPREFS_CONFIG_GPS_MODE;
#elif !HAS_GPS || GPS_DEFAULT_NOT_PRESENT #elif !HAS_GPS || GPS_DEFAULT_NOT_PRESENT

View File

@ -596,7 +596,6 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
if (config.device.button_gpio == c.payload_variant.device.button_gpio && if (config.device.button_gpio == c.payload_variant.device.button_gpio &&
config.device.buzzer_gpio == c.payload_variant.device.buzzer_gpio && config.device.buzzer_gpio == c.payload_variant.device.buzzer_gpio &&
config.device.role == c.payload_variant.device.role && config.device.role == c.payload_variant.device.role &&
config.device.disable_triple_click == c.payload_variant.device.disable_triple_click &&
config.device.rebroadcast_mode == c.payload_variant.device.rebroadcast_mode) { config.device.rebroadcast_mode == c.payload_variant.device.rebroadcast_mode) {
requiresReboot = false; requiresReboot = false;
} }