* sport.log only active if SPORT_FILE_LOG=YES
* audio concurrent access fixes
* added IO mutex
* added Event Trace Buffer
* fixed SD card error

Conflicts:
	radio/src/Makefile
	radio/src/targets/taranis/diskio.cpp
This commit is contained in:
Damjan Adamic
2014-10-14 22:43:05 +02:00
committed by bsongis
parent c4c7fed727
commit 874156122d
12 changed files with 901 additions and 578 deletions
+34 -6
View File
@@ -297,6 +297,16 @@ CHANNELS_MONITOR_INV_HIDE = NO
# Values = NO, YES
NANO = NO
# Enable trace of events into Trace Buffer for debugging purposes
# Activating any of these options also activates DEBUG and DEBUG_TRACE_BUFFER
# Values = NO, YES
# TRACE_SD_CARD SD card operations (read, write, etc)
# TRACE_FATFS FatFs file operations
# TRACE_AUDIO Audio processing (not yet implemented)
TRACE_SD_CARD = NO
TRACE_FATFS = NO
TRACE_AUDIO = NO
#------- END BUILD OPTIONS ---------------------------
# Define programs and commands.
@@ -311,6 +321,7 @@ CPPSRC =
INCDIRS = . translations
EXTRAINCDIRS =
LUADEP =
DEBUG_TRACE_BUFFER = NO
# MCU name
ifneq ($(PCB), $(filter $(PCB), STD 9X 9XR STD128 9X128 9XR128 9X2561 9XR2561 GRUVIN9X MEGA2560 SKY9X 9XRPRO TARANIS))
@@ -645,13 +656,13 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
endif
ifeq ($(BLUETOOTH), YES)
CPPDEFS += -DBLUETOOTH
CPPSRC += targets/sky9x/bluetooth.cpp
CPPDEFS += -DBLUETOOTH
CPPSRC += targets/sky9x/bluetooth.cpp
endif
ifeq ($(DEBUG), YES)
CPPSRC += debug.cpp
SRC += targets/sky9x/syscalls.c
SRC += targets/sky9x/syscalls.c
endif
endif
@@ -669,9 +680,26 @@ ifeq ($(PCB), TARANIS)
CPPDEFS = -DREV4
endif
ifeq ($(SPORT_FILE_LOG), YES)
DEBUG = YES
CPPDEFS += -DSPORT_FILE_LOG
endif
endif
ifeq ($(TRACE_SD_CARD), YES)
DEBUG = YES
DEBUG_TRACE_BUFFER = YES
CPPDEFS += -DTRACE_SD_CARD
endif
ifeq ($(TRACE_FATFS), YES)
DEBUG = YES
DEBUG_TRACE_BUFFER = YES
CPPDEFS += -DTRACE_FATFS
endif
ifeq ($(TRACE_AUDIO), YES)
DEBUG = YES
DEBUG_TRACE_BUFFER = YES
CPPDEFS += -DTRACE_AUDIO
endif
ifeq ($(DEBUG_TRACE_BUFFER), YES)
CPPDEFS += -DDEBUG_TRACE_BUFFER
endif
LDSCRIPT = targets/taranis/stm32_flash_bl.ld
TRGT = arm-none-eabi-
MCU = cortex-m3
@@ -990,7 +1018,7 @@ endif
ifeq ($(EXT), $(filter $(EXT), FRSKY FRSKY_SPORT TELEMETREZ))
CPPDEFS += -DFRSKY
ifeq ($(EXT), FRSKY_SPORT)
CPPSRC += telemetry/frsky.cpp telemetry/frsky_sport.cpp telemetry/frsky_d.cpp
CPPSRC += telemetry/frsky.cpp telemetry/frsky_sport.cpp telemetry/frsky_d.cpp
CPPDEFS += -DFRSKY_SPORT
else
CPPSRC += telemetry/frsky.cpp telemetry/frsky_d.cpp