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

Fixed issue that was causing the SPRacingF3Mini target not to build when transponder code was uncommented out. Fixes #179

Browse source
This commit is contained in:
rigoneri 2016-04-06 22:10:58 -05:00
parent f6b05a4894
commit d6550827d0
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -356,7 +356,8 @@ VCP_SRC = \
vcp/usb_istr.c \ vcp/usb_istr.c \
vcp/usb_prop.c \ vcp/usb_prop.c \
vcp/usb_pwr.c \ vcp/usb_pwr.c \
drivers/serial_usb_vcp.c drivers/serial_usb_vcp.c \
drivers/usb_io.c
NAZE_SRC = startup_stm32f10x_md_gcc.S \ NAZE_SRC = startup_stm32f10x_md_gcc.S \
drivers/accgyro_adxl345.c \ drivers/accgyro_adxl345.c \

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

@ -193,7 +193,7 @@ static const char * const featureNames[] = {
"SERVO_TILT", "SOFTSERIAL", "GPS", "FAILSAFE", "SERVO_TILT", "SOFTSERIAL", "GPS", "FAILSAFE",
"SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM", "SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM",
"RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "ONESHOT125", "RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "ONESHOT125",
"BLACKBOX", "CHANNEL_FORWARDING", NULL "BLACKBOX", "CHANNEL_FORWARDING", "TRANSPONDER", NULL
}; };
// sync this with rxFailsafeChannelMode_e // sync this with rxFailsafeChannelMode_e

1
src/main/io/transponder_ir.h
View file

@ -17,6 +17,7 @@
#pragma once #pragma once
void transponderInit(uint8_t* transponderCode);
void transponderEnable(void); void transponderEnable(void);
void transponderDisable(void); void transponderDisable(void);

10
src/main/main.c
View file

@ -33,6 +33,7 @@
#include "drivers/sensor.h" #include "drivers/sensor.h"
#include "drivers/system.h" #include "drivers/system.h"
#include "drivers/dma.h"
#include "drivers/gpio.h" #include "drivers/gpio.h"
#include "drivers/light_led.h" #include "drivers/light_led.h"
#include "drivers/sound_beeper.h" #include "drivers/sound_beeper.h"
@ -52,9 +53,9 @@
#include "drivers/flash_m25p16.h" #include "drivers/flash_m25p16.h"
#include "drivers/sonar_hcsr04.h" #include "drivers/sonar_hcsr04.h"
#include "drivers/gyro_sync.h" #include "drivers/gyro_sync.h"
#include "drivers/sdcard.h"
#include "drivers/usb_io.h" #include "drivers/usb_io.h"
#include "drivers/transponder_ir.h" #include "drivers/transponder_ir.h"
#include "drivers/sdcard.h"
#include "rx/rx.h" #include "rx/rx.h"
@ -130,8 +131,6 @@ void ledStripInit(ledConfig_t *ledConfigsToUse, hsvColor_t *colorsToUse);
void spektrumBind(rxConfig_t *rxConfig); void spektrumBind(rxConfig_t *rxConfig);
const sonarHardware_t *sonarGetHardwareConfiguration(batteryConfig_t *batteryConfig); const sonarHardware_t *sonarGetHardwareConfiguration(batteryConfig_t *batteryConfig);
void sonarInit(const sonarHardware_t *sonarHardware); void sonarInit(const sonarHardware_t *sonarHardware);
void transponderInit(uint8_t* transponderCode);
//void usbCableDetectInit(void);
#ifdef STM32F303xC #ifdef STM32F303xC
// from system_stm32f30x.c // from system_stm32f30x.c
@ -256,6 +255,8 @@ void init(void)
timerInit(); // timer must be initialized before any channel is allocated timerInit(); // timer must be initialized before any channel is allocated
dmaInit();
serialInit(&masterConfig.serialConfig, feature(FEATURE_SOFTSERIAL)); serialInit(&masterConfig.serialConfig, feature(FEATURE_SOFTSERIAL));
#ifdef USE_SERVOS #ifdef USE_SERVOS
@ -534,12 +535,10 @@ void init(void)
} }
#endif #endif
/* TODO - Fix in the future
#ifdef USB_CABLE_DETECTION #ifdef USB_CABLE_DETECTION
usbCableDetectInit(); usbCableDetectInit();
#endif #endif
#ifdef TRANSPONDER #ifdef TRANSPONDER
if (feature(FEATURE_TRANSPONDER)) { if (feature(FEATURE_TRANSPONDER)) {
transponderInit(masterConfig.transponderData); transponderInit(masterConfig.transponderData);
@ -548,7 +547,6 @@ void init(void)
systemState |= SYSTEM_STATE_TRANSPONDER_ENABLED; systemState |= SYSTEM_STATE_TRANSPONDER_ENABLED;
} }
#endif #endif
*/
#ifdef USE_FLASHFS #ifdef USE_FLASHFS
#ifdef NAZE #ifdef NAZE