rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #500 from martinbudden/bf_mk_tidy 

Tidied .mk file to make them consistent. Fixed EUSTM32F103RC build.
This commit is contained in:
Martin Budden 2016-06-14 07:29:47 +01:00 committed by GitHub
parent 3c84c169c2 0b2aa89579
commit 2651bb3273
29 changed files with 85 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/target/ALIENFLIGHTF3/target.mk
View File

@ -1,5 +1,5 @@
F3_TARGETS += $(TARGET)
FEATURES = VCP
F3_TARGETS += $(TARGET)
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -9,4 +9,5 @@ TARGET_SRC = \
drivers/accgyro_spi_mpu6500.c \
drivers/compass_ak8963.c \
hardware_revision.c \
drivers/sonar_hcsr04.c
drivers/sonar_hcsr04.c

7
src/main/target/ALIENFLIGHTF4/target.mk
View File

@ -1,5 +1,5 @@
F405_TARGETS += $(TARGET)
FEATURES += SDCARD VCP
F405_TARGETS += $(TARGET)
FEATURES += SDCARD VCP
TARGET_SRC = \
drivers/accgyro_mpu6500.c \
@ -10,4 +10,5 @@ TARGET_SRC = \
drivers/compass_ak8963.c \
drivers/compass_hmc5883l.c \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f4xx.c
drivers/light_ws2811strip_stm32f4xx.c

7
src/main/target/BLUEJAYF4/target.mk
View File

@ -1,7 +1,8 @@
F405_TARGETS += $(TARGET)
FEATURES += SDCARD VCP
F405_TARGETS += $(TARGET)
FEATURES += SDCARD VCP
TARGET_SRC = \
drivers/accgyro_spi_mpu6500.c \
drivers/accgyro_mpu6500.c \
drivers/barometer_ms5611.c
drivers/barometer_ms5611.c

5
src/main/target/CC3D/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = ONBOARDFLASH HIGHEND VCP
F1_TARGETS += $(TARGET)
FEATURES = ONBOARDFLASH HIGHEND VCP
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -10,4 +10,5 @@ TARGET_SRC = \
drivers/compass_hmc5883l.c \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f10x.c \
drivers/sonar_hcsr04.c
drivers/sonar_hcsr04.c

5
src/main/target/CHEBUZZF3/target.mk
View File

@ -1,5 +1,5 @@
F3_TARGETS += $(TARGET)
FEATURES = VCP SDCARD
F3_TARGETS += $(TARGET)
TARGET_SRC = \
drivers/light_ws2811strip.c \
@ -15,4 +15,5 @@ TARGET_SRC = \
drivers/accgyro_l3g4200d.c \
drivers/barometer_ms5611.c \
drivers/barometer_bmp280.c \
drivers/compass_ak8975.c
drivers/compass_ak8975.c

7
src/main/target/CJMCU/target.mk
View File

@ -1,5 +1,5 @@
FLASH_SIZE = 64
F1_TARGETS += $(TARGET)
F1_TARGETS += $(TARGET)
FLASH_SIZE = 64
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -8,4 +8,5 @@ TARGET_SRC = \
hardware_revision.c \
flight/gtune.c \
blackbox/blackbox.c \
blackbox/blackbox_io.c
blackbox/blackbox_io.c

5
src/main/target/COLIBRI_RACE/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = VCP
F3_TARGETS += $(TARGET)
FEATURES = VCP
TARGET_SRC = \
io/i2c_bst.c \
@ -14,4 +14,5 @@ TARGET_SRC = \
drivers/compass_ak8975.c \
drivers/compass_hmc5883l.c \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f30x.c
drivers/light_ws2811strip_stm32f30x.c

7
src/main/target/DOGE/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = VCP
F3_TARGETS += $(TARGET)
FEATURES = VCP
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -8,8 +8,5 @@ TARGET_SRC = \
drivers/barometer_bmp280.c \
drivers/barometer_spi_bmp280.c \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f30x.c
drivers/light_ws2811strip_stm32f30x.c

28
src/main/target/EUSTM32F103RC/target.c
View File

