Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00
Code Issues Wiki Activity

Convert TRANSPONDER to USE_xxx scheme

Browse source
This commit is contained in:
jflyper 2017-12-11 01:41:01 +09:00
parent bb79830f03
commit db014752d7
34 changed files with 46 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/drivers/timer.h
View file

@ -96,7 +96,7 @@ typedef struct timerHardware_s {
#if defined(STM32F3) || defined(STM32F4) || defined(STM32F7) #if defined(STM32F3) || defined(STM32F4) || defined(STM32F7)
uint8_t alternateFunction; uint8_t alternateFunction;
#endif #endif
#if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(TRANSPONDER) #if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(USE_TRANSPONDER)
#if defined(STM32F4) || defined(STM32F7) #if defined(STM32F4) || defined(STM32F7)
DMA_Stream_TypeDef *dmaRef; DMA_Stream_TypeDef *dmaRef;
uint32_t dmaChannel; uint32_t dmaChannel;

2
src/main/drivers/timer_def.h
View file

@ -22,7 +22,7 @@
#include "common/utils.h" #include "common/utils.h"
// allow conditional definition of DMA related members // allow conditional definition of DMA related members
#if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(TRANSPONDER) #if defined(USE_DSHOT) || defined(USE_LED_STRIP) || defined(USE_TRANSPONDER)
# define DEF_TIM_DMA_COND(...) __VA_ARGS__ # define DEF_TIM_DMA_COND(...) __VA_ARGS__
#else #else
# define DEF_TIM_DMA_COND(...) # define DEF_TIM_DMA_COND(...)

2
src/main/drivers/transponder_ir.c
View file

@ -21,7 +21,7 @@
#include <platform.h> #include <platform.h>
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
#include "dma.h" #include "dma.h"
#include "drivers/nvic.h" #include "drivers/nvic.h"

4
src/main/drivers/transponder_ir_arcitimer.c
View file

@ -18,6 +18,9 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <platform.h> #include <platform.h>
#ifdef USE_TRANSPONDER
#include "drivers/transponder_ir.h" #include "drivers/transponder_ir.h"
#include "drivers/transponder_ir_arcitimer.h" #include "drivers/transponder_ir_arcitimer.h"
@ -64,3 +67,4 @@ const struct transponderVTable arcitimerTansponderVTable = {
}; };
#endif #endif
#endif

4
src/main/drivers/transponder_ir_erlt.c
View file

@ -18,6 +18,9 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <platform.h> #include <platform.h>
#ifdef USE_TRANSPONDER
#include "drivers/transponder_ir.h" #include "drivers/transponder_ir.h"
#include "drivers/transponder_ir_erlt.h" #include "drivers/transponder_ir_erlt.h"
@ -77,3 +80,4 @@ const struct transponderVTable erltTansponderVTable = {
}; };
#endif #endif
#endif

4
src/main/drivers/transponder_ir_ilap.c
View file

@ -18,6 +18,9 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <platform.h> #include <platform.h>
#ifdef USE_TRANSPONDER
#include "drivers/transponder_ir.h" #include "drivers/transponder_ir.h"
#include "drivers/transponder_ir_ilap.h" #include "drivers/transponder_ir_ilap.h"
@ -79,3 +82,4 @@ const struct transponderVTable ilapTansponderVTable = {
}; };
#endif #endif
#endif

2
src/main/fc/config.c
View file

@ -467,7 +467,7 @@ static void validateAndFixConfig(void)
featureClear(FEATURE_SERVO_TILT | FEATURE_CHANNEL_FORWARDING); featureClear(FEATURE_SERVO_TILT | FEATURE_CHANNEL_FORWARDING);
#endif #endif
#ifndef TRANSPONDER #ifndef USE_TRANSPONDER
featureClear(FEATURE_TRANSPONDER); featureClear(FEATURE_TRANSPONDER);
#endif #endif

2
src/main/fc/fc_core.c
View file

@ -673,7 +673,7 @@ static void subTaskMainSubprocesses(timeUs_t currentTimeUs)
UNUSED(currentTimeUs); UNUSED(currentTimeUs);
#endif #endif
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
transponderUpdate(currentTimeUs); transponderUpdate(currentTimeUs);
#endif #endif
DEBUG_SET(DEBUG_PIDLOOP, 3, micros() - startTime); DEBUG_SET(DEBUG_PIDLOOP, 3, micros() - startTime);

2
src/main/fc/fc_hardfaults.c
View file

