From 77e2a1e29e8a611657b65eb65d547bf9a1c18893 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 31 May 2019 02:06:12 +0000 Subject: [PATCH] Clean up use of MAX7456_SPI_CLK and MAX7456_RESTORE_CLK These are set in many targets, but they are exactly the same as set in #6871 Notable exceptions: NOX, IMPUSERCF3 are set to clock data into the MAX7456 at 5MHz --- src/main/drivers/max7456.c | 9 --------- src/main/target/AG3X/target.h | 2 -- src/main/target/AIKONF4/target.h | 2 -- src/main/target/ALIENFLIGHTNGF7/target.h | 2 -- src/main/target/ALIENWHOOP/target.h | 2 -- src/main/target/ANYFCF7/target.h | 2 -- src/main/target/ANYFCM7/target.h | 2 -- src/main/target/BETAFLIGHTF3/target.h | 2 -- src/main/target/BETAFLIGHTF4/target.h | 2 -- src/main/target/CLRACINGF4/target.h | 2 -- src/main/target/CLRACINGF7/target.h | 2 -- src/main/target/CRAZYBEEF3FR/target.h | 2 -- src/main/target/ELINF722/target.h | 2 -- src/main/target/FF_FORTINIF4/target.h | 2 -- src/main/target/FF_PIKOF4/target.h | 2 -- src/main/target/FF_RACEPIT/target.h | 2 -- src/main/target/FRSKYF3/target.h | 2 -- src/main/target/FRSKYF4/target.h | 2 -- src/main/target/FURYF3/target.h | 2 -- src/main/target/FURYF4/target.h | 2 -- src/main/target/KAKUTEF4/target.h | 2 -- src/main/target/KAKUTEF7/target.h | 2 -- src/main/target/KROOZX/target.h | 2 -- src/main/target/MATEKF722SE/target.h | 2 -- src/main/target/MOTOLABF4/target.h | 2 -- src/main/target/NUCLEOH743/target.h | 1 - src/main/target/OMNIBUS/target.h | 2 -- src/main/target/OMNIBUSF4/target.h | 2 -- src/main/target/OMNIBUSF4FW/target.h | 2 -- src/main/target/OMNIBUSF7/target.h | 2 -- src/main/target/OMNINXT/target.h | 2 -- src/main/target/PYRODRONEF4/target.h | 2 -- src/main/target/RACEBASE/target.h | 2 -- src/main/target/REVO/target.h | 2 -- src/main/target/REVOLT/target.h | 2 -- src/main/target/SPEDIXF4/target.h | 2 -- src/main/target/VGOODRCF4/target.h | 2 -- src/main/target/WORMFC/target.h | 2 -- src/main/target/YUPIF4/target.h | 2 -- 39 files changed, 84 deletions(-) diff --git a/src/main/drivers/max7456.c b/src/main/drivers/max7456.c index 578e33e3a5..8dc28a6207 100644 --- a/src/main/drivers/max7456.c +++ b/src/main/drivers/max7456.c @@ -178,17 +178,8 @@ #define __spiBusTransactionBegin(busdev) spiBusTransactionBegin(busdev) #define __spiBusTransactionEnd(busdev) spiBusTransactionEnd(busdev) #else -#ifdef MAX7456_SPI_CLK #define __spiBusTransactionBegin(busdev) {spiBusSetDivisor(busdev, max7456SpiClock);IOLo((busdev)->busdev_u.spi.csnPin);} -#else - #define __spiBusTransactionBegin(busdev) IOLo((busdev)->busdev_u.spi.csnPin) -#endif - -#ifdef MAX7456_RESTORE_CLK #define __spiBusTransactionEnd(busdev) {IOHi((busdev)->busdev_u.spi.csnPin);spiSetDivisor((busdev)->busdev_u.spi.instance, MAX7456_RESTORE_CLK);} -#else - #define __spiBusTransactionEnd(busdev) IOHi((busdev)->busdev_u.spi.csnPin) -#endif #endif busDevice_t max7456BusDevice; diff --git a/src/main/target/AG3X/target.h b/src/main/target/AG3X/target.h index db4666f351..66fde17899 100644 --- a/src/main/target/AG3X/target.h +++ b/src/main/target/AG3X/target.h @@ -74,8 +74,6 @@ #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_FLASHFS #define USE_FLASH_M25P16 diff --git a/src/main/target/AIKONF4/target.h b/src/main/target/AIKONF4/target.h index 839a543857..012511dbe5 100644 --- a/src/main/target/AIKONF4/target.h +++ b/src/main/target/AIKONF4/target.h @@ -55,8 +55,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3 #define MAX7456_SPI_CS_PIN SPI3_NSS_PIN -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define USE_FLASHFS diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h index 170205c057..78c5caa67a 100644 --- a/src/main/target/ALIENFLIGHTNGF7/target.h +++ b/src/main/target/ALIENFLIGHTNGF7/target.h @@ -147,8 +147,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3 #define MAX7456_SPI_CS_PIN PB12 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_ADC #define ADC_INSTANCE ADC1 // Default added diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h index 1501b07a22..d3c8582a43 100644 --- a/src/main/target/ALIENWHOOP/target.h +++ b/src/main/target/ALIENWHOOP/target.h @@ -107,8 +107,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN SPI2_NSS_PIN -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) /* BLACKBOX dataflash available as of V2.1 -- did not exist on V1 and V2 */ #define USE_FLASHFS diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h index 4a0c2adc87..0bd83bece2 100644 --- a/src/main/target/ANYFCF7/target.h +++ b/src/main/target/ANYFCF7/target.h @@ -130,8 +130,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3 #define MAX7456_SPI_CS_PIN SPI3_NSS_PIN -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_SDCARD #define USE_SDCARD_SPI diff --git a/src/main/target/ANYFCM7/target.h b/src/main/target/ANYFCM7/target.h index fb47af044f..cbb7828e61 100644 --- a/src/main/target/ANYFCM7/target.h +++ b/src/main/target/ANYFCM7/target.h @@ -124,8 +124,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3 #define MAX7456_SPI_CS_PIN SPI3_NSS_PIN -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_I2C #define USE_I2C_DEVICE_2 diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h index 396707cdc0..c072cdf543 100644 --- a/src/main/target/BETAFLIGHTF3/target.h +++ b/src/main/target/BETAFLIGHTF3/target.h @@ -96,8 +96,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI1 #define MAX7456_SPI_CS_PIN PA1 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_SDCARD #define USE_SDCARD_SPI diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h index 1144243526..1ea0c7bac4 100644 --- a/src/main/target/BETAFLIGHTF4/target.h +++ b/src/main/target/BETAFLIGHTF4/target.h @@ -62,8 +62,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN PB12 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define FLASH_CS_PIN PA15 #define FLASH_SPI_INSTANCE SPI3 diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h index 00734806ab..cb9ad083f7 100644 --- a/src/main/target/CLRACINGF4/target.h +++ b/src/main/target/CLRACINGF4/target.h @@ -64,8 +64,6 @@ #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 ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT #define USE_SDCARD diff --git a/src/main/target/CLRACINGF7/target.h b/src/main/target/CLRACINGF7/target.h index a198835e2d..da0b8e45e7 100644 --- a/src/main/target/CLRACINGF7/target.h +++ b/src/main/target/CLRACINGF7/target.h @@ -59,8 +59,6 @@ #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 ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define USE_FLASHFS diff --git a/src/main/target/CRAZYBEEF3FR/target.h b/src/main/target/CRAZYBEEF3FR/target.h index 0db4c545de..dc25e1d0f0 100644 --- a/src/main/target/CRAZYBEEF3FR/target.h +++ b/src/main/target/CRAZYBEEF3FR/target.h @@ -145,8 +145,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI1 #define MAX7456_SPI_CS_PIN PB1 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/src/main/target/ELINF722/target.h b/src/main/target/ELINF722/target.h index 46dbad91b9..d27ceb1eae 100644 --- a/src/main/target/ELINF722/target.h +++ b/src/main/target/ELINF722/target.h @@ -49,8 +49,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN PC8 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define FLASH_CS_PIN PB3 #define FLASH_SPI_INSTANCE SPI3 diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h index 0b5ad3fd9b..acb417b087 100644 --- a/src/main/target/FF_FORTINIF4/target.h +++ b/src/main/target/FF_FORTINIF4/target.h @@ -98,8 +98,6 @@ #define MAX7456_SPI_INSTANCE SPI3 #define MAX7456_SPI_CS_PIN SPI3_NSS_PIN #endif -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) /*---------------------------------*/ /*-----------USB-UARTs-------------*/ diff --git a/src/main/target/FF_PIKOF4/target.h b/src/main/target/FF_PIKOF4/target.h index a89c611a54..5bfc588ce0 100644 --- a/src/main/target/FF_PIKOF4/target.h +++ b/src/main/target/FF_PIKOF4/target.h @@ -75,8 +75,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI1 #define MAX7456_SPI_CS_PIN PA4 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) /*---------------------------------*/ #else /*------------FLASH----------------*/ diff --git a/src/main/target/FF_RACEPIT/target.h b/src/main/target/FF_RACEPIT/target.h index 2e9a7ab206..647aa82b61 100644 --- a/src/main/target/FF_RACEPIT/target.h +++ b/src/main/target/FF_RACEPIT/target.h @@ -65,8 +65,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN SPI2_NSS_PIN -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) /*---------------------------------*/ /*------------FLASH----------------*/ diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h index a8b9ef9bed..c008f2e75c 100644 --- a/src/main/target/FRSKYF3/target.h +++ b/src/main/target/FRSKYF3/target.h @@ -83,8 +83,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN PB4 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_SPI #define USE_SPI_DEVICE_2 diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h index 3cd1f31549..2d641f5ea5 100644 --- a/src/main/target/FRSKYF4/target.h +++ b/src/main/target/FRSKYF4/target.h @@ -56,8 +56,6 @@ #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 ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h index 62dcb3003a..916fb71425 100644 --- a/src/main/target/FURYF3/target.h +++ b/src/main/target/FURYF3/target.h @@ -71,8 +71,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI1 #define MAX7456_SPI_CS_PIN PC13 - #define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz - #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_FLASHFS #define USE_FLASH_M25P16 diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index 797803be22..780a2721e4 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -61,8 +61,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN PB12 - #define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz - #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h index 4efdf44051..4df7dcc3f5 100644 --- a/src/main/target/KAKUTEF4/target.h +++ b/src/main/target/KAKUTEF4/target.h @@ -102,8 +102,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3 #define MAX7456_SPI_CS_PIN PB14 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define FLASH_CS_PIN PB3 #define FLASH_SPI_INSTANCE SPI3 diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h index 8b22a6b7e1..d6804e72d1 100644 --- a/src/main/target/KAKUTEF7/target.h +++ b/src/main/target/KAKUTEF7/target.h @@ -117,8 +117,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN SPI2_NSS_PIN -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #if defined(KAKUTEF7MINI) #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h index 4ab68bdb27..99ca3ac0c5 100644 --- a/src/main/target/KROOZX/target.h +++ b/src/main/target/KROOZX/target.h @@ -75,8 +75,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI1 #define MAX7456_SPI_CS_PIN PC4 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC diff --git a/src/main/target/MATEKF722SE/target.h b/src/main/target/MATEKF722SE/target.h index e5c70975f9..c444136183 100644 --- a/src/main/target/MATEKF722SE/target.h +++ b/src/main/target/MATEKF722SE/target.h @@ -99,8 +99,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN PB12 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) // *************** SPI3 SD BLACKBOX**************** diff --git a/src/main/target/MOTOLABF4/target.h b/src/main/target/MOTOLABF4/target.h index 5a6f049782..f4958b128c 100644 --- a/src/main/target/MOTOLABF4/target.h +++ b/src/main/target/MOTOLABF4/target.h @@ -65,8 +65,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI3 #define MAX7456_SPI_CS_PIN SPI3_NSS_PIN -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_VCP //#define USB_DETECT_PIN PC15 diff --git a/src/main/target/NUCLEOH743/target.h b/src/main/target/NUCLEOH743/target.h index 1357e0455e..d7c5ee2215 100644 --- a/src/main/target/NUCLEOH743/target.h +++ b/src/main/target/NUCLEOH743/target.h @@ -197,7 +197,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE NULL // SPI3 #define MAX7456_SPI_CS_PIN NONE // PC9 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) #define USE_I2C_OLED_DISPLAY diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h index 0d0c0c2685..907fc751fd 100644 --- a/src/main/target/OMNIBUS/target.h +++ b/src/main/target/OMNIBUS/target.h @@ -104,8 +104,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI1 #define MAX7456_SPI_CS_PIN PB1 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) //#define MAX7456_DMA_IRQ_HANDLER_ID DMA1_CH3_HANDLER #define USE_SPI diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index 2a8adb1254..78d5a9edc9 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -146,8 +146,6 @@ #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) // Globally configure flashfs and drivers for various flash chips #define USE_FLASHFS diff --git a/src/main/target/OMNIBUSF4FW/target.h b/src/main/target/OMNIBUSF4FW/target.h index aca987fbff..803d3e9a15 100644 --- a/src/main/target/OMNIBUSF4FW/target.h +++ b/src/main/target/OMNIBUSF4FW/target.h @@ -106,8 +106,6 @@ #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_FLASHFS #define USE_FLASH_M25P16 diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h index 76c19777b7..6213276645 100644 --- a/src/main/target/OMNIBUSF7/target.h +++ b/src/main/target/OMNIBUSF7/target.h @@ -162,8 +162,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN SPI2_NSS_PIN -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #ifdef FPVM_BETAFLIGHTF7 //FLASH-------------------------------------- diff --git a/src/main/target/OMNINXT/target.h b/src/main/target/OMNINXT/target.h index 0cd9ac224d..1800283881 100644 --- a/src/main/target/OMNINXT/target.h +++ b/src/main/target/OMNINXT/target.h @@ -92,8 +92,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN PA15 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_FLASHFS #define USE_FLASH_M25P16 diff --git a/src/main/target/PYRODRONEF4/target.h b/src/main/target/PYRODRONEF4/target.h index e2739f1994..33c3758727 100644 --- a/src/main/target/PYRODRONEF4/target.h +++ b/src/main/target/PYRODRONEF4/target.h @@ -57,8 +57,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN PB12 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) diff --git a/src/main/target/RACEBASE/target.h b/src/main/target/RACEBASE/target.h index 8c5380e1a3..ccbc601664 100644 --- a/src/main/target/RACEBASE/target.h +++ b/src/main/target/RACEBASE/target.h @@ -86,8 +86,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN PA7 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define FLASH_CS_PIN PB12 diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index c4795839f9..525cb97a28 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -155,8 +155,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN PC8 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_BARO #define USE_BARO_MS5611 diff --git a/src/main/target/REVOLT/target.h b/src/main/target/REVOLT/target.h index fb6b7f4fec..602e6ca8ba 100644 --- a/src/main/target/REVOLT/target.h +++ b/src/main/target/REVOLT/target.h @@ -114,8 +114,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN PD2 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #endif diff --git a/src/main/target/SPEDIXF4/target.h b/src/main/target/SPEDIXF4/target.h index 09e16c3172..68cdbacef0 100644 --- a/src/main/target/SPEDIXF4/target.h +++ b/src/main/target/SPEDIXF4/target.h @@ -63,8 +63,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_CS_PIN SPI2_NSS_PIN -#define MAX7456_SPI_CLK ( SPI_CLOCK_STANDARD ) -#define MAX7456_RESTORE_CLK ( SPI_CLOCK_FAST ) #define USE_FLASHFS #define USE_FLASH_M25P16 diff --git a/src/main/target/VGOODRCF4/target.h b/src/main/target/VGOODRCF4/target.h index bcd02d310f..0b6755ebf3 100644 --- a/src/main/target/VGOODRCF4/target.h +++ b/src/main/target/VGOODRCF4/target.h @@ -63,8 +63,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI1 #define MAX7456_SPI_CS_PIN PA4 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) //-------------------------------------IIC2 BMP280------------------------------ #define USE_BARO diff --git a/src/main/target/WORMFC/target.h b/src/main/target/WORMFC/target.h index 72ef72a8fb..71d22fc332 100644 --- a/src/main/target/WORMFC/target.h +++ b/src/main/target/WORMFC/target.h @@ -165,8 +165,6 @@ #define MAX7456_SPI_INSTANCE SPI3 #define MAX7456_SPI_CS_PIN PC0 #endif -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h index 72a281e1d6..97f3b5908f 100644 --- a/src/main/target/YUPIF4/target.h +++ b/src/main/target/YUPIF4/target.h @@ -108,8 +108,6 @@ #define USE_MAX7456 #define MAX7456_SPI_INSTANCE SPI1 #define MAX7456_SPI_CS_PIN PA14 -#define MAX7456_SPI_CLK (SPI_CLOCK_STANDARD) // 10MHz -#define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) // ADC inputs #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC