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

Tidied .mk file to make them consistent. Fixed EUSTM32F103RC build.

Browse source
This commit is contained in:
Martin Budden 2016-06-14 07:26:26 +01:00
parent 3c84c169c2
commit 0b2aa89579
29 changed files with 85 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/target/ALIENFLIGHTF3/target.mk
View file

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

1
src/main/target/ALIENFLIGHTF4/target.mk
View file

@ -11,3 +11,4 @@ TARGET_SRC = \
drivers/compass_hmc5883l.c \ drivers/compass_hmc5883l.c \
drivers/light_ws2811strip.c \ drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f4xx.c drivers/light_ws2811strip_stm32f4xx.c

1
src/main/target/BLUEJAYF4/target.mk
View file

@ -5,3 +5,4 @@ TARGET_SRC = \
drivers/accgyro_spi_mpu6500.c \ drivers/accgyro_spi_mpu6500.c \
drivers/accgyro_mpu6500.c \ drivers/accgyro_mpu6500.c \
drivers/barometer_ms5611.c drivers/barometer_ms5611.c

3
src/main/target/CC3D/target.mk
View file

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

3
src/main/target/CHEBUZZF3/target.mk
View file

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

3
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 = \ TARGET_SRC = \
drivers/accgyro_mpu.c \ drivers/accgyro_mpu.c \
@ -9,3 +9,4 @@ TARGET_SRC = \
flight/gtune.c \ flight/gtune.c \
blackbox/blackbox.c \ blackbox/blackbox.c \
blackbox/blackbox_io.c blackbox/blackbox_io.c

3
src/main/target/COLIBRI_RACE/target.mk
View file

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

5
src/main/target/DOGE/target.mk
View file

@ -1,5 +1,5 @@
FEATURES = VCP
F3_TARGETS += $(TARGET) F3_TARGETS += $(TARGET)
FEATURES = VCP
TARGET_SRC = \ TARGET_SRC = \
drivers/accgyro_mpu.c \ drivers/accgyro_mpu.c \
@ -10,6 +10,3 @@ TARGET_SRC = \
drivers/light_ws2811strip.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] = { 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_0, TIM_Channel_1, TIM2_IRQn, 0, Mode_IPD, 0 }, // PWM1 - RC1
{ TIM2, GPIOA, Pin_1, TIM_Channel_2, TIM2_IRQn, 0, Mode_IPD}, // PWM2 - RC2 { 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}, // PWM3 - RC3 { 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}, // PWM4 - RC4 { 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}, // PWM5 - RC5 { 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}, // PWM6 - RC6 { 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}, // PWM7 - RC7 { 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}, // PWM8 - RC8 { 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}, // PWM9 - OUT1 { 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}, // PWM10 - OUT2 { 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}, // PWM11 - OUT3 { 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}, // PWM12 - OUT4 { 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}, // PWM13 - OUT5 { 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} // PWM14 - OUT6 { 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 USE_EXTI
#define MPU6000_CS_GPIO GPIOB #define MPU6000_CS_GPIO GPIOB
#define MPU6000_CS_PIN GPIO_Pin_12 #define MPU6000_CS_PIN PB12
#define MPU6000_SPI_INSTANCE SPI2 #define MPU6000_SPI_INSTANCE SPI2
#define MPU6500_CS_GPIO_CLK_PERIPHERAL RCC_APB2Periph_GPIOB #define MPU6500_CS_GPIO_CLK_PERIPHERAL RCC_APB2Periph_GPIOB
#define MPU6500_CS_GPIO GPIOB #define MPU6500_CS_GPIO GPIOB
#define MPU6500_CS_PIN GPIO_Pin_12 #define MPU6500_CS_PIN PB12
#define MPU6500_SPI_INSTANCE SPI2 #define MPU6500_SPI_INSTANCE SPI2
#define GYRO #define GYRO
@ -109,7 +109,7 @@
#define EXTERNAL1_ADC_GPIO_PIN GPIO_Pin_5 #define EXTERNAL1_ADC_GPIO_PIN GPIO_Pin_5
#define EXTERNAL1_ADC_CHANNEL ADC_Channel_5 #define EXTERNAL1_ADC_CHANNEL ADC_Channel_5
#define LED_STRIP //#define LED_STRIP
#define LED_STRIP_TIMER TIM3 #define LED_STRIP_TIMER TIM3
#define SPEKTRUM_BIND #define SPEKTRUM_BIND

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

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

2
src/main/target/FURYF3/target.mk
View file

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

1
src/main/target/FURYF4/target.mk
View file

@ -6,3 +6,4 @@ TARGET_SRC = \
drivers/accgyro_spi_mpu6500.c \ drivers/accgyro_spi_mpu6500.c \
drivers/accgyro_mpu6500.c \ drivers/accgyro_mpu6500.c \
drivers/barometer_ms5611.c drivers/barometer_ms5611.c

3
src/main/target/IRCFUSIONF3/target.mk
View file

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

4
src/main/target/KISSFC/target.mk
View file

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

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

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

4
src/main/target/MOTOLAB/target.mk
View file

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

2
src/main/target/NAZE/target.mk
View file

@ -1,5 +1,5 @@
FEATURES = ONBOARDFLASH HIGHEND
F1_TARGETS += $(TARGET) F1_TARGETS += $(TARGET)
FEATURES = ONBOARDFLASH HIGHEND
TARGET_SRC = \ TARGET_SRC = \
drivers/accgyro_adxl345.c \ drivers/accgyro_adxl345.c \

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

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

3
src/main/target/OLIMEXINO/target.mk
View file

@ -1,5 +1,5 @@
FEATURES = HIGHEND
F1_TARGETS += $(TARGET) F1_TARGETS += $(TARGET)
FEATURES = HIGHEND
TARGET_SRC = \ TARGET_SRC = \
drivers/accgyro_mpu.c \ drivers/accgyro_mpu.c \
@ -10,3 +10,4 @@ TARGET_SRC = \
drivers/light_ws2811strip.c \ drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f10x.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) F1_TARGETS += $(TARGET)
FEATURES = ONBOARDFLASH HIGHEND
DEVICE_FLAGS = -DSTM32F10X_HD DEVICE_FLAGS = -DSTM32F10X_HD
@ -21,3 +21,4 @@ TARGET_SRC = \
drivers/light_ws2811strip.c \ drivers/light_ws2811strip.c \
drivers/light_ws2811strip_stm32f10x.c \ drivers/light_ws2811strip_stm32f10x.c \
drivers/sonar_hcsr04.c drivers/sonar_hcsr04.c

2
src/main/target/RMDO/target.mk
View file

@ -1,5 +1,5 @@
FEATURES = VCP ONBOARDFLASH
F3_TARGETS += $(TARGET) F3_TARGETS += $(TARGET)
FEATURES = VCP ONBOARDFLASH
TARGET_FLAGS = -DSPRACINGF3 TARGET_FLAGS = -DSPRACINGF3
TARGET_SRC = \ TARGET_SRC = \

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

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

4
src/main/target/SPARKY/target.mk
View file

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

3
src/main/target/SPRACINGF3/target.mk
View file

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

2
src/main/target/SPRACINGF3EVO/target.mk
View file

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

2
src/main/target/SPRACINGF3MINI/target.mk
View file

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

3
src/main/target/STM32F3DISCOVERY/target.mk
View file

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