@ -101,7 +101,7 @@ void HardFault_Handler(void)
} }
#endif #endif
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
// prevent IR LEDs from burning out. // prevent IR LEDs from burning out.
uint8_t requiredStateForTransponder = SYSTEM_STATE_CONFIG_LOADED | SYSTEM_STATE_TRANSPONDER_ENABLED; uint8_t requiredStateForTransponder = SYSTEM_STATE_CONFIG_LOADED | SYSTEM_STATE_TRANSPONDER_ENABLED;
if ((systemState & requiredStateForTransponder) == requiredStateForTransponder) { if ((systemState & requiredStateForTransponder) == requiredStateForTransponder) {

2
src/main/fc/fc_init.c
View file

@ -624,7 +624,7 @@ void init(void)
usbCableDetectInit(); usbCableDetectInit();
#endif #endif
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
if (feature(FEATURE_TRANSPONDER)) { if (feature(FEATURE_TRANSPONDER)) {
transponderInit(); transponderInit();
transponderStartRepeating(); transponderStartRepeating();

6
src/main/fc/fc_tasks.c
View file

@ -250,7 +250,7 @@ void fcTasksInit(void)
#endif #endif
setTaskEnabled(TASK_BATTERY_ALERTS, (useBatteryVoltage || useBatteryCurrent) && useBatteryAlerts); setTaskEnabled(TASK_BATTERY_ALERTS, (useBatteryVoltage || useBatteryCurrent) && useBatteryAlerts);
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
setTaskEnabled(TASK_TRANSPONDER, feature(FEATURE_TRANSPONDER)); setTaskEnabled(TASK_TRANSPONDER, feature(FEATURE_TRANSPONDER));
#endif #endif
@ -316,7 +316,7 @@ void fcTasksInit(void)
#ifdef USE_LED_STRIP #ifdef USE_LED_STRIP
setTaskEnabled(TASK_LEDSTRIP, feature(FEATURE_LED_STRIP)); setTaskEnabled(TASK_LEDSTRIP, feature(FEATURE_LED_STRIP));
#endif #endif
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
setTaskEnabled(TASK_TRANSPONDER, feature(FEATURE_TRANSPONDER)); setTaskEnabled(TASK_TRANSPONDER, feature(FEATURE_TRANSPONDER));
#endif #endif
#ifdef USE_OSD #ifdef USE_OSD
@ -390,7 +390,7 @@ cfTask_t cfTasks[TASK_COUNT] = {
.staticPriority = TASK_PRIORITY_MEDIUM, .staticPriority = TASK_PRIORITY_MEDIUM,
}, },
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
[TASK_TRANSPONDER] = { [TASK_TRANSPONDER] = {
.taskName = "TRANSPONDER", .taskName = "TRANSPONDER",
.taskFunc = transponderUpdate, .taskFunc = transponderUpdate,

2
src/main/interface/cli.c
View file

@ -3165,7 +3165,7 @@ const cliResourceValue_t resourceTable[] = {
{ OWNER_RX_BIND, PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_bind_pin_override_ioTag), 0 }, { OWNER_RX_BIND, PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_bind_pin_override_ioTag), 0 },
{ OWNER_RX_BIND_PLUG, PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_bind_plug_ioTag), 0 }, { OWNER_RX_BIND_PLUG, PG_RX_CONFIG, offsetof(rxConfig_t, spektrum_bind_plug_ioTag), 0 },
#endif #endif
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
{ OWNER_TRANSPONDER, PG_TRANSPONDER_CONFIG, offsetof(transponderConfig_t, ioTag), 0 }, { OWNER_TRANSPONDER, PG_TRANSPONDER_CONFIG, offsetof(transponderConfig_t, ioTag), 0 },
#endif #endif
#ifdef USE_SPI #ifdef USE_SPI

4
src/main/interface/msp.c
View file

@ -589,7 +589,7 @@ static bool mspCommonProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProce
break; break;
case MSP_TRANSPONDER_CONFIG: { case MSP_TRANSPONDER_CONFIG: {
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
// Backward compatibility to BFC 3.1.1 is lost for this message type // Backward compatibility to BFC 3.1.1 is lost for this message type
sbufWriteU8(dst, TRANSPONDER_PROVIDER_COUNT); sbufWriteU8(dst, TRANSPONDER_PROVIDER_COUNT);
for (unsigned int i = 0; i < TRANSPONDER_PROVIDER_COUNT; i++) { for (unsigned int i = 0; i < TRANSPONDER_PROVIDER_COUNT; i++) {
@ -2011,7 +2011,7 @@ static mspResult_e mspCommonProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
UNUSED(dataSize); // maybe unused due to compiler options UNUSED(dataSize); // maybe unused due to compiler options
switch (cmdMSP) { switch (cmdMSP) {
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
case MSP_SET_TRANSPONDER_CONFIG: { case MSP_SET_TRANSPONDER_CONFIG: {
// Backward compatibility to BFC 3.1.1 is lost for this message type // Backward compatibility to BFC 3.1.1 is lost for this message type

2
src/main/io/transponder_ir.c
View file

@ -23,7 +23,7 @@
#include <platform.h> #include <platform.h>
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
#include "build/build_config.h" #include "build/build_config.h"
#include "config/config_reset.h" #include "config/config_reset.h"

2
src/main/osd_slave/osd_slave_init.c
View file

@ -273,7 +273,7 @@ void init(void)
usbCableDetectInit(); usbCableDetectInit();
#endif #endif
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
if (feature(FEATURE_TRANSPONDER)) { if (feature(FEATURE_TRANSPONDER)) {
transponderInit(); transponderInit();
transponderStartRepeating(); transponderStartRepeating();

2
src/main/scheduler/scheduler.h
View file

@ -86,7 +86,7 @@ typedef enum {
#ifdef USE_LED_STRIP #ifdef USE_LED_STRIP
TASK_LEDSTRIP, TASK_LEDSTRIP,
#endif #endif
#ifdef TRANSPONDER #ifdef USE_TRANSPONDER
TASK_TRANSPONDER, TASK_TRANSPONDER,
#endif #endif
#ifdef STACK_CHECK #ifdef STACK_CHECK

2
src/main/target/BEEBRAIN_V2F/target.h
View file

@ -94,7 +94,7 @@
#define ADC_INSTANCE ADC3 #define ADC_INSTANCE ADC3
#define VBAT_ADC_PIN PB13 #define VBAT_ADC_PIN PB13
#define TRANSPONDER #define USE_TRANSPONDER
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_UART SERIAL_PORT_USART2 #define SERIALRX_UART SERIAL_PORT_USART2
#define RX_CHANNELS_TAER #define RX_CHANNELS_TAER

2
src/main/target/BEEROTORF4/target.h
View file

@ -141,7 +141,7 @@
#define USE_LED_STRIP #define USE_LED_STRIP
#define TRANSPONDER #define USE_TRANSPONDER
#define DEFAULT_FEATURES ( FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_AIRMODE ) #define DEFAULT_FEATURES ( FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_AIRMODE )
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL

2
src/main/target/CLRACINGF4/target.h
View file

@ -135,7 +135,7 @@
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
#define TRANSPONDER #define USE_TRANSPONDER
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define DEFAULT_FEATURES ( FEATURE_OSD ) #define DEFAULT_FEATURES ( FEATURE_OSD )

2
src/main/target/FF_PIKOBLX/target.h
View file

@ -98,7 +98,7 @@
#define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_PROVIDER SERIALRX_SBUS
#define SERIALRX_UART SERIAL_PORT_USART3 #define SERIALRX_UART SERIAL_PORT_USART3
#define TRANSPONDER #define USE_TRANSPONDER
#define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_SERIAL_4WAY_BLHELI_INTERFACE
// IO - stm32f303cc in 48pin package // IO - stm32f303cc in 48pin package

2
src/main/target/FRSKYF3/target.h
View file

@ -125,7 +125,7 @@
#define ADC_INSTANCE ADC2 #define ADC_INSTANCE ADC2
#define ADC24_DMA_REMAP #define ADC24_DMA_REMAP
#define TRANSPONDER #define USE_TRANSPONDER
#define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT #define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

2
src/main/target/NOX/target.h
View file

@ -102,7 +102,7 @@
#define SERIALRX_UART SERIAL_PORT_USART2 #define SERIALRX_UART SERIAL_PORT_USART2
#define TRANSPONDER #define USE_TRANSPONDER
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_PROVIDER SERIALRX_SBUS

2
src/main/target/OMNIBUS/target.h
View file

@ -157,7 +157,7 @@
//#define RSSI_ADC_PIN PB1 //#define RSSI_ADC_PIN PB1
//#define ADC_INSTANCE ADC3 //#define ADC_INSTANCE ADC3
#define TRANSPONDER #define USE_TRANSPONDER
#define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT #define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

2
src/main/target/OMNIBUSF4/target.h
View file

@ -225,7 +225,7 @@
#define RSSI_ADC_PIN PA0 // Direct from RSSI pad #define RSSI_ADC_PIN PA0 // Direct from RSSI pad
#endif #endif
#define TRANSPONDER #define USE_TRANSPONDER
#define USE_SONAR #define USE_SONAR

2
src/main/target/REVO/target.h
View file

@ -253,7 +253,7 @@
#define RSSI_ADC_PIN PA0 #define RSSI_ADC_PIN PA0
#endif #endif
#define TRANSPONDER #define USE_TRANSPONDER
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#if defined(PODIUMF4) #if defined(PODIUMF4)

2
src/main/target/RG_SSD_F3/target.h
View file

@ -122,7 +122,7 @@
#define CURRENT_METER_ADC_PIN PA5 #define CURRENT_METER_ADC_PIN PA5
#define VBAT_SCALE_DEFAULT 119 #define VBAT_SCALE_DEFAULT 119
#define TRANSPONDER #define USE_TRANSPONDER
#define TRANSPONDER_GPIO GPIOA #define TRANSPONDER_GPIO GPIOA
#define TRANSPONDER_GPIO_AHB_PERIPHERAL RCC_AHBPeriph_GPIOA #define TRANSPONDER_GPIO_AHB_PERIPHERAL RCC_AHBPeriph_GPIOA
#define TRANSPONDER_GPIO_AF GPIO_AF_1 #define TRANSPONDER_GPIO_AF GPIO_AF_1

2
src/main/target/SPRACINGF3EVO/target.h
View file

@ -169,7 +169,7 @@
#define USE_OSD_OVER_MSP_DISPLAYPORT #define USE_OSD_OVER_MSP_DISPLAYPORT
#define USE_MSP_CURRENT_METER #define USE_MSP_CURRENT_METER
#define TRANSPONDER #define USE_TRANSPONDER
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

2
src/main/target/SPRACINGF3MINI/target.h
View file

@ -178,7 +178,7 @@
#define CURRENT_METER_ADC_PIN PA5 #define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PB2 #define RSSI_ADC_PIN PB2
#define TRANSPONDER #define USE_TRANSPONDER
#define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT #define REDUCE_TRANSPONDER_CURRENT_DRAW_WHEN_USB_CABLE_PRESENT

2
src/main/target/SPRACINGF3NEO/target.h
View file

@ -156,7 +156,7 @@
#define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH2_HANDLER #define WS2811_DMA_HANDLER_IDENTIFER DMA1_CH2_HANDLER
#define WS2811_TIMER_GPIO_AF GPIO_AF_6 #define WS2811_TIMER_GPIO_AF GPIO_AF_6
#define TRANSPONDER #define USE_TRANSPONDER
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

2
src/main/target/SPRACINGF3OSD/target.h
View file

@ -86,7 +86,7 @@
#define VOLTAGE_12V_ADC_PIN PA0 #define VOLTAGE_12V_ADC_PIN PA0
#define VOLTAGE_5V_ADC_PIN PA1 #define VOLTAGE_5V_ADC_PIN PA1
#define TRANSPONDER #define USE_TRANSPONDER
#define DEFAULT_FEATURES (FEATURE_TRANSPONDER) #define DEFAULT_FEATURES (FEATURE_TRANSPONDER)

2
src/main/target/SPRACINGF4EVO/target.h
View file

@ -162,7 +162,7 @@
#define USE_MSP_CURRENT_METER #define USE_MSP_CURRENT_METER
#define USE_LED_STRIP #define USE_LED_STRIP
#define TRANSPONDER #define USE_TRANSPONDER
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

2
src/main/target/SPRACINGF4NEO/target.h
View file

@ -189,7 +189,7 @@
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
#define USE_LED_STRIP #define USE_LED_STRIP
#define TRANSPONDER #define USE_TRANSPONDER
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT

2
src/test/unit/platform.h
View file

@ -33,7 +33,7 @@
#define USE_TELEMETRY #define USE_TELEMETRY
#define USE_LED_STRIP #define USE_LED_STRIP
#define USE_SERVOS #define USE_SERVOS
#define TRANSPONDER #define USE_TRANSPONDER
typedef enum typedef enum
{ {

2
src/test/unit/target.h
View file

@ -50,7 +50,7 @@
#define USE_TELEMETRY_SMARTPORT #define USE_TELEMETRY_SMARTPORT
#define USE_LED_STRIP #define USE_LED_STRIP
#define USE_SERVOS #define USE_SERVOS
#define TRANSPONDER #define USE_TRANSPONDER
#define USE_VCP #define USE_VCP
#define USE_UART1 #define USE_UART1
#define USE_UART2 #define USE_UART2