From 350ca1f0ca9a83e2980f0fc16543aef3107c0889 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Wed, 25 Feb 2026 13:42:56 -0600 Subject: [PATCH] Tweak PA detect gpio to use pinMapping --- src/platform/portduino/PortduinoGlue.cpp | 7 +------ src/platform/portduino/PortduinoGlue.h | 5 ----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp index 92d10f0d2..2cf23332c 100644 --- a/src/platform/portduino/PortduinoGlue.cpp +++ b/src/platform/portduino/PortduinoGlue.cpp @@ -538,7 +538,7 @@ void portduinoSetup() } // In one test, this dance seemed necessary to trigger the pin to detect properly. - if (portduino_config.has_gpio_detect_pa) { + if (portduino_config.lora_pa_detect_pin.enabled) { pinMode(portduino_config.lora_pa_detect_pin.pin, INPUT_PULLDOWN); sleep(1); if (digitalRead(portduino_config.lora_pa_detect_pin.pin) == LOW) { @@ -681,11 +681,6 @@ bool loadConfig(const char *configPath) portduino_config.lr1120_max_power = yamlConfig["Lora"]["LR1120_MAX_POWER"].as(13); if (yamlConfig["Lora"]["RF95_MAX_POWER"]) portduino_config.rf95_max_power = yamlConfig["Lora"]["RF95_MAX_POWER"].as(20); - if (yamlConfig["Lora"]["GPIO_DETECT_PA"]) { - portduino_config.has_gpio_detect_pa = true; - portduino_config.gpio_detect_pa = yamlConfig["Lora"]["GPIO_DETECT_PA"].as(0); - portduino_config.lora_pa_detect_pin.pin = portduino_config.gpio_detect_pa; - } if (yamlConfig["Lora"]["TX_GAIN_LORA"]) { YAML::Node tx_gain_node = yamlConfig["Lora"]["TX_GAIN_LORA"]; diff --git a/src/platform/portduino/PortduinoGlue.h b/src/platform/portduino/PortduinoGlue.h index 8e826f9b3..64866d47b 100644 --- a/src/platform/portduino/PortduinoGlue.h +++ b/src/platform/portduino/PortduinoGlue.h @@ -98,8 +98,6 @@ extern struct portduino_config_struct { int lora_usb_pid = 0x5512; int lora_usb_vid = 0x1A86; int spiSpeed = 2000000; - bool has_gpio_detect_pa = false; - int gpio_detect_pa = 0; int num_pa_points = 1; // default to 1 point, with 0 gain uint16_t tx_gain_lora[22] = {0}; pinMapping lora_cs_pin = {"Lora", "CS"}; @@ -249,9 +247,6 @@ extern struct portduino_config_struct { if (rf95_max_power != 20) out << YAML::Key << "RF95_MAX_POWER" << YAML::Value << rf95_max_power; - if (has_gpio_detect_pa) - out << YAML::Key << "GPIO_DETECT_PA" << YAML::Value << gpio_detect_pa; - if (num_pa_points > 1) { out << YAML::Key << "TX_GAIN_LORA" << YAML::Value << YAML::Flow << YAML::BeginSeq; for (int i = 0; i < num_pa_points; i++) {