@ -72,19 +72,19 @@ const uint16_t airPWM[] = {
};
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
{ TIM2, GPIOA, Pin_0, TIM_Channel_1, TIM2_IRQn, 0, Mode_IPD}, // PWM1 - RC1
{ TIM2, GPIOA, Pin_1, TIM_Channel_2, TIM2_IRQn, 0, Mode_IPD}, // PWM2 - RC2
{ TIM2, GPIOA, Pin_2, TIM_Channel_3, TIM2_IRQn, 0, Mode_IPD}, // PWM3 - RC3
{ TIM2, GPIOA, Pin_3, TIM_Channel_4, TIM2_IRQn, 0, Mode_IPD}, // PWM4 - RC4
{ TIM3, GPIOA, Pin_6, TIM_Channel_1, TIM3_IRQn, 0, Mode_IPD}, // PWM5 - RC5
{ TIM3, GPIOA, Pin_7, TIM_Channel_2, TIM3_IRQn, 0, Mode_IPD}, // PWM6 - RC6
{ TIM3, GPIOB, Pin_0, TIM_Channel_3, TIM3_IRQn, 0, Mode_IPD}, // PWM7 - RC7
{ TIM3, GPIOB, Pin_1, TIM_Channel_4, TIM3_IRQn, 0, Mode_IPD}, // PWM8 - RC8
{ TIM1, GPIOA, Pin_8, TIM_Channel_1, TIM1_CC_IRQn, 1, Mode_IPD}, // PWM9 - OUT1
{ TIM1, GPIOA, Pin_11, TIM_Channel_4, TIM1_CC_IRQn, 1, Mode_IPD}, // PWM10 - OUT2
{ TIM4, GPIOB, Pin_6, TIM_Channel_1, TIM4_IRQn, 0, Mode_IPD}, // PWM11 - OUT3
{ TIM4, GPIOB, Pin_7, TIM_Channel_2, TIM4_IRQn, 0, Mode_IPD}, // PWM12 - OUT4
{ TIM4, GPIOB, Pin_8, TIM_Channel_3, TIM4_IRQn, 0, Mode_IPD}, // PWM13 - OUT5
{ TIM4, GPIOB, Pin_9, TIM_Channel_4, TIM4_IRQn, 0, Mode_IPD} // PWM14 - OUT6
{ TIM2, GPIOA, Pin_0, TIM_Channel_1, TIM2_IRQn, 0, Mode_IPD, 0 }, // PWM1 - RC1
{ TIM2, GPIOA, Pin_1, TIM_Channel_2, TIM2_IRQn, 0, Mode_IPD, 0 }, // PWM2 - RC2
{ TIM2, GPIOA, Pin_2, TIM_Channel_3, TIM2_IRQn, 0, Mode_IPD, 0 }, // PWM3 - RC3
{ TIM2, GPIOA, Pin_3, TIM_Channel_4, TIM2_IRQn, 0, Mode_IPD, 0 }, // PWM4 - RC4
{ TIM3, GPIOA, Pin_6, TIM_Channel_1, TIM3_IRQn, 0, Mode_IPD, 0 }, // PWM5 - RC5
{ TIM3, GPIOA, Pin_7, TIM_Channel_2, TIM3_IRQn, 0, Mode_IPD, 0 }, // PWM6 - RC6
{ TIM3, GPIOB, Pin_0, TIM_Channel_3, TIM3_IRQn, 0, Mode_IPD, 0 }, // PWM7 - RC7
{ TIM3, GPIOB, Pin_1, TIM_Channel_4, TIM3_IRQn, 0, Mode_IPD, 0 }, // PWM8 - RC8
{ TIM1, GPIOA, Pin_8, TIM_Channel_1, TIM1_CC_IRQn, 1, Mode_IPD, 0 }, // PWM9 - OUT1
{ TIM1, GPIOA, Pin_11, TIM_Channel_4, TIM1_CC_IRQn, 1, Mode_IPD, 0 }, // PWM10 - OUT2
{ TIM4, GPIOB, Pin_6, TIM_Channel_1, TIM4_IRQn, 0, Mode_IPD, 0 }, // PWM11 - OUT3
{ TIM4, GPIOB, Pin_7, TIM_Channel_2, TIM4_IRQn, 0, Mode_IPD, 0 }, // PWM12 - OUT4
{ TIM4, GPIOB, Pin_8, TIM_Channel_3, TIM4_IRQn, 0, Mode_IPD, 0 }, // PWM13 - OUT5
{ TIM4, GPIOB, Pin_9, TIM_Channel_4, TIM4_IRQn, 0, Mode_IPD, 0 } // PWM14 - OUT6
};

