[variant] Group each variant per STM32 series

As the number of variants continues to grow and in order to ease navigation, they have been grouped in sub-folders per STM32 series. Moreover this would ease generic variants. Signed-off-by: Frederic Pillon <[email protected]>
stm32duino · Jul 15, 2020 · f73c789 · f73c789
1 parent 2d498c7
commit f73c789
Show file tree

Hide file tree

Showing 483 changed files with 296 additions and 298 deletions.
diff --git a/boards.txt b/boards.txt
diff --git a/platform.txt b/platform.txt
@@ -109,7 +109,7 @@ build.opt.path={build.path}/sketch/{build.opt.name}
 extras.path={build.system.path}/extras
 
 # Create empty {build.opt} if not exists in the output sketch dir and force include of SrcWrapper library
-recipe.hooks.prebuild.1.pattern="{extras.path}/prebuild.sh" "{build.path}" "{build.source.path}" 
+recipe.hooks.prebuild.1.pattern="{extras.path}/prebuild.sh" "{build.path}" "{build.source.path}"
 recipe.hooks.prebuild.1.pattern.windows="{runtime.tools.STM32Tools.path}/tools/win/busybox.exe" sh "{extras.path}/prebuild.sh" "{build.path}" "{build.source.path}"
 
 # compile patterns
@@ -140,7 +140,7 @@ build.preferred_out_format=bin
 
 ## Save binary
 recipe.output.tmp_file={build.project_name}.{build.preferred_out_format}
-recipe.output.save_file={build.project_name}.{build.variant}.{build.preferred_out_format}
+recipe.output.save_file={build.project_name}.{build.board}.{build.preferred_out_format}
 
 ## Compute size
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
@@ -188,7 +188,7 @@ tools.hid_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx
 tools.hid_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux
 tools.hid_upload.upload.params.verbose=-d
 tools.hid_upload.upload.params.quiet=n
-tools.hid_upload.upload.pattern="{path}/{cmd}" "{build.path}/{build.project_name}.bin" {serial.port.file}                                                                                                                             
+tools.hid_upload.upload.pattern="{path}/{cmd}" "{build.path}/{build.project_name}.bin" {serial.port.file}
 
 # Upload using Maple bootloader over DFU
 tools.maple_upload.cmd=maple_upload.sh
@@ -207,4 +207,4 @@ tools.remoteproc_gen.busybox.windows={path}/win/busybox.exe
 tools.remoteproc_gen.script=run_arduino_gen.sh
 tools.remoteproc_gen.upload.params.verbose=
 tools.remoteproc_gen.upload.params.quiet=
