Spectrum analyser reworked (#6836)
* Spectrum analyser reworked * Fix typo * Cosmetics * Cosmetics * yet another overall look update * T16 compilations fixes * Various Taranis compile fixes * Cosmetics * Cosmetics * Cosmetics * Cosmetics fixes
This commit is contained in:
@@ -2,6 +2,7 @@ option(DISK_CACHE "Enable SD card disk cache" ON)
|
||||
option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" ON)
|
||||
option(PXX1 "PXX1 protocol support" ON)
|
||||
option(PXX2 "PXX2 protocol support" OFF)
|
||||
option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" ON)
|
||||
|
||||
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
|
||||
set(CPU_TYPE STM32F4)
|
||||
@@ -146,16 +147,16 @@ set(GUI_SRC
|
||||
rle.cpp
|
||||
)
|
||||
|
||||
if(PXX2 OR LUA)
|
||||
if(PXX2 OR LUA OR MULTIMODULE)
|
||||
set(GUI_SRC ${GUI_SRC} radio_tools.cpp)
|
||||
endif()
|
||||
|
||||
if(PXX2 OR MULTIMODULE)
|
||||
set(GUI_SRC ${GUI_SRC} radio_spectrum_analyser.cpp)
|
||||
endif()
|
||||
|
||||
if(PXX2)
|
||||
set(GUI_SRC
|
||||
${GUI_SRC}
|
||||
radio_spectrum_analyser.cpp
|
||||
radio_power_meter.cpp
|
||||
)
|
||||
set(GUI_SRC ${GUI_SRC} radio_power_meter.cpp)
|
||||
endif()
|
||||
|
||||
if(DISK_CACHE)
|
||||
|
||||
@@ -49,7 +49,7 @@ void watchdogInit(unsigned int duration)
|
||||
extern "C" void initialise_monitor_handles();
|
||||
#endif
|
||||
|
||||
#if defined(PCBX10)
|
||||
#if defined(PCBX10) && !defined(RADIO_T16)
|
||||
void sportUpdateInit()
|
||||
{
|
||||
GPIO_InitTypeDef GPIO_InitStructure;
|
||||
@@ -171,7 +171,7 @@ void boardInit()
|
||||
DBGMCU_APB1PeriphConfig(DBGMCU_IWDG_STOP|DBGMCU_TIM1_STOP|DBGMCU_TIM2_STOP|DBGMCU_TIM3_STOP|DBGMCU_TIM4_STOP|DBGMCU_TIM5_STOP|DBGMCU_TIM6_STOP|DBGMCU_TIM7_STOP|DBGMCU_TIM8_STOP|DBGMCU_TIM9_STOP|DBGMCU_TIM10_STOP|DBGMCU_TIM11_STOP|DBGMCU_TIM12_STOP|DBGMCU_TIM13_STOP|DBGMCU_TIM14_STOP, ENABLE);
|
||||
#endif
|
||||
|
||||
#if defined(PCBX10)
|
||||
#if defined(PCBX10) && !defined(RADIO_T16)
|
||||
ledInit();
|
||||
sportUpdateInit();
|
||||
#endif
|
||||
|
||||
@@ -569,7 +569,7 @@ void telemetryClearFifo();
|
||||
extern uint32_t telemetryErrors;
|
||||
|
||||
// Sport update driver
|
||||
#if defined(PCBX10)
|
||||
#if defined(PCBX10) && !defined(RADIO_T16)
|
||||
void sportUpdatePowerOn();
|
||||
void sportUpdatePowerOff();
|
||||
#define SPORT_UPDATE_POWER_ON() sportUpdatePowerOn()
|
||||
|
||||
Reference in New Issue
Block a user