6
src/main/target/EUSTM32F103RC/target.h
View File

@ -27,12 +27,12 @@
#define USE_EXTI
#define MPU6000_CS_GPIO GPIOB
#define MPU6000_CS_PIN GPIO_Pin_12
#define MPU6000_CS_PIN PB12
#define MPU6000_SPI_INSTANCE SPI2
#define MPU6500_CS_GPIO_CLK_PERIPHERAL RCC_APB2Periph_GPIOB
#define MPU6500_CS_GPIO GPIOB
#define MPU6500_CS_PIN GPIO_Pin_12
#define MPU6500_CS_PIN PB12
#define MPU6500_SPI_INSTANCE SPI2
#define GYRO
@ -109,7 +109,7 @@
#define EXTERNAL1_ADC_GPIO_PIN GPIO_Pin_5
#define EXTERNAL1_ADC_CHANNEL ADC_Channel_5
#define LED_STRIP
//#define LED_STRIP
#define LED_STRIP_TIMER TIM3
#define SPEKTRUM_BIND

3
src/main/target/EUSTM32F103RC/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = ONBOARDFLASH HIGHEND
F1_TARGETS += $(TARGET)
FEATURES = ONBOARDFLASH HIGHEND
DEVICE_FLAGS = -DSTM32F10X_HD
@ -21,3 +21,4 @@ TARGET_SRC = \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f10x.c \
drivers/sonar_hcsr04.c

4
src/main/target/FURYF3/target.mk
View File

@ -1,5 +1,5 @@
F3_TARGETS += $(TARGET)
FEATURES = VCP SDCARD ONBOARDFLASH
F3_TARGETS += $(TARGET)
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -11,5 +11,5 @@ TARGET_SRC = \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f30x.c \
drivers/sonar_hcsr04.c \
drivers/serial_softserial.c
drivers/serial_softserial.c

7
src/main/target/FURYF4/target.mk
View File

@ -1,8 +1,9 @@
F405_TARGETS += $(TARGET)
FEATURES += SDCARD VCP
F405_TARGETS += $(TARGET)
FEATURES += SDCARD VCP
TARGET_SRC = \
drivers/accgyro_spi_mpu6000.c \
drivers/accgyro_spi_mpu6500.c \
drivers/accgyro_mpu6500.c \
drivers/barometer_ms5611.c
drivers/barometer_ms5611.c

5
src/main/target/IRCFUSIONF3/target.mk
View File

@ -1,8 +1,9 @@
F3_TARGETS += $(TARGET)
FEATURES = VCP ONBOARDFLASH
F3_TARGETS += $(TARGET)
TARGET_FLAGS = -DSPRACINGF3
TARGET_SRC = \
drivers/accgyro_mpu.c \
drivers/accgyro_mpu6050.c \
drivers/barometer_bmp085.c
drivers/barometer_bmp085.c

10
src/main/target/KISSFC/target.mk
View File

@ -1,10 +1,8 @@
FEATURES = VCP
F3_TARGETS += $(TARGET)
FEATURES = VCP
TARGET_SRC = \
drivers/accgyro_mpu.c \
drivers/display_ug2864hsweg01.c \
drivers/accgyro_mpu6050.c
drivers/accgyro_mpu.c \
drivers/display_ug2864hsweg01.c \
drivers/accgyro_mpu6050.c

5
src/main/target/LUX_RACE/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = VCP
F3_TARGETS += $(TARGET)
FEATURES = VCP
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -9,6 +9,3 @@ TARGET_SRC = \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f30x.c

6
src/main/target/MOTOLAB/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = VCP ONBOARDFLASH
F3_TARGETS += $(TARGET)
FEATURES = VCP ONBOARDFLASH
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -9,7 +9,5 @@ TARGET_SRC = \
drivers/compass_hmc5883l.c \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f30x.c \
drivers/serial_softserial.c
drivers/serial_softserial.c

4
src/main/target/NAZE/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = ONBOARDFLASH HIGHEND
F1_TARGETS += $(TARGET)
FEATURES = ONBOARDFLASH HIGHEND
TARGET_SRC = \
drivers/accgyro_adxl345.c \
@ -18,4 +18,4 @@ TARGET_SRC = \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f10x.c \
drivers/sonar_hcsr04.c \
hardware_revision.c
hardware_revision.c

2
src/main/target/NAZE32PRO/target.mk
View File

