Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate the remaining F3 targets to feature cut levels. #7429

Merged
merged 1 commit into from Jan 20, 2019
Merged

Migrate the remaining F3 targets to feature cut levels. #7429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/main/target/AIRHEROF3/target.h
View file
Open in desktop
Expand Up @@ -22,8 +22,6 @@

#define TARGET_BOARD_IDENTIFIER "AIR3"

#define CONFIG_PREFER_ACC_ON

#define LED0_PIN PB3
#define LED1_PIN PB4

Expand Down
31 changes: 0 additions & 31 deletions src/main/target/BETAFLIGHTF3/target.h
View file
Open in desktop
Expand Up @@ -24,37 +24,6 @@

#define TARGET_BOARD_IDENTIFIER "BFF3"

// Removed to make the firmware fit into flash (in descending order of priority):
//#undef USE_GYRO_OVERFLOW_CHECK
#undef USE_GYRO_LPF2

//#undef USE_MSP_DISPLAYPORT
//#undef USE_MSP_OVER_TELEMETRY

//#undef USE_DYN_LPF
//#undef USE_D_CUT

#undef USE_ITERM_RELAX
#undef USE_RC_SMOOTHING_FILTER

#undef USE_HUFFMAN
#undef USE_PINIO
#undef USE_PINIOBOX

#undef USE_TELEMETRY_HOTT
#undef USE_TELEMETRY_MAVLINK
#undef USE_TELEMETRY_LTM
#undef USE_SERIALRX_XBUS
#undef USE_SERIALRX_SUMH
#undef USE_PWM

#undef USE_BOARD_INFO
#undef USE_EXTENDED_CMS_MENUS
#undef USE_RTC_TIME
#undef USE_RX_MSP
#undef USE_ESC_SENSOR_INFO


#define USE_BEEPER
#define BEEPER_PIN PC15
#define BEEPER_INVERTED
Expand Down
7 changes: 4 additions & 3 deletions src/main/target/BETAFLIGHTF3/target.mk
View file
Open in desktop
@@ -1,7 +1,8 @@

F3_TARGETS += $(TARGET)

FEATURES = VCP SDCARD_SPI
TARGET_FLAGS = -DSPRACINGF3

FEATURE_CUT_LEVEL = 7

TARGET_SRC = \
drivers/accgyro/accgyro_mpu.c \
Expand All @@ -11,4 +12,4 @@ TARGET_SRC = \
drivers/display_ug2864hsweg01.h \
drivers/flash_m25p16.c \
drivers/max7456.c \
io/osd.c
io/osd.c
2 changes: 0 additions & 2 deletions src/main/target/COLIBRI_RACE/target.h
View file
Open in desktop
Expand Up @@ -20,9 +20,7 @@

#pragma once

// Removed to make the firmware fit into flash (in descending order of priority):
#undef USE_GYRO_OVERFLOW_CHECK // target does not use affected gyros
//#undef USE_RTC_TIME

#define TARGET_BOARD_IDENTIFIER "CLBR"

Expand Down
3 changes: 3 additions & 0 deletions src/main/target/COLIBRI_RACE/target.mk
View file
Open in desktop
@@ -1,6 +1,9 @@
F3_TARGETS += $(TARGET)

FEATURES = VCP

FEATURE_CUT_LEVEL = 0

TARGET_SRC = \
i2c_bst.c \
bus_bst_stm32f30x.c \
Expand Down
32 changes: 5 additions & 27 deletions src/main/target/CRAZYBEEF3FR/target.h
View file
Open in desktop
Expand Up @@ -31,23 +31,14 @@
#define USBD_PRODUCT_STRING "CrazyBee F3 FR"
#endif

// Removed to make the firmware fit into flash (in descending order of priority):
//#undef USE_GYRO_OVERFLOW_CHECK
//#undef USE_GYRO_LPF2

//#undef USE_ITERM_RELAX
//#undef USE_RC_SMOOTHING_FILTER

//#undef USE_MSP_DISPLAYPORT
//#undef USE_MSP_OVER_TELEMETRY

//#undef USE_HUFFMAN
//#undef USE_PINIO
//#undef USE_PINIOBOX

#undef USE_SERIALRX_CRSF
#undef USE_SERIALRX_SUMD
#undef USE_SERIALRX_SUMH
#undef USE_SERIALRX_XBUS
#undef USE_TELEMETRY_CRSF
#undef USE_TELEMETRY_MAVLINK
#undef USE_PWM


#if defined(CRAZYBEEF3FS)
#undef USE_SERIALRX_SBUS
Expand All @@ -68,19 +59,6 @@
#undef USE_TELEMETRY_SRXL
#endif

#undef USE_TELEMETRY_HOTT
#undef USE_TELEMETRY_MAVLINK
#undef USE_TELEMETRY_LTM
#undef USE_SERIALRX_XBUS
#undef USE_SERIALRX_SUMH
#undef USE_PWM

