From 1dada04b66a36bc1795f907e4b410ef0c7bb48f8 Mon Sep 17 00:00:00 2001 From: bsongis Date: Sun, 19 Oct 2014 22:53:43 +0200 Subject: [PATCH] SWR added in the firmware as an option (SWR=YES) --- radio/src/Makefile | 24 ++++++++---------------- radio/src/gui/menus.cpp | 2 +- radio/src/logs.cpp | 17 +++++++++-------- radio/src/telemetry/frsky.cpp | 2 +- 4 files changed, 19 insertions(+), 26 deletions(-) diff --git a/radio/src/Makefile b/radio/src/Makefile index 73a88cd48..c53697ccf 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -615,7 +615,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO)) SDCARD = YES BUZZER = NO THR_TRACE = YES - CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DDSM2 -DDSM2_PPM + CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DDSM2 -DDSM2_PPM -DSWR ifeq ($(PCB), SKY9X) CPPDEFS += -DROTARY_ENCODERS=1 CPPSRC += targets/sky9x/rotenc_driver.cpp @@ -638,28 +638,23 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO)) CPPSRC += tasks_arm.cpp audio_arm.cpp haptic.cpp gui/view_about.cpp gui/view_text.cpp CPPSRC += targets/sky9x/telemetry_driver.cpp targets/sky9x/second_serial_driver.cpp targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp CPPSRC += loadboot.cpp - ifeq ($(SDCARD), YES) CPPDEFS += -DVOICE INCDIRS += FatFs FatFs/option EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/sky9x/diskio.cpp endif - ifeq ($(BUZZER), YES) CPPDEFS += -DBUZZER CPPSRC += buzzer.cpp endif - ifeq ($(RTCLOCK), YES) CPPDEFS += -DRTCLOCK CPPSRC += rtc.cpp targets/sky9x/rtc_driver.cpp endif - ifeq ($(BLUETOOTH), YES) CPPDEFS += -DBLUETOOTH CPPSRC += targets/sky9x/bluetooth.cpp endif - ifeq ($(DEBUG), YES) CPPSRC += debug.cpp SRC += targets/sky9x/syscalls.c @@ -671,13 +666,17 @@ ifeq ($(PCB), TARANIS) ARCH = ARM ifeq ($(PCBREV), REV3) CPPDEFS = -DREV3 + SWR = YES else ifeq ($(PCBREV), REV4a) CPPDEFS = -DREV4a + SWR = YES else ifeq ($(PCBREV), REVPLUS) CPPDEFS = -DREVPLUS HAPTIC = YES + SWR = NO else CPPDEFS = -DREV4 + SWR = YES endif ifeq ($(SPORT_FILE_LOG), YES) CPPDEFS += -DSPORT_FILE_LOG @@ -760,13 +759,11 @@ ifeq ($(PCB), TARANIS) SRC += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c EXTRABOARDSRC += targets/taranis/usbd_storage_msd.cpp endif - ifeq ($(NANO), YES) # use newlib-nano for linking NEWLIB_NANO_FLAGS = --specs=nano.specs -u _printf_float CPPDEFS += -DNANO endif - ifneq ($(LUA), NO) ifeq ($(LUA), YES) CPPDEFS += -DLUA_MODEL_SCRIPTS @@ -780,42 +777,37 @@ ifeq ($(PCB), TARANIS) SRC += $(LUASRC) LUADEP = lua_exports.cpp endif - ifeq ($(SDCARD), YES) EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/taranis/diskio.cpp CPPDEFS += -DVOICE INCDIRS += FatFs FatFs/option endif - ifeq ($(RTCLOCK), YES) CPPDEFS += -DRTCLOCK CPPSRC += rtc.cpp targets/taranis/rtc_driver.cpp endif - ifeq ($(DEBUG), YES) CPPSRC += debug.cpp endif - ifeq ($(DSM2), PPM) CPPSRC += pulses/dsm2_arm.cpp endif - ifeq ($(HUBSAN), YES) CPPDEFS += -DHUBSAN CPPSRC += pulses/hubsan.cpp CPPSRC += targets/taranis/a7105_driver.cpp endif - ifeq ($(HAPTIC), YES) CPPDEFS += -DHAPTIC CPPSRC += haptic.cpp CPPSRC += targets/taranis/haptic_driver.cpp endif - ifeq ($(CHANNELS_MONITOR_INV_HIDE), YES) CPPDEFS += -DCHANNELS_MONITOR_INV_HIDE endif - + ifeq ($(SWR), YES) + CPPDEFS += -DSWR + endif endif CC = $(TRGT)gcc diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp index 95fbbb281..8be3bf089 100644 --- a/radio/src/gui/menus.cpp +++ b/radio/src/gui/menus.cpp @@ -1423,7 +1423,7 @@ bool isTelemetrySourceAvailable(int source) return false; #endif -#if defined(PCBTARANIS) && defined(REVPLUS) +#if !defined(SWR) // on Taranis+ we also hide the SWR if (source == TELEM_SWR) return false; diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp index 576daca43..99ffb2b5a 100644 --- a/radio/src/logs.cpp +++ b/radio/src/logs.cpp @@ -115,13 +115,15 @@ const pm_char * openLogs() f_puts("Time,", &g_oLogFile); #endif -#if defined(PCBTARANIS) && defined(REVPLUS) - f_puts("RSSI,A1,A2,A3,A4,", &g_oLogFile); -#elif defined(CPUARM) && defined(FRSKY) +#if defined(FRSKY) +#if defined(CPUARM) && defined(SWR) f_puts("SWR,RSSI,A1,A2,A3,A4,", &g_oLogFile); -#elif defined(FRSKY) +#elif defined(CPUARM) + f_puts("RSSI,A1,A2,A3,A4,", &g_oLogFile); +#else f_puts("Buffer,RX,TX,A1,A2,", &g_oLogFile); #endif +#endif #if defined(FRSKY_HUB) if (IS_USR_PROTO_FRSKY_HUB()) { @@ -207,14 +209,13 @@ void writeLogs() #endif // #if defined(RTCLOCK) #if defined(FRSKY) -#if defined(PCBTARANIS) && defined(REVPLUS) - f_printf(&g_oLogFile, "%d,", RAW_FRSKY_MINMAX(frskyData.rssi[0])); -#elif defined(CPUARM) +#if defined(CPUARM) && defined(SWR) f_printf(&g_oLogFile, "%d,%d,", RAW_FRSKY_MINMAX(frskyData.swr), RAW_FRSKY_MINMAX(frskyData.rssi[0])); +#elif defined(CPUARM) + f_printf(&g_oLogFile, "%d,", RAW_FRSKY_MINMAX(frskyData.rssi[0])); #else f_printf(&g_oLogFile, "%d,%d,%d,", frskyStreaming, RAW_FRSKY_MINMAX(frskyData.rssi[0]), RAW_FRSKY_MINMAX(frskyData.rssi[1])); #endif - for (uint8_t i=0; i 0x33) { AUDIO_SWR_RED(); POPUP_WARNING(STR_ANTENNAPROBLEM);