From 40247b0a1b46155fec2b038a903dd0d04e101d0a Mon Sep 17 00:00:00 2001 From: Cheng Lin Date: Tue, 4 Dec 2018 20:39:41 -0500 Subject: [PATCH 1/2] add I2C support, and remove blackbox flash define Signed-off-by: Cheng Lin remove blackbox support --- src/main/target/CLRACINGF7/CL_RACINGF7.md | 13 ------------ src/main/target/CLRACINGF7/target.h | 25 ++++++++--------------- src/main/target/CLRACINGF7/target.mk | 4 +++- 3 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 src/main/target/CLRACINGF7/CL_RACINGF7.md diff --git a/src/main/target/CLRACINGF7/CL_RACINGF7.md b/src/main/target/CLRACINGF7/CL_RACINGF7.md deleted file mode 100644 index ab6f092224..0000000000 --- a/src/main/target/CLRACINGF7/CL_RACINGF7.md +++ /dev/null @@ -1,13 +0,0 @@ -MCU: STM32F722RE -IMU: ICM-20602 -IMU Interrupt: yes -BARO: NO -VCP: YES -Hardware UARTS: 6 uarts -OSD: uses a AB7456 chip -Blackbox: SD Card -PPM/UART NOT Shared: YES -Battery Voltage Sensor: 10:1 -Current sensor: 0.5 mOhm, 250 Current scale in the setting -Integrated Voltage Regulator: 3 A 5v -120A Current sensing PDB and 150A burst current for 10S on the current sensing Resistor diff --git a/src/main/target/CLRACINGF7/target.h b/src/main/target/CLRACINGF7/target.h index cf2e3517bb..9addaa0c14 100644 --- a/src/main/target/CLRACINGF7/target.h +++ b/src/main/target/CLRACINGF7/target.h @@ -51,26 +51,16 @@ #define GYRO_1_ALIGN CW0_DEG #define ACC_1_ALIGN CW0_DEG +#define USE_MAG +#define USE_MAG_HMC5883 +#define USE_MAG_QMC5883 +#define MAG_I2C_INSTANCE (I2CDEV_2) #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3 #define MAX7456_SPI_CS_PIN PA15 #define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) -//define use flash -#define FLASH_CS_PIN PB12 -#define FLASH_SPI_INSTANCE SPI2 -#define USE_FLASHFS -#define USE_FLASH_M25P16 -//define use SD card - -#define USE_SDCARD -#define USE_SDCARD_SPI -#define SDCARD_DETECT_PIN PA8 -#define SDCARD_SPI_INSTANCE SPI2 -#define SDCARD_SPI_CS_PIN SPI2_NSS_PIN -#define SDCARD_DMA_STREAM_TX_FULL DMA1_Stream4 -#define SDCARD_DMA_CHANNEL 0 #define USE_VCP @@ -104,6 +94,10 @@ #define USE_ESCSERIAL #define ESCSERIAL_TIMER_TX_PIN PB8 // (Hardware=0, PPM) +#define USE_I2C +#define USE_I2C_DEVICE_2 // External I2C +#define I2C_DEVICE (I2CDEV_2) + #define USE_SPI #define USE_SPI_DEVICE_1 #define USE_SPI_DEVICE_2 @@ -133,9 +127,8 @@ #define CURRENT_METER_SCALE_DEFAULT 250 // 3.3/120A = 25mv/A #define BINDPLUG_PIN PB2 -#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL -#define SERIALRX_UART SERIAL_PORT_UART5 +#define SERIALRX_UART SERIAL_PORT_UART5 #define USE_SERIAL_4WAY_BLHELI_INTERFACE #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/CLRACINGF7/target.mk b/src/main/target/CLRACINGF7/target.mk index 7073804f28..3bae3aba77 100644 --- a/src/main/target/CLRACINGF7/target.mk +++ b/src/main/target/CLRACINGF7/target.mk @@ -1,5 +1,5 @@ F7X2RE_TARGETS += $(TARGET) -FEATURES += VCP ONBOARDFLASH SDCARD_SPI +FEATURES += VCP ONBOARDFLASH TARGET_SRC = \ drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_mpu6500.c \ @@ -7,4 +7,6 @@ TARGET_SRC = \ drivers/accgyro/accgyro_spi_mpu6000.c \ drivers/light_ws2811strip.c \ drivers/light_ws2811strip_hal.c \ + drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_qmc5883l.c \ drivers/max7456.c From 4b0ecb4c63ec06d6183d81efe33de80a9c99372d Mon Sep 17 00:00:00 2001 From: Cheng Lin Date: Wed, 5 Dec 2018 10:32:03 -0500 Subject: [PATCH 2/2] Edit .md file to match hardware --- src/main/target/CLRACINGF7/CLRACINGF7.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/main/target/CLRACINGF7/CLRACINGF7.md diff --git a/src/main/target/CLRACINGF7/CLRACINGF7.md b/src/main/target/CLRACINGF7/CLRACINGF7.md new file mode 100644 index 0000000000..8624f95d55 --- /dev/null +++ b/src/main/target/CLRACINGF7/CLRACINGF7.md @@ -0,0 +1,12 @@ +MCU: STM32F722RE +IMU: ICM-20602 +IMU Interrupt: yes +BARO: NO +VCP: YES +Hardware UARTS: 6 uarts +OSD: uses a AB7456 chip +Blackbox: flash Chip +PPM/UART NOT Shared: YES +Battery Voltage Sensor: 10:1 +Current sensor: from 4 in 1 socket +Integrated Voltage Regulator: 1.5A 5v/v1 2A 5v/v2