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

Merge branch 'naze32pro' - work in progress

Browse source 
Conflicts:
	Makefile
This commit is contained in:
Dominic Clifton 2014-05-31 22:50:05 +01:00
commit 14448f4734
5 changed files with 51 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Makefile
View file

@ -32,7 +32,7 @@ SERIAL_DEVICE ?= /dev/ttyUSB0
FORKNAME = cleanflight FORKNAME = cleanflight
VALID_TARGETS = NAZE OLIMEXINO STM32F3DISCOVERY CHEBUZZF3 VALID_TARGETS = NAZE NAZE32PRO OLIMEXINO STM32F3DISCOVERY CHEBUZZF3
# Working directories # Working directories
ROOT = $(dir $(lastword $(MAKEFILE_LIST))) ROOT = $(dir $(lastword $(MAKEFILE_LIST)))
@ -45,7 +45,7 @@ INCLUDE_DIRS = $(SRC_DIR)
# Search path for sources # Search path for sources
VPATH := $(SRC_DIR):$(SRC_DIR)/startup VPATH := $(SRC_DIR):$(SRC_DIR)/startup
ifeq ($(TARGET),$(filter $(TARGET),STM32F3DISCOVERY CHEBUZZF3)) ifeq ($(TARGET),$(filter $(TARGET),STM32F3DISCOVERY CHEBUZZF3 NAZE32PRO))
STDPERIPH_DIR = $(ROOT)/lib/main/STM32F30x_StdPeriph_Driver STDPERIPH_DIR = $(ROOT)/lib/main/STM32F30x_StdPeriph_Driver
@ -181,9 +181,7 @@ OLIMEXINO_SRC = startup_stm32f10x_md_gcc.S \
drivers/timer.c \ drivers/timer.c \
$(COMMON_SRC) $(COMMON_SRC)
STM32F3DISCOVERY_SRC_COMMON = startup_stm32f30x_md_gcc.S \ STM32F30x_COMMON_SRC = startup_stm32f30x_md_gcc.S \
drivers/accgyro_l3gd20.c \
drivers/accgyro_lsm303dlhc.c \
drivers/adc.c \ drivers/adc.c \
drivers/adc_stm32f30x.c \ drivers/adc_stm32f30x.c \
drivers/bus_i2c_stm32f30x.c \ drivers/bus_i2c_stm32f30x.c \
@ -198,7 +196,16 @@ STM32F3DISCOVERY_SRC_COMMON = startup_stm32f30x_md_gcc.S \
drivers/serial_softserial.c \ drivers/serial_softserial.c \
drivers/timer.c drivers/timer.c
STM32F3DISCOVERY_SRC = $(STM32F3DISCOVERY_SRC_COMMON) \ NAZE32PRO_SRC = $(STM32F30x_COMMON_SRC) \
drivers/accgyro_mpu6050.c \
drivers/compass_hmc5883l.c \
$(COMMON_SRC)
STM32F3DISCOVERY_COMMON_SRC = $(STM32F30x_COMMON_SRC) \
drivers/accgyro_l3gd20.c \
drivers/accgyro_lsm303dlhc.c
STM32F3DISCOVERY_SRC = $(STM32F3DISCOVERY_COMMON_SRC) \
drivers/accgyro_adxl345.c \ drivers/accgyro_adxl345.c \
drivers/accgyro_bma280.c \ drivers/accgyro_bma280.c \
drivers/accgyro_mma845x.c \ drivers/accgyro_mma845x.c \
@ -210,6 +217,7 @@ STM32F3DISCOVERY_SRC = $(STM32F3DISCOVERY_SRC_COMMON) \
CHEBUZZF3_SRC = $(STM32F3DISCOVERY_SRC) \ CHEBUZZF3_SRC = $(STM32F3DISCOVERY_SRC) \
$(COMMON_SRC) $(COMMON_SRC)
# In some cases, %.s regarded as intermediate file, which is actually not. # In some cases, %.s regarded as intermediate file, which is actually not.
# This will prevent accidental deletion of startup code. # This will prevent accidental deletion of startup code.
.PRECIOUS: %.s .PRECIOUS: %.s

2
src/main/drivers/serial_softserial.c
View file

