From 410507c56a712e664b38c946d127b5044b6cbfbb Mon Sep 17 00:00:00 2001 From: mikeller Date: Thu, 7 Mar 2019 04:09:16 +1300 Subject: [PATCH] Moved target configs into 'unified_targets/configs/' and updated 'dmaopt' to 'dma'. --- unified_targets/configs/ALIENFLIGHTF4.config | 30 ++++++++++---------- unified_targets/configs/ALIENFLIGHTNGF7.config | 32 +++++++++++----------- .../configs/ALIENFLIGHTNGF7_Dual.config | 32 +++++++++++----------- unified_targets/configs/BEEROTORF4.config | 26 +++++++++--------- unified_targets/configs/CRAZYBEEF4FR.config | 18 ++++++------ unified_targets/configs/ELINF722.config | 4 +-- .../configs}/FF_RACEPIT.config | 0 unified_targets/configs/KAKUTEF7.config | 22 +++++++-------- unified_targets/configs/MATEKF411.config | 22 +++++++-------- .../config => unified_targets/configs}/NERO.config | 4 +-- unified_targets/configs/OMNIBUSF7V2.config | 28 +++++++++---------- 11 files changed, 109 insertions(+), 109 deletions(-) rename {src/main/target/STM32F405/config => unified_targets/configs}/FF_RACEPIT.config (100%) rename {src/main/target/STM32F7X2/config => unified_targets/configs}/NERO.config (96%) diff --git a/unified_targets/configs/ALIENFLIGHTF4.config b/unified_targets/configs/ALIENFLIGHTF4.config index 4bf8e9c2d..f748d7dfe 100644 --- a/unified_targets/configs/ALIENFLIGHTF4.config +++ b/unified_targets/configs/ALIENFLIGHTF4.config @@ -53,7 +53,7 @@ resource SDCARD_DETECT 1 B11 set sdcard_detect_inverted = ON set sdcard_mode = SPI set sdcard_spi_bus = 2 -dmaopt SPI_TX 2 0 +dma SPI_TX 2 0 # SPI Flash resource FLASH_CS 1 B12 @@ -91,20 +91,20 @@ resource LED_STRIP 1 B15 resource PPM 1 A08 # DMAOPT -dmaopt SPI_TX 2 0 # SPI_TX 2: DMA1 Stream 4 Channel 0 -dmaopt ADC 1 0 # ADC 1: DMA2 Stream 0 Channel 0 -dmaopt pin A08 1 # pin A08: DMA2 Stream 1 Channel 6 -dmaopt pin B00 0 # pin B00: DMA1 Stream 7 Channel 5 -dmaopt pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 -dmaopt pin B14 1 # pin B14: DMA2 Stream 2 Channel 6 -dmaopt pin B15 0 # pin B15: DMA2 Stream 6 Channel 0 -dmaopt pin B08 0 # pin B08: DMA1 Stream 7 Channel 2 -dmaopt pin A00 0 # pin A00: DMA1 Stream 2 Channel 6 -dmaopt pin A01 0 # pin A01: DMA1 Stream 4 Channel 6 -dmaopt pin C06 0 # pin C06: DMA2 Stream 2 Channel 0 -dmaopt pin C07 0 # pin C07: DMA2 Stream 2 Channel 0 -dmaopt pin C08 1 # pin C08: DMA2 Stream 4 Channel 7 -dmaopt pin C09 0 # pin C09: DMA2 Stream 7 Channel 7 +dma SPI_TX 2 0 # SPI_TX 2: DMA1 Stream 4 Channel 0 +dma ADC 1 0 # ADC 1: DMA2 Stream 0 Channel 0 +dma pin A08 1 # pin A08: DMA2 Stream 1 Channel 6 +dma pin B00 0 # pin B00: DMA1 Stream 7 Channel 5 +dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 +dma pin B14 1 # pin B14: DMA2 Stream 2 Channel 6 +dma pin B15 0 # pin B15: DMA2 Stream 6 Channel 0 +dma pin B08 0 # pin B08: DMA1 Stream 7 Channel 2 +dma pin A00 0 # pin A00: DMA1 Stream 2 Channel 6 +dma pin A01 0 # pin A01: DMA1 Stream 4 Channel 6 +dma pin C06 0 # pin C06: DMA2 Stream 2 Channel 0 +dma pin C07 0 # pin C07: DMA2 Stream 2 Channel 0 +dma pin C08 1 # pin C08: DMA2 Stream 4 Channel 7 +dma pin C09 0 # pin C09: DMA2 Stream 7 Channel 7 # DMA stream conflict if burst mode is not used set dshot_burst = ON diff --git a/unified_targets/configs/ALIENFLIGHTNGF7.config b/unified_targets/configs/ALIENFLIGHTNGF7.config index d8991cce1..c58efcdd9 100644 --- a/unified_targets/configs/ALIENFLIGHTNGF7.config +++ b/unified_targets/configs/ALIENFLIGHTNGF7.config @@ -55,7 +55,7 @@ resource SDCARD_DETECT 1 B11 set sdcard_detect_inverted = ON set sdcard_mode = SPI set sdcard_spi_bus = 2 -dmaopt SPI_TX 2 0 +dma SPI_TX 2 0 # SPI Flash resource FLASH_CS 1 B12 @@ -92,23 +92,23 @@ resource LED_STRIP 1 A08 resource PPM 1 A08 # DMAOPT -dmaopt SPI_TX 2 0 # SPI_TX 2: DMA1 Stream 4 Channel 0 -dmaopt ADC 1 0 # ADC 1: DMA2 Stream 0 Channel 0 -dmaopt pin A08 1 # pin A08: DMA2 Stream 1 Channel 6 -dmaopt pin C06 0 # pin C06: DMA2 Stream 2 Channel 0 -dmaopt pin C07 0 # pin C07: DMA1 Stream 5 Channel 5 -dmaopt pin B14 1 # pin B14: DMA2 Stream 3 Channel 7 -dmaopt pin B00 0 # pin B00: DMA1 Stream 7 Channel 5 -dmaopt pin A00 0 # pin A00: DMA1 Stream 2 Channel 6 -dmaopt pin C08 1 # pin C08: DMA2 Stream 4 Channel 7 -dmaopt pin A01 0 # pin A01: DMA1 Stream 4 Channel 6 -dmaopt pin C09 0 # pin C09: DMA2 Stream 7 Channel 7 -dmaopt pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 -dmaopt pin B15 0 # pin B15: DMA2 Stream 6 Channel 0 -dmaopt pin B08 0 # pin B08: DMA1 Stream 7 Channel 2 +dma SPI_TX 2 0 # SPI_TX 2: DMA1 Stream 4 Channel 0 +dma ADC 1 0 # ADC 1: DMA2 Stream 0 Channel 0 +dma pin A08 1 # pin A08: DMA2 Stream 1 Channel 6 +dma pin C06 0 # pin C06: DMA2 Stream 2 Channel 0 +dma pin C07 0 # pin C07: DMA1 Stream 5 Channel 5 +dma pin B14 1 # pin B14: DMA2 Stream 3 Channel 7 +dma pin B00 0 # pin B00: DMA1 Stream 7 Channel 5 +dma pin A00 0 # pin A00: DMA1 Stream 2 Channel 6 +dma pin C08 1 # pin C08: DMA2 Stream 4 Channel 7 +dma pin A01 0 # pin A01: DMA1 Stream 4 Channel 6 +dma pin C09 0 # pin C09: DMA2 Stream 7 Channel 7 +dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 +dma pin B15 0 # pin B15: DMA2 Stream 6 Channel 0 +dma pin B08 0 # pin B08: DMA1 Stream 7 Channel 2 # DMA stream conflict if burst mode is not used -# XXX Need a mechanism to specify dmaopt +# XXX Need a mechanism to specify dma set dshot_burst = ON # Serial ports diff --git a/unified_targets/configs/ALIENFLIGHTNGF7_Dual.config b/unified_targets/configs/ALIENFLIGHTNGF7_Dual.config index cca79bc53..224fda3c3 100644 --- a/unified_targets/configs/ALIENFLIGHTNGF7_Dual.config +++ b/unified_targets/configs/ALIENFLIGHTNGF7_Dual.config @@ -49,7 +49,7 @@ resource SDCARD_DETECT 1 B11 set sdcard_detect_inverted = ON set sdcard_mode = SPI set sdcard_spi_bus = 2 -dmaopt SPI_TX 2 0 +dma SPI_TX 2 0 # OSD resource OSD_CS 1 B12 @@ -82,23 +82,23 @@ resource LED_STRIP 1 A08 resource PPM 1 A08 # DMAOPT -dmaopt SPI_TX 2 0 # SPI_TX 2: DMA1 Stream 4 Channel 0 -dmaopt ADC 1 0 # ADC 1: DMA2 Stream 0 Channel 0 -dmaopt pin A08 1 # pin A08: DMA2 Stream 1 Channel 6 -dmaopt pin C06 0 # pin C06: DMA2 Stream 2 Channel 0 -dmaopt pin C07 0 # pin C07: DMA1 Stream 5 Channel 5 -dmaopt pin B14 1 # pin B14: DMA2 Stream 3 Channel 7 -dmaopt pin B00 0 # pin B00: DMA1 Stream 7 Channel 5 -dmaopt pin A00 0 # pin A00: DMA1 Stream 2 Channel 6 -dmaopt pin C08 1 # pin C08: DMA2 Stream 4 Channel 7 -dmaopt pin A01 0 # pin A01: DMA1 Stream 4 Channel 6 -dmaopt pin C09 0 # pin C09: DMA2 Stream 7 Channel 7 -dmaopt pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 -dmaopt pin B15 0 # pin B15: DMA2 Stream 6 Channel 0 -dmaopt pin B08 0 # pin B08: DMA1 Stream 7 Channel 2 +dma SPI_TX 2 0 # SPI_TX 2: DMA1 Stream 4 Channel 0 +dma ADC 1 0 # ADC 1: DMA2 Stream 0 Channel 0 +dma pin A08 1 # pin A08: DMA2 Stream 1 Channel 6 +dma pin C06 0 # pin C06: DMA2 Stream 2 Channel 0 +dma pin C07 0 # pin C07: DMA1 Stream 5 Channel 5 +dma pin B14 1 # pin B14: DMA2 Stream 3 Channel 7 +dma pin B00 0 # pin B00: DMA1 Stream 7 Channel 5 +dma pin A00 0 # pin A00: DMA1 Stream 2 Channel 6 +dma pin C08 1 # pin C08: DMA2 Stream 4 Channel 7 +dma pin A01 0 # pin A01: DMA1 Stream 4 Channel 6 +dma pin C09 0 # pin C09: DMA2 Stream 7 Channel 7 +dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 +dma pin B15 0 # pin B15: DMA2 Stream 6 Channel 0 +dma pin B08 0 # pin B08: DMA1 Stream 7 Channel 2 # DMA stream conflict if burst mode is not used -# XXX Need a mechanism to specify dmaopt +# XXX Need a mechanism to specify dma set dshot_burst = ON # Serial ports diff --git a/unified_targets/configs/BEEROTORF4.config b/unified_targets/configs/BEEROTORF4.config index aa5542615..9277be423 100644 --- a/unified_targets/configs/BEEROTORF4.config +++ b/unified_targets/configs/BEEROTORF4.config @@ -60,30 +60,30 @@ timer B05 0 timer B09 0 timer B08 0 -# dmaopt -dmaopt SPI_TX 2 0 +# dma +dma SPI_TX 2 0 # SPI_TX 2: DMA1 Stream 4 Channel 0 -dmaopt SPI_TX 3 0 +dma SPI_TX 3 0 # SPI_TX 3: DMA1 Stream 5 Channel 0 -dmaopt SPI_RX 3 0 +dma SPI_RX 3 0 # SPI_RX 3: DMA1 Stream 0 Channel 0 -dmaopt ADC 1 0 +dma ADC 1 0 # ADC 1: DMA2 Stream 0 Channel 0 -dmaopt pin B00 0 +dma pin B00 0 # pin B00: DMA2 Stream 6 Channel 0 -dmaopt pin B01 0 +dma pin B01 0 # pin B01: DMA2 Stream 6 Channel 0 -dmaopt pin A01 0 +dma pin A01 0 # pin A01: DMA1 Stream 6 Channel 3 -dmaopt pin A00 0 +dma pin A00 0 # pin A00: DMA1 Stream 5 Channel 3 -dmaopt pin C06 0 +dma pin C06 0 # pin C06: DMA2 Stream 2 Channel 0 -dmaopt pin C07 0 +dma pin C07 0 # pin C07: DMA2 Stream 2 Channel 0 -dmaopt pin B05 0 +dma pin B05 0 # pin B05: DMA1 Stream 5 Channel 5 -dmaopt pin B08 0 +dma pin B08 0 # pin B08: DMA1 Stream 7 Channel 2 # feature diff --git a/unified_targets/configs/CRAZYBEEF4FR.config b/unified_targets/configs/CRAZYBEEF4FR.config index 0123da36d..819749172 100644 --- a/unified_targets/configs/CRAZYBEEF4FR.config +++ b/unified_targets/configs/CRAZYBEEF4FR.config @@ -50,22 +50,22 @@ timer A02 2 timer A09 0 timer A10 0 -# dmaopt -dmaopt ADC 1 0 +# dma +dma ADC 1 0 # ADC 1: DMA2 Stream 0 Channel 0 -dmaopt pin B10 0 +dma pin B10 0 # pin B10: DMA1 Stream 1 Channel 3 -dmaopt pin B06 0 +dma pin B06 0 # pin B06: DMA1 Stream 0 Channel 2 -dmaopt pin B07 0 +dma pin B07 0 # pin B07: DMA1 Stream 3 Channel 2 -dmaopt pin B08 0 +dma pin B08 0 # pin B08: DMA1 Stream 7 Channel 2 -dmaopt pin A00 0 +dma pin A00 0 # pin A00: DMA1 Stream 2 Channel 6 -dmaopt pin A09 0 +dma pin A09 0 # pin A09: DMA2 Stream 6 Channel 0 -dmaopt pin A10 0 +dma pin A10 0 # pin A10: DMA2 Stream 6 Channel 0 # feature diff --git a/unified_targets/configs/ELINF722.config b/unified_targets/configs/ELINF722.config index cd84bb904..9bbd6cf9e 100644 --- a/unified_targets/configs/ELINF722.config +++ b/unified_targets/configs/ELINF722.config @@ -47,8 +47,8 @@ timer B09 1 timer B00 2 timer B01 2 -# dmaopt -dmaopt ADC 1 1 # DMA2 Stream 4 Channel 0 +# dma +dma ADC 1 1 # DMA2 Stream 4 Channel 0 # feature feature -RX_PARALLEL_PWM diff --git a/src/main/target/STM32F405/config/FF_RACEPIT.config b/unified_targets/configs/FF_RACEPIT.config similarity index 100% rename from src/main/target/STM32F405/config/FF_RACEPIT.config rename to unified_targets/configs/FF_RACEPIT.config diff --git a/unified_targets/configs/KAKUTEF7.config b/unified_targets/configs/KAKUTEF7.config index 6c3127153..a198089ba 100644 --- a/unified_targets/configs/KAKUTEF7.config +++ b/unified_targets/configs/KAKUTEF7.config @@ -57,26 +57,26 @@ timer C09 1 timer A03 1 timer D12 0 -# dmaopt -dmaopt SPI_TX 1 1 +# dma +dma SPI_TX 1 1 # SPI_TX 1: DMA2 Stream 5 Channel 3 -dmaopt ADC 1 1 +dma ADC 1 1 # ADC 1: DMA2 Stream 4 Channel 0 -dmaopt pin E13 1 +dma pin E13 1 # pin E13: DMA2 Stream 6 Channel 6 -dmaopt pin B00 0 +dma pin B00 0 # pin B00: DMA1 Stream 7 Channel 5 -dmaopt pin B01 0 +dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 -dmaopt pin E09 2 +dma pin E09 2 # pin E09: DMA2 Stream 3 Channel 6 -dmaopt pin E11 1 +dma pin E11 1 # pin E11: DMA2 Stream 2 Channel 6 -dmaopt pin C09 0 +dma pin C09 0 # pin C09: DMA2 Stream 7 Channel 7 -dmaopt pin A03 0 +dma pin A03 0 # pin A03: DMA1 Stream 1 Channel 6 -dmaopt pin D12 0 +dma pin D12 0 # pin D12: DMA1 Stream 0 Channel 2 # feature diff --git a/unified_targets/configs/MATEKF411.config b/unified_targets/configs/MATEKF411.config index 243d75df6..9927a0332 100644 --- a/unified_targets/configs/MATEKF411.config +++ b/unified_targets/configs/MATEKF411.config @@ -42,26 +42,26 @@ timer A00 1 timer A02 1 timer A08 0 -# dmaopt -dmaopt ADC 1 0 +# dma +dma ADC 1 0 # ADC 1: DMA2 Stream 0 Channel 0 -dmaopt pin B04 0 +dma pin B04 0 # pin B04: DMA1 Stream 4 Channel 5 -dmaopt pin B05 0 +dma pin B05 0 # pin B05: DMA1 Stream 5 Channel 5 -dmaopt pin B06 0 +dma pin B06 0 # pin B06: DMA1 Stream 0 Channel 2 -dmaopt pin B07 0 +dma pin B07 0 # pin B07: DMA1 Stream 3 Channel 2 -dmaopt pin B03 0 +dma pin B03 0 # pin B03: DMA1 Stream 6 Channel 3 -dmaopt pin B10 0 +dma pin B10 0 # pin B10: DMA1 Stream 1 Channel 3 -dmaopt pin A00 0 +dma pin A00 0 # pin A00: DMA1 Stream 2 Channel 6 -dmaopt pin A02 0 +dma pin A02 0 # pin A02: DMA1 Stream 0 Channel 6 -dmaopt pin A08 0 +dma pin A08 0 # pin A08: DMA2 Stream 6 Channel 0 # feature diff --git a/src/main/target/STM32F7X2/config/NERO.config b/unified_targets/configs/NERO.config similarity index 96% rename from src/main/target/STM32F7X2/config/NERO.config rename to unified_targets/configs/NERO.config index 448ae5179..b59d6f1ab 100644 --- a/src/main/target/STM32F7X2/config/NERO.config +++ b/unified_targets/configs/NERO.config @@ -48,7 +48,7 @@ resource SDCARD_DETECT 1 D02 set sdcard_detect_inverted = ON set sdcard_mode = SPI setsdcard_spi_bus = 3 -#dmaopt SPI_TX 3 0 +#dma SPI_TX 3 0 # Timers # First four timers @@ -63,7 +63,7 @@ resource MOTOR 3 A2 resource MOTOR 4 A3 # DMA stream conflict if burst mode is not used -# XXX Need a mechanism to specify dmaopt +# XXX Need a mechanism to specify dma set dshot_burst = ON # Remaining timers diff --git a/unified_targets/configs/OMNIBUSF7V2.config b/unified_targets/configs/OMNIBUSF7V2.config index 1c1f15d02..e20abab4f 100644 --- a/unified_targets/configs/OMNIBUSF7V2.config +++ b/unified_targets/configs/OMNIBUSF7V2.config @@ -62,32 +62,32 @@ timer C07 1 timer A03 0 timer A02 2 -# dmaopt -dmaopt SPI_TX 4 0 +# dma +dma SPI_TX 4 0 # SPI_TX 4: DMA2 Stream 1 Channel 4 -dmaopt ADC 1 1 +dma ADC 1 1 # ADC 1: DMA2 Stream 4 Channel 0 -dmaopt pin E13 1 +dma pin E13 1 # pin E13: DMA2 Stream 6 Channel 6 -dmaopt pin B00 0 +dma pin B00 0 # pin B00: DMA1 Stream 7 Channel 5 -dmaopt pin B01 0 +dma pin B01 0 # pin B01: DMA1 Stream 2 Channel 5 -dmaopt pin E09 2 +dma pin E09 2 # pin E09: DMA2 Stream 3 Channel 6 -dmaopt pin E11 1 +dma pin E11 1 # pin E11: DMA2 Stream 2 Channel 6 -dmaopt pin D12 0 +dma pin D12 0 # pin D12: DMA1 Stream 0 Channel 2 -dmaopt pin B10 0 +dma pin B10 0 # pin B10: DMA1 Stream 1 Channel 3 -dmaopt pin B11 0 +dma pin B11 0 # pin B11: DMA1 Stream 7 Channel 3 -dmaopt pin C06 0 +dma pin C06 0 # pin C06: DMA2 Stream 2 Channel 0 -dmaopt pin C07 1 +dma pin C07 1 # pin C07: DMA2 Stream 3 Channel 7 -dmaopt pin A03 0 +dma pin A03 0 # pin A03: DMA1 Stream 7 Channel 3 feature RX_SERIAL -- 2.11.4.GIT