From eb5af3a161f574594437e36ca69ed683f47ffb5b Mon Sep 17 00:00:00 2001 From: Blaine Date: Tue, 31 Jul 2018 01:14:19 -0700 Subject: [PATCH 1/4] Add support for the ST LIS3MDL 3-Axis Magnetometer per #6437 --- docs/Gps.md | 1 + make/source.mk | 1 + src/main/drivers/compass/compass_lis3mdl.c | 159 +++++++++++++++++++++ src/main/drivers/compass/compass_lis3mdl.h | 25 ++++ src/main/interface/settings.c | 2 +- src/main/sensors/compass.c | 17 +++ src/main/sensors/compass.h | 3 +- src/main/target/AG3X/target.h | 1 + src/main/target/AG3X/target.mk | 1 + src/main/target/ALIENFLIGHTF3/target.h | 1 + src/main/target/ALIENFLIGHTF3/target.mk | 1 + src/main/target/ALIENFLIGHTF4/target.h | 1 + src/main/target/ALIENFLIGHTF4/target.mk | 3 +- src/main/target/ALIENFLIGHTNGF7/target.h | 1 + src/main/target/ALIENFLIGHTNGF7/target.mk | 1 + src/main/target/ALIENWHOOP/target.h | 1 + src/main/target/ALIENWHOOP/target.mk | 1 + src/main/target/BETAFLIGHTF4/target.h | 1 + src/main/target/BETAFLIGHTF4/target.mk | 1 + src/main/target/BLUEJAYF4/target.h | 1 + src/main/target/BLUEJAYF4/target.mk | 4 +- src/main/target/CHEBUZZF3/target.h | 1 + src/main/target/CHEBUZZF3/target.mk | 1 + src/main/target/COLIBRI/target.h | 1 + src/main/target/COLIBRI/target.mk | 3 +- src/main/target/COLIBRI_RACE/target.h | 1 + src/main/target/COLIBRI_RACE/target.mk | 3 +- src/main/target/CRAZYFLIE2/target.h | 1 + src/main/target/CRAZYFLIE2/target.mk | 1 + src/main/target/DALRCF405/target.h | 1 + src/main/target/DALRCF405/target.mk | 1 + src/main/target/DALRCF722DUAL/target.h | 1 + src/main/target/DALRCF722DUAL/target.mk | 1 + src/main/target/ELLE0/target.h | 1 + src/main/target/ELLE0/target.mk | 3 +- src/main/target/F4BY/target.h | 1 + src/main/target/F4BY/target.mk | 3 +- src/main/target/KAKUTEF4/target.h | 1 + src/main/target/KAKUTEF4/target.mk | 1 + src/main/target/KAKUTEF7/target.h | 1 + src/main/target/KAKUTEF7/target.mk | 1 + src/main/target/KROOZX/target.h | 1 + src/main/target/KROOZX/target.mk | 1 + src/main/target/MATEKF405/target.h | 1 + src/main/target/MATEKF405/target.mk | 1 + src/main/target/MATEKF722/target.h | 1 + src/main/target/MATEKF722/target.mk | 1 + src/main/target/MICROSCISKY/target.h | 1 + src/main/target/MICROSCISKY/target.mk | 3 +- src/main/target/MULTIFLITEPICO/target.h | 1 + src/main/target/MULTIFLITEPICO/target.mk | 3 +- src/main/target/NUCLEOF7/target.h | 1 + src/main/target/NUCLEOF7/target.mk | 3 +- src/main/target/NUCLEOF722/target.h | 1 + src/main/target/NUCLEOF722/target.mk | 1 + src/main/target/OMNIBUSF4/target.h | 1 + src/main/target/OMNIBUSF4/target.mk | 1 + src/main/target/OMNIBUSF4FW/target.h | 1 + src/main/target/OMNIBUSF4FW/target.mk | 1 + src/main/target/OMNIBUSF7/target.h | 1 + src/main/target/OMNIBUSF7/target.mk | 1 + src/main/target/OMNINXT/target.h | 1 + src/main/target/OMNINXT/target.mk | 1 + src/main/target/RCEXPLORERF3/target.h | 1 + src/main/target/RCEXPLORERF3/target.mk | 1 + src/main/target/REVO/target.h | 1 + src/main/target/REVO/target.mk | 3 +- src/main/target/SKYZONEF405/target.h | 1 + src/main/target/SKYZONEF405/target.mk | 1 + src/main/target/SPARKY2/target.h | 1 + src/main/target/SPARKY2/target.mk | 3 +- src/main/target/SPEEDYBEEF4/target.h | 1 + src/main/target/SPEEDYBEEF4/target.mk | 1 + src/main/target/SPRACINGF3/target.h | 1 + src/main/target/SPRACINGF3/target.mk | 3 +- src/main/target/SPRACINGF4EVO/target.h | 1 + src/main/target/SPRACINGF4EVO/target.mk | 1 + src/main/target/SPRACINGF7DUAL/target.h | 1 + src/main/target/SPRACINGF7DUAL/target.mk | 1 + src/main/target/STM32F3DISCOVERY/target.h | 1 + src/main/target/STM32F3DISCOVERY/target.mk | 1 + src/main/target/STM32F7X2/target.h | 1 + src/main/target/YUPIF7/target.h | 1 + src/main/target/YUPIF7/target.mk | 1 + 84 files changed, 295 insertions(+), 15 deletions(-) create mode 100644 src/main/drivers/compass/compass_lis3mdl.c create mode 100644 src/main/drivers/compass/compass_lis3mdl.h diff --git a/docs/Gps.md b/docs/Gps.md index 01f170e3a..6626ee873 100644 --- a/docs/Gps.md +++ b/docs/Gps.md @@ -153,6 +153,7 @@ Module | Comments -------|-------- U-blox Neo-M8N w/Compass | Pinout can be found in Pixfalcon manual. SDA and SCL can be attached to I2C bus for compass, TX and RX can be attached to UART for GPS. Power must be applied for either to function. Reyax RY825AI | NEO-M8N, 18Hz UART USB interface GPS Glonass BeiDou QZSS antenna module flash. [eBay](http://www.ebay.com/itm/RY825AI-18Hz-UART-USB-interface-GPS-Glonass-BeiDou-QZSS-antenna-module-flash/181566850426) +mRo uGPS w/ LIS3MDL | Ultra compact and weights just 7.7 grams. Multiple constellation capabilities (GPS and GLONASS). Includes JST-GH pigtail. Available from [mRobotics](https://store.mrobotics.io/product-p/mro-ugps-samm8q-01.htm). #### NEO-7 Module | Comments diff --git a/make/source.mk b/make/source.mk index 5267ee77a..38fbc76dc 100644 --- a/make/source.mk +++ b/make/source.mk @@ -255,6 +255,7 @@ SIZE_OPTIMISED_SRC := $(SIZE_OPTIMISED_SRC) \ drivers/compass/compass_fake.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/display_ug2864hsweg01.c \ drivers/inverter.c \ drivers/light_ws2811strip.c \ diff --git a/src/main/drivers/compass/compass_lis3mdl.c b/src/main/drivers/compass/compass_lis3mdl.c new file mode 100644 index 000000000..b1e00ea0c --- /dev/null +++ b/src/main/drivers/compass/compass_lis3mdl.c @@ -0,0 +1,159 @@ +/* + * This file is part of Cleanflight and Betaflight. + * + * Cleanflight and Betaflight are free software. You can redistribute + * this software and/or modify this software under the terms of the + * GNU General Public License as published by the Free Software + * Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * Cleanflight and Betaflight are distributed in the hope that they + * will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software. + * + * If not, see . + */ + +#include +#include + +#include + +#include "platform.h" + +#if defined(USE_MAG_LIS3MDL) + +#include "compass.h" +#include "drivers/time.h" +#include "common/axis.h" + +#define LIS3MDL_MAG_I2C_ADDRESS 0x1E +#define LIS3MDL_DEVICE_ID 0x3D + +#define LIS3MDL_REG_WHO_AM_I 0x0F + +#define LIS3MDL_REG_CTRL_REG1 0x20 +#define LIS3MDL_REG_CTRL_REG2 0x21 +#define LIS3MDL_REG_CTRL_REG3 0x22 +#define LIS3MDL_REG_CTRL_REG4 0x23 +#define LIS3MDL_REG_CTRL_REG5 0x24 + +#define LIS3MDL_REG_STATUS_REG 0x27 + +#define LIS3MDL_REG_OUT_X_L 0x28 +#define LIS3MDL_REG_OUT_X_H 0x29 +#define LIS3MDL_REG_OUT_Y_L 0x2A +#define LIS3MDL_REG_OUT_Y_H 0x2B +#define LIS3MDL_REG_OUT_Z_L 0x2C +#define LIS3MDL_REG_OUT_Z_H 0x2D + +#define LIS3MDL_TEMP_OUT_L 0x2E +#define LIS3MDL_TEMP_OUT_H 0x2F + +#define LIS3MDL_INT_CFG 0x30 +#define LIS3MDL_INT_SRC 0x31 +#define LIS3MDL_THS_L 0x32 +#define LIS3MDL_THS_H 0x33 + +// CTRL_REG1 +#define LIS3MDL_TEMP_EN 0x80 // Default 0 +#define LIS3MDL_OM_LOW_POWER 0x00 // Default +#define LIS3MDL_OM_MED_PROF 0x20 +#define LIS3MDL_OM_HI_PROF 0x40 +#define LIS3MDL_OM_ULTRA_HI_PROF 0x60 +#define LIS3MDL_DO_0_625 0x00 +#define LIS3MDL_DO_1_25 0x04 +#define LIS3MDL_DO_2_5 0x08 +#define LIS3MDL_DO_5 0x0C +#define LIS3MDL_DO_10 0x10 // Default +#define LIS3MDL_DO_20 0x14 +#define LIS3MDL_DO_40 0x18 +#define LIS3MDL_DO_80 0x1C +#define LIS3MDL_FAST_ODR 0x02 + +// CTRL_REG2 +#define LIS3MDL_FS_4GAUSS 0x00 // Default +#define LIS3MDL_FS_8GAUSS 0x20 +#define LIS3MDL_FS_12GAUSS 0x40 +#define LIS3MDL_FS_16GAUSS 0x60 +#define LIS3MDL_REBOOT 0x08 +#define LIS3MDL_SOFT_RST 0x04 + +// CTRL_REG3 +#define LIS3MDL_LP 0x20 // Default 0 +#define LIS3MDL_SIM 0x04 // Default 0 +#define LIS3MDL_MD_CONTINUOUS 0x00 // Default +#define LIS3MDL_MD_SINGLE 0x01 +#define LIS3MDL_MD_POWERDOWN 0x03 + +// CTRL_REG4 +#define LIS3MDL_ZOM_LP 0x00 // Default +#define LIS3MDL_ZOM_MP 0x04 +#define LIS3MDL_ZOM_HP 0x08 +#define LIS3MDL_ZOM_UHP 0x0C +#define LIS3MDL_BLE 0x02 // Default 0 + +// CTRL_REG5 +#define LIS3MDL_FAST_READ 0x80 // Default 0 +#define LIS3MDL_BDU 0x40 // Default 0 + +static bool lis3mdlRead(magDev_t * mag, int16_t *magData) +{ + uint8_t buf[6]; + + busDevice_t *busdev = &mag->busdev; + + bool ack = busReadRegisterBuffer(busdev, LIS3MDL_REG_OUT_X_L, buf, 6); + + if (!ack) { + return false; + } + + magData[X] = (int16_t)(buf[1] << 8 | buf[0]) / 4; + magData[Y] = (int16_t)(buf[3] << 8 | buf[2]) / 4; + magData[Z] = (int16_t)(buf[5] << 8 | buf[4]) / 4; + + return true; +} + +static bool lis3mdlInit(magDev_t *mag) +{ + busDevice_t *busdev = &mag->busdev; + + busWriteRegister(busdev, LIS3MDL_REG_CTRL_REG2, LIS3MDL_FS_4GAUSS); + busWriteRegister(busdev, LIS3MDL_REG_CTRL_REG1, LIS3MDL_TEMP_EN | LIS3MDL_OM_ULTRA_HI_PROF | LIS3MDL_DO_80); + busWriteRegister(busdev, LIS3MDL_REG_CTRL_REG5, LIS3MDL_BDU); + busWriteRegister(busdev, LIS3MDL_REG_CTRL_REG4, LIS3MDL_ZOM_UHP); + busWriteRegister(busdev, LIS3MDL_REG_CTRL_REG3, 0x00); + + delay(100); + + return true; +} + +bool lis3mdlDetect(magDev_t * mag) +{ + busDevice_t *busdev = &mag->busdev; + + uint8_t sig = 0; + + if (busdev->bustype == BUSTYPE_I2C && busdev->busdev_u.i2c.address == 0) { + busdev->busdev_u.i2c.address = LIS3MDL_MAG_I2C_ADDRESS; + } + + bool ack = busReadRegisterBuffer(&mag->busdev, LIS3MDL_REG_WHO_AM_I, &sig, 1); + + if (!ack || sig != LIS3MDL_DEVICE_ID) { + return false; + } + + mag->init = lis3mdlInit; + mag->read = lis3mdlRead; + + return true; +} +#endif diff --git a/src/main/drivers/compass/compass_lis3mdl.h b/src/main/drivers/compass/compass_lis3mdl.h new file mode 100644 index 000000000..52a0928bd --- /dev/null +++ b/src/main/drivers/compass/compass_lis3mdl.h @@ -0,0 +1,25 @@ +/* + * This file is part of Cleanflight and Betaflight. + * + * Cleanflight and Betaflight are free software. You can redistribute + * this software and/or modify this software under the terms of the + * GNU General Public License as published by the Free Software + * Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * Cleanflight and Betaflight are distributed in the hope that they + * will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software. + * + * If not, see . + */ + +#pragma once + +#include "drivers/io_types.h" + +bool lis3mdlDetect(magDev_t* mag); diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c index 0f6719562..0137f10f0 100644 --- a/src/main/interface/settings.c +++ b/src/main/interface/settings.c @@ -126,7 +126,7 @@ const char * const lookupTableBaroHardware[] = { #if defined(USE_SENSOR_NAMES) || defined(USE_MAG) // sync with magSensor_e const char * const lookupTableMagHardware[] = { - "AUTO", "NONE", "HMC5883", "AK8975", "AK8963", "QMC5883" + "AUTO", "NONE", "HMC5883", "AK8975", "AK8963", "QMC5883", "LIS3MDL" }; #endif #if defined(USE_SENSOR_NAMES) || defined(USE_RANGEFINDER) diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c index 2aaa4ff8a..e52ae497f 100644 --- a/src/main/sensors/compass.c +++ b/src/main/sensors/compass.c @@ -38,6 +38,7 @@ #include "drivers/compass/compass_fake.h" #include "drivers/compass/compass_hmc5883l.h" #include "drivers/compass/compass_qmc5883l.h" +#include "drivers/compass/compass_lis3mdl.h" #include "drivers/io.h" #include "drivers/light_led.h" @@ -183,6 +184,22 @@ bool compassDetect(magDev_t *dev) #endif FALLTHROUGH; + case MAG_LIS3MDL: +#if defined(USE_MAG_LIS3MDL) + if (busdev->bustype == BUSTYPE_I2C) { + busdev->busdev_u.i2c.address = compassConfig()->mag_i2c_address; + } + + if (lis3mdlDetect(dev)) { +#ifdef MAG_LIS3MDL_ALIGN + dev->magAlign = MAG_LIS3MDL_ALIGN; +#endif + magHardware = MAG_LIS3MDL; + break; + } +#endif + FALLTHROUGH; + case MAG_QMC5883: #ifdef USE_MAG_QMC5883 if (busdev->bustype == BUSTYPE_I2C) { diff --git a/src/main/sensors/compass.h b/src/main/sensors/compass.h index 27946211d..cd8480dc1 100644 --- a/src/main/sensors/compass.h +++ b/src/main/sensors/compass.h @@ -34,7 +34,8 @@ typedef enum { MAG_HMC5883 = 2, MAG_AK8975 = 3, MAG_AK8963 = 4, - MAG_QMC5883 = 5 + MAG_QMC5883 = 5, + MAG_LIS3MDL = 6 } magSensor_e; typedef struct mag_s { diff --git a/src/main/target/AG3X/target.h b/src/main/target/AG3X/target.h index 7e19a0fc1..07d1c4aaa 100644 --- a/src/main/target/AG3X/target.h +++ b/src/main/target/AG3X/target.h @@ -67,6 +67,7 @@ #define USE_MAG #define USE_MAG_HMC5883 +#define USE_MAG_LIS3MDL #define USE_BARO #define USE_BARO_SPI_BMP280 diff --git a/src/main/target/AG3X/target.mk b/src/main/target/AG3X/target.mk index 7fd871549..21aa1e7db 100644 --- a/src/main/target/AG3X/target.mk +++ b/src/main/target/AG3X/target.mk @@ -17,4 +17,5 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h index 9acec9e9f..d7dc8ab2a 100644 --- a/src/main/target/ALIENFLIGHTF3/target.h +++ b/src/main/target/ALIENFLIGHTF3/target.h @@ -67,6 +67,7 @@ #define USE_MAG #define USE_MAG_AK8963 #define MAG_AK8963_ALIGN CW180_DEG_FLIP +#define USE_MAG_LIS3MDL #define USE_VCP #define USE_UART1 // Not connected - TX (PB6) RX PB7 (AF7) diff --git a/src/main/target/ALIENFLIGHTF3/target.mk b/src/main/target/ALIENFLIGHTF3/target.mk index 1b3c7c687..c180deeb9 100644 --- a/src/main/target/ALIENFLIGHTF3/target.mk +++ b/src/main/target/ALIENFLIGHTF3/target.mk @@ -6,4 +6,5 @@ TARGET_SRC = \ drivers/accgyro/accgyro_mpu6050.c \ drivers/accgyro/accgyro_mpu6500.c \ drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/compass/compass_lis3mdl.c \ drivers/compass/compass_ak8963.c diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h index 00c9d937d..4418fd3a4 100644 --- a/src/main/target/ALIENFLIGHTF4/target.h +++ b/src/main/target/ALIENFLIGHTF4/target.h @@ -59,6 +59,7 @@ #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 #define USE_MAG_AK8963 +#define USE_MAG_LIS3MDL #define MAG_AK8963_ALIGN CW180_DEG_FLIP diff --git a/src/main/target/ALIENFLIGHTF4/target.mk b/src/main/target/ALIENFLIGHTF4/target.mk index e733398ee..e7acd65ab 100644 --- a/src/main/target/ALIENFLIGHTF4/target.mk +++ b/src/main/target/ALIENFLIGHTF4/target.mk @@ -8,5 +8,6 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_ak8963.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h index 82b7349db..736ddd42a 100644 --- a/src/main/target/ALIENFLIGHTNGF7/target.h +++ b/src/main/target/ALIENFLIGHTNGF7/target.h @@ -59,6 +59,7 @@ #define USE_MAG_QMC5883 #define USE_MAG_AK8963 #define USE_MAG_SPI_AK8963 +#define USE_MAG_LIS3MDL #define HMC5883_CS_PIN PC15 #define HMC5883_SPI_INSTANCE SPI3 diff --git a/src/main/target/ALIENFLIGHTNGF7/target.mk b/src/main/target/ALIENFLIGHTNGF7/target.mk index 2d9d8709b..2b63a2259 100644 --- a/src/main/target/ALIENFLIGHTNGF7/target.mk +++ b/src/main/target/ALIENFLIGHTNGF7/target.mk @@ -9,4 +9,5 @@ TARGET_SRC = \ drivers/compass/compass_ak8963.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h index e30b08559..6087eb4f4 100644 --- a/src/main/target/ALIENWHOOP/target.h +++ b/src/main/target/ALIENWHOOP/target.h @@ -131,6 +131,7 @@ // MAG #define USE_MAG #define USE_MAG_AK8963 +#define USE_MAG_LIS3MDL #define MAG_AK8963_ALIGN CW0_DEG #define USE_MAG_DATA_READY_SIGNAL #define ENSURE_MAG_DATA_READY_IS_HIGH diff --git a/src/main/target/ALIENWHOOP/target.mk b/src/main/target/ALIENWHOOP/target.mk index 4d7235793..f23a6d92b 100644 --- a/src/main/target/ALIENWHOOP/target.mk +++ b/src/main/target/ALIENWHOOP/target.mk @@ -22,6 +22,7 @@ TARGET_SRC = \ drivers/accgyro/accgyro_spi_mpu6500.c \ drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_ak8963.c \ + drivers/compass/compass_lis3mdl.c \ drivers/flash_m25p16.c \ drivers/max7456.c \ io/osd.c diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h index 0d2be3064..89e4acec8 100644 --- a/src/main/target/BETAFLIGHTF4/target.h +++ b/src/main/target/BETAFLIGHTF4/target.h @@ -58,6 +58,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 diff --git a/src/main/target/BETAFLIGHTF4/target.mk b/src/main/target/BETAFLIGHTF4/target.mk index ca3302160..c44fb08ac 100644 --- a/src/main/target/BETAFLIGHTF4/target.mk +++ b/src/main/target/BETAFLIGHTF4/target.mk @@ -9,4 +9,5 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h index 68302a82d..dc84eacce 100644 --- a/src/main/target/BLUEJAYF4/target.h +++ b/src/main/target/BLUEJAYF4/target.h @@ -67,6 +67,7 @@ #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 //#define USE_MAG_AK8963 +#define USE_MAG_LIS3MDL #define HMC5883_I2C_INSTANCE I2CDEV_1 #define USE_BARO diff --git a/src/main/target/BLUEJAYF4/target.mk b/src/main/target/BLUEJAYF4/target.mk index 6b7d592ae..9607e3fcf 100644 --- a/src/main/target/BLUEJAYF4/target.mk +++ b/src/main/target/BLUEJAYF4/target.mk @@ -6,5 +6,5 @@ TARGET_SRC = \ drivers/accgyro/accgyro_mpu6500.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c - + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h index 8ba04ea5e..dd5f75cb8 100644 --- a/src/main/target/CHEBUZZF3/target.h +++ b/src/main/target/CHEBUZZF3/target.h @@ -88,6 +88,7 @@ #define USE_MAG #define USE_MAG_AK8975 +#define USE_MAG_LIS3MDL #define MAG_AK8975_ALIGN CW90_DEG_FLIP #define USE_VCP diff --git a/src/main/target/CHEBUZZF3/target.mk b/src/main/target/CHEBUZZF3/target.mk index 2ece8cd60..643c48aff 100644 --- a/src/main/target/CHEBUZZF3/target.mk +++ b/src/main/target/CHEBUZZF3/target.mk @@ -3,6 +3,7 @@ FEATURES = VCP SDCARD TARGET_SRC = \ drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_mpu3050.c \ drivers/accgyro/accgyro_mpu6050.c \ diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h index e9b8e266e..39a114e76 100644 --- a/src/main/target/COLIBRI/target.h +++ b/src/main/target/COLIBRI/target.h @@ -57,6 +57,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW270_DEG_FLIP #define MAG_INT_EXTI PC1 diff --git a/src/main/target/COLIBRI/target.mk b/src/main/target/COLIBRI/target.mk index 6594f8395..e79ae4f2b 100644 --- a/src/main/target/COLIBRI/target.mk +++ b/src/main/target/COLIBRI/target.mk @@ -6,4 +6,5 @@ TARGET_SRC = \ drivers/accgyro/accgyro_spi_mpu6000.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h index e2a5d7315..6e64fc4ba 100644 --- a/src/main/target/COLIBRI_RACE/target.h +++ b/src/main/target/COLIBRI_RACE/target.h @@ -74,6 +74,7 @@ #define USE_MAG_QMC5883 #define USE_MAG_AK8963 #define USE_MAG_AK8975 +#define USE_MAG_LIS3MDL #define USE_VCP #define USE_UART1 diff --git a/src/main/target/COLIBRI_RACE/target.mk b/src/main/target/COLIBRI_RACE/target.mk index d9346ed6a..b75590712 100644 --- a/src/main/target/COLIBRI_RACE/target.mk +++ b/src/main/target/COLIBRI_RACE/target.mk @@ -13,5 +13,6 @@ TARGET_SRC = \ drivers/compass/compass_ak8963.c \ drivers/compass/compass_ak8975.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/CRAZYFLIE2/target.h b/src/main/target/CRAZYFLIE2/target.h index 9672759c4..a3978f0fe 100644 --- a/src/main/target/CRAZYFLIE2/target.h +++ b/src/main/target/CRAZYFLIE2/target.h @@ -100,6 +100,7 @@ #define USE_MAG #define USE_MPU9250_MAG // Enables bypass configuration on the MPU9250 I2C bus #define USE_MAG_AK8963 +#define USE_MAG_LIS3MDL #define MAG_AK8963_ALIGN CW270_DEG #define USE_EXTI diff --git a/src/main/target/CRAZYFLIE2/target.mk b/src/main/target/CRAZYFLIE2/target.mk index a2e36c356..f7795de0c 100644 --- a/src/main/target/CRAZYFLIE2/target.mk +++ b/src/main/target/CRAZYFLIE2/target.mk @@ -5,3 +5,4 @@ TARGET_SRC = \ drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_mpu6500.c \ drivers/compass/compass_ak8963.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/DALRCF405/target.h b/src/main/target/DALRCF405/target.h index 7d9eda6d6..32ab990a4 100644 --- a/src/main/target/DALRCF405/target.h +++ b/src/main/target/DALRCF405/target.h @@ -76,6 +76,7 @@ #define USE_MAG_AK8975 #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL //ON BOARD FLASH ----------------------------------- #define USE_SPI_DEVICE_2 diff --git a/src/main/target/DALRCF405/target.mk b/src/main/target/DALRCF405/target.mk index 0018c55e8..34b772ffc 100644 --- a/src/main/target/DALRCF405/target.mk +++ b/src/main/target/DALRCF405/target.mk @@ -9,4 +9,5 @@ TARGET_SRC = \ drivers/compass/compass_ak8975.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/DALRCF722DUAL/target.h b/src/main/target/DALRCF722DUAL/target.h index da74cc38f..9586a206a 100644 --- a/src/main/target/DALRCF722DUAL/target.h +++ b/src/main/target/DALRCF722DUAL/target.h @@ -70,6 +70,7 @@ #define USE_MAG #define USE_MAG_HMC5883 +#define USE_MAG_LIS3MDL #define USE_VCP #define USE_UART1 diff --git a/src/main/target/DALRCF722DUAL/target.mk b/src/main/target/DALRCF722DUAL/target.mk index 8ce766dc8..6603b9ea3 100644 --- a/src/main/target/DALRCF722DUAL/target.mk +++ b/src/main/target/DALRCF722DUAL/target.mk @@ -8,6 +8,7 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/ELLE0/target.h b/src/main/target/ELLE0/target.h index d1066a868..2ceb5b021 100644 --- a/src/main/target/ELLE0/target.h +++ b/src/main/target/ELLE0/target.h @@ -54,6 +54,7 @@ #define USE_MAG #define USE_MAG_AK8963 +#define USE_MAG_LIS3MDL #define MAG_AK8963_ALIGN CW0_DEG_FLIP #define USE_VCP diff --git a/src/main/target/ELLE0/target.mk b/src/main/target/ELLE0/target.mk index 89263526d..86fcb4337 100644 --- a/src/main/target/ELLE0/target.mk +++ b/src/main/target/ELLE0/target.mk @@ -6,4 +6,5 @@ TARGET_SRC = \ drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_mpu6500.c \ drivers/accgyro/accgyro_spi_mpu6500.c \ - drivers/compass/compass_ak8963.c + drivers/compass/compass_ak8963.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h index dac1fee44..1ea9f2567 100644 --- a/src/main/target/F4BY/target.h +++ b/src/main/target/F4BY/target.h @@ -54,6 +54,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW90_DEG #define USE_BARO diff --git a/src/main/target/F4BY/target.mk b/src/main/target/F4BY/target.mk index e5c4a67fa..5fa6a0670 100644 --- a/src/main/target/F4BY/target.mk +++ b/src/main/target/F4BY/target.mk @@ -5,4 +5,5 @@ TARGET_SRC = \ drivers/accgyro/accgyro_spi_mpu6000.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h index 5ba410f52..3bdc3c9b2 100644 --- a/src/main/target/KAKUTEF4/target.h +++ b/src/main/target/KAKUTEF4/target.h @@ -101,6 +101,7 @@ #define USE_MAG #define USE_MAG_HMC5883 //External, connect to I2C1 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW180_DEG #define USE_BARO diff --git a/src/main/target/KAKUTEF4/target.mk b/src/main/target/KAKUTEF4/target.mk index 017defb8d..407f901ab 100644 --- a/src/main/target/KAKUTEF4/target.mk +++ b/src/main/target/KAKUTEF4/target.mk @@ -8,6 +8,7 @@ TARGET_SRC = \ drivers/compass/compass_ak8963.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c ifeq ($(TARGET), FLYWOOF405) diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h index b6f240ed1..92afef84f 100644 --- a/src/main/target/KAKUTEF7/target.h +++ b/src/main/target/KAKUTEF7/target.h @@ -149,6 +149,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_I2C_INSTANCE I2C_DEVICE #define SENSORS_SET (SENSOR_ACC | SENSOR_BARO) diff --git a/src/main/target/KAKUTEF7/target.mk b/src/main/target/KAKUTEF7/target.mk index 6c63c1453..1bf2b5a0e 100644 --- a/src/main/target/KAKUTEF7/target.mk +++ b/src/main/target/KAKUTEF7/target.mk @@ -12,6 +12,7 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/light_ws2811strip.c \ drivers/light_ws2811strip_hal.c \ drivers/max7456.c diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h index 8c060753b..dd7bcfca8 100644 --- a/src/main/target/KROOZX/target.h +++ b/src/main/target/KROOZX/target.h @@ -59,6 +59,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW180_DEG #define MAG_I2C_INSTANCE I2CDEV_1 diff --git a/src/main/target/KROOZX/target.mk b/src/main/target/KROOZX/target.mk index 0c294619c..de74e7f31 100644 --- a/src/main/target/KROOZX/target.mk +++ b/src/main/target/KROOZX/target.mk @@ -7,4 +7,5 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h index 8e8a539d8..7473da108 100644 --- a/src/main/target/MATEKF405/target.h +++ b/src/main/target/MATEKF405/target.h @@ -66,6 +66,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL // *************** Baro ************************** #define USE_I2C diff --git a/src/main/target/MATEKF405/target.mk b/src/main/target/MATEKF405/target.mk index aeedf2ad3..2504bf72d 100644 --- a/src/main/target/MATEKF405/target.mk +++ b/src/main/target/MATEKF405/target.mk @@ -10,4 +10,5 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/MATEKF722/target.h b/src/main/target/MATEKF722/target.h index fd7fb112c..bb3379a55 100644 --- a/src/main/target/MATEKF722/target.h +++ b/src/main/target/MATEKF722/target.h @@ -82,6 +82,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL // *************** SD Card ************************** #define USE_SDCARD diff --git a/src/main/target/MATEKF722/target.mk b/src/main/target/MATEKF722/target.mk index 7934b618a..32f47a0c4 100644 --- a/src/main/target/MATEKF722/target.mk +++ b/src/main/target/MATEKF722/target.mk @@ -10,4 +10,5 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h index 70f233f8b..389872cc1 100644 --- a/src/main/target/MICROSCISKY/target.h +++ b/src/main/target/MICROSCISKY/target.h @@ -65,6 +65,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW180_DEG #define USE_UART1 diff --git a/src/main/target/MICROSCISKY/target.mk b/src/main/target/MICROSCISKY/target.mk index d13b57b32..92afe2906 100644 --- a/src/main/target/MICROSCISKY/target.mk +++ b/src/main/target/MICROSCISKY/target.mk @@ -7,4 +7,5 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h index 4ef533a89..7d86ab30f 100644 --- a/src/main/target/MULTIFLITEPICO/target.h +++ b/src/main/target/MULTIFLITEPICO/target.h @@ -53,6 +53,7 @@ #define USE_MAG_AK8975 #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW270_DEG #define USE_MAG_DATA_READY_SIGNAL diff --git a/src/main/target/MULTIFLITEPICO/target.mk b/src/main/target/MULTIFLITEPICO/target.mk index f642917f9..c66ba8738 100644 --- a/src/main/target/MULTIFLITEPICO/target.mk +++ b/src/main/target/MULTIFLITEPICO/target.mk @@ -9,4 +9,5 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_ak8975.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/NUCLEOF7/target.h b/src/main/target/NUCLEOF7/target.h index 80ec6ed14..14797f58b 100644 --- a/src/main/target/NUCLEOF7/target.h +++ b/src/main/target/NUCLEOF7/target.h @@ -56,6 +56,7 @@ #define USE_FAKE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW270_DEG_FLIP #define USE_BARO diff --git a/src/main/target/NUCLEOF7/target.mk b/src/main/target/NUCLEOF7/target.mk index 3408bae1b..f0ab8b3cb 100644 --- a/src/main/target/NUCLEOF7/target.mk +++ b/src/main/target/NUCLEOF7/target.mk @@ -8,4 +8,5 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_fake.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/NUCLEOF722/target.h b/src/main/target/NUCLEOF722/target.h index b930c66df..7692c58d5 100644 --- a/src/main/target/NUCLEOF722/target.h +++ b/src/main/target/NUCLEOF722/target.h @@ -56,6 +56,7 @@ #define USE_FAKE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW270_DEG_FLIP #define USE_BARO diff --git a/src/main/target/NUCLEOF722/target.mk b/src/main/target/NUCLEOF722/target.mk index 164a5199f..6b9563c66 100644 --- a/src/main/target/NUCLEOF722/target.mk +++ b/src/main/target/NUCLEOF722/target.mk @@ -9,5 +9,6 @@ TARGET_SRC = \ drivers/compass/compass_fake.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/light_ws2811strip.c \ drivers/light_ws2811strip_hal.c diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index 0990eab45..ae0b91b78 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -118,6 +118,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW90_DEG #define USE_BARO diff --git a/src/main/target/OMNIBUSF4/target.mk b/src/main/target/OMNIBUSF4/target.mk index 89f1781ca..b14e5964f 100644 --- a/src/main/target/OMNIBUSF4/target.mk +++ b/src/main/target/OMNIBUSF4/target.mk @@ -9,5 +9,6 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/OMNIBUSF4FW/target.h b/src/main/target/OMNIBUSF4FW/target.h index fa0067648..fefc5639f 100644 --- a/src/main/target/OMNIBUSF4FW/target.h +++ b/src/main/target/OMNIBUSF4FW/target.h @@ -75,6 +75,7 @@ #define USE_MAG #define USE_MAG_HMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW90_DEG #define USE_BARO diff --git a/src/main/target/OMNIBUSF4FW/target.mk b/src/main/target/OMNIBUSF4FW/target.mk index 21caf6eb1..111fbddee 100644 --- a/src/main/target/OMNIBUSF4FW/target.mk +++ b/src/main/target/OMNIBUSF4FW/target.mk @@ -9,4 +9,5 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h index 18a047165..293072924 100644 --- a/src/main/target/OMNIBUSF7/target.h +++ b/src/main/target/OMNIBUSF7/target.h @@ -216,6 +216,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define SENSORS_SET (SENSOR_ACC | SENSOR_BARO) //ADC--------------------------------------- diff --git a/src/main/target/OMNIBUSF7/target.mk b/src/main/target/OMNIBUSF7/target.mk index dc42481aa..0fdbdcdfe 100644 --- a/src/main/target/OMNIBUSF7/target.mk +++ b/src/main/target/OMNIBUSF7/target.mk @@ -14,6 +14,7 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/light_ws2811strip.c \ drivers/light_ws2811strip_hal.c \ drivers/max7456.c diff --git a/src/main/target/OMNINXT/target.h b/src/main/target/OMNINXT/target.h index eda6e7cda..55d3f016b 100644 --- a/src/main/target/OMNINXT/target.h +++ b/src/main/target/OMNINXT/target.h @@ -78,6 +78,7 @@ #define USE_MAG #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_MAG_HMC5883 +#define USE_MAG_LIS3MDL #define USE_BARO #define USE_BARO_SPI_LPS diff --git a/src/main/target/OMNINXT/target.mk b/src/main/target/OMNINXT/target.mk index 4ef4d4e9e..eb0448f4a 100644 --- a/src/main/target/OMNINXT/target.mk +++ b/src/main/target/OMNINXT/target.mk @@ -23,4 +23,5 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/RCEXPLORERF3/target.h b/src/main/target/RCEXPLORERF3/target.h index f120de20a..c06728a86 100644 --- a/src/main/target/RCEXPLORERF3/target.h +++ b/src/main/target/RCEXPLORERF3/target.h @@ -67,6 +67,7 @@ #define USE_MAG #define USE_MAG_AK8975 #define USE_MAG_HMC5883 // External +#define USE_MAG_LIS3MDL #define MAG_AK8975_ALIGN CW180_DEG diff --git a/src/main/target/RCEXPLORERF3/target.mk b/src/main/target/RCEXPLORERF3/target.mk index 254db6c70..299a1ec20 100644 --- a/src/main/target/RCEXPLORERF3/target.mk +++ b/src/main/target/RCEXPLORERF3/target.mk @@ -7,6 +7,7 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_ak8975.c \ + drivers/compass/compass_lis3mdl.c \ drivers/display_ug2864hsweg01.c \ drivers/serial_usb_vcp.c \ drivers/flash_m25p16.c diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index 5468e6cdf..a3ac828e3 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -142,6 +142,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW90_DEG #define USE_BARO diff --git a/src/main/target/REVO/target.mk b/src/main/target/REVO/target.mk index b45407a44..16886a15d 100644 --- a/src/main/target/REVO/target.mk +++ b/src/main/target/REVO/target.mk @@ -13,4 +13,5 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp085.c \ drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/SKYZONEF405/target.h b/src/main/target/SKYZONEF405/target.h index 7524daae9..f543cecbb 100644 --- a/src/main/target/SKYZONEF405/target.h +++ b/src/main/target/SKYZONEF405/target.h @@ -71,6 +71,7 @@ #define USE_MAG #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_MAG_HMC5883 +#define USE_MAG_LIS3MDL #define USE_SPI_DEVICE_2 #define SPI2_SCK_PIN PB13 diff --git a/src/main/target/SKYZONEF405/target.mk b/src/main/target/SKYZONEF405/target.mk index d64e7df8b..9f1c1b1e7 100644 --- a/src/main/target/SKYZONEF405/target.mk +++ b/src/main/target/SKYZONEF405/target.mk @@ -8,4 +8,5 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h index 8c978bef3..925fd10ab 100644 --- a/src/main/target/SPARKY2/target.h +++ b/src/main/target/SPARKY2/target.h @@ -58,6 +58,7 @@ #define USE_MAG //#define USE_MAG_HMC5883 #define USE_MAG_AK8963 +#define USE_MAG_LIS3MDL //#define MAG_HMC5883_ALIGN CW180_DEG #define MAG_AK8963_ALIGN CW270_DEG diff --git a/src/main/target/SPARKY2/target.mk b/src/main/target/SPARKY2/target.mk index a07c15d24..70c043e94 100644 --- a/src/main/target/SPARKY2/target.mk +++ b/src/main/target/SPARKY2/target.mk @@ -6,4 +6,5 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_ak8963.c \ - drivers/compass/compass_hmc5883l.c + drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/SPEEDYBEEF4/target.h b/src/main/target/SPEEDYBEEF4/target.h index abf0ff9e9..258f01dce 100644 --- a/src/main/target/SPEEDYBEEF4/target.h +++ b/src/main/target/SPEEDYBEEF4/target.h @@ -57,6 +57,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL // *************** Baro ************************** #define USE_I2C diff --git a/src/main/target/SPEEDYBEEF4/target.mk b/src/main/target/SPEEDYBEEF4/target.mk index 90a40d059..03531ccc6 100644 --- a/src/main/target/SPEEDYBEEF4/target.mk +++ b/src/main/target/SPEEDYBEEF4/target.mk @@ -8,4 +8,5 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h index bacd56ec9..6e5c891ba 100644 --- a/src/main/target/SPRACINGF3/target.h +++ b/src/main/target/SPRACINGF3/target.h @@ -154,6 +154,7 @@ #define USE_MAG_AK8975 #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW270_DEG #define USE_MAG_DATA_READY_SIGNAL diff --git a/src/main/target/SPRACINGF3/target.mk b/src/main/target/SPRACINGF3/target.mk index 0d96cb170..f2544417c 100644 --- a/src/main/target/SPRACINGF3/target.mk +++ b/src/main/target/SPRACINGF3/target.mk @@ -8,7 +8,8 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_ak8975.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c + drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c ifeq ($(TARGET), FLIP32F3OSD) TARGET_SRC += \ diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h index 3ec54721e..1d70a1d9f 100644 --- a/src/main/target/SPRACINGF4EVO/target.h +++ b/src/main/target/SPRACINGF4EVO/target.h @@ -80,6 +80,7 @@ #define USE_MAG_AK8975 #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define USE_VCP #define USE_UART1 diff --git a/src/main/target/SPRACINGF4EVO/target.mk b/src/main/target/SPRACINGF4EVO/target.mk index 86d4303c7..a41a03e1a 100644 --- a/src/main/target/SPRACINGF4EVO/target.mk +++ b/src/main/target/SPRACINGF4EVO/target.mk @@ -9,6 +9,7 @@ TARGET_SRC = \ drivers/compass/compass_ak8975.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c \ drivers/vtx_rtc6705.c diff --git a/src/main/target/SPRACINGF7DUAL/target.h b/src/main/target/SPRACINGF7DUAL/target.h index 4919d32bb..53fe2e3c9 100644 --- a/src/main/target/SPRACINGF7DUAL/target.h +++ b/src/main/target/SPRACINGF7DUAL/target.h @@ -86,6 +86,7 @@ #define USE_MAG #define USE_MAG_HMC5883 +#define USE_MAG_LIS3MDL #define USE_VCP #define USE_UART1 diff --git a/src/main/target/SPRACINGF7DUAL/target.mk b/src/main/target/SPRACINGF7DUAL/target.mk index 27cd2b15a..581846b46 100644 --- a/src/main/target/SPRACINGF7DUAL/target.mk +++ b/src/main/target/SPRACINGF7DUAL/target.mk @@ -10,6 +10,7 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c \ drivers/vtx_rtc6705_soft_spi.c diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h index 28087c41a..c0a1b891a 100644 --- a/src/main/target/STM32F3DISCOVERY/target.h +++ b/src/main/target/STM32F3DISCOVERY/target.h @@ -178,6 +178,7 @@ #define USE_MAG_AK8975 #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define USE_VCP #define USE_UART1 diff --git a/src/main/target/STM32F3DISCOVERY/target.mk b/src/main/target/STM32F3DISCOVERY/target.mk index 8886e68e1..46ff3f44d 100644 --- a/src/main/target/STM32F3DISCOVERY/target.mk +++ b/src/main/target/STM32F3DISCOVERY/target.mk @@ -20,5 +20,6 @@ TARGET_SRC = \ drivers/compass/compass_fake.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/flash_m25p16.c \ drivers/max7456.c diff --git a/src/main/target/STM32F7X2/target.h b/src/main/target/STM32F7X2/target.h index 8ce87c348..00c683a44 100644 --- a/src/main/target/STM32F7X2/target.h +++ b/src/main/target/STM32F7X2/target.h @@ -60,6 +60,7 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 +#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW270_DEG_FLIP #define USE_BARO diff --git a/src/main/target/YUPIF7/target.h b/src/main/target/YUPIF7/target.h index b3bfb4fe7..edd954038 100644 --- a/src/main/target/YUPIF7/target.h +++ b/src/main/target/YUPIF7/target.h @@ -116,6 +116,7 @@ #define MAG_HMC5883_ALIGN CW270_DEG_FLIP #define USE_MAG_QMC5883 #define MAG_QMC5883_ALIGN CW270_DEG_FLIP +#define USE_MAG_LIS3MDL // *************** OSD ***************************** #define USE_MAX7456 diff --git a/src/main/target/YUPIF7/target.mk b/src/main/target/YUPIF7/target.mk index 8ae0bb21f..61808eabc 100644 --- a/src/main/target/YUPIF7/target.mk +++ b/src/main/target/YUPIF7/target.mk @@ -6,4 +6,5 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_lis3mdl.c \ drivers/max7456.c From e4e9dc650731356f3d0faaa067f73a2966412b59 Mon Sep 17 00:00:00 2001 From: Blaine Date: Wed, 19 Sep 2018 21:43:34 -0700 Subject: [PATCH 2/4] Remove LIS3MDL from < F4 targets --- src/main/target/ALIENFLIGHTF3/target.h | 1 - src/main/target/ALIENFLIGHTF3/target.mk | 1 - src/main/target/CHEBUZZF3/target.h | 1 - src/main/target/CHEBUZZF3/target.mk | 1 - src/main/target/COLIBRI/target.h | 1 - src/main/target/COLIBRI/target.mk | 1 - src/main/target/COLIBRI_RACE/target.h | 1 - src/main/target/COLIBRI_RACE/target.mk | 1 - src/main/target/CRAZYFLIE2/target.h | 1 - src/main/target/CRAZYFLIE2/target.mk | 1 - src/main/target/ELLE0/target.h | 1 - src/main/target/ELLE0/target.mk | 1 - src/main/target/KROOZX/target.h | 1 - src/main/target/KROOZX/target.mk | 1 - src/main/target/MULTIFLITEPICO/target.h | 1 - src/main/target/MULTIFLITEPICO/target.mk | 1 - src/main/target/RCEXPLORERF3/target.h | 1 - src/main/target/RCEXPLORERF3/target.mk | 1 - src/main/target/SPARKY2/target.h | 1 - src/main/target/SPARKY2/target.mk | 1 - src/main/target/SPRACINGF3/target.h | 1 - src/main/target/SPRACINGF3/target.mk | 1 - src/main/target/STM32F3DISCOVERY/target.h | 1 - src/main/target/STM32F3DISCOVERY/target.mk | 1 - 24 files changed, 24 deletions(-) diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h index d7dc8ab2a..9acec9e9f 100644 --- a/src/main/target/ALIENFLIGHTF3/target.h +++ b/src/main/target/ALIENFLIGHTF3/target.h @@ -67,7 +67,6 @@ #define USE_MAG #define USE_MAG_AK8963 #define MAG_AK8963_ALIGN CW180_DEG_FLIP -#define USE_MAG_LIS3MDL #define USE_VCP #define USE_UART1 // Not connected - TX (PB6) RX PB7 (AF7) diff --git a/src/main/target/ALIENFLIGHTF3/target.mk b/src/main/target/ALIENFLIGHTF3/target.mk index c180deeb9..1b3c7c687 100644 --- a/src/main/target/ALIENFLIGHTF3/target.mk +++ b/src/main/target/ALIENFLIGHTF3/target.mk @@ -6,5 +6,4 @@ TARGET_SRC = \ drivers/accgyro/accgyro_mpu6050.c \ drivers/accgyro/accgyro_mpu6500.c \ drivers/accgyro/accgyro_spi_mpu6500.c \ - drivers/compass/compass_lis3mdl.c \ drivers/compass/compass_ak8963.c diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h index dd5f75cb8..8ba04ea5e 100644 --- a/src/main/target/CHEBUZZF3/target.h +++ b/src/main/target/CHEBUZZF3/target.h @@ -88,7 +88,6 @@ #define USE_MAG #define USE_MAG_AK8975 -#define USE_MAG_LIS3MDL #define MAG_AK8975_ALIGN CW90_DEG_FLIP #define USE_VCP diff --git a/src/main/target/CHEBUZZF3/target.mk b/src/main/target/CHEBUZZF3/target.mk index 643c48aff..2ece8cd60 100644 --- a/src/main/target/CHEBUZZF3/target.mk +++ b/src/main/target/CHEBUZZF3/target.mk @@ -3,7 +3,6 @@ FEATURES = VCP SDCARD TARGET_SRC = \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_lis3mdl.c \ drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_mpu3050.c \ drivers/accgyro/accgyro_mpu6050.c \ diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h index 39a114e76..e9b8e266e 100644 --- a/src/main/target/COLIBRI/target.h +++ b/src/main/target/COLIBRI/target.h @@ -57,7 +57,6 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 -#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW270_DEG_FLIP #define MAG_INT_EXTI PC1 diff --git a/src/main/target/COLIBRI/target.mk b/src/main/target/COLIBRI/target.mk index e79ae4f2b..cc139bf25 100644 --- a/src/main/target/COLIBRI/target.mk +++ b/src/main/target/COLIBRI/target.mk @@ -7,4 +7,3 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ - drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h index 6e64fc4ba..e2a5d7315 100644 --- a/src/main/target/COLIBRI_RACE/target.h +++ b/src/main/target/COLIBRI_RACE/target.h @@ -74,7 +74,6 @@ #define USE_MAG_QMC5883 #define USE_MAG_AK8963 #define USE_MAG_AK8975 -#define USE_MAG_LIS3MDL #define USE_VCP #define USE_UART1 diff --git a/src/main/target/COLIBRI_RACE/target.mk b/src/main/target/COLIBRI_RACE/target.mk index b75590712..9273e1af2 100644 --- a/src/main/target/COLIBRI_RACE/target.mk +++ b/src/main/target/COLIBRI_RACE/target.mk @@ -14,5 +14,4 @@ TARGET_SRC = \ drivers/compass/compass_ak8975.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ - drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/CRAZYFLIE2/target.h b/src/main/target/CRAZYFLIE2/target.h index a3978f0fe..9672759c4 100644 --- a/src/main/target/CRAZYFLIE2/target.h +++ b/src/main/target/CRAZYFLIE2/target.h @@ -100,7 +100,6 @@ #define USE_MAG #define USE_MPU9250_MAG // Enables bypass configuration on the MPU9250 I2C bus #define USE_MAG_AK8963 -#define USE_MAG_LIS3MDL #define MAG_AK8963_ALIGN CW270_DEG #define USE_EXTI diff --git a/src/main/target/CRAZYFLIE2/target.mk b/src/main/target/CRAZYFLIE2/target.mk index f7795de0c..a2e36c356 100644 --- a/src/main/target/CRAZYFLIE2/target.mk +++ b/src/main/target/CRAZYFLIE2/target.mk @@ -5,4 +5,3 @@ TARGET_SRC = \ drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_mpu6500.c \ drivers/compass/compass_ak8963.c \ - drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/ELLE0/target.h b/src/main/target/ELLE0/target.h index 2ceb5b021..d1066a868 100644 --- a/src/main/target/ELLE0/target.h +++ b/src/main/target/ELLE0/target.h @@ -54,7 +54,6 @@ #define USE_MAG #define USE_MAG_AK8963 -#define USE_MAG_LIS3MDL #define MAG_AK8963_ALIGN CW0_DEG_FLIP #define USE_VCP diff --git a/src/main/target/ELLE0/target.mk b/src/main/target/ELLE0/target.mk index 86fcb4337..492aa0ae1 100644 --- a/src/main/target/ELLE0/target.mk +++ b/src/main/target/ELLE0/target.mk @@ -7,4 +7,3 @@ TARGET_SRC = \ drivers/accgyro/accgyro_mpu6500.c \ drivers/accgyro/accgyro_spi_mpu6500.c \ drivers/compass/compass_ak8963.c \ - drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h index dd7bcfca8..8c060753b 100644 --- a/src/main/target/KROOZX/target.h +++ b/src/main/target/KROOZX/target.h @@ -59,7 +59,6 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 -#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW180_DEG #define MAG_I2C_INSTANCE I2CDEV_1 diff --git a/src/main/target/KROOZX/target.mk b/src/main/target/KROOZX/target.mk index de74e7f31..0c294619c 100644 --- a/src/main/target/KROOZX/target.mk +++ b/src/main/target/KROOZX/target.mk @@ -7,5 +7,4 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ - drivers/compass/compass_lis3mdl.c \ drivers/max7456.c diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h index 7d86ab30f..4ef533a89 100644 --- a/src/main/target/MULTIFLITEPICO/target.h +++ b/src/main/target/MULTIFLITEPICO/target.h @@ -53,7 +53,6 @@ #define USE_MAG_AK8975 #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 -#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW270_DEG #define USE_MAG_DATA_READY_SIGNAL diff --git a/src/main/target/MULTIFLITEPICO/target.mk b/src/main/target/MULTIFLITEPICO/target.mk index c66ba8738..fdc4db650 100644 --- a/src/main/target/MULTIFLITEPICO/target.mk +++ b/src/main/target/MULTIFLITEPICO/target.mk @@ -10,4 +10,3 @@ TARGET_SRC = \ drivers/compass/compass_ak8975.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ - drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/RCEXPLORERF3/target.h b/src/main/target/RCEXPLORERF3/target.h index c06728a86..f120de20a 100644 --- a/src/main/target/RCEXPLORERF3/target.h +++ b/src/main/target/RCEXPLORERF3/target.h @@ -67,7 +67,6 @@ #define USE_MAG #define USE_MAG_AK8975 #define USE_MAG_HMC5883 // External -#define USE_MAG_LIS3MDL #define MAG_AK8975_ALIGN CW180_DEG diff --git a/src/main/target/RCEXPLORERF3/target.mk b/src/main/target/RCEXPLORERF3/target.mk index 299a1ec20..254db6c70 100644 --- a/src/main/target/RCEXPLORERF3/target.mk +++ b/src/main/target/RCEXPLORERF3/target.mk @@ -7,7 +7,6 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_ak8975.c \ - drivers/compass/compass_lis3mdl.c \ drivers/display_ug2864hsweg01.c \ drivers/serial_usb_vcp.c \ drivers/flash_m25p16.c diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h index 925fd10ab..8c978bef3 100644 --- a/src/main/target/SPARKY2/target.h +++ b/src/main/target/SPARKY2/target.h @@ -58,7 +58,6 @@ #define USE_MAG //#define USE_MAG_HMC5883 #define USE_MAG_AK8963 -#define USE_MAG_LIS3MDL //#define MAG_HMC5883_ALIGN CW180_DEG #define MAG_AK8963_ALIGN CW270_DEG diff --git a/src/main/target/SPARKY2/target.mk b/src/main/target/SPARKY2/target.mk index 70c043e94..c543c7613 100644 --- a/src/main/target/SPARKY2/target.mk +++ b/src/main/target/SPARKY2/target.mk @@ -7,4 +7,3 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_ak8963.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h index 6e5c891ba..bacd56ec9 100644 --- a/src/main/target/SPRACINGF3/target.h +++ b/src/main/target/SPRACINGF3/target.h @@ -154,7 +154,6 @@ #define USE_MAG_AK8975 #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 -#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW270_DEG #define USE_MAG_DATA_READY_SIGNAL diff --git a/src/main/target/SPRACINGF3/target.mk b/src/main/target/SPRACINGF3/target.mk index f2544417c..ae896bf0b 100644 --- a/src/main/target/SPRACINGF3/target.mk +++ b/src/main/target/SPRACINGF3/target.mk @@ -9,7 +9,6 @@ TARGET_SRC = \ drivers/compass/compass_ak8975.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ - drivers/compass/compass_lis3mdl.c ifeq ($(TARGET), FLIP32F3OSD) TARGET_SRC += \ diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h index c0a1b891a..28087c41a 100644 --- a/src/main/target/STM32F3DISCOVERY/target.h +++ b/src/main/target/STM32F3DISCOVERY/target.h @@ -178,7 +178,6 @@ #define USE_MAG_AK8975 #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 -#define USE_MAG_LIS3MDL #define USE_VCP #define USE_UART1 diff --git a/src/main/target/STM32F3DISCOVERY/target.mk b/src/main/target/STM32F3DISCOVERY/target.mk index 46ff3f44d..8886e68e1 100644 --- a/src/main/target/STM32F3DISCOVERY/target.mk +++ b/src/main/target/STM32F3DISCOVERY/target.mk @@ -20,6 +20,5 @@ TARGET_SRC = \ drivers/compass/compass_fake.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ - drivers/compass/compass_lis3mdl.c \ drivers/flash_m25p16.c \ drivers/max7456.c From 5a237436e233d9e7926848bb7ecde4eb3bcf759a Mon Sep 17 00:00:00 2001 From: Blaine Date: Wed, 19 Sep 2018 21:48:37 -0700 Subject: [PATCH 3/4] Removed LIS3MDL from Microscisky and Revo targets --- src/main/target/MICROSCISKY/target.h | 1 - src/main/target/MICROSCISKY/target.mk | 1 - src/main/target/REVO/target.h | 1 - src/main/target/REVO/target.mk | 1 - 4 files changed, 4 deletions(-) diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h index 389872cc1..70f233f8b 100644 --- a/src/main/target/MICROSCISKY/target.h +++ b/src/main/target/MICROSCISKY/target.h @@ -65,7 +65,6 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 -#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW180_DEG #define USE_UART1 diff --git a/src/main/target/MICROSCISKY/target.mk b/src/main/target/MICROSCISKY/target.mk index 92afe2906..9776ed80e 100644 --- a/src/main/target/MICROSCISKY/target.mk +++ b/src/main/target/MICROSCISKY/target.mk @@ -8,4 +8,3 @@ TARGET_SRC = \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ - drivers/compass/compass_lis3mdl.c diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index a3ac828e3..5468e6cdf 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -142,7 +142,6 @@ #define USE_MAG #define USE_MAG_HMC5883 #define USE_MAG_QMC5883 -#define USE_MAG_LIS3MDL #define MAG_HMC5883_ALIGN CW90_DEG #define USE_BARO diff --git a/src/main/target/REVO/target.mk b/src/main/target/REVO/target.mk index 16886a15d..f7ff0b678 100644 --- a/src/main/target/REVO/target.mk +++ b/src/main/target/REVO/target.mk @@ -14,4 +14,3 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_qmc5883l.c \ - drivers/compass/compass_lis3mdl.c From 13463e63df7feb32e2c371761c7de86c771f1c3c Mon Sep 17 00:00:00 2001 From: Blaine Date: Wed, 19 Sep 2018 21:56:50 -0700 Subject: [PATCH 4/4] Cleanup --- src/main/target/COLIBRI/target.mk | 2 +- src/main/target/COLIBRI_RACE/target.mk | 2 +- src/main/target/ELLE0/target.mk | 2 +- src/main/target/MICROSCISKY/target.mk | 2 +- src/main/target/REVO/target.mk | 2 +- src/main/target/SPARKY2/target.mk | 2 +- src/main/target/SPRACINGF3/target.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/target/COLIBRI/target.mk b/src/main/target/COLIBRI/target.mk index cc139bf25..6594f8395 100644 --- a/src/main/target/COLIBRI/target.mk +++ b/src/main/target/COLIBRI/target.mk @@ -6,4 +6,4 @@ TARGET_SRC = \ drivers/accgyro/accgyro_spi_mpu6000.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_qmc5883l.c diff --git a/src/main/target/COLIBRI_RACE/target.mk b/src/main/target/COLIBRI_RACE/target.mk index 9273e1af2..d9346ed6a 100644 --- a/src/main/target/COLIBRI_RACE/target.mk +++ b/src/main/target/COLIBRI_RACE/target.mk @@ -13,5 +13,5 @@ TARGET_SRC = \ drivers/compass/compass_ak8963.c \ drivers/compass/compass_ak8975.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_qmc5883l.c diff --git a/src/main/target/ELLE0/target.mk b/src/main/target/ELLE0/target.mk index 492aa0ae1..89263526d 100644 --- a/src/main/target/ELLE0/target.mk +++ b/src/main/target/ELLE0/target.mk @@ -6,4 +6,4 @@ TARGET_SRC = \ drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_mpu6500.c \ drivers/accgyro/accgyro_spi_mpu6500.c \ - drivers/compass/compass_ak8963.c \ + drivers/compass/compass_ak8963.c diff --git a/src/main/target/MICROSCISKY/target.mk b/src/main/target/MICROSCISKY/target.mk index 9776ed80e..d13b57b32 100644 --- a/src/main/target/MICROSCISKY/target.mk +++ b/src/main/target/MICROSCISKY/target.mk @@ -7,4 +7,4 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_qmc5883l.c diff --git a/src/main/target/REVO/target.mk b/src/main/target/REVO/target.mk index f7ff0b678..b45407a44 100644 --- a/src/main/target/REVO/target.mk +++ b/src/main/target/REVO/target.mk @@ -13,4 +13,4 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp085.c \ drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_qmc5883l.c diff --git a/src/main/target/SPARKY2/target.mk b/src/main/target/SPARKY2/target.mk index c543c7613..a07c15d24 100644 --- a/src/main/target/SPARKY2/target.mk +++ b/src/main/target/SPARKY2/target.mk @@ -6,4 +6,4 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_ms5611.c \ drivers/compass/compass_ak8963.c \ - drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/SPRACINGF3/target.mk b/src/main/target/SPRACINGF3/target.mk index ae896bf0b..0d96cb170 100644 --- a/src/main/target/SPRACINGF3/target.mk +++ b/src/main/target/SPRACINGF3/target.mk @@ -8,7 +8,7 @@ TARGET_SRC = \ drivers/barometer/barometer_bmp280.c \ drivers/compass/compass_ak8975.c \ drivers/compass/compass_hmc5883l.c \ - drivers/compass/compass_qmc5883l.c \ + drivers/compass/compass_qmc5883l.c ifeq ($(TARGET), FLIP32F3OSD) TARGET_SRC += \