@ -18,7 +18,7 @@
#define SOFT_SERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8 #define SOFT_SERIAL_2_TIMER_TX_HARDWARE 7 // PWM 8
#endif #endif
#if defined(STM32F3DISCOVERY) && !defined(CHEBUZZF3) #if defined(STM32F303xC) && !defined(CHEBUZZF3)
#define SOFT_SERIAL_1_TIMER_RX_HARDWARE 8 // PWM 9 #define SOFT_SERIAL_1_TIMER_RX_HARDWARE 8 // PWM 9
#define SOFT_SERIAL_1_TIMER_TX_HARDWARE 9 // PWM 10 #define SOFT_SERIAL_1_TIMER_TX_HARDWARE 9 // PWM 10
#define SOFT_SERIAL_2_TIMER_RX_HARDWARE 10 // PWM 11 #define SOFT_SERIAL_2_TIMER_RX_HARDWARE 10 // PWM 11

4
src/main/drivers/system.c
View file

@ -153,7 +153,7 @@ void systemInit(bool overclock)
// Make all GPIO in by default to save power and reduce noise // Make all GPIO in by default to save power and reduce noise
gpio.mode = Mode_AIN; gpio.mode = Mode_AIN;
gpio.pin = Pin_All; gpio.pin = Pin_All;
#ifdef STM32F3DISCOVERY #ifdef STM32F303xC
gpio.pin = Pin_All & ~(Pin_13|Pin_14|Pin_15); // Leave JTAG pins alone gpio.pin = Pin_All & ~(Pin_13|Pin_14|Pin_15); // Leave JTAG pins alone
gpioInit(GPIOA, &gpio); gpioInit(GPIOA, &gpio);
gpio.pin = Pin_All; gpio.pin = Pin_All;
@ -285,6 +285,8 @@ void systemReset(bool toBootloader)
if (toBootloader) { if (toBootloader) {
// 1FFFF000 -> 20000200 -> SP // 1FFFF000 -> 20000200 -> SP
// 1FFFF004 -> 1FFFF021 -> PC // 1FFFF004 -> 1FFFF021 -> PC
// FIXME update for STM32F30x
*((uint32_t *)0x20004FF0) = 0xDEADBEEF; // 20KB STM32F103 *((uint32_t *)0x20004FF0) = 0xDEADBEEF; // 20KB STM32F103
} }

24
src/main/platform.h
View file

@ -1,8 +1,7 @@
#pragma once #pragma once
#ifdef STM32F3DISCOVERY #ifdef STM32F303xC
#include "stm32f30x_conf.h" #include "stm32f30x_conf.h"
#include "stm32f30x_rcc.h" #include "stm32f30x_rcc.h"
#include "stm32f30x_gpio.h" #include "stm32f30x_gpio.h"
@ -13,6 +12,27 @@
#define U_ID_1 (*(uint32_t*)0x10000000) #define U_ID_1 (*(uint32_t*)0x10000000)
#define U_ID_2 (*(uint32_t*)0x10000003) #define U_ID_2 (*(uint32_t*)0x10000003)
#endif
#ifdef NAZE32PRO
#define LED0_GPIO GPIOB
#define LED0_PIN Pin_12
#define BEEP_GPIO GPIOB
#define BEEP_PIN Pin_10
#define BUZZER
#define LED0
#define GYRO
#define ACC
#define MAG
#define SENSORS_SET (SENSOR_ACC)
#endif
#ifdef STM32F3DISCOVERY
#define LED0_GPIO GPIOE #define LED0_GPIO GPIOE
#define LED0_PIN Pin_8|Pin_12 // Blue LEDs - PE8/PE12 #define LED0_PIN Pin_8|Pin_12 // Blue LEDs - PE8/PE12
#define LED0_INVERTED #define LED0_INVERTED

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

@ -53,6 +53,17 @@
#undef USE_GYRO_L3GD20 #undef USE_GYRO_L3GD20
#endif #endif
#ifdef NAZE32PRO
#undef USE_ACC_LSM303DLHC
#undef USE_ACC_ADXL345
#undef USE_ACC_BMA280
#undef USE_ACC_MMA8452
#undef USE_ACC_LSM303DLHC
#undef USE_GYRO_L3G4200D
#undef USE_GYRO_L3GD20
#undef USE_GYRO_MPU3050
#endif
#if defined(OLIMEXINO) #if defined(OLIMEXINO)
#undef USE_GYRO_L3GD20 #undef USE_GYRO_L3GD20
#undef USE_GYRO_L3G4200D #undef USE_GYRO_L3G4200D