revert most

Author: thinkyhead

buildroot/share/PlatformIO/scripts/SAMD21_minitronics20.py

@@ -14,5 +14,5 @@
 
     serialBuf = str(max(int(rxBuf), int(txBuf), 350))
 
-    build_flags = env.get("BUILD_FLAGS")
+    build_flags = env.get('BUILD_FLAGS')
     env.Replace(BUILD_FLAGS=build_flags)

buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py

@@ -14,6 +14,6 @@
 
     serialBuf = str(max(int(rxBuf), int(txBuf), 350))
 
-    build_flags = env.get("BUILD_FLAGS")
+    build_flags = env.get('BUILD_FLAGS')
     build_flags.append("-DSERIAL_BUFFER_SIZE=" + serialBuf)
     env.Replace(BUILD_FLAGS=build_flags)

buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py

@@ -8,11 +8,11 @@
     flash_size = 0
     vect_tab_addr = 0
 
-    for define in env["CPPDEFINES"]:
+    for define in env['CPPDEFINES']:
         if define[0] == "VECT_TAB_ADDR":
             vect_tab_addr = define[1]
         if define[0] == "STM32_FLASH_SIZE":
             flash_size = define[1]
 
-    print("Use the {0:s} address as the marlin app entry point.".format(vect_tab_addr))
-    print("Use the {0:d}KB flash version of stm32f103rct6 chip.".format(flash_size))
+    print('Use the {0:s} address as the marlin app entry point.'.format(vect_tab_addr))
+    print('Use the {0:d}KB flash version of stm32f103rct6 chip.'.format(flash_size))

buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py

@@ -9,40 +9,18 @@
     # Custom HEX from ELF
     env.AddPostAction(
         join("$BUILD_DIR", "${PROGNAME}.elf"),
-        env.VerboseAction(
-            " ".join(
-                [
-                    "$OBJCOPY",
-                    "-O ihex",
-                    "$TARGET",
-                    '"'
-                    + join("$BUILD_DIR", "${PROGNAME}.hex")
-                    + '"'  # Note: $BUILD_DIR is a full path
-                ]
-            ),
-            "Building $TARGET"
-        )
-    )
+        env.VerboseAction(" ".join([
+            "$OBJCOPY", "-O ihex", "$TARGET",
+            "\"" + join("$BUILD_DIR", "${PROGNAME}.hex") + "\"", # Note: $BUILD_DIR is a full path
+        ]), "Building $TARGET"))
 
     # In-line command with arguments
-    UPLOAD_TOOL = "stm32flash"
+    UPLOAD_TOOL="stm32flash"
     platform = env.PioPlatform()
     if platform.get_package_dir("tool-stm32duino") != None:
-        UPLOAD_TOOL = expandvars(
-            '"'
-            + join(
-                platform.get_package_dir("tool-stm32duino"), "stm32flash", "stm32flash"
-            )
-            + '"'
-        )
+        UPLOAD_TOOL=expandvars("\"" + join(platform.get_package_dir("tool-stm32duino"),"stm32flash","stm32flash") + "\"")
 
     env.Replace(
         UPLOADER=UPLOAD_TOOL,
-        UPLOADCMD=expandvars(
-            UPLOAD_TOOL
-            + ' -v -i rts,-dtr,dtr -R -b 115200 -g 0x8000000 -w "'
-            + join("$BUILD_DIR", "${PROGNAME}.hex")
-            + '"'
-            + " $UPLOAD_PORT"
-        )
+        UPLOADCMD=expandvars(UPLOAD_TOOL + " -v -i rts,-dtr,dtr -R -b 115200 -g 0x8000000 -w \"" + join("$BUILD_DIR","${PROGNAME}.hex")+"\"" + " $UPLOAD_PORT")
     )

buildroot/share/PlatformIO/scripts/STM32F1_build_flags.py

@@ -15,15 +15,19 @@
         "-Os",
         "-mcpu=cortex-m3",
         "-mthumb",
+
         "-fsigned-char",
         "-fno-move-loop-invariants",
         "-fno-strict-aliasing",
         "-fsingle-precision-constant",
+
         "--specs=nano.specs",
         "--specs=nosys.specs",
-        "-MMD",
-        "-MP",
+
+        "-MMD", "-MP",
+
         "-IMarlin/src/HAL/STM32F1",
+
         "-DTARGET_STM32F1",
         "-DARDUINO_ARCH_STM32",
         "-DPLATFORM_M997_SUPPORT"
@@ -39,7 +43,9 @@
     if pioutil.is_pio_build():
         pioutil.env.Append(
             ARFLAGS=["rcs"],
+
             ASFLAGS=["-x", "assembler-with-cpp"],
+
             CXXFLAGS=[
                 "-fabi-version=0",
                 "-fno-use-cxa-atexit",
@@ -52,6 +58,6 @@
                 "-mthumb",
                 "--specs=nano.specs",
                 "--specs=nosys.specs",
-                "-u_printf_float"
-            ]
+                "-u_printf_float",
+            ],
         )

buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py

@@ -38,8 +38,6 @@
     else:
 
         # The following almost works, but __start__ (from wirish/start.S) is not seen by common.inc
-        board.update("build.variants_dir", source_root_str)
+        board.update("build.variants_dir", source_root_str);
         src = str(source_dir)
-        env.Append( # Add include path for variant
-            BUILD_FLAGS=[f"-I{src}", f"-L{src}/ld"]
-        )
+        env.Append(BUILD_FLAGS=[f"-I{src}", f"-L{src}/ld"])  # Add include path for variant

buildroot/share/PlatformIO/scripts/collect-code-tests.py

@@ -9,7 +9,7 @@
     import os, re
     env = pioutil.env
 
-    os.environ["PATH"] = f"./buildroot/bin/:./buildroot/tests/:{os.environ['PATH']}"
+    os.environ['PATH'] = f"./buildroot/bin/:./buildroot/tests/:{os.environ['PATH']}"
 
     def collect_test_suites():
         """Get all the test suites"""
@@ -21,36 +21,38 @@ def register_test_suites():
         targets = []
         test_suites = collect_test_suites()
         for path in test_suites:
-            name = re.sub(r"^\d+-|\.ini$", "", path.name)
-            targets += [name]
+            name = re.sub(r'^\d+-|\.ini$', '', path.name)
+            targets += [name];
 
             env.AddCustomTarget(
-                name=f"marlin_{name}",
-                dependencies=None,
-                actions=[
+                name = f"marlin_{name}",
+                dependencies = None,
+                actions = [
                     f"echo ====== Configuring for marlin_{name} ======",
                     "restore_configs",
                     f"cp -f {path} ./Marlin/config.ini",
                     "python ./buildroot/share/PlatformIO/scripts/configuration.py",
                     f"platformio test -e linux_native_test -f {name}",
                     "restore_configs",
                 ],
-                title="Marlin: {}".format(name.lower().title().replace("_", " ")),
-                description=(
+                title = "Marlin: {}".format(name.lower().title().replace("_", " ")),
+                description = (
                     f"Run a Marlin test suite, with the appropriate configuration, "
                     f"that sits in {path}"
                 )
             )
 
         env.AddCustomTarget(
-            name="test-marlin",
-            dependencies=None,
-            actions=[
+            name = "test-marlin",
+            dependencies = None,
+            actions = [
                 f"platformio run -t marlin_{name} -e linux_native_test"
                 for name in targets
             ],
-            title="Marlin: Test all code test suites",
-            description=(f"Run all Marlin code test suites ({len(targets)} found).")
+            title = "Marlin: Test all code test suites",
+            description = (
+                f"Run all Marlin code test suites ({len(targets)} found)."
+            ),
         )
 
     register_test_suites()

buildroot/share/PlatformIO/scripts/common-cxxflags.py

@@ -30,18 +30,12 @@ def add_cpu_freq():
     # It useful to keep two live versions: a debug version for debugging and another for
     # release, for flashing when upload is not done automatically by jlink/stlink.
     # Without this, PIO needs to recompile everything twice for any small change.
-    if env.GetBuildType() == "debug" and env.get("UPLOAD_PROTOCOL") not in [
-        "jlink",
-        "stlink",
-        "custom"
-    ]:
+    if env.GetBuildType() == "debug" and env.get("UPLOAD_PROTOCOL") not in ["jlink", "stlink", "custom"]:
         env["BUILD_DIR"] = "$PROJECT_BUILD_DIR/$PIOENV/debug"
 
         def on_program_ready(source, target, env):
             import shutil
-            shutil.copy(
-                target[0].get_abspath(), env.subst("$PROJECT_BUILD_DIR/$PIOENV")
-            )
+            shutil.copy(target[0].get_abspath(), env.subst("$PROJECT_BUILD_DIR/$PIOENV"))
 
         env.AddPostAction("$PROGPATH", on_program_ready)
 

buildroot/share/PlatformIO/scripts/common-dependencies-post.py

@@ -9,11 +9,9 @@
     Import("projenv") # src_dir environment. Only for post: scripts!
 
     def apply_board_build_flags():
-        if not "BOARD_CUSTOM_BUILD_FLAGS" in env["MARLIN_FEATURES"]:
+        if not 'BOARD_CUSTOM_BUILD_FLAGS' in env['MARLIN_FEATURES']:
             return
-        projenv.Append(
-            CCFLAGS=env["MARLIN_FEATURES"]["BOARD_CUSTOM_BUILD_FLAGS"].split()
-        )
+        projenv.Append(CCFLAGS=env['MARLIN_FEATURES']['BOARD_CUSTOM_BUILD_FLAGS'].split())
 
     # We need to add the board build flags in a post script
     # so the platform build script doesn't overwrite the custom CCFLAGS