@ -1,4 +1,4 @@
FEATURES = VCP
F3_TARGETS += $(TARGET)
FEATURES = VCP
TARGET_SRC = \

5
src/main/target/OLIMEXINO/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = HIGHEND
F1_TARGETS += $(TARGET)
FEATURES = HIGHEND
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -9,4 +9,5 @@ TARGET_SRC = \
drivers/compass_hmc5883l.c \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f10x.c \
drivers/sonar_hcsr04.c
drivers/sonar_hcsr04.c

3
src/main/target/PORT103R/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = ONBOARDFLASH HIGHEND
F1_TARGETS += $(TARGET)
FEATURES = ONBOARDFLASH HIGHEND
DEVICE_FLAGS = -DSTM32F10X_HD
@ -21,3 +21,4 @@ TARGET_SRC = \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f10x.c \
drivers/sonar_hcsr04.c

2
src/main/target/REVO/target.mk
View File

@ -4,5 +4,5 @@ FEATURES += VCP ONBOARDFLASH
TARGET_SRC = \
drivers/accgyro_spi_mpu6000.c \
drivers/barometer_ms5611.c \
drivers/compass_hmc5883l.c
drivers/compass_hmc5883l.c

4
src/main/target/RMDO/target.mk
View File

@ -1,5 +1,5 @@
F3_TARGETS += $(TARGET)
FEATURES = VCP ONBOARDFLASH
F3_TARGETS += $(TARGET)
TARGET_FLAGS = -DSPRACINGF3
TARGET_SRC = \
@ -9,5 +9,5 @@ TARGET_SRC = \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f30x.c \
drivers/serial_softserial.c \
drivers/sonar_hcsr04.c
drivers/sonar_hcsr04.c

3
src/main/target/SINGULARITY/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = VCP ONBOARDFLASH
F3_TARGETS += $(TARGET)
FEATURES = VCP ONBOARDFLASH
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -9,4 +9,3 @@ TARGET_SRC = \
drivers/serial_softserial.c \
drivers/vtx_rtc6705.c

6
src/main/target/SPARKY/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = VCP
F3_TARGETS += $(TARGET)
FEATURES = VCP
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -8,7 +8,5 @@ TARGET_SRC = \
drivers/barometer_bmp280.c \
drivers/compass_ak8975.c \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f30x.c
drivers/light_ws2811strip_stm32f30x.c

5
src/main/target/SPRACINGF3/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = VCP ONBOARDFLASH
F3_TARGETS += $(TARGET)
FEATURES = VCP ONBOARDFLASH
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -12,4 +12,5 @@ TARGET_SRC = \
drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f30x.c \
drivers/serial_softserial.c \
drivers/sonar_hcsr04.c
drivers/sonar_hcsr04.c

4
src/main/target/SPRACINGF3EVO/target.mk
View File

@ -1,5 +1,5 @@
FEATURES = VCP SDCARD
F3_TARGETS += $(TARGET)
FEATURES = VCP SDCARD
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -12,5 +12,5 @@ TARGET_SRC = \
drivers/serial_usb_vcp.c \
drivers/transponder_ir.c \
drivers/transponder_ir_stm32f30x.c \
io/transponder_ir.c
io/transponder_ir.c

4
src/main/target/SPRACINGF3MINI/target.mk
View File

@ -1,5 +1,5 @@
F3_TARGETS += $(TARGET)
FEATURES = VCP SDCARD
F3_TARGETS += $(TARGET)
TARGET_SRC = \
drivers/accgyro_mpu.c \
@ -15,5 +15,5 @@ TARGET_SRC = \
drivers/sonar_hcsr04.c \
drivers/transponder_ir.c \
drivers/transponder_ir_stm32f30x.c \
io/transponder_ir.c
io/transponder_ir.c

5
src/main/target/STM32F3DISCOVERY/target.mk
View File

@ -1,5 +1,5 @@
F3_TARGETS += $(TARGET)
FEATURES = VCP SDCARD
F3_TARGETS += $(TARGET)
TARGET_SRC = \
drivers/light_ws2811strip.c \
@ -15,4 +15,5 @@ TARGET_SRC = \
drivers/accgyro_l3g4200d.c \
drivers/barometer_ms5611.c \
drivers/barometer_bmp280.c \
drivers/compass_ak8975.c
drivers/compass_ak8975.c