//#undef USE_BOARD_INFO
//#undef USE_EXTENDED_CMS_MENUS
//#undef USE_RTC_TIME
#undef USE_RX_MSP
//#undef USE_ESC_SENSOR_INFO

#define ENABLE_DSHOT_DMAR true

#define LED0_PIN PB3
Expand Down
2 changes: 2 additions & 0 deletions src/main/target/CRAZYBEEF3FR/target.mk
View file
Open in desktop
Expand Up @@ -2,6 +2,8 @@ F3_TARGETS += $(TARGET)

FEATURES = VCP

FEATURE_CUT_LEVEL = 2

TARGET_SRC = \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_spi_mpu6000.c \
Expand Down
24 changes: 0 additions & 24 deletions src/main/target/FRSKYF3/target.h
View file
Open in desktop
Expand Up @@ -23,30 +23,6 @@
#define TARGET_BOARD_IDENTIFIER "FRF3"
#define USE_TARGET_CONFIG

// Removed to make the firmware fit into flash (in descending order of priority):
//#undef USE_GYRO_OVERFLOW_CHECK
//#undef USE_GYRO_LPF2

//#undef USE_ITERM_RELAX
#undef USE_RC_SMOOTHING_FILTER

#undef USE_HUFFMAN
#undef USE_PINIO
#undef USE_PINIOBOX

#undef USE_TELEMETRY_HOTT
#undef USE_TELEMETRY_MAVLINK
#undef USE_TELEMETRY_LTM
#undef USE_SERIALRX_XBUS
#undef USE_SERIALRX_SUMH
#undef USE_PWM

#undef USE_BOARD_INFO
#undef USE_EXTENDED_CMS_MENUS
#undef USE_RTC_TIME
#undef USE_RX_MSP
#undef USE_ESC_SENSOR_INFO

#define LED0_PIN PB3
#define USE_BEEPER
#define BEEPER_PIN PC15
Expand Down
3 changes: 3 additions & 0 deletions src/main/target/FRSKYF3/target.mk
View file
Open in desktop
@@ -1,6 +1,9 @@
F3_TARGETS += $(TARGET)

FEATURES = VCP SDCARD_SPI

FEATURE_CUT_LEVEL = 4

TARGET_SRC = \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_spi_mpu6000.c \
Expand Down
30 changes: 0 additions & 30 deletions src/main/target/FURYF3/target.h
View file
Open in desktop
Expand Up @@ -23,41 +23,11 @@
#ifdef FURYF3OSD
#define TARGET_BOARD_IDENTIFIER "FY3O"
// #define USBD_PRODUCT_STRING "FuryF3OSD"
#undef USE_THRUST_LINEARIZATION
#else
#define TARGET_BOARD_IDENTIFIER "FYF3"
// #define USBD_PRODUCT_STRING "FuryF3"
#endif

// Removed to make the firmware fit into flash (in descending order of priority):
//#undef USE_GYRO_OVERFLOW_CHECK
//#undef USE_GYRO_LPF2

//#undef USE_ITERM_RELAX
//#undef USE_RC_SMOOTHING_FILTER

//#undef USE_MSP_DISPLAYPORT
//#undef USE_MSP_OVER_TELEMETRY

//#undef USE_HUFFMAN
//#undef USE_PINIO
//#undef USE_PINIOBOX

//#undef USE_TELEMETRY_HOTT
//#undef USE_TELEMETRY_MAVLINK
#undef USE_TELEMETRY_LTM
#undef USE_SERIALRX_XBUS
#undef USE_SERIALRX_SUMH
#undef USE_PWM

#undef USE_BOARD_INFO
#undef USE_EXTENDED_CMS_MENUS
#undef USE_RTC_TIME
#undef USE_RX_MSP
#undef USE_ESC_SENSOR_INFO

#define CONFIG_PREFER_ACC_ON

#define LED0_PIN PC14

#define USE_BEEPER
Expand Down
7 changes: 6 additions & 1 deletion src/main/target/FURYF3/target.mk
View file
Open in desktop
@@ -1,8 +1,13 @@
F3_TARGETS += $(TARGET)

ifeq ($(TARGET), FURYF3OSD)
FEATURES += VCP ONBOARDFLASH

FEATURE_CUT_LEVEL = 4
else
FEATURES += VCP SDCARD_SPI

FEATURE_CUT_LEVEL = 3
endif

TARGET_SRC = \
Expand All @@ -18,4 +23,4 @@ TARGET_SRC += \
else
TARGET_SRC += \
drivers/barometer/barometer_ms5611.c
endif
endif
20 changes: 0 additions & 20 deletions src/main/target/IMPULSERCF3/target.h
View file
Open in desktop
Expand Up @@ -22,26 +22,6 @@

