From df29310c3a62a7cbeeaf81b2892e3b4874153f30 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 24 Jun 2024 12:54:27 +0200 Subject: [PATCH 1/3] USE_MAG_ALL --- src/main/target/ATOMRCF405V2/target.h | 7 +------ src/main/target/FLYWOOF405S_AIO/target.h | 8 +------- src/main/target/GEPRCF745_BT_HD/target.h | 7 +------ src/main/target/JHEMCUF405/target.h | 8 +------- src/main/target/JHEMCUF722/target.h | 7 +------ src/main/target/SDMODELH7V1/target.h | 8 +------- src/main/target/TAKERF722SE/target.h | 5 +---- src/main/target/ZEEZF7/target.h | 4 ---- 8 files changed, 7 insertions(+), 47 deletions(-) diff --git a/src/main/target/ATOMRCF405V2/target.h b/src/main/target/ATOMRCF405V2/target.h index b8315653899..232ac47d953 100644 --- a/src/main/target/ATOMRCF405V2/target.h +++ b/src/main/target/ATOMRCF405V2/target.h @@ -81,12 +81,7 @@ */ #define USE_MAG #define MAG_I2C_BUS DEFAULT_I2C_BUS - -#define USE_MAG_HMC5883 -#define USE_MAG_QMC5883 -#define USE_MAG_IST8310 -#define USE_MAG_MAG3110 -#define USE_MAG_LIS3MDL +#defiine USE_MAG_ALL /* * Barometer diff --git a/src/main/target/FLYWOOF405S_AIO/target.h b/src/main/target/FLYWOOF405S_AIO/target.h index c25dedfeb9b..4250943633e 100644 --- a/src/main/target/FLYWOOF405S_AIO/target.h +++ b/src/main/target/FLYWOOF405S_AIO/target.h @@ -68,13 +68,7 @@ #define USE_MAG #define MAG_I2C_BUS BUS_I2C1 -#define USE_MAG_AK8963 -#define USE_MAG_AK8975 -#define USE_MAG_HMC5883 -#define USE_MAG_QMC5883 -#define USE_MAG_IST8310 -#define USE_MAG_MAG3110 -#define USE_MAG_LIS3MDL +#define USE_MAG_ALL #define USE_RANGEFINDER #define USE_RANGEFINDER_HCSR04_I2C diff --git a/src/main/target/GEPRCF745_BT_HD/target.h b/src/main/target/GEPRCF745_BT_HD/target.h index 3d61f663dd8..c6c84a32ad3 100644 --- a/src/main/target/GEPRCF745_BT_HD/target.h +++ b/src/main/target/GEPRCF745_BT_HD/target.h @@ -89,12 +89,7 @@ #define USE_MAG #define MAG_I2C_BUS BUS_I2C1 -#define USE_MAG_HMC5883 -#define USE_MAG_QMC5883 -#define USE_MAG_IST8310 -#define USE_MAG_IST8308 -#define USE_MAG_MAG3110 -#define USE_MAG_LIS3MDL +#define USE_MAG_ALL #define TEMPERATURE_I2C_BUS BUS_I2C1 diff --git a/src/main/target/JHEMCUF405/target.h b/src/main/target/JHEMCUF405/target.h index 6a5b2f52ab4..3cd6fd1e3ea 100644 --- a/src/main/target/JHEMCUF405/target.h +++ b/src/main/target/JHEMCUF405/target.h @@ -68,13 +68,7 @@ #define USE_MAG #define MAG_I2C_BUS BUS_I2C1 -#define USE_MAG_AK8963 -#define USE_MAG_AK8975 -#define USE_MAG_HMC5883 -#define USE_MAG_QMC5883 -#define USE_MAG_IST8310 -#define USE_MAG_MAG3110 -#define USE_MAG_LIS3MDL +#define USE_MAG_ALL #define USE_RANGEFINDER #define USE_RANGEFINDER_HCSR04_I2C diff --git a/src/main/target/JHEMCUF722/target.h b/src/main/target/JHEMCUF722/target.h index 9d34e5c8201..2777df365e3 100644 --- a/src/main/target/JHEMCUF722/target.h +++ b/src/main/target/JHEMCUF722/target.h @@ -107,12 +107,7 @@ // Mag #define USE_MAG #define MAG_I2C_BUS BUS_I2C1 -#define USE_MAG_HMC5883 -#define USE_MAG_QMC5883 -#define USE_MAG_IST8310 -#define USE_MAG_IST8308 -#define USE_MAG_MAG3110 -#define USE_MAG_LIS3MDL +#define USE_MAG_ALL // Onboard Flash #define USE_SPI_DEVICE_3 diff --git a/src/main/target/SDMODELH7V1/target.h b/src/main/target/SDMODELH7V1/target.h index cc4d39cf6c8..1d3f90b8f9d 100644 --- a/src/main/target/SDMODELH7V1/target.h +++ b/src/main/target/SDMODELH7V1/target.h @@ -93,13 +93,7 @@ #define USE_MAG #define MAG_I2C_BUS BUS_I2C1 -#define USE_MAG_HMC5883 -#define USE_MAG_QMC5883 -#define USE_MAG_IST8310 -#define USE_MAG_IST8308 -#define USE_MAG_MAG3110 -#define USE_MAG_LIS3MDL -#define USE_MAG_VCM5883 +#define USE_MAG_ALL #define TEMPERATURE_I2C_BUS BUS_I2C1 #define PITOT_I2C_BUS BUS_I2C1 diff --git a/src/main/target/TAKERF722SE/target.h b/src/main/target/TAKERF722SE/target.h index 817dc535f03..599d5610ad4 100644 --- a/src/main/target/TAKERF722SE/target.h +++ b/src/main/target/TAKERF722SE/target.h @@ -121,11 +121,8 @@ #define USE_BARO_MS5611 #define USE_MAG +#define USE_MAG_ALL #define MAG_I2C_BUS BUS_I2C1 -#define USE_MAG_HMC5883 -#define USE_MAG_QMC5883 -#define USE_MAG_IST8310 -#define USE_MAG_IST8308 #define TEMPERATURE_I2C_BUS BUS_I2C1 diff --git a/src/main/target/ZEEZF7/target.h b/src/main/target/ZEEZF7/target.h index 28395b274fb..563a5814891 100755 --- a/src/main/target/ZEEZF7/target.h +++ b/src/main/target/ZEEZF7/target.h @@ -107,10 +107,6 @@ #define USE_BARO #define USE_BARO_DPS310 -#define USE_MAG -#define USE_MAG_QMC5883 -#endif - #if defined ZEEZF7V2 || defined ZEEZF7V3 #define USE_I2C #define USE_BARO From b07caf31906cb3cf6b8d9611d69ca5107c01cfac Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 24 Jun 2024 12:57:44 +0200 Subject: [PATCH 2/3] fix typo --- src/main/target/ATOMRCF405V2/target.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/target/ATOMRCF405V2/target.h b/src/main/target/ATOMRCF405V2/target.h index 232ac47d953..32c064f4f21 100644 --- a/src/main/target/ATOMRCF405V2/target.h +++ b/src/main/target/ATOMRCF405V2/target.h @@ -81,7 +81,7 @@ */ #define USE_MAG #define MAG_I2C_BUS DEFAULT_I2C_BUS -#defiine USE_MAG_ALL +#define USE_MAG_ALL /* * Barometer From ea658710f8b07956057d9a86474cb17e6afd8007 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 24 Jun 2024 13:01:00 +0200 Subject: [PATCH 3/3] Another fix --- src/main/target/ZEEZF7/target.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/target/ZEEZF7/target.h b/src/main/target/ZEEZF7/target.h index 563a5814891..2ab83104d3a 100755 --- a/src/main/target/ZEEZF7/target.h +++ b/src/main/target/ZEEZF7/target.h @@ -107,6 +107,11 @@ #define USE_BARO #define USE_BARO_DPS310 +#define USE_MAG +#define USE_MAG_ALL + +#endif + #if defined ZEEZF7V2 || defined ZEEZF7V3 #define USE_I2C #define USE_BARO