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

Afromini NAZE Alias target // rev5 override

Browse source
This commit is contained in:
borisbstyle 2015-12-06 23:38:17 +01:00
parent 400fe14e30
commit b0d3db2456
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -42,7 +42,7 @@ FORKNAME = betaflight
CC3D_TARGETS = CC3D CC3D_OPBL CC3D_BP6 CC3D_OPBL_BP6 CC3D_TARGETS = CC3D CC3D_OPBL CC3D_BP6 CC3D_OPBL_BP6
VALID_TARGETS = NAZE NAZE32PRO OLIMEXINO STM32F3DISCOVERY CHEBUZZF3 $(CC3D_TARGETS) CJMCU EUSTM32F103RC SPRACINGF3 PORT103R SPARKY ALIENWIIF1 ALIENWIIF3 COLIBRI_RACE MOTOLAB RMDO IRCFUSIONF3 VALID_TARGETS = NAZE NAZE32PRO OLIMEXINO STM32F3DISCOVERY CHEBUZZF3 $(CC3D_TARGETS) CJMCU EUSTM32F103RC SPRACINGF3 PORT103R SPARKY ALIENWIIF1 ALIENWIIF3 COLIBRI_RACE MOTOLAB RMDO IRCFUSIONF3 AFROMINI
# Valid targets for OP VCP support # Valid targets for OP VCP support
VCP_VALID_TARGETS = $(CC3D_TARGETS) VCP_VALID_TARGETS = $(CC3D_TARGETS)
@ -52,7 +52,7 @@ OPBL_VALID_TARGETS = CC3D_OPBL CC3D_OPBL_BP6
BP6_VALID_TARGETS = CC3D_BP6 CC3D_OPBL_BP6 BP6_VALID_TARGETS = CC3D_BP6 CC3D_OPBL_BP6
64K_TARGETS = CJMCU 64K_TARGETS = CJMCU
128K_TARGETS = ALIENWIIF1 $(CC3D_TARGETS) NAZE OLIMEXINO RMDO 128K_TARGETS = ALIENWIIF1 $(CC3D_TARGETS) NAZE OLIMEXINO RMDO AFROMINI
256K_TARGETS = EUSTM32F103RC PORT103R STM32F3DISCOVERY CHEBUZZF3 NAZE32PRO SPRACINGF3 IRCFUSIONF3 SPARKY ALIENWIIF3 COLIBRI_RACE MOTOLAB 256K_TARGETS = EUSTM32F103RC PORT103R STM32F3DISCOVERY CHEBUZZF3 NAZE32PRO SPRACINGF3 IRCFUSIONF3 SPARKY ALIENWIIF3 COLIBRI_RACE MOTOLAB
F3_TARGETS = STM32F3DISCOVERY CHEBUZZF3 NAZE32PRO SPRACINGF3 IRCFUSIONF3 SPARKY ALIENWIIF3 COLIBRI_RACE MOTOLAB RMDO F3_TARGETS = STM32F3DISCOVERY CHEBUZZF3 NAZE32PRO SPRACINGF3 IRCFUSIONF3 SPARKY ALIENWIIF3 COLIBRI_RACE MOTOLAB RMDO
@ -256,7 +256,11 @@ ifeq ($(BP6),yes)
TARGET_FLAGS := -DBEEPER_PIN6 $(TARGET_FLAGS) TARGET_FLAGS := -DBEEPER_PIN6 $(TARGET_FLAGS)
endif endif
ifeq ($(TARGET),AFROMINI)
# AFROMINI is a VARIANT of NAZE being recognized as rev4, but needs to use rev5 config
TARGET_FLAGS := $(TARGET_FLAGS) -DNAZE -DAFROMINI
TARGET_DIR = $(ROOT)/src/main/target/NAZE
endif
INCLUDE_DIRS := $(INCLUDE_DIRS) \ INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(TARGET_DIR) $(TARGET_DIR)
@ -384,6 +388,8 @@ NAZE_SRC = startup_stm32f10x_md_gcc.S \
ALIENWIIF1_SRC = $(NAZE_SRC) ALIENWIIF1_SRC = $(NAZE_SRC)
AFROMINI_SRC = $(NAZE_SRC)
EUSTM32F103RC_SRC = startup_stm32f10x_hd_gcc.S \ EUSTM32F103RC_SRC = startup_stm32f10x_hd_gcc.S \
drivers/accgyro_adxl345.c \ drivers/accgyro_adxl345.c \
drivers/accgyro_bma280.c \ drivers/accgyro_bma280.c \

4
src/main/sensors/initialisation.c
View file

@ -105,12 +105,16 @@ const extiConfig_t *selectMPUIntExtiConfig(void)
.exti_irqn = EXTI15_10_IRQn .exti_irqn = EXTI15_10_IRQn
}; };
#ifdef AFROMINI
return &nazeRev5MPUIntExtiConfig;
#else
if (hardwareRevision < NAZE32_REV5) { if (hardwareRevision < NAZE32_REV5) {
return &nazeRev4MPUIntExtiConfig; return &nazeRev4MPUIntExtiConfig;
} else { } else {
return &nazeRev5MPUIntExtiConfig; return &nazeRev5MPUIntExtiConfig;
} }
#endif #endif
#endif
#if defined(SPRACINGF3) #if defined(SPRACINGF3)
static const extiConfig_t spRacingF3MPUIntExtiConfig = { static const extiConfig_t spRacingF3MPUIntExtiConfig = {