#define TARGET_BOARD_IDENTIFIER "IMF3"


// Removed to make the firmware fit into flash (in descending order of priority):
//#undef USE_GYRO_OVERFLOW_CHECK
//#undef USE_GYRO_LPF2

//#undef USE_ITERM_RELAX
//#undef USE_RC_SMOOTHING_FILTER

//#undef USE_TELEMETRY_HOTT
//#undef USE_TELEMETRY_MAVLINK
#undef USE_TELEMETRY_LTM
#undef USE_SERIALRX_XBUS

#undef USE_BOARD_INFO
#undef USE_EXTENDED_CMS_MENUS
#undef USE_RTC_TIME
#undef USE_RX_MSP
#undef USE_ESC_SENSOR_INFO


#define ENABLE_DSHOT_DMAR true

#define LED0_PIN PB7
Expand Down
3 changes: 3 additions & 0 deletions src/main/target/IMPULSERCF3/target.mk
View file
Open in desktop
@@ -1,6 +1,9 @@
F3_TARGETS += $(TARGET)

FEATURES = VCP ONBOARDFLASH

FEATURE_CUT_LEVEL = 2

TARGET_SRC = \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_spi_mpu6000.c \
Expand Down
2 changes: 0 additions & 2 deletions src/main/target/IRCFUSIONF3/target.h
View file
Open in desktop
Expand Up @@ -82,8 +82,6 @@
#define CURRENT_METER_ADC_PIN PA5
#define RSSI_ADC_PIN PB2

#undef USE_LED_STRIP

// IO - stm32f303cc in 48pin package
#define TARGET_IO_PORTA 0xffff
#define TARGET_IO_PORTB 0xffff
Expand Down
4 changes: 3 additions & 1 deletion src/main/target/IRCFUSIONF3/target.mk
View file
Open in desktop
@@ -1,6 +1,8 @@
F3_TARGETS += $(TARGET)

FEATURES = VCP ONBOARDFLASH
TARGET_FLAGS = -DSPRACINGF3

FEATURE_CUT_LEVEL = 1

TARGET_SRC = \
drivers/accgyro/accgyro_mpu.c \
Expand Down
3 changes: 1 addition & 2 deletions src/main/target/KROOZX/target.h
View file
Open in desktop
Expand Up @@ -71,9 +71,8 @@
#define SDCARD_SPI_CS_PIN PA15
#define SPI3_TX_DMA_OPT 0 // DMA 1 Stream 5 Channel 0

#ifdef USE_MSP_DISPLAYPORT
#undef USE_MSP_DISPLAYPORT
#endif

#define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI1
#define MAX7456_SPI_CS_PIN PC4
Expand Down
4 changes: 4 additions & 0 deletions src/main/target/KROOZX/target.mk
View file
Open in desktop
@@ -1,5 +1,9 @@
F405_TARGETS += $(TARGET)

FEATURES += VCP SDCARD_SPI

FEATURE_CUT_LEVEL = 0

HSE_VALUE = 16000000

TARGET_SRC = \
Expand Down
30 changes: 0 additions & 30 deletions src/main/target/LUX_RACE/target.h
View file
Open in desktop
Expand Up @@ -26,36 +26,6 @@
#define TARGET_BOARD_IDENTIFIER "LUX"
#endif

// Removed to make the firmware fit into flash (in descending order of priority):
#if defined(LUXV2_RACE)
//#undef USE_GYRO_OVERFLOW_CHECK
//#undef USE_GYRO_LPF2

//#undef USE_DYN_LPF

//#undef USE_ITERM_RELAX
//#undef USE_RC_SMOOTHING_FILTER
//#undef USE_THRUST_LINEARIZATION

//#undef USE_HUFFMAN
//#undef USE_PINIO
//#undef USE_PINIOBOX

//#undef USE_TELEMETRY_HOTT
//#undef USE_TELEMETRY_MAVLINK
//#undef USE_TELEMETRY_LTM
//#undef USE_SERIALRX_XBUS
//#undef USE_SERIALRX_SUMH
//#undef USE_PWM

//#undef USE_BOARD_INFO
#undef USE_EXTENDED_CMS_MENUS
#undef USE_D_CUT
//#undef USE_RTC_TIME
#undef USE_RX_MSP
//#undef USE_ESC_SENSOR_INFO
#endif

#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC


Expand Down
7 changes: 7 additions & 0 deletions src/main/target/LUX_RACE/target.mk
View file
Open in desktop
@@ -1,6 +1,13 @@
F3_TARGETS += $(TARGET)

FEATURES = VCP SDCARD_SPI

ifeq ($(TARGET), LUXV2_RACE)
FEATURE_CUT_LEVEL = 1
else
FEATURE_CUT_LEVEL = 0
endif

TARGET_SRC = \
drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_mpu6500.c \
Expand Down