diff --git a/tools/test/.gitignore b/tools/test/.gitignore
deleted file mode 100644
index 5d0d475..0000000
--- a/tools/test/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build
-cache
-libraries
-library_index.json
diff --git a/tools/test/README.md b/tools/test/README.md
deleted file mode 100644
index 6056a7c..0000000
--- a/tools/test/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Deprecated, use tools/script/run_build.py instead.
diff --git a/tools/test/guess_includes.py b/tools/test/guess_includes.py
deleted file mode 100644
index a76e95c..0000000
--- a/tools/test/guess_includes.py
+++ /dev/null
@@ -1,390 +0,0 @@
-import os
-import glob
-import json
-import re
-import subprocess
-from subprocess import call, check_output
-
-BOARD = "BluePill_F103C8"
-
-DIR_CORES = "../../STM32"
-DIR_PROJECTS = "sources/arduino_projects"
-
-def find_examples(dir, list):
-    if not os.path.isdir(dir):
-        return
-    
-    subdirs = os.listdir(dir)
-    for subdir in subdirs:
-        if os.path.exists(dir + '/' + subdir + '/' + subdir + '.ino'):
-            list.append(dir + '/' + subdir)
-
-        if os.path.exists(dir + '/' + subdir + '/' + subdir + '.pde'):
-            list.append(dir + '/' + subdir)
-
-        find_examples(dir + '/' + subdir, list)
-
-def find_directories():
-    dirs = []
-
-    DIR_LIBRARIES = DIR_CORES + "/libraries"
-    core_libs = os.listdir(DIR_LIBRARIES)
-    for core_lib in core_libs:
-        if os.path.exists(DIR_LIBRARIES + "/" + core_lib + '/src'):
-            dirs.append(DIR_LIBRARIES + "/" + core_lib + '/src')
-        else:
-            dirs.append(DIR_LIBRARIES + "/" + core_lib)
-        
-        find_examples(DIR_LIBRARIES + '/' + core_lib + '/examples', dirs)
-        
-    return dirs
-    
-    projects = os.listdir(DIR_PROJECTS)
-    for project in projects:
-        if os.path.exists(DIR_PROJECTS + '/' + project + '/src'):
-            dirs.append(DIR_PROJECTS + '/' + project + '/src')
-        else:
-            dirs.append(DIR_PROJECTS + '/' + project)
-
-        if os.path.exists(DIR_PROJECTS + '/' + project + '/examples'):
-            examples = os.listdir(DIR_PROJECTS + '/' + project + '/examples')
-
-            #TODO use glob.glob()
-            for example in examples:
-                if not os.path.isdir(DIR_PROJECTS + '/' + project + '/examples/' + example):
-                    continue
-                if os.path.exists(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + example + '.ino'):
-                    dirs.append(DIR_PROJECTS + '/' + project + '/examples/' + example)
-
-                if os.path.exists(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + example + '.pde'):
-                    dirs.append(DIR_PROJECTS + '/' + project + '/examples/' + example)
-
-                subexamples = os.listdir(DIR_PROJECTS + '/' + project + '/examples/' + example)
-                for subexample in subexamples:
-                    if not os.path.isdir(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample):
-                        continue
-
-                    if os.path.isdir(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample) and os.path.exists(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample + '/' + subexample + '.ino'):
-                        dirs.append(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample)
-                    if os.path.isdir(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample) and os.path.exists(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample + '/' + subexample + '.pde'):
-                        dirs.append(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample)
-
-                    subsubexamples = os.listdir(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample)
-                    for subsubexample in subsubexamples:
-                        if os.path.isdir(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample + '/' + subsubexample) and os.path.exists(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample + '/' + subsubexample + '/' + subsubexample + '.ino'):
-                            dirs.append(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample + '/' + subsubexample)
-                        if os.path.isdir(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample + '/' + subsubexample) and os.path.exists(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample + '/' + subsubexample + '/' + subsubexample + '.pde'):
-                            dirs.append(DIR_PROJECTS + '/' + project + '/examples/' + example + '/' + subexample + '/' + subsubexample)
-
-    return dirs
-
-core_includes = os.listdir(DIR_CORES + "/cores/arduino")
-
-
-def remove_all(lst, key):
-    return [val for val in lst if val!=key]
-
-def get_includes(filename):
-    file = open(filename, "r")
-    includes = []
-
-    if "Printoo" in filename: #TODO remove this when SoftwareSerial is available
-        return includes
-
-    declarations = []
-
-    for line in file:
-        if '//' in line:
-            line = line[:line.index('//')]
-
-        line = line.rstrip()
-
-        declaration_found = re.search('^([a-zA-Z].* .*\\(.*\\).*){$', line)
-        if declaration_found:
-            func_decl = declaration_found.groups()[0] + ';'
-            if func_decl.startswith('SIGNAL'):
-                    continue
-            if "::" in func_decl[:func_decl.index('(')]:
-                    continue
-            if "." in func_decl[:func_decl.index('(')]:
-                    continue
-            if 'void setup(' in func_decl:
-                    continue
-            if 'void loop(' in func_decl:
-                    continue
-            declarations.append(func_decl);
-
-        if line.rstrip() == '{':
-            combined = previous_line.rstrip() + line
-            declaration_found = re.search('^([a-zA-Z].* .*.*\\(.*\\).*){$', combined)
-            if declaration_found:
-                func_decl = declaration_found.groups()[0] + ';'
-                if 'void setup(' in func_decl:
-                        continue
-                if 'void loop(' in func_decl:
-                        continue
-                declarations.append(func_decl);
-
-
-        found = re.search('include.*?"(.*)"', line)
-        if found:
-            includes.append(found.groups()[0])
-        found = re.search('include.*?<(.*)>', line)
-        if found:
-            includes.append(found.groups()[0])
-
-
-        previous_line = line
-
-
-    for ignore_include in core_includes:
-        includes = remove_all(includes, ignore_include)
-    includes = remove_all(includes, "string.h")
-    includes = remove_all(includes, "variant.h")
-    includes = remove_all(includes, "time.h")
-
-    if filename.endswith('.ino') or filename.endswith('.pde'):
-        with open(filename + '.h', 'w') as file:
-            if declarations:
-                for include in includes:
-                    if include.startswith('avr/'):
-                        continue
-
-                    file.write('#include "' + include + '"\n');
-            file.write("\n".join(declarations))
-
-    return includes
-
-dirs = find_directories();
-
-header_to_dir = {}
-
-for dir in dirs:
-    if 'examples' in dir:
-        continue
-    #print dir
-    headers = [file for file in os.listdir(dir) if file.endswith(('.h', '.hpp'))]
-    for header in headers:
-        if header in header_to_dir:
-            pass
-            #print header + ": " + header_to_dir[header] + "=>" + dir
-        else:
-            header_to_dir[header] = dir
-
-def get_sources(dir, subdir):
-    sources = [subdir + file for file in os.listdir(dir) if file.endswith(('.h', '.hpp', '.c', '.cpp', '.ino', '.pde'))]
-    for file in os.listdir(dir):
-        if os.path.isdir(dir + '/' + file) and file != 'examples':
-            sources.extend(get_sources(dir + '/' + file, subdir + file + '/'))
-    return sources
-
-def create_includes():
-    #print check_output(["find", ".", "-name", "'build-include-*.txt'", "-delete"], stderr=subprocess.STDOUT)
-
-    for dir in dirs:
-
-        sources = get_sources(dir, '')
-
-        dirs_to_include = []
-
-        for source in sources:
-            includes = get_includes(dir + '/' + source)
-
-            for include in includes:
-                skip = False
-                for s in sources:
-                    if s == include or include.endswith('/' + s) or s.endswith('/' + include):
-                        skip = True
-
-                if skip:
-                    continue
-
-                if include in header_to_dir:
-                    dirs_to_include.append(header_to_dir[include])
-
-        dirs_to_include = list(set(dirs_to_include))
-
-        if dir in dirs_to_include:
-            dirs_to_include.remove(dir)
-
-        add = []
-
-        for dir_to_include in dirs_to_include:
-            if os.path.exists(dir_to_include + '/build-include.txt'):
-                with open(dir_to_include + '/build-include.txt', 'r') as file:
-                    add.extend(file.readline().strip().split(" "))
-
-        dirs_to_include.extend(add)
-
-        dirs_to_include = list(set(dirs_to_include))
-
-        with open(dir + '/build-include.txt', 'w') as file:
-            for d in dirs_to_include:
-                file.write(d + ' ')
-
-create_includes()
-
-exit()
-                
-already_compiled = []
-
-def make(directory):
-    if (directory in already_compiled):
-        return
-    print directory
-
-    already_compiled.append(directory)
-
-    #try:
-    with open(directory + '/build-include-' + ARCH + '.txt') as f:
-            dependencies= f.readline()
-            for dependency in dependencies.split():
-                make(dependency)
-    #except:
-    #    print 'DEPENDENCIES NOT CREATED'
-
-    call(['make', 'clean', 'ARCH='+ARCH, 'BOARD='+BOARD, 'PROJECT='+directory])
-
-    try:
-        os.mkdir(directory+"/build-"+BOARD)
-    except OSError:
-        pass
-
-    stdout = open(directory+"/build-"+BOARD+"/stdout.txt", "w")
-    stderr = open(directory+"/build-"+BOARD+"/stderr.txt", "w")
-    call(['make', 'ARCH='+ARCH, 'BOARD='+BOARD, 'PROJECT='+directory], stdout = stdout, stderr = stderr)
-    stdout.close()
-    stderr.close()
-
-#create_includes()
-
-#raise X
-
-for dir in dirs:
-    make(dir)
-#make('sources/arduino_projects/Adafruit_GFX_Library-1.1.5')
-#make('sources/arduino_projects/Adafruit_ILI9341-1.0.1/examples/graphicstest')
-#make('sources/arduino_projects/LcdProgressBarDouble-1.0.4/examples/DoubleBarPot')
-#make('sources/arduino_projects/RTClib-1.2.0')
-#make('sources/arduino_projects/Arduino_GUI-1.6.11/examples/01.Basics/Blink')
-#make('sources/arduino_projects/SD-1.0.6/src')
-#make('sources/arduino_projects/SD-1.0.6/examples/listfiles')
-#make('sources/arduino_projects/Cayenne-1.0.1')
-#make('sources/arduino_projects/ArduinoJson-5.6.7')
-#make('sources/arduino_projects/ArduinoJson-5.6.7/examples/JsonParserExample')
-#make('sources/arduino_projects/EMoRo_2560-2.4.1/src')
-#make('sources/arduino_projects/Kalman_Filter_Library-1.0.1/examples/MPU6050')
-#make('sources/arduino_projects/SparkFun_Graphic_LCD_Serial_Backpack-1.0.1/examples/SparkFunSerialGraphicLCDDemo')
-#make('sources/arduino_projects/DHT_sensor_library-1.2.3')
-#make('sources/arduino_projects/DHT_sensor_library-1.2.3/examples/DHTtester')
-#make('sources/arduino_projects/Adafruit_GPS_Library-1.0.1/examples/leo_locus_erase')
-#make('sources/arduino_projects/DimSwitch-1.0.2/examples/DimSwitchTester-ESP-MQTT')
-#make('sources/arduino_projects/MFRC522-1.1.8/examples/RFID-Cloner')
-#make('sources/arduino_projects/U8glib-1.19.1/examples/HelloWorld')
-#make('sources/arduino_projects/Adafruit_CC3000_Library-1.0.3/examples/HTTPServer')
-#make('sources/arduino_projects/Adafruit_Fingerprint_Sensor_Library-1.0.0')
-#make('sources/arduino_projects/LiquidCrystal_I2C-1.1.2/examples/HelloWorld')
-#make('sources/arduino_projects/AccelStepper')
-
-#raise Error
-
-output = []
-
-errors = {}
-
-for dir in dirs:
-    #print dir
-    error = False
-    if not os.path.exists(dir+"/build-"+BOARD+"/stderr.txt"):
-        continue
-
-    with open(dir+"/build-"+BOARD+"/stderr.txt", "r") as file:
-        for line in file:
-            #Find the most relevant error line
-            if 'warning: changing start of section ' in line:
-                continue
-            if 'In function ' in line:
-                continue
-            if 'In constructor ' in line:
-                continue
-            if 'In member function ' in line:
-                continue
-            if 'In file included from ' in line:
-                continue
-            if 'from sources/' in line:
-                continue
-            if 'from ./sources/' in line:
-                continue
-            if 'from <command-line>' in line:
-                continue
-
-            if not error: error = line
-
-    #print "ERROR = ", error
-    if not error:
-        error = "SUCCESS"
-
-    errors[dir] = error.strip()
-
-with open('cache/library_index.json') as file:
-    data = json.load(file)
-
-libraries = {}
-
-for library in data["libraries"]:
-    libraries[library["name"]] = library
-
-for name, library in libraries.iteritems():
-    if "github.com" in library["website"]:
-        api = library["website"].replace("github.com", "api.github.com/repos")
-        api = api.replace("https", "http")
-        if api.endswith(".git"):
-            api = api[:-4]
-        download_file = "cache/github_api/" + api[len("http://api.github.com/repos")+1:].replace("/", ":")
-
-        if os.path.exists(download_file):
-            with open(download_file) as file:
-                data = json.load(file)
-                libraries[name]["github_api"] = data
-                libraries[name]["sort"] = data["forks_count"] + data["watchers_count"] + data["stargazers_count"] + data["subscribers_count"]
-                libraries[name]["sort"] = data["stargazers_count"]
-
-    zip_file = os.path.basename(library["url"])
-    projects_folder = DIR_PROJECTS + "/" + zip_file[:-4]
-    if projects_folder in errors:
-        libraries[name]["error"] = errors[projects_folder]
-    elif (projects_folder + "/src") in errors:
-        libraries[name]["error"] = errors[projects_folder + "/src"]
-    else:
-        libraries[name]["error"] = "NOT FOUND"
-
-    libraries[name]['example_errors'] = {}
-    libraries[name]['projects_folder'] = projects_folder
-
-    for error_folder in errors:
-        if 'examples' in error_folder and error_folder.startswith(projects_folder):
-            #print projects_folder, error_folder, errors[error_folder]
-            libraries[name]['example_errors'][error_folder] = errors[error_folder]
-
-    #if (libraries[name]['author'] == 'Arduino'):
-    #    libraries[name]["sort"] = 10000
-
-
-
-def sort_library(a):
-    if "sort" in libraries[a]:
-        return libraries[a]["sort"]
-    else:
-        return 0
-
-library_names = sorted(libraries, key=sort_library, reverse=True)
-
-for name in library_names:
-    if 'sort' in libraries[name]:
-        pass
-        #print name, libraries[name]["sort"], libraries[name]["website"], libraries[name]["projects_folder"], libraries[name]["error"], libraries[name]["example_errors"]
-
-with open('result.json', 'w') as file:
-    file.write(json.dumps({'libraries': libraries, 'library_names': library_names}))
-
-
diff --git a/tools/test/make.py b/tools/test/make.py
deleted file mode 100644
index 8927d57..0000000
--- a/tools/test/make.py
+++ /dev/null
@@ -1,56 +0,0 @@
-import subprocess
-import os
-import json
-
-projects = [
-    'SPI/src/',
-    'Wire/src/',
-    'I2S/src/',
-    'SDIO/src/',
-    'HardwareTest/examples/AutomaticCompilation/Basic/',
-    'HardwareTest/examples/AutomaticCompilation/SPI/',    
-    'HardwareTest/examples/AutomaticCompilation/I2C/',
-    'HardwareTest/examples/AutomaticCompilation/UART/',
-    'HardwareTest/examples/AutomaticCompilation/SDIO/',
-    'HardwareTest/examples/AutomaticCompilation/I2S/',
-    'HardwareTest/examples/AutomaticCompilation/USB/',
-]
-
-variants = os.listdir('makefiles')
-
-results = {}
-
-for project in projects:
-    print 'Compiling: ' + project
-    subprocesses = {}
-    
-    for variant in variants:
-        
-        path = 'build/' + variant + '/' + project
-        
-        if not os.path.exists(path):
-            os.makedirs(path)
-        
-        
-        with open(path + '/stdout.txt', 'w') as out, open(path + '/stderr.txt', 'w') as err:
-            p = subprocess.Popen(['make', 'VARIANT=' + variant, 'PROJECT=' + project], stdout = out, stderr = err)
-            subprocesses[variant] = p
-    
-    #for variant, p in subprocesses.iteritems():
-            p.wait()
-            
-            results.setdefault(project, {})[variant] = (p.returncode == 0)
-            
-            if p.returncode == 0:
-                print '.',
-            else:
-                print
-                print variant + 'COMPILATION ERROR ! ' + str(p.returncode)
-
-print
-print 'FINISH'
-
-print results
-
-with open('result.json', 'w') as file:
-    file.write(json.dumps(results))
diff --git a/tools/test/makefile b/tools/test/makefile
deleted file mode 100644
index b37154a..0000000
--- a/tools/test/makefile
+++ /dev/null
@@ -1,114 +0,0 @@
-PATH_COMPILER = D:\programs\gcc-arm
-#PATH_COMPILER = C:\Users\$(USERNAME)\AppData\Local\Arduino15\packages\arduino\tools\arm-none-eabi-gcc\4.8.3-2014q1
-
-PATH_ROOT = ../../STM32/
-PATH_PROJECT = $(PATH_ROOT)/libraries/$(PROJECT)
-PATH_CORE = $(PATH_ROOT)/cores/arduino/
-PATH_VARIANT = $(PATH_ROOT)variants/$(build.variant)/
-PATH_BUILD_ROOT = build/$(VARIANT)/
-PATH_BUILD_CORE = $(PATH_BUILD_ROOT)/core/
-PATH_BUILD_PROJECT = $(PATH_BUILD_ROOT)/$(PROJECT)/
-
-include makefiles/$(VARIANT)
-
-### Included libraries
-
-cat := $(if $(filter $(OS),Windows_NT),type,cat)
-LIBRARIES = $(shell $(cat) $(subst /,\\,$(PATH_PROJECT)/build-include.txt))
-
-#### Source files
-
-PROJECT_SOURCES_C += $(wildcard $(PATH_PROJECT)*.c) 
-PROJECT_SOURCES_CPP += $(wildcard $(PATH_PROJECT)*.cpp) 
-PROJECT_SOURCES_INO += $(wildcard $(PATH_PROJECT)*.ino)
-
-CORE_SOURCES_C = $(wildcard $(PATH_CORE)*.c)
-CORE_SOURCES_C += $(wildcard $(PATH_CORE)stm32/*.c)
-CORE_SOURCES_C += $(wildcard $(PATH_CORE)stm32_HAL/*.c)
-CORE_SOURCES_C += $(wildcard $(PATH_CORE)usb/*.c)
-CORE_SOURCES_CPP += $(wildcard $(PATH_CORE)*.cpp)
-CORE_SOURCES_S += $(wildcard $(PATH_CORE)stm32_HAL/*.S)
-
-VARIANT_SOURCES_C += $(wildcard $(PATH_VARIANT)*.c)
-VARIANT_SOURCES_CPP += $(wildcard $(PATH_VARIANT)*.cpp)
-
-#### Object files
-
-OBJECTS = $(patsubst $(PATH_PROJECT)%,$(PATH_BUILD_PROJECT)%,$(PROJECT_SOURCES_C:.c=.c.o))
-OBJECTS += $(patsubst $(PATH_PROJECT)%,$(PATH_BUILD_PROJECT)%,$(PROJECT_SOURCES_CPP:.cpp=.cpp.o))
-OBJECTS += $(patsubst $(PATH_PROJECT)%,$(PATH_BUILD_PROJECT)%,$(PROJECT_SOURCES_INO:.ino=.ino.cpp.o))
-
-OBJECTS += $(patsubst $(PATH_CORE)%,$(PATH_BUILD_CORE)%,$(CORE_SOURCES_C:.c=.c.o))
-OBJECTS += $(patsubst $(PATH_CORE)%,$(PATH_BUILD_CORE)%,$(CORE_SOURCES_CPP:.cpp=.cpp.o))
-OBJECTS += $(patsubst $(PATH_CORE)%,$(PATH_BUILD_CORE)%,$(CORE_SOURCES_S:.S=.s.o))
-
-OBJECTS += $(patsubst $(PATH_VARIANT)%,$(PATH_BUILD_CORE)%,$(VARIANT_SOURCES_C:.c=.c.o))
-OBJECTS += $(patsubst $(PATH_VARIANT)%,$(PATH_BUILD_CORE)%,$(VARIANT_SOURCES_CPP:.cpp=.cpp.o))
-
-
-LIBRARY_OBJ_DIRS += $(patsubst $(PATH_ROOT)libraries%,$(PATH_BUILD_ROOT)%,$(LIBRARIES))
-OBJECTS += $(foreach dir,$(LIBRARY_OBJ_DIRS),$(wildcard $(dir)/*.o))
-
-ifneq ($(wildcard $(PATH_PROJECT)/*.ino),) 
-	ELF = $(PATH_BUILD_CORE)build.elf
-	BIN = $(PATH_BUILD_CORE)build.bin
-endif
-
-INCLUDES = "-I$(PATH_ROOT)cores/arduino/"
-INCLUDES += "-I$(PATH_ROOT)cores/arduino/stm32"
-INCLUDES += "-I$(PATH_ROOT)cores/arduino/stm32_HAL"
-INCLUDES += "-I$(PATH_ROOT)cores/arduino/usb"
-INCLUDES += "-I$(PATH_ROOT)system/CMSIS"
-INCLUDES += "-I$(PATH_ROOT)system/STM32F1/CMSIS_Inc"
-INCLUDES += "-I$(PATH_ROOT)system/STM32F1/CMSIS_Src"
-INCLUDES += "-I$(PATH_ROOT)system/STM32F1/HAL_Inc"
-INCLUDES += "-I$(PATH_ROOT)system/STM32F1/HAL_Src"
-INCLUDES += "-I$(PATH_ROOT)system/STM32F1/stm32_chip"
-INCLUDES += "-I$(PATH_VARIANT)"
-INCLUDES += $(LIBRARIES:%=-I%)
-
-all: $(OBJECTS) $(BIN)
-	$(info BUILD SUCCESSFUL)
-
-$(BIN): $(ELF)
-	$(recipe.objcopy.bin.pattern)
-	
-$(ELF):
-	$(recipe.c.combine.pattern)
-
-$(PATH_BUILD_PROJECT)%.cpp.o: $(PATH_PROJECT)%.cpp
-	-@mkdir $(subst /,\\,$(@D)) 2> build/ignore
-	$(recipe.cpp.o.pattern)
-
-$(PATH_BUILD_PROJECT)%.ino.cpp.o: $(PATH_PROJECT)%.ino
-	-@mkdir $(subst /,\\,$(@D)) 2> build/ignore
-	$(subst -c,-c -include Arduino.h -x c++,$(recipe.cpp.o.pattern) )
-	
-$(PATH_BUILD_PROJECT)%.c.o: $(PATH_PROJECT)%.c
-	-@mkdir $(subst /,\\,$(@D)) 2> build/ignore
-	$(recipe.c.o.pattern)
-
-$(PATH_BUILD_CORE)%.cpp.o: $(PATH_CORE)%.cpp
-	-@mkdir $(subst /,\\,$(@D)) 2> build/ignore
-	$(recipe.cpp.o.pattern)
-
-$(PATH_BUILD_CORE)%.c.o: $(PATH_CORE)%.c
-	-@mkdir $(subst /,\\,$(@D)) 2> build/ignore
-	$(recipe.c.o.pattern)
-
-$(PATH_BUILD_CORE)%.s.o: $(PATH_CORE)%.S
-	-@mkdir $(subst /,\\,$(@D)) 2> build/ignore
-	$(recipe.S.o.pattern)
-
-$(PATH_BUILD_CORE)%.cpp.o: $(PATH_VARIANT)%.cpp
-	-@mkdir $(subst /,\\,$(@D)) 2> build/ignore
-	$(recipe.cpp.o.pattern)
-
-$(PATH_BUILD_CORE)%.c.o: $(PATH_VARIANT)%.c
-	-@mkdir $(subst /,\\,$(@D)) 2> build/ignore
-	$(recipe.c.o.pattern)
-
-clean:
-	rm -rf $(PATH_BUILD)
-	rm -f $(ELF)
-	rm -f $(BIN)
diff --git a/tools/test/makefiles/BLACK_F407XX_BLACK_F407VE_STLinkMethod b/tools/test/makefiles/BLACK_F407XX_BLACK_F407VE_STLinkMethod
deleted file mode 100644
index 33a5ef3..0000000
--- a/tools/test/makefiles/BLACK_F407XX_BLACK_F407VE_STLinkMethod
+++ /dev/null
@@ -1,125 +0,0 @@
-name=BLACK F407VE/ZE/ZG boards
-upload.maximum_size=524288
-upload.maximum_data_size=131072
-build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-build.core=arduino
-build.board=BLACK_F407XX
-build.series=STM32F4
-build.f_cpu=168000000L
-upload.tool=stlink_upload
-upload.protocol=STLink
-menu.usb.SerialUSB=Serial [Virtual COM port, PA11/PA12 pins]
-menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL
-menu.usb.Disabled=Disabled, no USB
-menu.serial.Automatic=Automatically selected based on upload method
-menu.serial.SerialUSB=SerialUSB
-menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB
-menu.serial.SerialUART1=SerialUART1
-menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1
-build.variant=BLACK_F407VE
-build.extra_flags=-DSTM32F407VE -DHSE_VALUE=8000000
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407VE -DHSE_VALUE=8000000 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407VE -DHSE_VALUE=8000000 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407VE -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLACK_F407VE.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZE_STLinkMethod b/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZE_STLinkMethod
deleted file mode 100644
index 0c505c3..0000000
--- a/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZE_STLinkMethod
+++ /dev/null
@@ -1,125 +0,0 @@
-name=BLACK F407VE/ZE/ZG boards
-upload.maximum_size=1232896
-upload.maximum_data_size=131072
-build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-build.core=arduino
-build.board=BLACK_F407XX
-build.series=STM32F4
-build.f_cpu=168000000L
-upload.tool=stlink_upload
-upload.protocol=STLink
-menu.usb.SerialUSB=Serial [Virtual COM port, PA11/PA12 pins]
-menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL
-menu.usb.Disabled=Disabled, no USB
-menu.serial.Automatic=Automatically selected based on upload method
-menu.serial.SerialUSB=SerialUSB
-menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB
-menu.serial.SerialUART1=SerialUART1
-menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1
-build.variant=BLACK_F407ZE
-build.extra_flags=-DSTM32F407ZE -DHSE_VALUE=8000000
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407ZE -DHSE_VALUE=8000000 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407ZE -DHSE_VALUE=8000000 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407ZE -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLACK_F407ZE.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZG_STLinkMethod b/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZG_STLinkMethod
deleted file mode 100644
index 0747086..0000000
--- a/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZG_STLinkMethod
+++ /dev/null
@@ -1,125 +0,0 @@
-name=BLACK F407VE/ZE/ZG boards
-upload.maximum_size=1232896
-upload.maximum_data_size=131072
-build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-build.core=arduino
-build.board=BLACK_F407XX
-build.series=STM32F4
-build.f_cpu=168000000L
-upload.tool=stlink_upload
-upload.protocol=STLink
-menu.usb.SerialUSB=Serial [Virtual COM port, PA11/PA12 pins]
-menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL
-menu.usb.Disabled=Disabled, no USB
-menu.serial.Automatic=Automatically selected based on upload method
-menu.serial.SerialUSB=SerialUSB
-menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB
-menu.serial.SerialUART1=SerialUART1
-menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1
-build.variant=BLACK_F407ZG
-build.extra_flags=-DSTM32F407ZG -DHSE_VALUE=8000000
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407ZG -DHSE_VALUE=8000000 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407ZG -DHSE_VALUE=8000000 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407ZG -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLACK_F407ZG.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/BluePill_BMPMethod b/tools/test/makefiles/BluePill_BMPMethod
deleted file mode 100644
index c12d685..0000000
--- a/tools/test/makefiles/BluePill_BMPMethod
+++ /dev/null
@@ -1,117 +0,0 @@
-name=BluePill F103CB
-upload.protocol=gdb_bmp
-upload.maximum_size=131072
-upload.maximum_data_size=20480
-upload.tool=bmp_upload
-build.mcu=cortex-m3
-build.board=BLUEPILL
-build.core=arduino
-build.variant=BLUEPILL
-build.series=STM32F1
-build.extra_flags=-DSTM32F103CB
-build.f_cpu=72000000L
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLUEPILL.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/BluePill_DFUUploadMethod b/tools/test/makefiles/BluePill_DFUUploadMethod
deleted file mode 100644
index 5f295b1..0000000
--- a/tools/test/makefiles/BluePill_DFUUploadMethod
+++ /dev/null
@@ -1,124 +0,0 @@
-name=BluePill F103CB
-upload.protocol=maple_dfu
-upload.maximum_size=131072
-upload.maximum_data_size=20480
-upload.tool=maple_upload
-build.mcu=cortex-m3
-build.board=BLUEPILL
-build.core=arduino
-build.variant=BLUEPILL
-build.series=STM32F1
-build.extra_flags=-DSTM32F103CB -DVECT_TAB_OFFSET=0x2000
-build.f_cpu=72000000L
-build.ldscript=ldscript_bootloader_2000.ld
-upload.usbID=1EAF:0003
-upload.altID=2
-flash.maximum_size=122880
-maximum_data_size=122880
-ram.maximum_size=20480
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUSB
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUSB
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLUEPILL.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/BluePill_STLinkMethod b/tools/test/makefiles/BluePill_STLinkMethod
deleted file mode 100644
index 2889590..0000000
--- a/tools/test/makefiles/BluePill_STLinkMethod
+++ /dev/null
@@ -1,118 +0,0 @@
-name=BluePill F103CB
-upload.protocol=STLink
-upload.maximum_size=131072
-upload.maximum_data_size=20480
-upload.tool=stlink_upload
-build.mcu=cortex-m3
-build.board=BLUEPILL
-build.core=arduino
-build.variant=BLUEPILL
-build.series=STM32F1
-build.extra_flags=-DSTM32F103CB
-build.f_cpu=72000000L
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUSB
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUSB
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLUEPILL.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/BluePill_serialMethod b/tools/test/makefiles/BluePill_serialMethod
deleted file mode 100644
index 3a99bf1..0000000
--- a/tools/test/makefiles/BluePill_serialMethod
+++ /dev/null
@@ -1,118 +0,0 @@
-name=BluePill F103CB
-upload.protocol=maple_serial
-upload.maximum_size=131072
-upload.maximum_data_size=20480
-upload.tool=serial_upload
-build.mcu=cortex-m3
-build.board=BLUEPILL
-build.core=arduino
-build.variant=BLUEPILL
-build.series=STM32F1
-build.extra_flags=-DSTM32F103CB
-build.f_cpu=72000000L
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART1
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART1
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART1 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART1 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLUEPILL.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/DISCOVERY_F407VG b/tools/test/makefiles/DISCOVERY_F407VG
deleted file mode 100644
index 1cbe1aa..0000000
--- a/tools/test/makefiles/DISCOVERY_F407VG
+++ /dev/null
@@ -1,124 +0,0 @@
-name=Discovery F407VG
-upload.maximum_size=1048576
-upload.maximum_data_size=131072
-build.core=arduino
-build.board=DISCOVERY_F407VG
-build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-build.series=STM32F4
-build.variant=DISCOVERY_F407VG
-build.extra_flags=-DSTM32F407VG -DHSE_VALUE=8000000
-build.f_cpu=168000000L
-upload.protocol=STLink
-upload.tool=stlink_upload
-menu.usb.SerialUSB=Serial [Virtual COM port]
-menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL
-menu.usb.Disabled=Disabled, no USB
-menu.serial.SerialUSB=SerialUSB
-menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB
-menu.serial.SerialUART2=SerialUART2 [PA2/PA3]
-menu.serial.SerialUART2.build.extra_flags_serial=-DMENU_SERIAL=SerialUART2
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F407VG -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407VG -DHSE_VALUE=8000000 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F407VG -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407VG -DHSE_VALUE=8000000 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F407VG -DARDUINO_ARCH_STM32GENERIC  -DSTM32F407VG -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.DISCOVERY_F407VG.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/DISCOVERY_F429ZI b/tools/test/makefiles/DISCOVERY_F429ZI
deleted file mode 100644
index 76b286d..0000000
--- a/tools/test/makefiles/DISCOVERY_F429ZI
+++ /dev/null
@@ -1,123 +0,0 @@
-name=Discovery F429ZI
-upload.maximum_size=1048576
-upload.maximum_data_size=131072
-build.core=arduino
-build.board=DISCOVERY_F429ZI
-build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-build.series=STM32F4
-build.variant=DISCOVERY_F429ZI
-build.extra_flags=-DSTM32F429ZI -DSTM32F429xx -DHSE_VALUE=8000000
-upload.protocol=STLink
-upload.tool=stlink_upload
-menu.usb.SerialUSB=Serial [Virtual COM port]
-menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL
-menu.usb.Disabled=Disabled, no USB
-menu.serial.SerialUSB=SerialUSB
-menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB
-menu.serial.SerialUART1=SerialUART1 [PA9/PA10]
-menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F429ZI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F429ZI -DSTM32F429xx -DHSE_VALUE=8000000 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F429ZI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F429ZI -DSTM32F429xx -DHSE_VALUE=8000000 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F429ZI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F429ZI -DSTM32F429xx -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.DISCOVERY_F429ZI.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/DISCOVERY_F746NG b/tools/test/makefiles/DISCOVERY_F746NG
deleted file mode 100644
index 12ef1de..0000000
--- a/tools/test/makefiles/DISCOVERY_F746NG
+++ /dev/null
@@ -1,124 +0,0 @@
-name=Discovery F746NG
-upload.maximum_size=1048576
-upload.maximum_data_size=327680
-build.core=arduino
-build.board=DISCOVERY_F746NG
-build.mcu=cortex-m7
-build.series=STM32F7
-build.variant=DISCOVERY_F746NG
-build.extra_flags=-DSTM32F746NG
-build.f_cpu=218000000L
-upload.protocol=STLink
-upload.tool=stlink_upload
-menu.usb.SerialUSB=Serial [Virtual COM port, PA11/PA12 pins]
-menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL
-menu.usb.Disabled=Disabled, no USB
-menu.serial.SerialUART1=SerialUART1 [Through ST-Link Virtual COM port] [PB7/PA9]
-menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1
-menu.serial.SerialUSB=SerialUSB
-menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F7/CMSIS_Inc" "-I../../STM32/system/STM32F7/CMSIS_Src" "-I../../STM32/system/STM32F7/HAL_Inc" "-I../../STM32/system/STM32F7/HAL_Src"  "-I../../STM32/system/STM32F7/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m7 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F7 -DARDUINO=10802 -DARDUINO_DISCOVERY_F746NG -DARDUINO_ARCH_STM32GENERIC  -DSTM32F746NG -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F7/CMSIS_Inc" "-I../../STM32/system/STM32F7/CMSIS_Src" "-I../../STM32/system/STM32F7/HAL_Inc" "-I../../STM32/system/STM32F7/HAL_Src"  "-I../../STM32/system/STM32F7/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F7 -DARDUINO=10802 -DARDUINO_DISCOVERY_F746NG -DARDUINO_ARCH_STM32GENERIC  -DSTM32F746NG -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F7/CMSIS_Inc" "-I../../STM32/system/STM32F7/CMSIS_Src" "-I../../STM32/system/STM32F7/HAL_Inc" "-I../../STM32/system/STM32F7/HAL_Src"  "-I../../STM32/system/STM32F7/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F7 -DARDUINO=10802 -DARDUINO_DISCOVERY_F746NG -DARDUINO_ARCH_STM32GENERIC  -DSTM32F746NG "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F7/CMSIS_Inc" "-I../../STM32/system/STM32F7/CMSIS_Src" "-I../../STM32/system/STM32F7/HAL_Inc" "-I../../STM32/system/STM32F7/HAL_Src"  "-I../../STM32/system/STM32F7/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m7 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.DISCOVERY_F746NG.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/DISCOVERY_L053C8 b/tools/test/makefiles/DISCOVERY_L053C8
deleted file mode 100644
index 9a0689d..0000000
--- a/tools/test/makefiles/DISCOVERY_L053C8
+++ /dev/null
@@ -1,124 +0,0 @@
-name=Discovery L053C8
-upload.maximum_size=65536
-upload.maximum_data_size=8192
-build.core=arduino
-build.board=DISCOVERY_L053C8
-build.mcu=cortex-m0
-build.series=STM32L0
-build.variant=DISCOVERY_L053C8
-build.extra_flags=-DSTM32L053C8
-build.f_cpu=32000000L
-upload.protocol=STLink
-upload.tool=stlink_upload
-menu.usb.SerialUSB=Serial [Virtual COM port, PA11/PA12 pins]
-menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL
-menu.usb.Disabled=Disabled, no USB
-menu.serial.SerialUART1=SerialUART1 [Through ST-Link Virtual COM port] [PA9/PA10]
-menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1
-menu.serial.SerialUSB=SerialUSB (USB connector)
-menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src"  "-I../../STM32/system/STM32L0/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_DISCOVERY_L053C8 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L053C8 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src"  "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_DISCOVERY_L053C8 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L053C8 -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src"  "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp -DSTM32L0 -DARDUINO=10802 -DARDUINO_DISCOVERY_L053C8 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L053C8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src"  "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.DISCOVERY_L053C8.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/MapleMini_F103CB_BMPMethod b/tools/test/makefiles/MapleMini_F103CB_BMPMethod
deleted file mode 100644
index 2b29df1..0000000
--- a/tools/test/makefiles/MapleMini_F103CB_BMPMethod
+++ /dev/null
@@ -1,117 +0,0 @@
-name=MapleMini F103CB
-upload.protocol=gdb_bmp
-upload.maximum_size=131072
-upload.maximum_data_size=20480
-upload.tool=bmp_upload
-build.mcu=cortex-m3
-build.board=MAPLE_MINI
-build.core=arduino
-build.variant=MAPLE_MINI
-build.series=STM32F1
-build.extra_flags=-DSTM32F103CB
-build.f_cpu=72000000L
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.MAPLE_MINI.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/MapleMini_F103CB_DFUUploadMethod1 b/tools/test/makefiles/MapleMini_F103CB_DFUUploadMethod1
deleted file mode 100644
index f0e1f31..0000000
--- a/tools/test/makefiles/MapleMini_F103CB_DFUUploadMethod1
+++ /dev/null
@@ -1,124 +0,0 @@
-name=MapleMini F103CB
-upload.protocol=maple_dfu
-upload.maximum_size=131072
-upload.maximum_data_size=20480
-upload.tool=maple_upload
-build.mcu=cortex-m3
-build.board=MAPLE_MINI
-build.core=arduino
-build.variant=MAPLE_MINI
-build.series=STM32F1
-build.extra_flags=-DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DUSB_DISC_PIN=PB9
-build.f_cpu=72000000L
-build.ldscript=ldscript_bootloader_5000.ld
-upload.usbID=1EAF:0003
-upload.altID=1
-flash.maximum_size=110592
-maximum_data_size=110592
-ram.maximum_size=17408
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUSB
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUSB
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DUSB_DISC_PIN=PB9 -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DUSB_DISC_PIN=PB9 -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DUSB_DISC_PIN=PB9 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.MAPLE_MINI.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/MapleMini_F103CB_STLinkMethod b/tools/test/makefiles/MapleMini_F103CB_STLinkMethod
deleted file mode 100644
index e79f5c2..0000000
--- a/tools/test/makefiles/MapleMini_F103CB_STLinkMethod
+++ /dev/null
@@ -1,118 +0,0 @@
-name=MapleMini F103CB
-upload.protocol=STLink
-upload.maximum_size=131072
-upload.maximum_data_size=20480
-upload.tool=stlink_upload
-build.mcu=cortex-m3
-build.board=MAPLE_MINI
-build.core=arduino
-build.variant=MAPLE_MINI
-build.series=STM32F1
-build.extra_flags=-DSTM32F103CB
-build.f_cpu=72000000L
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART1
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART1
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART1 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART1 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.MAPLE_MINI.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/MapleMini_F103CB_serialMethod b/tools/test/makefiles/MapleMini_F103CB_serialMethod
deleted file mode 100644
index 87a6c07..0000000
--- a/tools/test/makefiles/MapleMini_F103CB_serialMethod
+++ /dev/null
@@ -1,117 +0,0 @@
-name=MapleMini F103CB
-upload.protocol=maple_serial
-upload.maximum_size=131072
-upload.maximum_data_size=20480
-upload.tool=serial_upload
-build.mcu=cortex-m3
-build.board=MAPLE_MINI
-build.core=arduino
-build.variant=MAPLE_MINI
-build.series=STM32F1
-build.extra_flags=-DSTM32F103CB
-build.f_cpu=72000000L
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB -DMENU_USB_SERIAL "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.MAPLE_MINI.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_F030R8_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_F030R8_STLinkMethod
deleted file mode 100644
index 95d3f90..0000000
--- a/tools/test/makefiles/NUCLEO_64_Nucleo_F030R8_STLinkMethod
+++ /dev/null
@@ -1,119 +0,0 @@
-name=Nucleo-64 boards
-build.core=arduino
-build.board=NUCLEO_64
-upload.tool=stlink_upload
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2
-upload.maximum_size=65536
-upload.maximum_data_size=8192
-build.mcu=cortex-m0
-build.series=STM32F0
-build.variant=NUCLEO_F030R8
-build.extra_flags=-DSTM32F030R8
-massstorage_drive=NODE_F030R8
-build.f_cpu=48000000L
-upload.protocol=STLink
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src"  "-I../../STM32/system/STM32F0/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F030R8 -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src"  "-I../../STM32/system/STM32F0/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F030R8 -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src"  "-I../../STM32/system/STM32F0/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F030R8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src"  "-I../../STM32/system/STM32F0/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_F030R8.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "NODE_F030R8"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_F103RB_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_F103RB_STLinkMethod
deleted file mode 100644
index b910a39..0000000
--- a/tools/test/makefiles/NUCLEO_64_Nucleo_F103RB_STLinkMethod
+++ /dev/null
@@ -1,119 +0,0 @@
-name=Nucleo-64 boards
-build.core=arduino
-build.board=NUCLEO_64
-upload.tool=stlink_upload
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2
-upload.maximum_size=131072
-upload.maximum_data_size=20480
-build.mcu=cortex-m3
-build.series=STM32F1
-build.variant=NUCLEO_F103RB
-build.extra_flags=-DSTM32F103RB
-massstorage_drive=NODE_F103RB
-build.f_cpu=64000000L
-upload.protocol=STLink
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103RB -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103RB -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F103RB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src"  "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_F103RB.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "NODE_F103RB"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_F303RE_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_F303RE_STLinkMethod
deleted file mode 100644
index ed3427a..0000000
--- a/tools/test/makefiles/NUCLEO_64_Nucleo_F303RE_STLinkMethod
+++ /dev/null
@@ -1,119 +0,0 @@
-name=Nucleo-64 boards
-build.core=arduino
-build.board=NUCLEO_64
-upload.tool=stlink_upload
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2
-upload.maximum_size=524288
-upload.maximum_data_size=81920
-build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-build.series=STM32F3
-build.variant=NUCLEO_F303RE
-build.extra_flags=-DSTM32F303RE
-massstorage_drive=NODE_F303RE
-build.f_cpu=72000000L
-upload.protocol=STLink
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src"  "-I../../STM32/system/STM32F3/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F3 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F303RE -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src"  "-I../../STM32/system/STM32F3/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F3 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F303RE -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src"  "-I../../STM32/system/STM32F3/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F3 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F303RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src"  "-I../../STM32/system/STM32F3/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_F303RE.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "NODE_F303RE"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_F411RE_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_F411RE_STLinkMethod
deleted file mode 100644
index 9e3c542..0000000
--- a/tools/test/makefiles/NUCLEO_64_Nucleo_F411RE_STLinkMethod
+++ /dev/null
@@ -1,119 +0,0 @@
-name=Nucleo-64 boards
-build.core=arduino
-build.board=NUCLEO_64
-upload.tool=stlink_upload
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2
-upload.maximum_size=524288
-upload.maximum_data_size=131072
-build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-build.series=STM32F4
-build.variant=NUCLEO_F411RE
-build.extra_flags=-DSTM32F411RE
-massstorage_drive=NODE_F411RE
-build.f_cpu=100000000L
-upload.protocol=STLink
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F411RE -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F411RE -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32F411RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src"  "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_F411RE.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "NODE_F411RE"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_L053R8_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_L053R8_STLinkMethod
deleted file mode 100644
index c9b8ce7..0000000
--- a/tools/test/makefiles/NUCLEO_64_Nucleo_L053R8_STLinkMethod
+++ /dev/null
@@ -1,119 +0,0 @@
-name=Nucleo-64 boards
-build.core=arduino
-build.board=NUCLEO_64
-upload.tool=stlink_upload
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2
-upload.maximum_size=65536
-upload.maximum_data_size=8192
-build.mcu=cortex-m0
-build.series=STM32L0
-build.variant=NUCLEO_L053R8
-build.extra_flags=-DSTM32L053R8
-massstorage_drive=NODE_L053R8
-build.f_cpu=32000000L
-upload.protocol=STLink
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src"  "-I../../STM32/system/STM32L0/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L053R8 -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src"  "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L053R8 -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src"  "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp -DSTM32L0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L053R8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src"  "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_L053R8.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "NODE_L053R8"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_L152RE_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_L152RE_STLinkMethod
deleted file mode 100644
index c4f74ab..0000000
--- a/tools/test/makefiles/NUCLEO_64_Nucleo_L152RE_STLinkMethod
+++ /dev/null
@@ -1,119 +0,0 @@
-name=Nucleo-64 boards
-build.core=arduino
-build.board=NUCLEO_64
-upload.tool=stlink_upload
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2
-upload.maximum_size=524288
-upload.maximum_data_size=81920
-build.mcu=cortex-m3
-build.series=STM32L1
-build.variant=NUCLEO_L152RE
-build.extra_flags=-DSTM32L152RE
-massstorage_drive=NODE_L152RE
-build.f_cpu=32000000L
-upload.protocol=STLink
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src"  "-I../../STM32/system/STM32L1/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L152RE -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src"  "-I../../STM32/system/STM32L1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L152RE -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src"  "-I../../STM32/system/STM32L1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp -DSTM32L1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L152RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src"  "-I../../STM32/system/STM32L1/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_L152RE.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "NODE_L152RE"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_L476RG_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_L476RG_STLinkMethod
deleted file mode 100644
index e4bed64..0000000
--- a/tools/test/makefiles/NUCLEO_64_Nucleo_L476RG_STLinkMethod
+++ /dev/null
@@ -1,119 +0,0 @@
-name=Nucleo-64 boards
-build.core=arduino
-build.board=NUCLEO_64
-upload.tool=stlink_upload
-build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2
-upload.maximum_size=1048576
-upload.maximum_data_size=131072
-build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-build.series=STM32L4
-build.variant=NUCLEO_L476RG
-build.extra_flags=-DSTM32L476RG
-massstorage_drive=NODE_L476RG
-build.f_cpu=80000000L
-upload.protocol=STLink
-build.project_name=$(VARIANT)/$(PROJECT)/out
-object_file=$@
-source_file=$<
-includes=$(INCLUDES)
-object_files=$(OBJECTS)
-runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER)
-runtime.ide.version=10802
-build.path=build
-build.arch=STM32GENERIC
-runtime.hardware.path=../../STM32
-build.system.path=../../STM32/system
-build.core.path=../../STM32/cores/arduino
-build.variant.path=$(PATH_VARIANT)
-build.extra_flags_usb=-DMENU_USB_SERIAL
-name=STM32GENERIC for STM32 boards
-version=1.0.0
-compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src"  "-I../../STM32/system/STM32L4/stm32_chip"
-compiler.warning_flags=-w
-compiler.warning_flags.none=-w
-compiler.warning_flags.default=
-compiler.warning_flags.more=-Wall
-compiler.warning_flags.all=-Wall -Wextra
-compiler.path=$(PATH_COMPILER)/bin/
-compiler.S.cmd=arm-none-eabi-gcc
-compiler.c.cmd=arm-none-eabi-gcc
-compiler.cpp.cmd=arm-none-eabi-g++
-compiler.ar.cmd=arm-none-eabi-ar
-compiler.c.elf.cmd=arm-none-eabi-gcc
-compiler.objcopy.cmd=arm-none-eabi-objcopy
-compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -x assembler-with-cpp
-compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD
-compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD
-compiler.ar.flags=rcs
-compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
-compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0
-compiler.elf2hex.flags=-O binary
-compiler.elf2hex.cmd=arm-none-eabi-objcopy
-compiler.ldflags=
-compiler.size.cmd=arm-none-eabi-size
-compiler.define=-DARDUINO=
-build.extra_flags=
-build.extra_flags_usb=
-build.extra_flags_serial=
-build.extra_flags_serial_auto=
-build.extra_flags_menu=-DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2
-build.ldscript=ldscript.ld
-compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
-compiler.ar.extra_flags=
-compiler.elf2hex.extra_flags=
-build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
-build.usb_manufacturer="Unknown"
-recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L476RG -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src"  "-I../../STM32/system/STM32L4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L476RG -DMENU_USB_SERIAL  -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src"  "-I../../STM32/system/STM32L4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -x assembler-with-cpp -DSTM32L4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC  -DSTM32L476RG "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src"  "-I../../STM32/system/STM32L4/stm32_chip" $(INCLUDES) "$<" -o "$@"
-recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs  "{archive_file_path}" "$@"
-recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map"  -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS)  -lc -Wl,--end-group -lm -lgcc --specs=nano.specs
-recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary  "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin"
-recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin
-recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_L476RG.bin
-recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf"
-recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).*
-recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).*
-recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
-upload.altID=unknown
-upload.usbID=unknown
-tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher
-tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher
-tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher
-tools.nucleoFlasher.cmd.linux=nucleoFlasher
-tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat
-tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX
-tools.nucleoFlasher.upload.params.verbose=
-tools.nucleoFlasher.upload.params.quiet=
-tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "NODE_L476RG"
-tools.stlink_upload.cmd=stlink_upload
-tools.stlink_upload.cmd.windows=stlink_upload.bat
-tools.stlink_upload.path.windows=../../STM32/tools/win
-tools.stlink_upload.path.macosx=../../STM32/tools/macosx
-tools.stlink_upload.path.linux=../../STM32/tools/linux
-tools.stlink_upload.path.linux64=../../STM32/tools/linux64
-tools.stlink_upload.upload.params.verbose=-d
-tools.stlink_upload.upload.params.quiet=
-tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.maple_upload.cmd=maple_upload
-tools.maple_upload.cmd.windows=maple_upload.bat
-tools.maple_upload.path=../../STM32/tools/win
-tools.maple_upload.path.macosx={runtime.hardware.path.path}/tools/macosx
-tools.maple_upload.path.linux=../../STM32/tools/linux
-tools.maple_upload.path.linux64=../../STM32/tools/linux64
-tools.maple_upload.upload.params.verbose=-d
-tools.maple_upload.upload.params.quiet=
-tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
-tools.serial_upload.cmd=serial_upload
-tools.serial_upload.cmd.windows=serial_upload.bat
-tools.serial_upload.cmd.macosx=serial_upload
-tools.serial_upload.path=../../STM32/tools/win
-tools.serial_upload.path.macosx=../../STM32/tools/macosx
-tools.serial_upload.path.linux=../../STM32/tools/linux
-tools.serial_upload.path.linux64=../../STM32/tools/linux64
-tools.serial_upload.upload.params.verbose=-d
-tools.serial_upload.upload.params.quiet=n
-tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin"
diff --git a/tools/test/parse_library.py b/tools/test/parse_library.py
deleted file mode 100644
index 52471e9..0000000
--- a/tools/test/parse_library.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import json
-import os.path
-import urllib2
-import time
-import urllib
-import zipfile
-
-urllib.urlretrieve ("http://downloads.arduino.cc/libraries/library_index.json", "library_index.json")
-
-with open('library_index.json') as file:
-    data = json.load(file)
-
-libraries = {}
-
-for library in data["libraries"]:
-    libraries[library["name"]] = library
-
-for name, library in libraries.iteritems():
-    
-    zip_file = os.path.basename(library["url"])
-    download_file = "cache/" + zip_file
-    
-    print zip_file
-    
-    if not os.path.exists(download_file):
-        try:
-            urllib.urlretrieve (library["url"], download_file)
-        except Exception, e:
-            print e
-        time.sleep(1)
-    try:
-        zip_ref = zipfile.ZipFile(download_file, 'r')
-        zip_ref.extractall('libraries')
-        zip_ref.close()
-    except Exception, e:
-            print e
\ No newline at end of file
diff --git a/tools/test/platform_to_makefile.py b/tools/test/platform_to_makefile.py
deleted file mode 100644
index 3062c8b..0000000
--- a/tools/test/platform_to_makefile.py
+++ /dev/null
@@ -1,106 +0,0 @@
-from collections import OrderedDict
-
-root = '../../STM32';
-
-with open(root + '/boards.txt') as file:
-    boards = file.readlines()
-
-with open(root + '/platform.txt') as file:
-    platform = file.readlines()
-
-variants = {}
-variant_nucleos = {}
-variant_uploads = {}
-    
-for line in boards:
-    line = line.strip()
-    
-    if not line or line.startswith('#') or line.startswith('menu'):
-        continue
-        
-    (board, data) = line.split('.', 1)
-    
-    (key, value) = data.split('=', 1)
-    
-    key = key.strip()
-    value = value.strip()
-    
-    if key.startswith('menu.subboard.'):
-        key = key.replace('menu.subboard.', '')
-        if '.' not in key:
-            continue
-
-        (upload, k) = key.split('.', 1)
-        variant_nucleos.setdefault(board + '_' + upload, variants[board].copy())[k] = value
-    
-    elif key.startswith('menu.upload_method.'):
-        key = key.replace('menu.upload_method.', '')
-        if '.' not in key or 'MassStorageMethod' in key or 'DFUUploadMethod2' in key:
-            continue
-
-        (upload, k) = key.split('.', 1)
-        if variant_nucleos:
-            for name, keyvalues in variant_nucleos.iteritems():
-                variant_uploads.setdefault(name + '_' + upload, keyvalues)[k] = value
-        else:
-            variant_uploads.setdefault(board + '_' + upload, variants[board].copy())[k] = value
-    else:
-        variants.setdefault(board, OrderedDict())[key] = value
-
-del variant_uploads['BLACK_F407XX_serialMethod']
-del variant_uploads['BLACK_F407XX_STLinkMethod']
-
-for variant in variants.keys():
-    upload_exists = False
-    for variant_upload in variant_uploads.keys():
-        if variant in variant_upload:
-            upload_exists = True
-            break
-    if not upload_exists:
-        variant_uploads[variant] = variants[variant]
-
-for (variant, replaces) in variant_uploads.iteritems():
-    replaces = replaces.copy()
-    replaces['build.project_name'] = '$(VARIANT)/$(PROJECT)/out'
-    replaces['object_file'] = '$@'
-    replaces['source_file'] = '$<'
-    replaces['includes'] = '$(INCLUDES)'
-    replaces['object_files'] = '$(OBJECTS)'
-    
-    replaces['runtime.tools.arm-none-eabi-gcc.path'] = '$(PATH_COMPILER)'
-    
-    replaces['runtime.ide.version'] = '10802'
-    replaces['build.path'] = 'build'
-    replaces['build.arch'] = 'STM32GENERIC'
-    replaces['runtime.hardware.path'] = root
-    replaces['build.system.path'] = root + '/system'
-    replaces['build.core.path'] = root + '/cores/arduino'
-    replaces['build.variant.path'] = '$(PATH_VARIANT)'
-    
-    replaces['build.extra_flags_usb'] = '-DMENU_USB_SERIAL'
-
-    with open('makefiles/' + variant, 'w') as file:
-        
-        for key, value in replaces.iteritems():
-            file.write(key + '=' + value + '\n')
-        
-        for line in platform:
-            line = line.strip()
-            
-            if not line or line.startswith('#'):
-                continue
-                
-            for (key, value) in replaces.iteritems():
-                line = line.replace('{' + key + '}', value)
-            
-            (key, value) = line.split('=', 1)
-            
-            key = key.strip()
-            value = value.strip()
-            
-            if value or key not in replaces:
-                replaces[key] = value
-            
-            line = line.replace('"build/{archive_file}"', '')
-            
-            file.write(line + '\n')
diff --git a/tools/test/result.json b/tools/test/result.json
deleted file mode 100644
index 4187d08..0000000
--- a/tools/test/result.json
+++ /dev/null
@@ -1 +0,0 @@
-{"SPI/src/": {"MapleMini_F103CB_serialMethod": true, "NUCLEO_64_Nucleo_F303RE_STLinkMethod": false, "DISCOVERY_L053C8": false, "MapleMini_F103CB_DFUUploadMethod1": true, "MapleMini_F103CB_BMPMethod": true, "NUCLEO_64_Nucleo_F030R8_STLinkMethod": false, "BluePill_STLinkMethod": true, "MapleMini_F103CB_STLinkMethod": true, "NUCLEO_64_Nucleo_L152RE_STLinkMethod": false, "DISCOVERY_F407VG": true, "BluePill_serialMethod": true, "DISCOVERY_F429ZI": true, "NUCLEO_64_Nucleo_F103RB_STLinkMethod": true, "BLACK_F407XX_BLACK_F407ZE_STLinkMethod": true, "NUCLEO_64_Nucleo_L053R8_STLinkMethod": false, "BluePill_DFUUploadMethod": true, "BLACK_F407XX_BLACK_F407VE_STLinkMethod": true, "DISCOVERY_F746NG": true, "BluePill_BMPMethod": true, "NUCLEO_64_Nucleo_L476RG_STLinkMethod": false, "BLACK_F407XX_BLACK_F407ZG_STLinkMethod": true, "NUCLEO_64_Nucleo_F411RE_STLinkMethod": true}, "Wire/src/": {"MapleMini_F103CB_serialMethod": true, "NUCLEO_64_Nucleo_F303RE_STLinkMethod": false, "DISCOVERY_L053C8": false, "MapleMini_F103CB_DFUUploadMethod1": true, "MapleMini_F103CB_BMPMethod": true, "NUCLEO_64_Nucleo_F030R8_STLinkMethod": false, "BluePill_STLinkMethod": true, "MapleMini_F103CB_STLinkMethod": true, "NUCLEO_64_Nucleo_L152RE_STLinkMethod": true, "DISCOVERY_F407VG": true, "BluePill_serialMethod": true, "DISCOVERY_F429ZI": true, "NUCLEO_64_Nucleo_F103RB_STLinkMethod": true, "BLACK_F407XX_BLACK_F407ZE_STLinkMethod": true, "NUCLEO_64_Nucleo_L053R8_STLinkMethod": false, "BluePill_DFUUploadMethod": true, "BLACK_F407XX_BLACK_F407VE_STLinkMethod": true, "DISCOVERY_F746NG": true, "BluePill_BMPMethod": true, "NUCLEO_64_Nucleo_L476RG_STLinkMethod": false, "BLACK_F407XX_BLACK_F407ZG_STLinkMethod": true, "NUCLEO_64_Nucleo_F411RE_STLinkMethod": true}, "HardwareTest/examples/AutomaticCompilation/SDIO/": {"MapleMini_F103CB_serialMethod": false, "NUCLEO_64_Nucleo_F303RE_STLinkMethod": false, "DISCOVERY_L053C8": false, "MapleMini_F103CB_DFUUploadMethod1": false, "MapleMini_F103CB_BMPMethod": false, "NUCLEO_64_Nucleo_F030R8_STLinkMethod": false, "BluePill_STLinkMethod": false, "MapleMini_F103CB_STLinkMethod": false, "NUCLEO_64_Nucleo_L152RE_STLinkMethod": false, "DISCOVERY_F407VG": true, "BluePill_serialMethod": false, "DISCOVERY_F429ZI": true, "NUCLEO_64_Nucleo_F103RB_STLinkMethod": false, "BLACK_F407XX_BLACK_F407ZE_STLinkMethod": true, "NUCLEO_64_Nucleo_L053R8_STLinkMethod": false, "BluePill_DFUUploadMethod": false, "BLACK_F407XX_BLACK_F407VE_STLinkMethod": true, "DISCOVERY_F746NG": true, "BluePill_BMPMethod": false, "NUCLEO_64_Nucleo_L476RG_STLinkMethod": true, "BLACK_F407XX_BLACK_F407ZG_STLinkMethod": true, "NUCLEO_64_Nucleo_F411RE_STLinkMethod": true}, "HardwareTest/examples/AutomaticCompilation/SPI/": {"MapleMini_F103CB_serialMethod": true, "NUCLEO_64_Nucleo_F303RE_STLinkMethod": false, "DISCOVERY_L053C8": false, "MapleMini_F103CB_DFUUploadMethod1": true, "MapleMini_F103CB_BMPMethod": true, "NUCLEO_64_Nucleo_F030R8_STLinkMethod": false, "BluePill_STLinkMethod": true, "MapleMini_F103CB_STLinkMethod": true, "NUCLEO_64_Nucleo_L152RE_STLinkMethod": false, "DISCOVERY_F407VG": true, "BluePill_serialMethod": true, "DISCOVERY_F429ZI": true, "NUCLEO_64_Nucleo_F103RB_STLinkMethod": true, "BLACK_F407XX_BLACK_F407ZE_STLinkMethod": true, "NUCLEO_64_Nucleo_L053R8_STLinkMethod": false, "BluePill_DFUUploadMethod": true, "BLACK_F407XX_BLACK_F407VE_STLinkMethod": true, "DISCOVERY_F746NG": true, "BluePill_BMPMethod": true, "NUCLEO_64_Nucleo_L476RG_STLinkMethod": false, "BLACK_F407XX_BLACK_F407ZG_STLinkMethod": true, "NUCLEO_64_Nucleo_F411RE_STLinkMethod": true}, "SDIO/src/": {"MapleMini_F103CB_serialMethod": false, "NUCLEO_64_Nucleo_F303RE_STLinkMethod": false, "DISCOVERY_L053C8": false, "MapleMini_F103CB_DFUUploadMethod1": false, "MapleMini_F103CB_BMPMethod": false, "NUCLEO_64_Nucleo_F030R8_STLinkMethod": false, "BluePill_STLinkMethod": false, "MapleMini_F103CB_STLinkMethod": false, "NUCLEO_64_Nucleo_L152RE_STLinkMethod": false, "DISCOVERY_F407VG": true, "BluePill_serialMethod": false, "DISCOVERY_F429ZI": true, "NUCLEO_64_Nucleo_F103RB_STLinkMethod": false, "BLACK_F407XX_BLACK_F407ZE_STLinkMethod": true, "NUCLEO_64_Nucleo_L053R8_STLinkMethod": false, "BluePill_DFUUploadMethod": false, "BLACK_F407XX_BLACK_F407VE_STLinkMethod": true, "DISCOVERY_F746NG": true, "BluePill_BMPMethod": false, "NUCLEO_64_Nucleo_L476RG_STLinkMethod": true, "BLACK_F407XX_BLACK_F407ZG_STLinkMethod": true, "NUCLEO_64_Nucleo_F411RE_STLinkMethod": true}, "HardwareTest/examples/AutomaticCompilation/I2C/": {"MapleMini_F103CB_serialMethod": true, "NUCLEO_64_Nucleo_F303RE_STLinkMethod": false, "DISCOVERY_L053C8": false, "MapleMini_F103CB_DFUUploadMethod1": true, "MapleMini_F103CB_BMPMethod": true, "NUCLEO_64_Nucleo_F030R8_STLinkMethod": false, "BluePill_STLinkMethod": true, "MapleMini_F103CB_STLinkMethod": true, "NUCLEO_64_Nucleo_L152RE_STLinkMethod": true, "DISCOVERY_F407VG": true, "BluePill_serialMethod": true, "DISCOVERY_F429ZI": true, "NUCLEO_64_Nucleo_F103RB_STLinkMethod": true, "BLACK_F407XX_BLACK_F407ZE_STLinkMethod": true, "NUCLEO_64_Nucleo_L053R8_STLinkMethod": false, "BluePill_DFUUploadMethod": true, "BLACK_F407XX_BLACK_F407VE_STLinkMethod": true, "DISCOVERY_F746NG": true, "BluePill_BMPMethod": true, "NUCLEO_64_Nucleo_L476RG_STLinkMethod": false, "BLACK_F407XX_BLACK_F407ZG_STLinkMethod": true, "NUCLEO_64_Nucleo_F411RE_STLinkMethod": true}, "HardwareTest/examples/AutomaticCompilation/Basic/": {"MapleMini_F103CB_serialMethod": true, "NUCLEO_64_Nucleo_F303RE_STLinkMethod": true, "DISCOVERY_L053C8": true, "MapleMini_F103CB_DFUUploadMethod1": true, "MapleMini_F103CB_BMPMethod": true, "NUCLEO_64_Nucleo_F030R8_STLinkMethod": false, "BluePill_STLinkMethod": true, "MapleMini_F103CB_STLinkMethod": true, "NUCLEO_64_Nucleo_L152RE_STLinkMethod": true, "DISCOVERY_F407VG": true, "BluePill_serialMethod": true, "DISCOVERY_F429ZI": true, "NUCLEO_64_Nucleo_F103RB_STLinkMethod": true, "BLACK_F407XX_BLACK_F407ZE_STLinkMethod": true, "NUCLEO_64_Nucleo_L053R8_STLinkMethod": true, "BluePill_DFUUploadMethod": true, "BLACK_F407XX_BLACK_F407VE_STLinkMethod": true, "DISCOVERY_F746NG": true, "BluePill_BMPMethod": true, "NUCLEO_64_Nucleo_L476RG_STLinkMethod": true, "BLACK_F407XX_BLACK_F407ZG_STLinkMethod": true, "NUCLEO_64_Nucleo_F411RE_STLinkMethod": true}}
\ No newline at end of file