diff --git a/Makefile b/Makefile index d87fea00f..9ff4b3ae9 100644 --- a/Makefile +++ b/Makefile @@ -126,13 +126,13 @@ else $(error Unknown target MCU specified.) endif -GROUP_1_TARGETS := ALIENFLIGHTF3 ALIENFLIGHTF4 AIRHEROF3 AIRHEROF3_QUAD COLIBRI_RACE LUX_RACE SPARKY REVO SPARKY2 COLIBRI KISSFC FALCORE FF_F35_LIGHTNING FF_FORTINIF4 FF_PIKOF4 FF_PIKOF4OSD +GROUP_1_TARGETS := AIRHEROF3 AIRHEROF3_QUAD COLIBRI_RACE LUX_RACE SPARKY REVO SPARKY2 COLIBRI FALCORE FF_F35_LIGHTNING FF_FORTINIF4 FF_PIKOF4 FF_PIKOF4OSD GROUP_2_TARGETS := SPRACINGF3 SPRACINGF3EVO SPRACINGF3EVO_1SS SPRACINGF3MINI SPRACINGF4EVO CLRACINGF4AIR CLRACINGF4AIRV2 BEEROTORF4 BETAFLIGHTF3 BETAFLIGHTF4 PIKOBLX GROUP_3_TARGETS := OMNIBUS AIRBOTF4 BLUEJAYF4 OMNIBUSF4 OMNIBUSF4PRO FIREWORKSV2 SPARKY2 MATEKF405 OMNIBUSF7 DYSF4PRO OMNIBUSF4PRO_LEDSTRIPM5 OMNIBUSF7NXT OMNIBUSF7V2 ASGARD32F4 -GROUP_4_TARGETS := ANYFC ANYFCF7 ANYFCF7_EXTERNAL_BARO ANYFCM7 ALIENFLIGHTNGF7 PIXRACER YUPIF4 YUPIF4MINI YUPIF4R2 YUPIF7 MATEKF405SE MATEKF411 MATEKF722 MATEKF405OSD MATEKF405_SERVOS6 NOX -GROUP_5_TARGETS := ASGARD32F7 CHEBUZZF3 CLRACINGF4AIRV3 DALRCF405 DALRCF722DUAL DYSF4PROV2 F4BY FISHDRONEF4 FOXEERF405 FOXEERF722DUAL FRSKYF3 FRSKYF4 FURYF3 FURYF3_SPIFLASH FURYF4OSD +GROUP_4_TARGETS := ANYFC ANYFCF7 ANYFCF7_EXTERNAL_BARO ALIENFLIGHTNGF7 PIXRACER YUPIF7 MATEKF405SE MATEKF411 MATEKF722 MATEKF405OSD MATEKF405_SERVOS6 NOX +GROUP_5_TARGETS := ASGARD32F7 CLRACINGF4AIRV3 DALRCF405 DALRCF722DUAL DYSF4PROV2 F4BY FISHDRONEF4 FOXEERF405 FOXEERF722DUAL FRSKYF3 FRSKYF4 FURYF3 FURYF3_SPIFLASH FURYF4OSD GROUP_6_TARGETS := MAMBAF405 OMNIBUSF4V3 OMNIBUSF4V3_S6_SS OMNIBUSF4V3_S5S6_SS OMNIBUSF4V3_S5_S6_2SS AIKONF4 -GROUP_7_TARGETS := KAKUTEF4 KAKUTEF4V2 KAKUTEF7 KAKUTEF7MINI KFC32F3_INAV KROOZX MATEKF411_RSSI MATEKF411_SFTSRL2 MATEKF722MINI MATEKF722SE MATEKF722_HEXSERVO +GROUP_7_TARGETS := KAKUTEF4 KAKUTEF4V2 KAKUTEF7 KAKUTEF7MINI KFC32F3_INAV MATEKF411_RSSI MATEKF411_SFTSRL2 MATEKF722MINI MATEKF722SE MATEKF722_HEXSERVO GROUP_8_TARGETS := MATEKF765 GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS) $(GROUP_5_TARGETS) $(GROUP_6_TARGETS) $(GROUP_7_TARGETS) $(GROUP_8_TARGETS), $(VALID_TARGETS)) diff --git a/build_docs.sh b/build_docs.sh index 918430eac..70c2cc45c 100755 --- a/build_docs.sh +++ b/build_docs.sh @@ -29,7 +29,6 @@ doc_files=( 'Migrating from baseflight.md' 'Boards.md' 'Board - AlienFlight.md' - 'Board - ChebuzzF3.md' 'Board - ColibriRace.md' 'Board - Motolab.md' 'Board - Paris Air Hero 32.md' diff --git a/docs/1wire.md b/docs/1wire.md index c64760e77..94094637c 100644 --- a/docs/1wire.md +++ b/docs/1wire.md @@ -58,7 +58,7 @@ The following parameters can be used to enable and configure this in the related ``` // Define your esc hardware - #if defined(STM32F3DISCOVERY) && !(defined(CHEBUZZF3)) + #if defined(STM32F3DISCOVERY) const escHardware_t escHardware[ESC_COUNT] = { { GPIOD, 12 }, { GPIOD, 13 }, diff --git a/docs/Board - ChebuzzF3.md b/docs/Board - ChebuzzF3.md index c72920781..7df560412 100644 --- a/docs/Board - ChebuzzF3.md +++ b/docs/Board - ChebuzzF3.md @@ -1,10 +1,3 @@ -# Board - ChebuzzF3 - -The ChebuzzF3 is a daugter board which connects to the bottom of an STM32F3Discovery board and provides pin headers and ports for various FC connections. - -All connections were traced using a multimeter and then verified against the TauLabs source code using the revision linked. - -https://github.com/TauLabs/TauLabs/blob/816760dec2a20db7fb9ec1a505add240e696c31f/flight/targets/flyingf3/board-info/board_hw_defs.c ## Connections diff --git a/docs/LedStrip.md b/docs/LedStrip.md index 46d463754..3e2a9b11d 100644 --- a/docs/LedStrip.md +++ b/docs/LedStrip.md @@ -50,7 +50,7 @@ from another BEC. Just ensure that the GROUND is the same for all BEC outputs a | Target | Pin | LED Strip | Signal | | --------------------- | ---- | --------- | -------| -| ChebuzzF3/F3Discovery | PB8 | Data In | PB8 | +| F3Discovery | PB8 | Data In | PB8 | | Sparky | PWM5 | Data In | PA6 | If you have LEDs that are intermittent, flicker or show the wrong colors then drop the VIN to less than 4.7v, e.g. by using an inline diff --git a/fake_travis_build.sh b/fake_travis_build.sh index f56adee40..438000880 100755 --- a/fake_travis_build.sh +++ b/fake_travis_build.sh @@ -2,7 +2,6 @@ targets=("PUBLISHMETA=True" \ "RUNTESTS=True" \ - "TARGET=CHEBUZZF3" \ "TARGET=COLIBRI_RACE" \ "TARGET=SPRACINGF3" \ "TARGET=SPRACINGF3EVO" \ @@ -11,7 +10,6 @@ targets=("PUBLISHMETA=True" \ "TARGET=RMDO" \ "TARGET=SPARKY" \ "TARGET=STM32F3DISCOVERY" \ - "TARGET=ALIENFLIGHTF3"\ "TARGET=RCEXPLORERF3" ) #fake a travis build environment export TRAVIS_BUILD_NUMBER=$(date +%s) diff --git a/make/release.mk b/make/release.mk index a4ecbd534..2933b4fe1 100644 --- a/make/release.mk +++ b/make/release.mk @@ -1,7 +1,7 @@ RELEASE_TARGETS = AIRHEROF3 AIRHEROF3_QUAD RELEASE_TARGETS += COLIBRI_RACE LUX_RACE FURYF3 FURYF3_SPIFLASH RCEXPLORERF3 RMDO SPARKY KFC32F3_INAV FALCORE MOTOLAB ANYFC BLUEJAYF4 COLIBRI F4BY DALRCF405 -RELEASE_TARGETS += QUANTON REVO SPARKY2 YUPIF4 YUPIF4R2 YUPIF4MINI KROOZX PIKOBLX CLRACINGF4AIR CLRACINGF4AIRV2 PIXRACER BEEROTORF4 ANYFCF7 ANYFCF7_EXTERNAL_BARO ANYFCM7 +RELEASE_TARGETS += QUANTON REVO SPARKY2 PIKOBLX CLRACINGF4AIR CLRACINGF4AIRV2 PIXRACER BEEROTORF4 ANYFCF7 ANYFCF7_EXTERNAL_BARO RELEASE_TARGETS += ALIENFLIGHTNGF7 RELEASE_TARGETS += BETAFLIGHTF3 BETAFLIGHTF4 diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c index 7b4736d5a..e936274f7 100644 --- a/src/main/fc/fc_init.c +++ b/src/main/fc/fc_init.c @@ -217,12 +217,8 @@ void init(void) // Latch active features to be used for feature() in the remainder of init(). latchActiveFeatures(); - -#ifdef ALIENFLIGHTF3 - ledInit(hardwareRevision == AFF3_REV_1 ? false : true); -#else + ledInit(false); -#endif #ifdef USE_EXTI EXTIInit(); diff --git a/src/main/target/ALIENFLIGHTF3/target.mk b/src/main/target/ALIENFLIGHTF3/target.mk_ similarity index 100% rename from src/main/target/ALIENFLIGHTF3/target.mk rename to src/main/target/ALIENFLIGHTF3/target.mk_ diff --git a/src/main/target/ALIENFLIGHTF4/target.mk b/src/main/target/ALIENFLIGHTF4/target.mk_ similarity index 100% rename from src/main/target/ALIENFLIGHTF4/target.mk rename to src/main/target/ALIENFLIGHTF4/target.mk_ diff --git a/src/main/target/ANYFCM7/target.mk b/src/main/target/ANYFCM7/target.mk_ similarity index 100% rename from src/main/target/ANYFCM7/target.mk rename to src/main/target/ANYFCM7/target.mk_ diff --git a/src/main/target/CHEBUZZF3/target.mk b/src/main/target/CHEBUZZF3/target.mk_ similarity index 100% rename from src/main/target/CHEBUZZF3/target.mk rename to src/main/target/CHEBUZZF3/target.mk_ diff --git a/src/main/target/KISSFC/target.mk b/src/main/target/KISSFC/target.mk_ similarity index 100% rename from src/main/target/KISSFC/target.mk rename to src/main/target/KISSFC/target.mk_ diff --git a/src/main/target/KROOZX/target.mk b/src/main/target/KROOZX/target.mk_ similarity index 100% rename from src/main/target/KROOZX/target.mk rename to src/main/target/KROOZX/target.mk_ diff --git a/src/main/target/RADIX/target.mk b/src/main/target/RADIX/target.mk_ similarity index 100% rename from src/main/target/RADIX/target.mk rename to src/main/target/RADIX/target.mk_ diff --git a/src/main/target/YUPIF4/YUPIF4MINI.mk b/src/main/target/YUPIF4/YUPIF4MINI.mk_ similarity index 100% rename from src/main/target/YUPIF4/YUPIF4MINI.mk rename to src/main/target/YUPIF4/YUPIF4MINI.mk_ diff --git a/src/main/target/YUPIF4/YUPIF4R2.mk b/src/main/target/YUPIF4/YUPIF4R2.mk_ similarity index 100% rename from src/main/target/YUPIF4/YUPIF4R2.mk rename to src/main/target/YUPIF4/YUPIF4R2.mk_ diff --git a/src/main/target/YUPIF4/target.mk b/src/main/target/YUPIF4/target.mk_ similarity index 100% rename from src/main/target/YUPIF4/target.mk rename to src/main/target/YUPIF4/target.mk_