diff --git a/src/main/drivers/vtx_rtc6705_soft_spi.c b/src/main/drivers/vtx_rtc6705_soft_spi.c index 7c331cdf57..0b67c25142 100644 --- a/src/main/drivers/vtx_rtc6705_soft_spi.c +++ b/src/main/drivers/vtx_rtc6705_soft_spi.c @@ -30,9 +30,6 @@ #include "drivers/light_led.h" #include "drivers/time.h" #include "drivers/vtx_rtc6705.h" -#include "fc/runtime_config.h" -#include "flight/failsafe.h" -#include "io/vtx.h" #define DP_5G_MASK 0x7000 #define PA5G_BS_MASK 0x0E00 @@ -139,11 +136,7 @@ void rtc6705SetFrequency(uint16_t channel_freq) void rtc6705SetRFPower(uint8_t rf_power) { - if (!ARMING_FLAG(ARMED) && (vtxSettingsConfig()->lowPowerDisarm == 0xFF) && !failsafeIsActive()) { - rtc6705_write_register(7, ((PA_CONTROL_DEFAULT | PD_Q5G_MASK) & (~(PA5G_PW_MASK | PA5G_BS_MASK | DP_5G_MASK)))); - } else { - rtc6705_write_register(7, (rf_power > 1 ? PA_CONTROL_DEFAULT : (PA_CONTROL_DEFAULT | PD_Q5G_MASK) & (~(PA5G_PW_MASK | PA5G_BS_MASK)))); - } + rtc6705_write_register(7, (rf_power > 1 ? PA_CONTROL_DEFAULT : (PA_CONTROL_DEFAULT | PD_Q5G_MASK) & (~(PA5G_PW_MASK | PA5G_BS_MASK)))); } void rtc6705Disable(void) diff --git a/src/main/target/FISHDRONEF4/config.c b/src/main/target/FISHDRONEF4/config.c deleted file mode 100644 index 50c51ee180..0000000000 --- a/src/main/target/FISHDRONEF4/config.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of Cleanflight and Betaflight. - * - * Cleanflight and Betaflight are free software. You can redistribute - * this software and/or modify this software under the terms of the - * GNU General Public License as published by the Free Software - * Foundation, either version 3 of the License, or (at your option) - * any later version. - * - * Cleanflight and Betaflight are distributed in the hope that they - * will be useful, but WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software. - * - * If not, see . - */ - -#include "io/vtx.h" - -#ifdef USE_TARGET_CONFIG -#if defined(STACKX) -#define VTX_SETTINGS_ULTRA_LOW_POWER 0xff -void targetConfiguration(void) -{ - vtxSettingsConfigMutable()->lowPowerDisarm = VTX_SETTINGS_ULTRA_LOW_POWER; -} -#endif -#endif \ No newline at end of file diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h index 21a97123ac..6135985c8e 100644 --- a/src/main/target/FISHDRONEF4/target.h +++ b/src/main/target/FISHDRONEF4/target.h @@ -23,7 +23,6 @@ #if defined(STACKX) #define TARGET_BOARD_IDENTIFIER "SXF4" #define USBD_PRODUCT_STRING "Stack-X F4" -#define USE_TARGET_CONFIG #else #define TARGET_BOARD_IDENTIFIER "FDF4" #define USBD_PRODUCT_STRING "FishDroneF4"