-tools.remoteproc_gen.upload.pattern="{busybox}" sh "{path}/{script}" generate "{build.path}/{build.project_name}.elf" "{build.path}/run_arduino_{build.project_name}.sh" 
+tools.remoteproc_gen.upload.pattern="{busybox}" sh "{path}/{script}" generate "{build.path}/{build.project_name}.elf" "{build.path}/run_arduino_{build.project_name}.sh"
diff --git a/variants/DEMO_F030F4/PeripheralPins.c → ...ts/STM32F0xx/DEMO_F030F4/PeripheralPins.c b/variants/DEMO_F030F4/PeripheralPins.c → ...ts/STM32F0xx/DEMO_F030F4/PeripheralPins.c
diff --git a/variants/DEMO_F030F4/PinNamesVar.h → variants/STM32F0xx/DEMO_F030F4/PinNamesVar.h b/variants/DEMO_F030F4/PinNamesVar.h → variants/STM32F0xx/DEMO_F030F4/PinNamesVar.h
diff --git a/variants/DEMO_F030F4/ldscript.ld → variants/STM32F0xx/DEMO_F030F4/ldscript.ld b/variants/DEMO_F030F4/ldscript.ld → variants/STM32F0xx/DEMO_F030F4/ldscript.ld
diff --git a/variants/DEMO_F030F4/variant.cpp → variants/STM32F0xx/DEMO_F030F4/variant.cpp b/variants/DEMO_F030F4/variant.cpp → variants/STM32F0xx/DEMO_F030F4/variant.cpp
diff --git a/variants/DEMO_F030F4/variant.h → variants/STM32F0xx/DEMO_F030F4/variant.h b/variants/DEMO_F030F4/variant.h → variants/STM32F0xx/DEMO_F030F4/variant.h
diff --git a/variants/DISCO_F030R8/PeripheralPins.c → ...s/STM32F0xx/DISCO_F030R8/PeripheralPins.c b/variants/DISCO_F030R8/PeripheralPins.c → ...s/STM32F0xx/DISCO_F030R8/PeripheralPins.c
diff --git a/variants/DISCO_F030R8/PinNamesVar.h → ...ants/STM32F0xx/DISCO_F030R8/PinNamesVar.h b/variants/DISCO_F030R8/PinNamesVar.h → ...ants/STM32F0xx/DISCO_F030R8/PinNamesVar.h
diff --git a/variants/DISCO_F030R8/ldscript.ld → variants/STM32F0xx/DISCO_F030R8/ldscript.ld b/variants/DISCO_F030R8/ldscript.ld → variants/STM32F0xx/DISCO_F030R8/ldscript.ld
diff --git a/variants/DISCO_F030R8/variant.cpp → variants/STM32F0xx/DISCO_F030R8/variant.cpp b/variants/DISCO_F030R8/variant.cpp → variants/STM32F0xx/DISCO_F030R8/variant.cpp
diff --git a/variants/DISCO_F030R8/variant.h → variants/STM32F0xx/DISCO_F030R8/variant.h b/variants/DISCO_F030R8/variant.h → variants/STM32F0xx/DISCO_F030R8/variant.h
diff --git a/variants/DISCO_F072RB/PeripheralPins.c → ...s/STM32F0xx/DISCO_F072RB/PeripheralPins.c b/variants/DISCO_F072RB/PeripheralPins.c → ...s/STM32F0xx/DISCO_F072RB/PeripheralPins.c
diff --git a/variants/DISCO_F072RB/PinNamesVar.h → ...ants/STM32F0xx/DISCO_F072RB/PinNamesVar.h b/variants/DISCO_F072RB/PinNamesVar.h → ...ants/STM32F0xx/DISCO_F072RB/PinNamesVar.h
diff --git a/variants/DISCO_F072RB/ldscript.ld → variants/STM32F0xx/DISCO_F072RB/ldscript.ld b/variants/DISCO_F072RB/ldscript.ld → variants/STM32F0xx/DISCO_F072RB/ldscript.ld
diff --git a/variants/DISCO_F072RB/variant.cpp → variants/STM32F0xx/DISCO_F072RB/variant.cpp b/variants/DISCO_F072RB/variant.cpp → variants/STM32F0xx/DISCO_F072RB/variant.cpp
diff --git a/variants/DISCO_F072RB/variant.h → variants/STM32F0xx/DISCO_F072RB/variant.h b/variants/DISCO_F072RB/variant.h → variants/STM32F0xx/DISCO_F072RB/variant.h
diff --git a/variants/EEXTR_F030_V1/PeripheralPins.c → .../STM32F0xx/EEXTR_F030_V1/PeripheralPins.c b/variants/EEXTR_F030_V1/PeripheralPins.c → .../STM32F0xx/EEXTR_F030_V1/PeripheralPins.c
diff --git a/variants/EEXTR_F030_V1/PinNamesVar.h → ...nts/STM32F0xx/EEXTR_F030_V1/PinNamesVar.h b/variants/EEXTR_F030_V1/PinNamesVar.h → ...nts/STM32F0xx/EEXTR_F030_V1/PinNamesVar.h
diff --git a/variants/EEXTR_F030_V1/ldscript.ld → variants/STM32F0xx/EEXTR_F030_V1/ldscript.ld b/variants/EEXTR_F030_V1/ldscript.ld → variants/STM32F0xx/EEXTR_F030_V1/ldscript.ld
diff --git a/variants/EEXTR_F030_V1/variant.cpp → variants/STM32F0xx/EEXTR_F030_V1/variant.cpp b/variants/EEXTR_F030_V1/variant.cpp → variants/STM32F0xx/EEXTR_F030_V1/variant.cpp
diff --git a/variants/EEXTR_F030_V1/variant.h → variants/STM32F0xx/EEXTR_F030_V1/variant.h b/variants/EEXTR_F030_V1/variant.h → variants/STM32F0xx/EEXTR_F030_V1/variant.h
diff --git a/variants/ELEKTOR_F072Cx/PeripheralPins.c → ...STM32F0xx/ELEKTOR_F072Cx/PeripheralPins.c b/variants/ELEKTOR_F072Cx/PeripheralPins.c → ...STM32F0xx/ELEKTOR_F072Cx/PeripheralPins.c
diff --git a/variants/ELEKTOR_F072Cx/PinNamesVar.h → ...ts/STM32F0xx/ELEKTOR_F072Cx/PinNamesVar.h b/variants/ELEKTOR_F072Cx/PinNamesVar.h → ...ts/STM32F0xx/ELEKTOR_F072Cx/PinNamesVar.h
diff --git a/variants/ELEKTOR_F072Cx/ldscript.ld → ...ants/STM32F0xx/ELEKTOR_F072Cx/ldscript.ld b/variants/ELEKTOR_F072Cx/ldscript.ld → ...ants/STM32F0xx/ELEKTOR_F072Cx/ldscript.ld
diff --git a/variants/ELEKTOR_F072Cx/variant.cpp → ...ants/STM32F0xx/ELEKTOR_F072Cx/variant.cpp b/variants/ELEKTOR_F072Cx/variant.cpp → ...ants/STM32F0xx/ELEKTOR_F072Cx/variant.cpp
diff --git a/variants/ELEKTOR_F072Cx/variant.h → variants/STM32F0xx/ELEKTOR_F072Cx/variant.h b/variants/ELEKTOR_F072Cx/variant.h → variants/STM32F0xx/ELEKTOR_F072Cx/variant.h
diff --git a/variants/MALYANMx00_F070CB/PeripheralPins.c → ...32F0xx/MALYANMx00_F070CB/PeripheralPins.c b/variants/MALYANMx00_F070CB/PeripheralPins.c → ...32F0xx/MALYANMx00_F070CB/PeripheralPins.c
diff --git a/variants/MALYANMx00_F070CB/PinNamesVar.h → ...STM32F0xx/MALYANMx00_F070CB/PinNamesVar.h b/variants/MALYANMx00_F070CB/PinNamesVar.h → ...STM32F0xx/MALYANMx00_F070CB/PinNamesVar.h
diff --git a/variants/MALYANMx00_F070CB/ldscript.ld → ...s/STM32F0xx/MALYANMx00_F070CB/ldscript.ld b/variants/MALYANMx00_F070CB/ldscript.ld → ...s/STM32F0xx/MALYANMx00_F070CB/ldscript.ld
diff --git a/...s/MALYANMx00_F070CB/startup_Mx00_f070xb.S → ...x/MALYANMx00_F070CB/startup_Mx00_f070xb.S b/...s/MALYANMx00_F070CB/startup_Mx00_f070xb.S → ...x/MALYANMx00_F070CB/startup_Mx00_f070xb.S
diff --git a/variants/MALYANMx00_F070CB/variant.cpp → ...s/STM32F0xx/MALYANMx00_F070CB/variant.cpp b/variants/MALYANMx00_F070CB/variant.cpp → ...s/STM32F0xx/MALYANMx00_F070CB/variant.cpp
diff --git a/variants/MALYANMx00_F070CB/variant.h → ...nts/STM32F0xx/MALYANMx00_F070CB/variant.h b/variants/MALYANMx00_F070CB/variant.h → ...nts/STM32F0xx/MALYANMx00_F070CB/variant.h
diff --git a/variants/NUCLEO_F030R8/PeripheralPins.c → .../STM32F0xx/NUCLEO_F030R8/PeripheralPins.c b/variants/NUCLEO_F030R8/PeripheralPins.c → .../STM32F0xx/NUCLEO_F030R8/PeripheralPins.c
diff --git a/variants/NUCLEO_F030R8/PinNamesVar.h → ...nts/STM32F0xx/NUCLEO_F030R8/PinNamesVar.h b/variants/NUCLEO_F030R8/PinNamesVar.h → ...nts/STM32F0xx/NUCLEO_F030R8/PinNamesVar.h
diff --git a/variants/NUCLEO_F030R8/ldscript.ld → variants/STM32F0xx/NUCLEO_F030R8/ldscript.ld b/variants/NUCLEO_F030R8/ldscript.ld → variants/STM32F0xx/NUCLEO_F030R8/ldscript.ld
diff --git a/variants/NUCLEO_F030R8/variant.cpp → variants/STM32F0xx/NUCLEO_F030R8/variant.cpp b/variants/NUCLEO_F030R8/variant.cpp → variants/STM32F0xx/NUCLEO_F030R8/variant.cpp
diff --git a/variants/NUCLEO_F030R8/variant.h → variants/STM32F0xx/NUCLEO_F030R8/variant.h b/variants/NUCLEO_F030R8/variant.h → variants/STM32F0xx/NUCLEO_F030R8/variant.h
diff --git a/variants/NUCLEO_F031K6/PeripheralPins.c → .../STM32F0xx/NUCLEO_F031K6/PeripheralPins.c b/variants/NUCLEO_F031K6/PeripheralPins.c → .../STM32F0xx/NUCLEO_F031K6/PeripheralPins.c
diff --git a/variants/NUCLEO_F031K6/PinNamesVar.h → ...nts/STM32F0xx/NUCLEO_F031K6/PinNamesVar.h b/variants/NUCLEO_F031K6/PinNamesVar.h → ...nts/STM32F0xx/NUCLEO_F031K6/PinNamesVar.h
diff --git a/variants/NUCLEO_F031K6/ldscript.ld → variants/STM32F0xx/NUCLEO_F031K6/ldscript.ld b/variants/NUCLEO_F031K6/ldscript.ld → variants/STM32F0xx/NUCLEO_F031K6/ldscript.ld
diff --git a/variants/NUCLEO_F031K6/variant.cpp → variants/STM32F0xx/NUCLEO_F031K6/variant.cpp b/variants/NUCLEO_F031K6/variant.cpp → variants/STM32F0xx/NUCLEO_F031K6/variant.cpp
diff --git a/variants/NUCLEO_F031K6/variant.h → variants/STM32F0xx/NUCLEO_F031K6/variant.h b/variants/NUCLEO_F031K6/variant.h → variants/STM32F0xx/NUCLEO_F031K6/variant.h
diff --git a/variants/NUCLEO_F072RB/PeripheralPins.c → .../STM32F0xx/NUCLEO_F072RB/PeripheralPins.c b/variants/NUCLEO_F072RB/PeripheralPins.c → .../STM32F0xx/NUCLEO_F072RB/PeripheralPins.c
diff --git a/variants/NUCLEO_F072RB/PinNamesVar.h → ...nts/STM32F0xx/NUCLEO_F072RB/PinNamesVar.h b/variants/NUCLEO_F072RB/PinNamesVar.h → ...nts/STM32F0xx/NUCLEO_F072RB/PinNamesVar.h
diff --git a/variants/NUCLEO_F072RB/ldscript.ld → variants/STM32F0xx/NUCLEO_F072RB/ldscript.ld b/variants/NUCLEO_F072RB/ldscript.ld → variants/STM32F0xx/NUCLEO_F072RB/ldscript.ld
diff --git a/variants/NUCLEO_F072RB/variant.cpp → variants/STM32F0xx/NUCLEO_F072RB/variant.cpp b/variants/NUCLEO_F072RB/variant.cpp → variants/STM32F0xx/NUCLEO_F072RB/variant.cpp
diff --git a/variants/NUCLEO_F072RB/variant.h → variants/STM32F0xx/NUCLEO_F072RB/variant.h b/variants/NUCLEO_F072RB/variant.h → variants/STM32F0xx/NUCLEO_F072RB/variant.h
diff --git a/variants/NUCLEO_F091RC/PeripheralPins.c → .../STM32F0xx/NUCLEO_F091RC/PeripheralPins.c b/variants/NUCLEO_F091RC/PeripheralPins.c → .../STM32F0xx/NUCLEO_F091RC/PeripheralPins.c
diff --git a/variants/NUCLEO_F091RC/PinNamesVar.h → ...nts/STM32F0xx/NUCLEO_F091RC/PinNamesVar.h b/variants/NUCLEO_F091RC/PinNamesVar.h → ...nts/STM32F0xx/NUCLEO_F091RC/PinNamesVar.h
diff --git a/variants/NUCLEO_F091RC/ldscript.ld → variants/STM32F0xx/NUCLEO_F091RC/ldscript.ld b/variants/NUCLEO_F091RC/ldscript.ld → variants/STM32F0xx/NUCLEO_F091RC/ldscript.ld
diff --git a/variants/NUCLEO_F091RC/variant.cpp → variants/STM32F0xx/NUCLEO_F091RC/variant.cpp b/variants/NUCLEO_F091RC/variant.cpp → variants/STM32F0xx/NUCLEO_F091RC/variant.cpp
diff --git a/variants/NUCLEO_F091RC/variant.h → variants/STM32F0xx/NUCLEO_F091RC/variant.h b/variants/NUCLEO_F091RC/variant.h → variants/STM32F0xx/NUCLEO_F091RC/variant.h
diff --git a/variants/PYBSTICK26_DUINO/PeripheralPins.c → ...M32F0xx/PYBSTICK26_DUINO/PeripheralPins.c b/variants/PYBSTICK26_DUINO/PeripheralPins.c → ...M32F0xx/PYBSTICK26_DUINO/PeripheralPins.c
diff --git a/variants/PYBSTICK26_DUINO/PinNamesVar.h → .../STM32F0xx/PYBSTICK26_DUINO/PinNamesVar.h b/variants/PYBSTICK26_DUINO/PinNamesVar.h → .../STM32F0xx/PYBSTICK26_DUINO/PinNamesVar.h
diff --git a/variants/PYBSTICK26_DUINO/ldscript.ld → ...ts/STM32F0xx/PYBSTICK26_DUINO/ldscript.ld b/variants/PYBSTICK26_DUINO/ldscript.ld → ...ts/STM32F0xx/PYBSTICK26_DUINO/ldscript.ld
diff --git a/variants/PYBSTICK26_DUINO/variant.cpp → ...ts/STM32F0xx/PYBSTICK26_DUINO/variant.cpp b/variants/PYBSTICK26_DUINO/variant.cpp → ...ts/STM32F0xx/PYBSTICK26_DUINO/variant.cpp
diff --git a/variants/PYBSTICK26_DUINO/variant.h → ...ants/STM32F0xx/PYBSTICK26_DUINO/variant.h b/variants/PYBSTICK26_DUINO/variant.h → ...ants/STM32F0xx/PYBSTICK26_DUINO/variant.h
diff --git a/variants/WRAITH32_F051K6/PeripheralPins.c → ...TM32F0xx/WRAITH32_F051K6/PeripheralPins.c b/variants/WRAITH32_F051K6/PeripheralPins.c → ...TM32F0xx/WRAITH32_F051K6/PeripheralPins.c
diff --git a/variants/WRAITH32_F051K6/PinNamesVar.h → ...s/STM32F0xx/WRAITH32_F051K6/PinNamesVar.h b/variants/WRAITH32_F051K6/PinNamesVar.h → ...s/STM32F0xx/WRAITH32_F051K6/PinNamesVar.h
diff --git a/variants/WRAITH32_F051K6/ldscript.ld → ...nts/STM32F0xx/WRAITH32_F051K6/ldscript.ld b/variants/WRAITH32_F051K6/ldscript.ld → ...nts/STM32F0xx/WRAITH32_F051K6/ldscript.ld
diff --git a/variants/WRAITH32_F051K6/readme.txt → ...ants/STM32F0xx/WRAITH32_F051K6/readme.txt b/variants/WRAITH32_F051K6/readme.txt → ...ants/STM32F0xx/WRAITH32_F051K6/readme.txt
diff --git a/variants/WRAITH32_F051K6/variant.cpp → ...nts/STM32F0xx/WRAITH32_F051K6/variant.cpp b/variants/WRAITH32_F051K6/variant.cpp → ...nts/STM32F0xx/WRAITH32_F051K6/variant.cpp
diff --git a/variants/WRAITH32_F051K6/variant.h → variants/STM32F0xx/WRAITH32_F051K6/variant.h b/variants/WRAITH32_F051K6/variant.h → variants/STM32F0xx/WRAITH32_F051K6/variant.h
diff --git a/variants/AFROFLIGHT_F103CB/PeripheralPins.c → ...32F1xx/AFROFLIGHT_F103CB/PeripheralPins.c b/variants/AFROFLIGHT_F103CB/PeripheralPins.c → ...32F1xx/AFROFLIGHT_F103CB/PeripheralPins.c
diff --git a/variants/AFROFLIGHT_F103CB/PinNamesVar.h → ...STM32F1xx/AFROFLIGHT_F103CB/PinNamesVar.h b/variants/AFROFLIGHT_F103CB/PinNamesVar.h → ...STM32F1xx/AFROFLIGHT_F103CB/PinNamesVar.h
diff --git a/variants/AFROFLIGHT_F103CB/ldscript.ld → ...s/STM32F1xx/AFROFLIGHT_F103CB/ldscript.ld b/variants/AFROFLIGHT_F103CB/ldscript.ld → ...s/STM32F1xx/AFROFLIGHT_F103CB/ldscript.ld
diff --git a/variants/AFROFLIGHT_F103CB/variant.cpp → ...s/STM32F1xx/AFROFLIGHT_F103CB/variant.cpp b/variants/AFROFLIGHT_F103CB/variant.cpp → ...s/STM32F1xx/AFROFLIGHT_F103CB/variant.cpp
diff --git a/variants/AFROFLIGHT_F103CB/variant.h → ...nts/STM32F1xx/AFROFLIGHT_F103CB/variant.h b/variants/AFROFLIGHT_F103CB/variant.h → ...nts/STM32F1xx/AFROFLIGHT_F103CB/variant.h
diff --git a/variants/DISCO_F100RB/PeripheralPins.c → ...s/STM32F1xx/DISCO_F100RB/PeripheralPins.c b/variants/DISCO_F100RB/PeripheralPins.c → ...s/STM32F1xx/DISCO_F100RB/PeripheralPins.c
diff --git a/variants/DISCO_F100RB/PinNamesVar.h → ...ants/STM32F1xx/DISCO_F100RB/PinNamesVar.h b/variants/DISCO_F100RB/PinNamesVar.h → ...ants/STM32F1xx/DISCO_F100RB/PinNamesVar.h
diff --git a/variants/DISCO_F100RB/ldscript.ld → variants/STM32F1xx/DISCO_F100RB/ldscript.ld b/variants/DISCO_F100RB/ldscript.ld → variants/STM32F1xx/DISCO_F100RB/ldscript.ld
diff --git a/variants/DISCO_F100RB/variant.cpp → variants/STM32F1xx/DISCO_F100RB/variant.cpp b/variants/DISCO_F100RB/variant.cpp → variants/STM32F1xx/DISCO_F100RB/variant.cpp
diff --git a/variants/DISCO_F100RB/variant.h → variants/STM32F1xx/DISCO_F100RB/variant.h b/variants/DISCO_F100RB/variant.h → variants/STM32F1xx/DISCO_F100RB/variant.h
diff --git a/variants/Generic_F103Cx/PeripheralPins.c → ...STM32F1xx/Generic_F103Cx/PeripheralPins.c b/variants/Generic_F103Cx/PeripheralPins.c → ...STM32F1xx/Generic_F103Cx/PeripheralPins.c
diff --git a/variants/Generic_F103Cx/PinNamesVar.h → ...ts/STM32F1xx/Generic_F103Cx/PinNamesVar.h b/variants/Generic_F103Cx/PinNamesVar.h → ...ts/STM32F1xx/Generic_F103Cx/PinNamesVar.h
diff --git a/variants/Generic_F103Cx/ldscript.ld → ...ants/STM32F1xx/Generic_F103Cx/ldscript.ld b/variants/Generic_F103Cx/ldscript.ld → ...ants/STM32F1xx/Generic_F103Cx/ldscript.ld
diff --git a/variants/Generic_F103Cx/variant.cpp → ...ants/STM32F1xx/Generic_F103Cx/variant.cpp b/variants/Generic_F103Cx/variant.cpp → ...ants/STM32F1xx/Generic_F103Cx/variant.cpp
diff --git a/variants/Generic_F103Cx/variant.h → variants/STM32F1xx/Generic_F103Cx/variant.h b/variants/Generic_F103Cx/variant.h → variants/STM32F1xx/Generic_F103Cx/variant.h
diff --git a/variants/Generic_F103Rx/PeripheralPins.c → ...STM32F1xx/Generic_F103Rx/PeripheralPins.c b/variants/Generic_F103Rx/PeripheralPins.c → ...STM32F1xx/Generic_F103Rx/PeripheralPins.c
diff --git a/variants/Generic_F103Rx/PinNamesVar.h → ...ts/STM32F1xx/Generic_F103Rx/PinNamesVar.h b/variants/Generic_F103Rx/PinNamesVar.h → ...ts/STM32F1xx/Generic_F103Rx/PinNamesVar.h
diff --git a/variants/Generic_F103Rx/ldscript.ld → ...ants/STM32F1xx/Generic_F103Rx/ldscript.ld b/variants/Generic_F103Rx/ldscript.ld → ...ants/STM32F1xx/Generic_F103Rx/ldscript.ld
diff --git a/variants/Generic_F103Rx/variant.cpp → ...ants/STM32F1xx/Generic_F103Rx/variant.cpp b/variants/Generic_F103Rx/variant.cpp → ...ants/STM32F1xx/Generic_F103Rx/variant.cpp
diff --git a/variants/Generic_F103Rx/variant.h → variants/STM32F1xx/Generic_F103Rx/variant.h b/variants/Generic_F103Rx/variant.h → variants/STM32F1xx/Generic_F103Rx/variant.h
diff --git a/variants/Generic_F103Tx/PeripheralPins.c → ...STM32F1xx/Generic_F103Tx/PeripheralPins.c b/variants/Generic_F103Tx/PeripheralPins.c → ...STM32F1xx/Generic_F103Tx/PeripheralPins.c
diff --git a/variants/Generic_F103Tx/PinNamesVar.h → ...ts/STM32F1xx/Generic_F103Tx/PinNamesVar.h b/variants/Generic_F103Tx/PinNamesVar.h → ...ts/STM32F1xx/Generic_F103Tx/PinNamesVar.h
diff --git a/variants/Generic_F103Tx/ldscript.ld → ...ants/STM32F1xx/Generic_F103Tx/ldscript.ld b/variants/Generic_F103Tx/ldscript.ld → ...ants/STM32F1xx/Generic_F103Tx/ldscript.ld
diff --git a/variants/Generic_F103Tx/variant.cpp → ...ants/STM32F1xx/Generic_F103Tx/variant.cpp b/variants/Generic_F103Tx/variant.cpp → ...ants/STM32F1xx/Generic_F103Tx/variant.cpp
diff --git a/variants/Generic_F103Tx/variant.h → variants/STM32F1xx/Generic_F103Tx/variant.h b/variants/Generic_F103Tx/variant.h → variants/STM32F1xx/Generic_F103Tx/variant.h
diff --git a/variants/Generic_F103Vx/PeripheralPins.c → ...STM32F1xx/Generic_F103Vx/PeripheralPins.c b/variants/Generic_F103Vx/PeripheralPins.c → ...STM32F1xx/Generic_F103Vx/PeripheralPins.c
diff --git a/variants/Generic_F103Vx/PinNamesVar.h → ...ts/STM32F1xx/Generic_F103Vx/PinNamesVar.h b/variants/Generic_F103Vx/PinNamesVar.h → ...ts/STM32F1xx/Generic_F103Vx/PinNamesVar.h
diff --git a/variants/Generic_F103Vx/ldscript.ld → ...ants/STM32F1xx/Generic_F103Vx/ldscript.ld b/variants/Generic_F103Vx/ldscript.ld → ...ants/STM32F1xx/Generic_F103Vx/ldscript.ld
diff --git a/variants/Generic_F103Vx/variant.cpp → ...ants/STM32F1xx/Generic_F103Vx/variant.cpp b/variants/Generic_F103Vx/variant.cpp → ...ants/STM32F1xx/Generic_F103Vx/variant.cpp
diff --git a/variants/Generic_F103Vx/variant.h → variants/STM32F1xx/Generic_F103Vx/variant.h b/variants/Generic_F103Vx/variant.h → variants/STM32F1xx/Generic_F103Vx/variant.h
diff --git a/variants/Generic_F103Zx/PeripheralPins.c → ...STM32F1xx/Generic_F103Zx/PeripheralPins.c b/variants/Generic_F103Zx/PeripheralPins.c → ...STM32F1xx/Generic_F103Zx/PeripheralPins.c
diff --git a/variants/Generic_F103Zx/PinNamesVar.h → ...ts/STM32F1xx/Generic_F103Zx/PinNamesVar.h b/variants/Generic_F103Zx/PinNamesVar.h → ...ts/STM32F1xx/Generic_F103Zx/PinNamesVar.h
diff --git a/variants/Generic_F103Zx/ldscript.ld → ...ants/STM32F1xx/Generic_F103Zx/ldscript.ld b/variants/Generic_F103Zx/ldscript.ld → ...ants/STM32F1xx/Generic_F103Zx/ldscript.ld
diff --git a/variants/Generic_F103Zx/variant.cpp → ...ants/STM32F1xx/Generic_F103Zx/variant.cpp b/variants/Generic_F103Zx/variant.cpp → ...ants/STM32F1xx/Generic_F103Zx/variant.cpp
diff --git a/variants/Generic_F103Zx/variant.h → variants/STM32F1xx/Generic_F103Zx/variant.h b/variants/Generic_F103Zx/variant.h → variants/STM32F1xx/Generic_F103Zx/variant.h
diff --git a/variants/HY_TinySTM103T/PeripheralPins.c → ...STM32F1xx/HY_TinySTM103T/PeripheralPins.c b/variants/HY_TinySTM103T/PeripheralPins.c → ...STM32F1xx/HY_TinySTM103T/PeripheralPins.c
diff --git a/variants/HY_TinySTM103T/PinNamesVar.h → ...ts/STM32F1xx/HY_TinySTM103T/PinNamesVar.h b/variants/HY_TinySTM103T/PinNamesVar.h → ...ts/STM32F1xx/HY_TinySTM103T/PinNamesVar.h
diff --git a/variants/HY_TinySTM103T/ldscript.ld → ...ants/STM32F1xx/HY_TinySTM103T/ldscript.ld b/variants/HY_TinySTM103T/ldscript.ld → ...ants/STM32F1xx/HY_TinySTM103T/ldscript.ld
diff --git a/variants/HY_TinySTM103T/variant.cpp → ...ants/STM32F1xx/HY_TinySTM103T/variant.cpp b/variants/HY_TinySTM103T/variant.cpp → ...ants/STM32F1xx/HY_TinySTM103T/variant.cpp
diff --git a/variants/HY_TinySTM103T/variant.h → variants/STM32F1xx/HY_TinySTM103T/variant.h b/variants/HY_TinySTM103T/variant.h → variants/STM32F1xx/HY_TinySTM103T/variant.h
diff --git a/variants/MALYANM200_F103CB/PeripheralPins.c → ...32F1xx/MALYANM200_F103CB/PeripheralPins.c b/variants/MALYANM200_F103CB/PeripheralPins.c → ...32F1xx/MALYANM200_F103CB/PeripheralPins.c
diff --git a/variants/MALYANM200_F103CB/PinNamesVar.h → ...STM32F1xx/MALYANM200_F103CB/PinNamesVar.h b/variants/MALYANM200_F103CB/PinNamesVar.h → ...STM32F1xx/MALYANM200_F103CB/PinNamesVar.h
diff --git a/variants/MALYANM200_F103CB/ldscript.ld → ...s/STM32F1xx/MALYANM200_F103CB/ldscript.ld b/variants/MALYANM200_F103CB/ldscript.ld → ...s/STM32F1xx/MALYANM200_F103CB/ldscript.ld
diff --git a/...s/MALYANM200_F103CB/startup_M200_f103xb.S → ...x/MALYANM200_F103CB/startup_M200_f103xb.S b/...s/MALYANM200_F103CB/startup_M200_f103xb.S → ...x/MALYANM200_F103CB/startup_M200_f103xb.S
diff --git a/variants/MALYANM200_F103CB/variant.cpp → ...s/STM32F1xx/MALYANM200_F103CB/variant.cpp b/variants/MALYANM200_F103CB/variant.cpp → ...s/STM32F1xx/MALYANM200_F103CB/variant.cpp
diff --git a/variants/MALYANM200_F103CB/variant.h → ...nts/STM32F1xx/MALYANM200_F103CB/variant.h b/variants/MALYANM200_F103CB/variant.h → ...nts/STM32F1xx/MALYANM200_F103CB/variant.h
diff --git a/variants/MAPLEMINI_F103CB/PeripheralPins.c → ...M32F1xx/MAPLEMINI_F103CB/PeripheralPins.c b/variants/MAPLEMINI_F103CB/PeripheralPins.c → ...M32F1xx/MAPLEMINI_F103CB/PeripheralPins.c
diff --git a/variants/MAPLEMINI_F103CB/PinNamesVar.h → .../STM32F1xx/MAPLEMINI_F103CB/PinNamesVar.h b/variants/MAPLEMINI_F103CB/PinNamesVar.h → .../STM32F1xx/MAPLEMINI_F103CB/PinNamesVar.h
diff --git a/variants/MAPLEMINI_F103CB/ldscript.ld → ...ts/STM32F1xx/MAPLEMINI_F103CB/ldscript.ld b/variants/MAPLEMINI_F103CB/ldscript.ld → ...ts/STM32F1xx/MAPLEMINI_F103CB/ldscript.ld
diff --git a/variants/MAPLEMINI_F103CB/variant.cpp → ...ts/STM32F1xx/MAPLEMINI_F103CB/variant.cpp b/variants/MAPLEMINI_F103CB/variant.cpp → ...ts/STM32F1xx/MAPLEMINI_F103CB/variant.cpp
diff --git a/variants/MAPLEMINI_F103CB/variant.h → ...ants/STM32F1xx/MAPLEMINI_F103CB/variant.h b/variants/MAPLEMINI_F103CB/variant.h → ...ants/STM32F1xx/MAPLEMINI_F103CB/variant.h
diff --git a/variants/NUCLEO_F103RB/PeripheralPins.c → .../STM32F1xx/NUCLEO_F103RB/PeripheralPins.c b/variants/NUCLEO_F103RB/PeripheralPins.c → .../STM32F1xx/NUCLEO_F103RB/PeripheralPins.c
diff --git a/variants/NUCLEO_F103RB/PinNamesVar.h → ...nts/STM32F1xx/NUCLEO_F103RB/PinNamesVar.h b/variants/NUCLEO_F103RB/PinNamesVar.h → ...nts/STM32F1xx/NUCLEO_F103RB/PinNamesVar.h
diff --git a/variants/NUCLEO_F103RB/ldscript.ld → variants/STM32F1xx/NUCLEO_F103RB/ldscript.ld b/variants/NUCLEO_F103RB/ldscript.ld → variants/STM32F1xx/NUCLEO_F103RB/ldscript.ld
diff --git a/variants/NUCLEO_F103RB/variant.cpp → variants/STM32F1xx/NUCLEO_F103RB/variant.cpp b/variants/NUCLEO_F103RB/variant.cpp → variants/STM32F1xx/NUCLEO_F103RB/variant.cpp
diff --git a/variants/NUCLEO_F103RB/variant.h → variants/STM32F1xx/NUCLEO_F103RB/variant.h b/variants/NUCLEO_F103RB/variant.h → variants/STM32F1xx/NUCLEO_F103RB/variant.h
diff --git a/variants/PILL_F103XX/PeripheralPins.c → ...ts/STM32F1xx/PILL_F103XX/PeripheralPins.c b/variants/PILL_F103XX/PeripheralPins.c → ...ts/STM32F1xx/PILL_F103XX/PeripheralPins.c
diff --git a/variants/PILL_F103XX/PinNamesVar.h → variants/STM32F1xx/PILL_F103XX/PinNamesVar.h b/variants/PILL_F103XX/PinNamesVar.h → variants/STM32F1xx/PILL_F103XX/PinNamesVar.h
diff --git a/variants/PILL_F103XX/ldscript.ld → variants/STM32F1xx/PILL_F103XX/ldscript.ld b/variants/PILL_F103XX/ldscript.ld → variants/STM32F1xx/PILL_F103XX/ldscript.ld
diff --git a/variants/PILL_F103XX/variant.cpp → variants/STM32F1xx/PILL_F103XX/variant.cpp b/variants/PILL_F103XX/variant.cpp → variants/STM32F1xx/PILL_F103XX/variant.cpp
diff --git a/variants/PILL_F103XX/variant.h → variants/STM32F1xx/PILL_F103XX/variant.h b/variants/PILL_F103XX/variant.h → variants/STM32F1xx/PILL_F103XX/variant.h
diff --git a/variants/NUCLEO_F207ZG/PeripheralPins.c → .../STM32F2xx/NUCLEO_F207ZG/PeripheralPins.c b/variants/NUCLEO_F207ZG/PeripheralPins.c → .../STM32F2xx/NUCLEO_F207ZG/PeripheralPins.c
diff --git a/variants/ARMED_V1/PinNamesVar.h → ...nts/STM32F2xx/NUCLEO_F207ZG/PinNamesVar.h b/variants/ARMED_V1/PinNamesVar.h → ...nts/STM32F2xx/NUCLEO_F207ZG/PinNamesVar.h
diff --git a/variants/NUCLEO_F207ZG/ldscript.ld → variants/STM32F2xx/NUCLEO_F207ZG/ldscript.ld b/variants/NUCLEO_F207ZG/ldscript.ld → variants/STM32F2xx/NUCLEO_F207ZG/ldscript.ld
diff --git a/variants/NUCLEO_F207ZG/variant.cpp → variants/STM32F2xx/NUCLEO_F207ZG/variant.cpp b/variants/NUCLEO_F207ZG/variant.cpp → variants/STM32F2xx/NUCLEO_F207ZG/variant.cpp
diff --git a/variants/NUCLEO_F207ZG/variant.h → variants/STM32F2xx/NUCLEO_F207ZG/variant.h b/variants/NUCLEO_F207ZG/variant.h → variants/STM32F2xx/NUCLEO_F207ZG/variant.h
diff --git a/variants/NUCLEO_F302R8/PeripheralPins.c → .../STM32F3xx/NUCLEO_F302R8/PeripheralPins.c b/variants/NUCLEO_F302R8/PeripheralPins.c → .../STM32F3xx/NUCLEO_F302R8/PeripheralPins.c
diff --git a/variants/NUCLEO_F302R8/PinNamesVar.h → ...nts/STM32F3xx/NUCLEO_F302R8/PinNamesVar.h b/variants/NUCLEO_F302R8/PinNamesVar.h → ...nts/STM32F3xx/NUCLEO_F302R8/PinNamesVar.h
diff --git a/variants/NUCLEO_F302R8/ldscript.ld → variants/STM32F3xx/NUCLEO_F302R8/ldscript.ld b/variants/NUCLEO_F302R8/ldscript.ld → variants/STM32F3xx/NUCLEO_F302R8/ldscript.ld
diff --git a/variants/NUCLEO_F302R8/variant.cpp → variants/STM32F3xx/NUCLEO_F302R8/variant.cpp b/variants/NUCLEO_F302R8/variant.cpp → variants/STM32F3xx/NUCLEO_F302R8/variant.cpp
diff --git a/variants/NUCLEO_F302R8/variant.h → variants/STM32F3xx/NUCLEO_F302R8/variant.h b/variants/NUCLEO_F302R8/variant.h → variants/STM32F3xx/NUCLEO_F302R8/variant.h
diff --git a/variants/NUCLEO_F303K8/PeripheralPins.c → .../STM32F3xx/NUCLEO_F303K8/PeripheralPins.c b/variants/NUCLEO_F303K8/PeripheralPins.c → .../STM32F3xx/NUCLEO_F303K8/PeripheralPins.c
diff --git a/variants/NUCLEO_F303K8/PinNamesVar.h → ...nts/STM32F3xx/NUCLEO_F303K8/PinNamesVar.h b/variants/NUCLEO_F303K8/PinNamesVar.h → ...nts/STM32F3xx/NUCLEO_F303K8/PinNamesVar.h
diff --git a/variants/NUCLEO_F303K8/ldscript.ld → variants/STM32F3xx/NUCLEO_F303K8/ldscript.ld b/variants/NUCLEO_F303K8/ldscript.ld → variants/STM32F3xx/NUCLEO_F303K8/ldscript.ld
diff --git a/variants/NUCLEO_F303K8/variant.cpp → variants/STM32F3xx/NUCLEO_F303K8/variant.cpp b/variants/NUCLEO_F303K8/variant.cpp → variants/STM32F3xx/NUCLEO_F303K8/variant.cpp
diff --git a/variants/NUCLEO_F303K8/variant.h → variants/STM32F3xx/NUCLEO_F303K8/variant.h b/variants/NUCLEO_F303K8/variant.h → variants/STM32F3xx/NUCLEO_F303K8/variant.h
diff --git a/variants/NUCLEO_F303RE/PeripheralPins.c → .../STM32F3xx/NUCLEO_F303RE/PeripheralPins.c b/variants/NUCLEO_F303RE/PeripheralPins.c → .../STM32F3xx/NUCLEO_F303RE/PeripheralPins.c
diff --git a/variants/NUCLEO_F303RE/PinNamesVar.h → ...nts/STM32F3xx/NUCLEO_F303RE/PinNamesVar.h b/variants/NUCLEO_F303RE/PinNamesVar.h → ...nts/STM32F3xx/NUCLEO_F303RE/PinNamesVar.h
diff --git a/variants/NUCLEO_F303RE/ldscript.ld → variants/STM32F3xx/NUCLEO_F303RE/ldscript.ld b/variants/NUCLEO_F303RE/ldscript.ld → variants/STM32F3xx/NUCLEO_F303RE/ldscript.ld
diff --git a/variants/NUCLEO_F303RE/variant.cpp → variants/STM32F3xx/NUCLEO_F303RE/variant.cpp b/variants/NUCLEO_F303RE/variant.cpp → variants/STM32F3xx/NUCLEO_F303RE/variant.cpp
diff --git a/variants/NUCLEO_F303RE/variant.h → variants/STM32F3xx/NUCLEO_F303RE/variant.h b/variants/NUCLEO_F303RE/variant.h → variants/STM32F3xx/NUCLEO_F303RE/variant.h
diff --git a/variants/PILL_F303XX/PeripheralPins.c → ...ts/STM32F3xx/PILL_F303XX/PeripheralPins.c b/variants/PILL_F303XX/PeripheralPins.c → ...ts/STM32F3xx/PILL_F303XX/PeripheralPins.c
diff --git a/variants/PILL_F303XX/PinNamesVar.h → variants/STM32F3xx/PILL_F303XX/PinNamesVar.h b/variants/PILL_F303XX/PinNamesVar.h → variants/STM32F3xx/PILL_F303XX/PinNamesVar.h
diff --git a/variants/PILL_F303XX/ldscript.ld → variants/STM32F3xx/PILL_F303XX/ldscript.ld b/variants/PILL_F303XX/ldscript.ld → variants/STM32F3xx/PILL_F303XX/ldscript.ld
diff --git a/variants/PILL_F303XX/variant.cpp → variants/STM32F3xx/PILL_F303XX/variant.cpp b/variants/PILL_F303XX/variant.cpp → variants/STM32F3xx/PILL_F303XX/variant.cpp
diff --git a/variants/PILL_F303XX/variant.h → variants/STM32F3xx/PILL_F303XX/variant.h b/variants/PILL_F303XX/variant.h → variants/STM32F3xx/PILL_F303XX/variant.h
diff --git a/variants/SPARKY_F303CC/PeripheralPins.c → .../STM32F3xx/SPARKY_F303CC/PeripheralPins.c b/variants/SPARKY_F303CC/PeripheralPins.c → .../STM32F3xx/SPARKY_F303CC/PeripheralPins.c
diff --git a/variants/SPARKY_F303CC/PinNamesVar.h → ...nts/STM32F3xx/SPARKY_F303CC/PinNamesVar.h b/variants/SPARKY_F303CC/PinNamesVar.h → ...nts/STM32F3xx/SPARKY_F303CC/PinNamesVar.h
diff --git a/variants/SPARKY_F303CC/ldscript.ld → variants/STM32F3xx/SPARKY_F303CC/ldscript.ld b/variants/SPARKY_F303CC/ldscript.ld → variants/STM32F3xx/SPARKY_F303CC/ldscript.ld
diff --git a/variants/SPARKY_F303CC/variant.cpp → variants/STM32F3xx/SPARKY_F303CC/variant.cpp b/variants/SPARKY_F303CC/variant.cpp → variants/STM32F3xx/SPARKY_F303CC/variant.cpp
diff --git a/variants/SPARKY_F303CC/variant.h → variants/STM32F3xx/SPARKY_F303CC/variant.h b/variants/SPARKY_F303CC/variant.h → variants/STM32F3xx/SPARKY_F303CC/variant.h
diff --git a/variants/ARMED_V1/PeripheralPins.c → variants/STM32F4xx/ARMED_V1/PeripheralPins.c b/variants/ARMED_V1/PeripheralPins.c → variants/STM32F4xx/ARMED_V1/PeripheralPins.c
diff --git a/variants/BLACK_F407XX/PinNamesVar.h → variants/STM32F4xx/ARMED_V1/PinNamesVar.h b/variants/BLACK_F407XX/PinNamesVar.h → variants/STM32F4xx/ARMED_V1/PinNamesVar.h
diff --git a/variants/ARMED_V1/ldscript.ld → variants/STM32F4xx/ARMED_V1/ldscript.ld b/variants/ARMED_V1/ldscript.ld → variants/STM32F4xx/ARMED_V1/ldscript.ld
diff --git a/variants/ARMED_V1/variant.cpp → variants/STM32F4xx/ARMED_V1/variant.cpp b/variants/ARMED_V1/variant.cpp → variants/STM32F4xx/ARMED_V1/variant.cpp
diff --git a/variants/ARMED_V1/variant.h → variants/STM32F4xx/ARMED_V1/variant.h b/variants/ARMED_V1/variant.h → variants/STM32F4xx/ARMED_V1/variant.h
diff --git a/variants/BLACK_F407XX/PeripheralPins.c → ...s/STM32F4xx/BLACK_F407XX/PeripheralPins.c b/variants/BLACK_F407XX/PeripheralPins.c → ...s/STM32F4xx/BLACK_F407XX/PeripheralPins.c
diff --git a/variants/BLUE_F407VE_Mini/PinNamesVar.h → ...ants/STM32F4xx/BLACK_F407XX/PinNamesVar.h b/variants/BLUE_F407VE_Mini/PinNamesVar.h → ...ants/STM32F4xx/BLACK_F407XX/PinNamesVar.h
diff --git a/variants/BLACK_F407XX/ldscript.ld → variants/STM32F4xx/BLACK_F407XX/ldscript.ld b/variants/BLACK_F407XX/ldscript.ld → variants/STM32F4xx/BLACK_F407XX/ldscript.ld
diff --git a/variants/BLACK_F407XX/variant.cpp → variants/STM32F4xx/BLACK_F407XX/variant.cpp b/variants/BLACK_F407XX/variant.cpp → variants/STM32F4xx/BLACK_F407XX/variant.cpp
diff --git a/variants/BLACK_F407XX/variant.h → variants/STM32F4xx/BLACK_F407XX/variant.h b/variants/BLACK_F407XX/variant.h → variants/STM32F4xx/BLACK_F407XX/variant.h
diff --git a/variants/BLUE_F407VE_Mini/PeripheralPins.c → ...M32F4xx/BLUE_F407VE_Mini/PeripheralPins.c b/variants/BLUE_F407VE_Mini/PeripheralPins.c → ...M32F4xx/BLUE_F407VE_Mini/PeripheralPins.c
diff --git a/variants/DISCO_F407VG/PinNamesVar.h → .../STM32F4xx/BLUE_F407VE_Mini/PinNamesVar.h b/variants/DISCO_F407VG/PinNamesVar.h → .../STM32F4xx/BLUE_F407VE_Mini/PinNamesVar.h
diff --git a/variants/BLUE_F407VE_Mini/ldscript.ld → ...ts/STM32F4xx/BLUE_F407VE_Mini/ldscript.ld b/variants/BLUE_F407VE_Mini/ldscript.ld → ...ts/STM32F4xx/BLUE_F407VE_Mini/ldscript.ld
diff --git a/variants/BLUE_F407VE_Mini/variant.cpp → ...ts/STM32F4xx/BLUE_F407VE_Mini/variant.cpp b/variants/BLUE_F407VE_Mini/variant.cpp → ...ts/STM32F4xx/BLUE_F407VE_Mini/variant.cpp
diff --git a/variants/BLUE_F407VE_Mini/variant.h → ...ants/STM32F4xx/BLUE_F407VE_Mini/variant.h b/variants/BLUE_F407VE_Mini/variant.h → ...ants/STM32F4xx/BLUE_F407VE_Mini/variant.h
diff --git a/variants/DISCO_F407VG/PeripheralPins.c → ...s/STM32F4xx/DISCO_F407VG/PeripheralPins.c b/variants/DISCO_F407VG/PeripheralPins.c → ...s/STM32F4xx/DISCO_F407VG/PeripheralPins.c
diff --git a/variants/DIYMORE_F407VGT/PinNamesVar.h → ...ants/STM32F4xx/DISCO_F407VG/PinNamesVar.h b/variants/DIYMORE_F407VGT/PinNamesVar.h → ...ants/STM32F4xx/DISCO_F407VG/PinNamesVar.h
diff --git a/variants/DISCO_F407VG/ldscript.ld → variants/STM32F4xx/DISCO_F407VG/ldscript.ld b/variants/DISCO_F407VG/ldscript.ld → variants/STM32F4xx/DISCO_F407VG/ldscript.ld
diff --git a/variants/DISCO_F407VG/variant.cpp → variants/STM32F4xx/DISCO_F407VG/variant.cpp b/variants/DISCO_F407VG/variant.cpp → variants/STM32F4xx/DISCO_F407VG/variant.cpp
diff --git a/variants/DISCO_F407VG/variant.h → variants/STM32F4xx/DISCO_F407VG/variant.h b/variants/DISCO_F407VG/variant.h → variants/STM32F4xx/DISCO_F407VG/variant.h
diff --git a/variants/DISCO_F413ZH/PeripheralPins.c → ...s/STM32F4xx/DISCO_F413ZH/PeripheralPins.c b/variants/DISCO_F413ZH/PeripheralPins.c → ...s/STM32F4xx/DISCO_F413ZH/PeripheralPins.c
diff --git a/variants/DISCO_F413ZH/PinNamesVar.h → ...ants/STM32F4xx/DISCO_F413ZH/PinNamesVar.h b/variants/DISCO_F413ZH/PinNamesVar.h → ...ants/STM32F4xx/DISCO_F413ZH/PinNamesVar.h
diff --git a/variants/DISCO_F413ZH/ldscript.ld → variants/STM32F4xx/DISCO_F413ZH/ldscript.ld b/variants/DISCO_F413ZH/ldscript.ld → variants/STM32F4xx/DISCO_F413ZH/ldscript.ld
diff --git a/variants/DISCO_F413ZH/variant.cpp → variants/STM32F4xx/DISCO_F413ZH/variant.cpp b/variants/DISCO_F413ZH/variant.cpp → variants/STM32F4xx/DISCO_F413ZH/variant.cpp
diff --git a/variants/DISCO_F413ZH/variant.h → variants/STM32F4xx/DISCO_F413ZH/variant.h b/variants/DISCO_F413ZH/variant.h → variants/STM32F4xx/DISCO_F413ZH/variant.h
diff --git a/variants/DIYMORE_F407VGT/PeripheralPins.c → ...TM32F4xx/DIYMORE_F407VGT/PeripheralPins.c b/variants/DIYMORE_F407VGT/PeripheralPins.c → ...TM32F4xx/DIYMORE_F407VGT/PeripheralPins.c
diff --git a/variants/FEATHER_F405/PinNamesVar.h → ...s/STM32F4xx/DIYMORE_F407VGT/PinNamesVar.h b/variants/FEATHER_F405/PinNamesVar.h → ...s/STM32F4xx/DIYMORE_F407VGT/PinNamesVar.h
diff --git a/variants/DIYMORE_F407VGT/ldscript.ld → ...nts/STM32F4xx/DIYMORE_F407VGT/ldscript.ld b/variants/DIYMORE_F407VGT/ldscript.ld → ...nts/STM32F4xx/DIYMORE_F407VGT/ldscript.ld
diff --git a/variants/DIYMORE_F407VGT/variant.cpp → ...nts/STM32F4xx/DIYMORE_F407VGT/variant.cpp b/variants/DIYMORE_F407VGT/variant.cpp → ...nts/STM32F4xx/DIYMORE_F407VGT/variant.cpp
diff --git a/variants/DIYMORE_F407VGT/variant.h → variants/STM32F4xx/DIYMORE_F407VGT/variant.h b/variants/DIYMORE_F407VGT/variant.h → variants/STM32F4xx/DIYMORE_F407VGT/variant.h
diff --git a/variants/FEATHER_F405/PeripheralPins.c → ...s/STM32F4xx/FEATHER_F405/PeripheralPins.c b/variants/FEATHER_F405/PeripheralPins.c → ...s/STM32F4xx/FEATHER_F405/PeripheralPins.c
diff --git a/variants/FK407M1/PinNamesVar.h → ...ants/STM32F4xx/FEATHER_F405/PinNamesVar.h b/variants/FK407M1/PinNamesVar.h → ...ants/STM32F4xx/FEATHER_F405/PinNamesVar.h
diff --git a/variants/FEATHER_F405/ldscript.ld → variants/STM32F4xx/FEATHER_F405/ldscript.ld b/variants/FEATHER_F405/ldscript.ld → variants/STM32F4xx/FEATHER_F405/ldscript.ld
diff --git a/variants/FEATHER_F405/variant.cpp → variants/STM32F4xx/FEATHER_F405/variant.cpp b/variants/FEATHER_F405/variant.cpp → variants/STM32F4xx/FEATHER_F405/variant.cpp
diff --git a/variants/FEATHER_F405/variant.h → variants/STM32F4xx/FEATHER_F405/variant.h b/variants/FEATHER_F405/variant.h → variants/STM32F4xx/FEATHER_F405/variant.h
diff --git a/variants/FK407M1/PeripheralPins.c → variants/STM32F4xx/FK407M1/PeripheralPins.c b/variants/FK407M1/PeripheralPins.c → variants/STM32F4xx/FK407M1/PeripheralPins.c
diff --git a/variants/Generic_F4x5RG/PinNamesVar.h → variants/STM32F4xx/FK407M1/PinNamesVar.h b/variants/Generic_F4x5RG/PinNamesVar.h → variants/STM32F4xx/FK407M1/PinNamesVar.h
diff --git a/variants/FK407M1/ldscript.ld → variants/STM32F4xx/FK407M1/ldscript.ld b/variants/FK407M1/ldscript.ld → variants/STM32F4xx/FK407M1/ldscript.ld
diff --git a/variants/FK407M1/variant.cpp → variants/STM32F4xx/FK407M1/variant.cpp b/variants/FK407M1/variant.cpp → variants/STM32F4xx/FK407M1/variant.cpp
diff --git a/variants/FK407M1/variant.h → variants/STM32F4xx/FK407M1/variant.h b/variants/FK407M1/variant.h → variants/STM32F4xx/FK407M1/variant.h
diff --git a/variants/FYSETC_S6/PeripheralPins.c → ...ants/STM32F4xx/FYSETC_S6/PeripheralPins.c b/variants/FYSETC_S6/PeripheralPins.c → ...ants/STM32F4xx/FYSETC_S6/PeripheralPins.c
diff --git a/variants/FYSETC_S6/PinNamesVar.h → variants/STM32F4xx/FYSETC_S6/PinNamesVar.h b/variants/FYSETC_S6/PinNamesVar.h → variants/STM32F4xx/FYSETC_S6/PinNamesVar.h
diff --git a/variants/FYSETC_S6/ldscript.ld → variants/STM32F4xx/FYSETC_S6/ldscript.ld b/variants/FYSETC_S6/ldscript.ld → variants/STM32F4xx/FYSETC_S6/ldscript.ld
diff --git a/variants/FYSETC_S6/variant.cpp → variants/STM32F4xx/FYSETC_S6/variant.cpp b/variants/FYSETC_S6/variant.cpp → variants/STM32F4xx/FYSETC_S6/variant.cpp
diff --git a/variants/FYSETC_S6/variant.h → variants/STM32F4xx/FYSETC_S6/variant.h b/variants/FYSETC_S6/variant.h → variants/STM32F4xx/FYSETC_S6/variant.h
diff --git a/variants/Generic_F401Cx/PeripheralPins.c → ...STM32F4xx/Generic_F401Cx/PeripheralPins.c b/variants/Generic_F401Cx/PeripheralPins.c → ...STM32F4xx/Generic_F401Cx/PeripheralPins.c
diff --git a/variants/Generic_F401Cx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F401Cx/PinNamesVar.h b/variants/Generic_F401Cx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F401Cx/PinNamesVar.h
diff --git a/variants/Generic_F401Cx/ldscript.ld → ...ants/STM32F4xx/Generic_F401Cx/ldscript.ld b/variants/Generic_F401Cx/ldscript.ld → ...ants/STM32F4xx/Generic_F401Cx/ldscript.ld
diff --git a/variants/Generic_F401Cx/variant.cpp → ...ants/STM32F4xx/Generic_F401Cx/variant.cpp b/variants/Generic_F401Cx/variant.cpp → ...ants/STM32F4xx/Generic_F401Cx/variant.cpp
diff --git a/variants/Generic_F401Cx/variant.h → variants/STM32F4xx/Generic_F401Cx/variant.h b/variants/Generic_F401Cx/variant.h → variants/STM32F4xx/Generic_F401Cx/variant.h
diff --git a/variants/Generic_F401Rx/PeripheralPins.c → ...STM32F4xx/Generic_F401Rx/PeripheralPins.c b/variants/Generic_F401Rx/PeripheralPins.c → ...STM32F4xx/Generic_F401Rx/PeripheralPins.c
diff --git a/variants/Generic_F401Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F401Rx/PinNamesVar.h b/variants/Generic_F401Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F401Rx/PinNamesVar.h
diff --git a/variants/Generic_F401Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F401Rx/ldscript.ld b/variants/Generic_F401Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F401Rx/ldscript.ld
diff --git a/variants/Generic_F401Rx/variant.cpp → ...ants/STM32F4xx/Generic_F401Rx/variant.cpp b/variants/Generic_F401Rx/variant.cpp → ...ants/STM32F4xx/Generic_F401Rx/variant.cpp
diff --git a/variants/Generic_F401Rx/variant.h → variants/STM32F4xx/Generic_F401Rx/variant.h b/variants/Generic_F401Rx/variant.h → variants/STM32F4xx/Generic_F401Rx/variant.h
diff --git a/variants/Generic_F410Cx/PeripheralPins.c → ...STM32F4xx/Generic_F410Cx/PeripheralPins.c b/variants/Generic_F410Cx/PeripheralPins.c → ...STM32F4xx/Generic_F410Cx/PeripheralPins.c
diff --git a/variants/Generic_F410Cx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F410Cx/PinNamesVar.h b/variants/Generic_F410Cx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F410Cx/PinNamesVar.h
diff --git a/variants/Generic_F410Cx/ldscript.ld → ...ants/STM32F4xx/Generic_F410Cx/ldscript.ld b/variants/Generic_F410Cx/ldscript.ld → ...ants/STM32F4xx/Generic_F410Cx/ldscript.ld
diff --git a/variants/Generic_F410Cx/variant.cpp → ...ants/STM32F4xx/Generic_F410Cx/variant.cpp b/variants/Generic_F410Cx/variant.cpp → ...ants/STM32F4xx/Generic_F410Cx/variant.cpp
diff --git a/variants/Generic_F410Cx/variant.h → variants/STM32F4xx/Generic_F410Cx/variant.h b/variants/Generic_F410Cx/variant.h → variants/STM32F4xx/Generic_F410Cx/variant.h
diff --git a/variants/Generic_F410Rx/PeripheralPins.c → ...STM32F4xx/Generic_F410Rx/PeripheralPins.c b/variants/Generic_F410Rx/PeripheralPins.c → ...STM32F4xx/Generic_F410Rx/PeripheralPins.c
diff --git a/variants/Generic_F410Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F410Rx/PinNamesVar.h b/variants/Generic_F410Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F410Rx/PinNamesVar.h
diff --git a/variants/Generic_F410Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F410Rx/ldscript.ld b/variants/Generic_F410Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F410Rx/ldscript.ld
diff --git a/variants/Generic_F410Rx/variant.cpp → ...ants/STM32F4xx/Generic_F410Rx/variant.cpp b/variants/Generic_F410Rx/variant.cpp → ...ants/STM32F4xx/Generic_F410Rx/variant.cpp
diff --git a/variants/Generic_F410Rx/variant.h → variants/STM32F4xx/Generic_F410Rx/variant.h b/variants/Generic_F410Rx/variant.h → variants/STM32F4xx/Generic_F410Rx/variant.h
diff --git a/variants/Generic_F411Cx/PeripheralPins.c → ...STM32F4xx/Generic_F411Cx/PeripheralPins.c b/variants/Generic_F411Cx/PeripheralPins.c → ...STM32F4xx/Generic_F411Cx/PeripheralPins.c
diff --git a/variants/Generic_F411Cx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F411Cx/PinNamesVar.h b/variants/Generic_F411Cx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F411Cx/PinNamesVar.h
diff --git a/variants/Generic_F411Cx/ldscript.ld → ...ants/STM32F4xx/Generic_F411Cx/ldscript.ld b/variants/Generic_F411Cx/ldscript.ld → ...ants/STM32F4xx/Generic_F411Cx/ldscript.ld
diff --git a/variants/Generic_F411Cx/variant.cpp → ...ants/STM32F4xx/Generic_F411Cx/variant.cpp b/variants/Generic_F411Cx/variant.cpp → ...ants/STM32F4xx/Generic_F411Cx/variant.cpp
diff --git a/variants/Generic_F411Cx/variant.h → variants/STM32F4xx/Generic_F411Cx/variant.h b/variants/Generic_F411Cx/variant.h → variants/STM32F4xx/Generic_F411Cx/variant.h
diff --git a/variants/Generic_F411Rx/PeripheralPins.c → ...STM32F4xx/Generic_F411Rx/PeripheralPins.c b/variants/Generic_F411Rx/PeripheralPins.c → ...STM32F4xx/Generic_F411Rx/PeripheralPins.c
diff --git a/variants/Generic_F411Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F411Rx/PinNamesVar.h b/variants/Generic_F411Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F411Rx/PinNamesVar.h
diff --git a/variants/Generic_F411Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F411Rx/ldscript.ld b/variants/Generic_F411Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F411Rx/ldscript.ld
diff --git a/variants/Generic_F411Rx/variant.cpp → ...ants/STM32F4xx/Generic_F411Rx/variant.cpp b/variants/Generic_F411Rx/variant.cpp → ...ants/STM32F4xx/Generic_F411Rx/variant.cpp
diff --git a/variants/Generic_F411Rx/variant.h → variants/STM32F4xx/Generic_F411Rx/variant.h b/variants/Generic_F411Rx/variant.h → variants/STM32F4xx/Generic_F411Rx/variant.h
diff --git a/variants/Generic_F412Cx/PeripheralPins.c → ...STM32F4xx/Generic_F412Cx/PeripheralPins.c b/variants/Generic_F412Cx/PeripheralPins.c → ...STM32F4xx/Generic_F412Cx/PeripheralPins.c
diff --git a/variants/Generic_F412Cx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F412Cx/PinNamesVar.h b/variants/Generic_F412Cx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F412Cx/PinNamesVar.h
diff --git a/variants/Generic_F412Cx/ldscript.ld → ...ants/STM32F4xx/Generic_F412Cx/ldscript.ld b/variants/Generic_F412Cx/ldscript.ld → ...ants/STM32F4xx/Generic_F412Cx/ldscript.ld
diff --git a/variants/Generic_F412Cx/variant.cpp → ...ants/STM32F4xx/Generic_F412Cx/variant.cpp b/variants/Generic_F412Cx/variant.cpp → ...ants/STM32F4xx/Generic_F412Cx/variant.cpp
diff --git a/variants/Generic_F412Cx/variant.h → variants/STM32F4xx/Generic_F412Cx/variant.h b/variants/Generic_F412Cx/variant.h → variants/STM32F4xx/Generic_F412Cx/variant.h
diff --git a/variants/Generic_F412Rx/PeripheralPins.c → ...STM32F4xx/Generic_F412Rx/PeripheralPins.c b/variants/Generic_F412Rx/PeripheralPins.c → ...STM32F4xx/Generic_F412Rx/PeripheralPins.c
diff --git a/variants/Generic_F412Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F412Rx/PinNamesVar.h b/variants/Generic_F412Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F412Rx/PinNamesVar.h
diff --git a/variants/Generic_F412Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F412Rx/ldscript.ld b/variants/Generic_F412Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F412Rx/ldscript.ld
diff --git a/variants/Generic_F412Rx/variant.cpp → ...ants/STM32F4xx/Generic_F412Rx/variant.cpp b/variants/Generic_F412Rx/variant.cpp → ...ants/STM32F4xx/Generic_F412Rx/variant.cpp
diff --git a/variants/Generic_F412Rx/variant.h → variants/STM32F4xx/Generic_F412Rx/variant.h b/variants/Generic_F412Rx/variant.h → variants/STM32F4xx/Generic_F412Rx/variant.h
diff --git a/variants/Generic_F446Rx/PeripheralPins.c → ...STM32F4xx/Generic_F446Rx/PeripheralPins.c b/variants/Generic_F446Rx/PeripheralPins.c → ...STM32F4xx/Generic_F446Rx/PeripheralPins.c
diff --git a/variants/Generic_F446Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F446Rx/PinNamesVar.h b/variants/Generic_F446Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F446Rx/PinNamesVar.h
diff --git a/variants/Generic_F446Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F446Rx/ldscript.ld b/variants/Generic_F446Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F446Rx/ldscript.ld
diff --git a/variants/Generic_F446Rx/variant.cpp → ...ants/STM32F4xx/Generic_F446Rx/variant.cpp b/variants/Generic_F446Rx/variant.cpp → ...ants/STM32F4xx/Generic_F446Rx/variant.cpp
diff --git a/variants/Generic_F446Rx/variant.h → variants/STM32F4xx/Generic_F446Rx/variant.h b/variants/Generic_F446Rx/variant.h → variants/STM32F4xx/Generic_F446Rx/variant.h
diff --git a/variants/Generic_F4x3Cx/PeripheralPins.c → ...STM32F4xx/Generic_F4x3Cx/PeripheralPins.c b/variants/Generic_F4x3Cx/PeripheralPins.c → ...STM32F4xx/Generic_F4x3Cx/PeripheralPins.c
diff --git a/variants/Generic_F4x3Cx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F4x3Cx/PinNamesVar.h b/variants/Generic_F4x3Cx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F4x3Cx/PinNamesVar.h
diff --git a/variants/Generic_F4x3Cx/ldscript.ld → ...ants/STM32F4xx/Generic_F4x3Cx/ldscript.ld b/variants/Generic_F4x3Cx/ldscript.ld → ...ants/STM32F4xx/Generic_F4x3Cx/ldscript.ld
diff --git a/variants/Generic_F4x3Cx/variant.cpp → ...ants/STM32F4xx/Generic_F4x3Cx/variant.cpp b/variants/Generic_F4x3Cx/variant.cpp → ...ants/STM32F4xx/Generic_F4x3Cx/variant.cpp
diff --git a/variants/Generic_F4x3Cx/variant.h → variants/STM32F4xx/Generic_F4x3Cx/variant.h b/variants/Generic_F4x3Cx/variant.h → variants/STM32F4xx/Generic_F4x3Cx/variant.h
diff --git a/variants/Generic_F4x3Rx/PeripheralPins.c → ...STM32F4xx/Generic_F4x3Rx/PeripheralPins.c b/variants/Generic_F4x3Rx/PeripheralPins.c → ...STM32F4xx/Generic_F4x3Rx/PeripheralPins.c
diff --git a/variants/Generic_F4x3Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F4x3Rx/PinNamesVar.h b/variants/Generic_F4x3Rx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F4x3Rx/PinNamesVar.h
diff --git a/variants/Generic_F4x3Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F4x3Rx/ldscript.ld b/variants/Generic_F4x3Rx/ldscript.ld → ...ants/STM32F4xx/Generic_F4x3Rx/ldscript.ld
diff --git a/variants/Generic_F4x3Rx/variant.cpp → ...ants/STM32F4xx/Generic_F4x3Rx/variant.cpp b/variants/Generic_F4x3Rx/variant.cpp → ...ants/STM32F4xx/Generic_F4x3Rx/variant.cpp
diff --git a/variants/Generic_F4x3Rx/variant.h → variants/STM32F4xx/Generic_F4x3Rx/variant.h b/variants/Generic_F4x3Rx/variant.h → variants/STM32F4xx/Generic_F4x3Rx/variant.h
diff --git a/variants/Generic_F4x5RG/PeripheralPins.c → ...STM32F4xx/Generic_F4x5RG/PeripheralPins.c b/variants/Generic_F4x5RG/PeripheralPins.c → ...STM32F4xx/Generic_F4x5RG/PeripheralPins.c
diff --git a/variants/Generic_F4x7Vx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F4x5RG/PinNamesVar.h b/variants/Generic_F4x7Vx/PinNamesVar.h → ...ts/STM32F4xx/Generic_F4x5RG/PinNamesVar.h
diff --git a/variants/Generic_F4x5RG/ldscript.ld → ...ants/STM32F4xx/Generic_F4x5RG/ldscript.ld b/variants/Generic_F4x5RG/ldscript.ld → ...ants/STM32F4xx/Generic_F4x5RG/ldscript.ld
diff --git a/variants/Generic_F4x5RG/variant.cpp → ...ants/STM32F4xx/Generic_F4x5RG/variant.cpp b/variants/Generic_F4x5RG/variant.cpp → ...ants/STM32F4xx/Generic_F4x5RG/variant.cpp
diff --git a/variants/Generic_F4x5RG/variant.h → variants/STM32F4xx/Generic_F4x5RG/variant.h b/variants/Generic_F4x5RG/variant.h → variants/STM32F4xx/Generic_F4x5RG/variant.h
diff --git a/variants/Generic_F4x7Vx/PeripheralPins.c → ...STM32F4xx/Generic_F4x7Vx/PeripheralPins.c b/variants/Generic_F4x7Vx/PeripheralPins.c → ...STM32F4xx/Generic_F4x7Vx/PeripheralPins.c
diff --git a/variants/NUCLEO_F207ZG/PinNamesVar.h → ...ts/STM32F4xx/Generic_F4x7Vx/PinNamesVar.h b/variants/NUCLEO_F207ZG/PinNamesVar.h → ...ts/STM32F4xx/Generic_F4x7Vx/PinNamesVar.h
diff --git a/variants/Generic_F4x7Vx/ldscript.ld → ...ants/STM32F4xx/Generic_F4x7Vx/ldscript.ld b/variants/Generic_F4x7Vx/ldscript.ld → ...ants/STM32F4xx/Generic_F4x7Vx/ldscript.ld
diff --git a/variants/Generic_F4x7Vx/variant.cpp → ...ants/STM32F4xx/Generic_F4x7Vx/variant.cpp b/variants/Generic_F4x7Vx/variant.cpp → ...ants/STM32F4xx/Generic_F4x7Vx/variant.cpp
diff --git a/variants/Generic_F4x7Vx/variant.h → variants/STM32F4xx/Generic_F4x7Vx/variant.h b/variants/Generic_F4x7Vx/variant.h → variants/STM32F4xx/Generic_F4x7Vx/variant.h
diff --git a/variants/NUCLEO_F429ZI/PeripheralPins.c → .../STM32F4xx/NUCLEO_F429ZI/PeripheralPins.c b/variants/NUCLEO_F429ZI/PeripheralPins.c → .../STM32F4xx/NUCLEO_F429ZI/PeripheralPins.c
diff --git a/variants/NUCLEO_F429ZI/PinNamesVar.h → ...nts/STM32F4xx/NUCLEO_F429ZI/PinNamesVar.h b/variants/NUCLEO_F429ZI/PinNamesVar.h → ...nts/STM32F4xx/NUCLEO_F429ZI/PinNamesVar.h
diff --git a/variants/NUCLEO_F429ZI/ldscript.ld → variants/STM32F4xx/NUCLEO_F429ZI/ldscript.ld b/variants/NUCLEO_F429ZI/ldscript.ld → variants/STM32F4xx/NUCLEO_F429ZI/ldscript.ld
diff --git a/variants/NUCLEO_F429ZI/variant.cpp → variants/STM32F4xx/NUCLEO_F429ZI/variant.cpp b/variants/NUCLEO_F429ZI/variant.cpp → variants/STM32F4xx/NUCLEO_F429ZI/variant.cpp
diff --git a/variants/NUCLEO_F429ZI/variant.h → variants/STM32F4xx/NUCLEO_F429ZI/variant.h b/variants/NUCLEO_F429ZI/variant.h → variants/STM32F4xx/NUCLEO_F429ZI/variant.h
diff --git a/variants/NUCLEO_F446RE/PeripheralPins.c → .../STM32F4xx/NUCLEO_F446RE/PeripheralPins.c b/variants/NUCLEO_F446RE/PeripheralPins.c → .../STM32F4xx/NUCLEO_F446RE/PeripheralPins.c
diff --git a/variants/NUCLEO_F446RE/PinNamesVar.h → ...nts/STM32F4xx/NUCLEO_F446RE/PinNamesVar.h b/variants/NUCLEO_F446RE/PinNamesVar.h → ...nts/STM32F4xx/NUCLEO_F446RE/PinNamesVar.h
diff --git a/variants/NUCLEO_F446RE/ldscript.ld → variants/STM32F4xx/NUCLEO_F446RE/ldscript.ld b/variants/NUCLEO_F446RE/ldscript.ld → variants/STM32F4xx/NUCLEO_F446RE/ldscript.ld
diff --git a/variants/NUCLEO_F446RE/variant.cpp → variants/STM32F4xx/NUCLEO_F446RE/variant.cpp b/variants/NUCLEO_F446RE/variant.cpp → variants/STM32F4xx/NUCLEO_F446RE/variant.cpp
diff --git a/variants/NUCLEO_F446RE/variant.h → variants/STM32F4xx/NUCLEO_F446RE/variant.h b/variants/NUCLEO_F446RE/variant.h → variants/STM32F4xx/NUCLEO_F446RE/variant.h
diff --git a/variants/NUCLEO_F4x1RE/PeripheralPins.c → .../STM32F4xx/NUCLEO_F4x1RE/PeripheralPins.c b/variants/NUCLEO_F4x1RE/PeripheralPins.c → .../STM32F4xx/NUCLEO_F4x1RE/PeripheralPins.c
diff --git a/variants/NUCLEO_F4x1RE/PinNamesVar.h → ...nts/STM32F4xx/NUCLEO_F4x1RE/PinNamesVar.h b/variants/NUCLEO_F4x1RE/PinNamesVar.h → ...nts/STM32F4xx/NUCLEO_F4x1RE/PinNamesVar.h
diff --git a/variants/NUCLEO_F4x1RE/ldscript.ld → variants/STM32F4xx/NUCLEO_F4x1RE/ldscript.ld b/variants/NUCLEO_F4x1RE/ldscript.ld → variants/STM32F4xx/NUCLEO_F4x1RE/ldscript.ld
diff --git a/variants/NUCLEO_F4x1RE/variant.cpp → variants/STM32F4xx/NUCLEO_F4x1RE/variant.cpp b/variants/NUCLEO_F4x1RE/variant.cpp → variants/STM32F4xx/NUCLEO_F4x1RE/variant.cpp
diff --git a/variants/NUCLEO_F4x1RE/variant.h → variants/STM32F4xx/NUCLEO_F4x1RE/variant.h b/variants/NUCLEO_F4x1RE/variant.h → variants/STM32F4xx/NUCLEO_F4x1RE/variant.h
diff --git a/variants/PRNTR_Vx/PeripheralPins.c → variants/STM32F4xx/PRNTR_Vx/PeripheralPins.c b/variants/PRNTR_Vx/PeripheralPins.c → variants/STM32F4xx/PRNTR_Vx/PeripheralPins.c
diff --git a/variants/PRNTR_Vx/PinNamesVar.h → variants/STM32F4xx/PRNTR_Vx/PinNamesVar.h b/variants/PRNTR_Vx/PinNamesVar.h → variants/STM32F4xx/PRNTR_Vx/PinNamesVar.h
diff --git a/variants/PRNTR_Vx/ldscript.ld → variants/STM32F4xx/PRNTR_Vx/ldscript.ld b/variants/PRNTR_Vx/ldscript.ld → variants/STM32F4xx/PRNTR_Vx/ldscript.ld
diff --git a/variants/PRNTR_Vx/variant.cpp → variants/STM32F4xx/PRNTR_Vx/variant.cpp b/variants/PRNTR_Vx/variant.cpp → variants/STM32F4xx/PRNTR_Vx/variant.cpp
diff --git a/variants/PRNTR_Vx/variant.h → variants/STM32F4xx/PRNTR_Vx/variant.h b/variants/PRNTR_Vx/variant.h → variants/STM32F4xx/PRNTR_Vx/variant.h
diff --git a/variants/PYBSTICK26_LITE/PeripheralPins.c → ...TM32F4xx/PYBSTICK26_LITE/PeripheralPins.c b/variants/PYBSTICK26_LITE/PeripheralPins.c → ...TM32F4xx/PYBSTICK26_LITE/PeripheralPins.c
diff --git a/variants/PYBSTICK26_LITE/PinNamesVar.h → ...s/STM32F4xx/PYBSTICK26_LITE/PinNamesVar.h b/variants/PYBSTICK26_LITE/PinNamesVar.h → ...s/STM32F4xx/PYBSTICK26_LITE/PinNamesVar.h
diff --git a/variants/PYBSTICK26_LITE/ldscript.ld → ...nts/STM32F4xx/PYBSTICK26_LITE/ldscript.ld b/variants/PYBSTICK26_LITE/ldscript.ld → ...nts/STM32F4xx/PYBSTICK26_LITE/ldscript.ld
diff --git a/variants/PYBSTICK26_LITE/variant.cpp → ...nts/STM32F4xx/PYBSTICK26_LITE/variant.cpp b/variants/PYBSTICK26_LITE/variant.cpp → ...nts/STM32F4xx/PYBSTICK26_LITE/variant.cpp
diff --git a/variants/PYBSTICK26_LITE/variant.h → variants/STM32F4xx/PYBSTICK26_LITE/variant.h b/variants/PYBSTICK26_LITE/variant.h → variants/STM32F4xx/PYBSTICK26_LITE/variant.h
diff --git a/variants/PYBSTICK26_PRO/PeripheralPins.c → ...STM32F4xx/PYBSTICK26_PRO/PeripheralPins.c b/variants/PYBSTICK26_PRO/PeripheralPins.c → ...STM32F4xx/PYBSTICK26_PRO/PeripheralPins.c
diff --git a/variants/PYBSTICK26_PRO/PinNamesVar.h → ...ts/STM32F4xx/PYBSTICK26_PRO/PinNamesVar.h b/variants/PYBSTICK26_PRO/PinNamesVar.h → ...ts/STM32F4xx/PYBSTICK26_PRO/PinNamesVar.h
diff --git a/variants/PYBSTICK26_PRO/ldscript.ld → ...ants/STM32F4xx/PYBSTICK26_PRO/ldscript.ld b/variants/PYBSTICK26_PRO/ldscript.ld → ...ants/STM32F4xx/PYBSTICK26_PRO/ldscript.ld
diff --git a/variants/PYBSTICK26_PRO/variant.cpp → ...ants/STM32F4xx/PYBSTICK26_PRO/variant.cpp b/variants/PYBSTICK26_PRO/variant.cpp → ...ants/STM32F4xx/PYBSTICK26_PRO/variant.cpp
diff --git a/variants/PYBSTICK26_PRO/variant.h → variants/STM32F4xx/PYBSTICK26_PRO/variant.h b/variants/PYBSTICK26_PRO/variant.h → variants/STM32F4xx/PYBSTICK26_PRO/variant.h
diff --git a/variants/PYBSTICK26_STD/PeripheralPins.c → ...STM32F4xx/PYBSTICK26_STD/PeripheralPins.c b/variants/PYBSTICK26_STD/PeripheralPins.c → ...STM32F4xx/PYBSTICK26_STD/PeripheralPins.c
diff --git a/variants/PYBSTICK26_STD/PinNamesVar.h → ...ts/STM32F4xx/PYBSTICK26_STD/PinNamesVar.h b/variants/PYBSTICK26_STD/PinNamesVar.h → ...ts/STM32F4xx/PYBSTICK26_STD/PinNamesVar.h
diff --git a/variants/PYBSTICK26_STD/ldscript.ld → ...ants/STM32F4xx/PYBSTICK26_STD/ldscript.ld b/variants/PYBSTICK26_STD/ldscript.ld → ...ants/STM32F4xx/PYBSTICK26_STD/ldscript.ld
diff --git a/variants/PYBSTICK26_STD/variant.cpp → ...ants/STM32F4xx/PYBSTICK26_STD/variant.cpp b/variants/PYBSTICK26_STD/variant.cpp → ...ants/STM32F4xx/PYBSTICK26_STD/variant.cpp
diff --git a/variants/PYBSTICK26_STD/variant.h → variants/STM32F4xx/PYBSTICK26_STD/variant.h b/variants/PYBSTICK26_STD/variant.h → variants/STM32F4xx/PYBSTICK26_STD/variant.h