Update - python scripts

classicrocker883 · classicrocker883 · commit 7a07c917dfb4 · 2025-10-08T23:36:43.000-04:00
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -6,5 +6,5 @@
         "marlinfirmware.auto-build",
         "ms-vscode.cpptools-extension-pack",
         "platformio.platformio-ide"
-    ],
-}
+    ]
+}
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/scripts/svg2cpp.py
@@ -267,8 +267,9 @@ def layer_matches(self):
         """Are we in the correct layer?"""
         if not self.args.layer:
             return True
-        for l in self.groups:
-            if l and l.find(self.args.layer) != -1:
+        target_layer = self.args.layer
+        for group_name in self.groups:
+            if group_name and target_layer in group_name:
                 return True
         return False
 
diff --git a/buildroot/share/PlatformIO/debugging/launch.json b/buildroot/share/PlatformIO/debugging/launch.json
@@ -22,7 +22,7 @@
             "device": "stlink",
             "executable": "${workspaceRoot}/.pio/build/STM32F407VG_btt_USB_debug/firmware.elf",
             "openOCDLaunchCommands": [ "init", "reset init" ],
-            "svdFile": "${env:HOME}/.platformio/platforms/ststm32@12.1.1/misc/svd/STM32F40x.svd",
+            "svdFile": "${env:HOME}/.platformio/platforms/ststm32@12.1.1/misc/svd/STM32F40x.svd"
         },
         {
             "name": "Launch Sim (ggdb)",
diff --git a/buildroot/share/PlatformIO/scripts/SAMD21_minitronics20.py b/buildroot/share/PlatformIO/scripts/SAMD21_minitronics20.py
@@ -10,10 +10,10 @@
     env = pioutil.env
 
     mf = env["MARLIN_FEATURES"]
-    rxBuf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
-    txBuf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
+    rx_Buf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
+    tx_Buf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
 
-    serialBuf = str(max(int(rxBuf), int(txBuf), 350))
+    serialBuf = str(max(int(rx_Buf), int(tx_Buf), 350))
 
     build_flags = env.get("BUILD_FLAGS")
     env.Replace(BUILD_FLAGS=build_flags)
diff --git a/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py b/buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
@@ -10,10 +10,10 @@
     env = pioutil.env
 
     mf = env["MARLIN_FEATURES"]
-    rxBuf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
-    txBuf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
+    rx_Buf = mf["RX_BUFFER_SIZE"] if "RX_BUFFER_SIZE" in mf else "0"
+    tx_Buf = mf["TX_BUFFER_SIZE"] if "TX_BUFFER_SIZE" in mf else "0"
 
-    serialBuf = str(max(int(rxBuf), int(txBuf), 350))
+    serialBuf = str(max(int(rx_Buf), int(tx_Buf), 350))
 
     build_flags = env.get("BUILD_FLAGS")
     build_flags.append("-DSERIAL_BUFFER_SIZE=" + serialBuf)
diff --git a/buildroot/share/PlatformIO/scripts/chitu_crypt.py b/buildroot/share/PlatformIO/scripts/chitu_crypt.py
@@ -62,7 +62,6 @@ def xor_block(r0, r1, block_number, block_size, file_key):
     def encrypt_file(input, output_file, file_length):
         input_file = bytearray(input.read())
         block_size = 0x800
-        key_length = 0x18
 
         uid_value = uuid.uuid4()
         file_key = int(uid_value.hex[0:8], 16)
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies-post.py b/buildroot/share/PlatformIO/scripts/common-dependencies-post.py
@@ -9,7 +9,7 @@
     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 "BOARD_CUSTOM_BUILD_FLAGS" not in env["MARLIN_FEATURES"]:
             return
         projenv.Append(CCFLAGS=env["MARLIN_FEATURES"]["BOARD_CUSTOM_BUILD_FLAGS"].split())
 
diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.py b/buildroot/share/PlatformIO/scripts/common-dependencies.py
@@ -70,15 +70,15 @@ def add_to_feat_cnf(feature, flines):
                 for dep in re.split(r',\s*', line):
                     lib_name = (re.sub(r'@([~^]|[<>]=?)?[\d.]+', "", dep.strip()) .split("=") .pop(0))
                     lib_re = re.compile("(?!^" + lib_name + "\\b)")
-                    if not "lib_deps" in feat: feat["lib_deps"] = {}
+                    if "lib_deps" not in feat: feat["lib_deps"] = {}
                     feat["lib_deps"] = list(filter(lib_re.match, feat["lib_deps"])) + [dep]
                     blab("[%s] lib_deps = %s" % (feature, dep), 3)
 
     def load_features():
         blab("========== Gather [features] entries...")
         for key in ProjectConfig().items("features"):
             feature = key[0].upper()
-            if not feature in FEATURE_CONFIG:
+            if feature not in FEATURE_CONFIG:
                 FEATURE_CONFIG[feature] = {"lib_deps": []}
             add_to_feat_cnf(feature, key[1])
 
@@ -101,7 +101,7 @@ def get_all_known_libs():
         known_libs = []
         for feature in FEATURE_CONFIG:
             feat = FEATURE_CONFIG[feature]
-            if not "lib_deps" in feat:
+            if "lib_deps" not in feat:
                 continue
             for dep in feat["lib_deps"]:
                 known_libs.append(PackageSpec(dep).name)
diff --git a/buildroot/share/PlatformIO/scripts/configuration.py b/buildroot/share/PlatformIO/scripts/configuration.py
@@ -222,7 +222,6 @@ def apply_config_ini(cp):
 
     # For each ini_use_config item perform an action
     for ckey in config_keys:
-        addbase = False
 
         # For a key ending in .ini load and parse another .ini file
         if ckey.endswith(".ini"):
diff --git a/buildroot/share/PlatformIO/scripts/open_explorer.py b/buildroot/share/PlatformIO/scripts/open_explorer.py
@@ -8,12 +8,12 @@ def open_file_explorer():
 
     env = DefaultEnvironment()
     BUILD_PATH = Path(env["PROJECT_BUILD_DIR"], env["PIOENV"])
-    script = f"{BUILD_PATH}"
+    script = str(BUILD_PATH)
     import platform
     current_OS = platform.system()
     if current_OS == "Windows":
-        import os
         try:
+            import os
             os.startfile(script)
         except OSError:
             try:
diff --git a/buildroot/share/PlatformIO/scripts/preprocessor.py b/buildroot/share/PlatformIO/scripts/preprocessor.py
@@ -53,7 +53,7 @@ def run_preprocessor(env, fn=None):
 def search_compiler(env):
     global nocache
 
-    from pathlib import Path, PurePath
+    from pathlib import Path
 
     ENV_BUILD_PATH = Path(env["PROJECT_BUILD_DIR"], env["PIOENV"])
     GCC_PATH_CACHE = ENV_BUILD_PATH / ".gcc_path"
diff --git a/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py b/buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
@@ -53,11 +53,11 @@ def tryAddFlag(name, value):
     mf = env["MARLIN_FEATURES"]
 
     # Get the largest defined buffer sizes for RX or TX, using defaults for undefined
-    rxBuf = getBufferSize("RX", 128)
-    txBuf = getBufferSize("TX",  64)
+    rx_Buf = getBufferSize("RX", 128)
+    tx_Buf = getBufferSize("TX",  64)
 
     # Provide serial buffer sizes to the stm32duino platform
-    tryAddFlag("SERIAL_RX_BUFFER_SIZE", rxBuf)
-    tryAddFlag("SERIAL_TX_BUFFER_SIZE", txBuf)
-    tryAddFlag("USART_RX_BUF_SIZE", rxBuf)
-    tryAddFlag("USART_TX_BUF_SIZE", txBuf)
+    tryAddFlag("SERIAL_RX_BUFFER_SIZE", rx_Buf)
+    tryAddFlag("SERIAL_TX_BUFFER_SIZE", tx_Buf)
+    tryAddFlag("USART_RX_BUF_SIZE", rx_Buf)
+    tryAddFlag("USART_TX_BUF_SIZE", tx_Buf)
diff --git a/buildroot/share/fonts/buildhzk.py b/buildroot/share/fonts/buildhzk.py
@@ -9,7 +9,7 @@
 def glyph_bits(size_x, size_y, font, glyph_ord):
     asc  = font[b"FONT_ASCENT"]
     desc = font[b"FONT_DESCENT"]
-    bits = [0 for y in range(size_y)]
+    bits = [0] * size_y
 
     glyph_bytes = math.ceil(size_x / 8)
     try:
diff --git a/buildroot/share/scripts/MarlinBinaryProtocol.py b/buildroot/share/scripts/MarlinBinaryProtocol.py
@@ -91,9 +91,9 @@ def dispatch(data):
                         return
 
         def reconnect():
-            print("Reconnecting..")
+            print("Reconnecting...")
             self.port.close()
-            for x in range(10):
+            for _ in range(10):
                 try:
                     if self.connected:
                         self.port = serial.Serial(self.device, baudrate = self.baud, write_timeout = 0, timeout = 1)
@@ -143,7 +143,7 @@ def send(self, protocol, packet_type, data=bytearray()):
                 self.await_response()
             except ReadTimeout:
                 self.errors += 1
-                #print("Packetloss detected..")
+                #print("Packetloss detected...")
         self.packet_transit = None
 
     def await_response(self):
@@ -180,7 +180,7 @@ def send_ascii(self, data, send_and_forget=False):
                     self.await_response_ascii()
             except ReadTimeout:
                 self.errors += 1
-                #print("Packetloss detected..")
+                #print("Packetloss detected...")
             except serial.SerialException:
                 return
         self.packet_transit = None
diff --git a/buildroot/share/scripts/createSpeedLookupTable.py b/buildroot/share/scripts/createSpeedLookupTable.py
@@ -22,8 +22,8 @@
 print()
 
 print("  const struct { uint16_t base; uint8_t gain; } speed_lookuptable_fast[256] PROGMEM = {")
-a = [0 for i in range(8)] + [int(0.5 + float(timer_freq) / (i * 256)) for i in range(8, 256)]
-b = [0 for i in range(8)] + [a[i] - a[i + 1] for i in range(8, 255)]
+a = [0] * 8 + [int(0.5 + float(timer_freq) / (i * 256)) for i in range(8, 256)]
+b = [0] * 8 + [a[i] - a[i + 1] for i in range(8, 255)]
 b.append(b[-1])
 for i in range(32):
     print("    ", end="")
diff --git a/buildroot/share/scripts/createTemperatureLookupMarlin.py b/buildroot/share/scripts/createTemperatureLookupMarlin.py
@@ -20,13 +20,13 @@
 """
 
 from __future__ import print_function, division
-from math import *
+import math
 import sys, getopt
 
 # Constants
 ZERO   = 273.15       # Zero point of Kelvin scale
-VADC   = 5            # ADC voltage
-VCC    = 5            # Supply voltage
+VADC   = 5.0          # ADC voltage
+VCC    = 5.0          # Supply voltage
 ARES   = pow(2, 10)   # 10 Bit ADC resolution
 VSTEP  = VADC / ARES  # ADC voltage resolution
 TMIN   = 0            # Lowest temperature in table
@@ -36,17 +36,17 @@ class Thermistor:
     """Class to do the thermistor maths"""
 
     def __init__(self, rp, t1, r1, t2, r2, t3, r3):
-        l1 = log(r1)
-        l2 = log(r2)
-        l3 = log(r3)
+        l1 = math.log(r1)
+        l2 = math.log(r2)
+        l3 = math.log(r3)
         y1 = 1.0 / (t1 + ZERO)  # Adjust scale
         y2 = 1.0 / (t2 + ZERO)
         y3 = 1.0 / (t3 + ZERO)
         x = (y2 - y1) / (l2 - l1)
         y = (y3 - y1) / (l3 - l1)
         c = (y - x) / ((l3 - l2) * (l1 + l2 + l3))
-        b = x - c * (l1**2 + l2**2 + l1 * l2)
-        a = y1 - (b + l1**2 * c) * l1
+        b = x - c * (l1**2 + l1 * l2 + l2**2)
+        a = y1 - (b + c * l1**2) * l1
 
         if c < 0:
             print("//////////////////////////////////////////////////////////////////////////////////////")
@@ -69,20 +69,22 @@ def voltage(self, adc):
 
     def resist(self, adc):
         """Convert ADC reading into a resistance in Ohms"""
-        r = self.rp * self.voltage(adc) / (VCC - self.voltage(adc))  # Resistance of thermistor
-        return r
+        v = self.voltage(adc)
+        return self.rp * v / (VCC - v)
 
     def temp(self, adc):
         """Convert ADC reading into a temperature in Celsius"""
-        l = log(self.resist(adc))
-        Tinv = self.c1 + self.c2 * l + self.c3 * l**3  # Inverse temperature
-        return (1 / Tinv) - ZERO  # Temperature
+        r = self.resist(adc)
+        l = math.log(r)
+        inv_T = self.c1 + self.c2 * l + self.c3 * (l ** 3)  # Inverse temperature
+        return (1.0 / inv_T) - ZERO  # Temperature
 
     def adc(self, temp):
         """Convert temperature into a ADC reading"""
-        x = (self.c1 - (1.0 / (temp + ZERO))) / (2 * self.c3)
-        y = sqrt((self.c2 / (3 * self.c3)) ** 3 + x**2)
-        r = exp((y - x) ** (1.0 / 3) - (y + x) ** (1.0 / 3))
+        inv_T = 1.0 / (temp + ZERO)
+        x = (self.c1 - inv_T) / (2 * self.c3)
+        y = math.sqrt((self.c2 / (3 * self.c3)) ** 3 + x**2)
+        r = math.exp((y - x) ** (1.0 / 3) - (y + x) ** (1.0 / 3))
         return (r / (self.rp + r)) * ARES
 
 def main(argv):
@@ -111,27 +113,30 @@ def main(argv):
             rp = int(arg)
         elif opt == "--t1":
             arg = arg.split(":")
-            t1 = float(arg[0])
-            r1 = float(arg[1])
+            t1  = float(arg[0])
+            r1  = float(arg[1])
         elif opt == "--t2":
             arg = arg.split(":")
-            t2 = float(arg[0])
-            r2 = float(arg[1])
+            t2  = float(arg[0])
+            r2  = float(arg[1])
         elif opt == "--t3":
             arg = arg.split(":")
-            t3 = float(arg[0])
-            r3 = float(arg[1])
+            t3  = float(arg[0])
+            r3  = float(arg[1])
         elif opt == "--num-temps":
             num_temps = int(arg)
 
     t = Thermistor(rp, t1, r1, t2, r2, t3, r3)
-    increment = int((ARES - 1) / (num_temps - 1))
-    step = int((TMIN - TMAX) / (num_temps - 1))
     low_bound = t.temp(ARES - 1)
     up_bound = t.temp(1)
-    min_temp = int(TMIN if TMIN > low_bound else low_bound)
-    max_temp = int(TMAX if TMAX < up_bound else up_bound)
-    temps = list(range(max_temp, TMIN + step, step))
+    min_temp = max(TMIN, low_bound)
+    max_temp = min(TMAX, up_bound)
+    step_size = (max_temp - min_temp) / (num_temps - 1)
+    temps = []
+    for i in range(num_temps):
+        temp = min_temp + (i * step_size)
+        temps.append(int(round(temp)))
+    temps.reverse()
 
     print("// Thermistor lookup table for Marlin")
     print("// ./createTemperatureLookupMarlin.py --rp=%s --t1=%s:%s --t2=%s:%s --t3=%s:%s --num-temps=%s" % (rp, t1, r1, t2, r2, t3, r3, num_temps))
@@ -140,14 +145,16 @@ def main(argv):
     print()
     print("const short temptable[][2] PROGMEM = {")
 
-    for temp in temps:
+    for i, temp in enumerate(temps):
         adc = t.adc(temp)
-        print("    { OV(%7.2f), %4s }%s // v=%.3f\tr=%.3f\tres=%.3f degC/count" %
-            (adc, temp,
-            "," if temp != temps[-1] else " ",
-            t.voltage(adc),
-            t.resist( adc),
-            t.resol(  adc))
+        voltage = t.voltage(adc)
+        resistance = t.resist(adc)
+        resolution = t.resol(adc)
+
+        comma = "," if i < len(temps) - 1 else " "
+
+        print(
+            f"    {{ OV({adc:7.2f}), {temp:4d} }}{comma} // v={voltage:.3f}\tr={resistance:.3f}\tres={resolution:.3f} degC/count"
         )
     print("};")
 
diff --git a/buildroot/share/scripts/languageImport.py b/buildroot/share/scripts/languageImport.py
@@ -88,9 +88,9 @@
                 else "Narrow"
             )
             columns.append({"lang": lang, "style": style})
-            if not lang in strings_per_lang:
+            if lang not in strings_per_lang:
                 strings_per_lang[lang] = {}
-            if not style in strings_per_lang[lang]:
+            if style not in strings_per_lang[lang]:
                 strings_per_lang[lang][style] = {}
         continue
     # Add the named string for all the included languages
@@ -159,7 +159,7 @@
     lang, style = col["lang"], col["style"]
 
     # If we haven't already opened a file for this language, do so now
-    if not lang in gotlang:
+    if lang not in gotlang:
         gotlang[lang] = {}
         if f: f.close()
         fn = "%s/language_%s.h" % (OUTDIR, lang)
diff --git a/buildroot/share/scripts/pinsformat.py b/buildroot/share/scripts/pinsformat.py
@@ -93,7 +93,6 @@ def format_pins(argv):
 # Find the pin pattern so non-pin defines can be skipped
 def get_pin_pattern(txt):
     r = ""
-    m = 0
     match_count = [0, 0, 0, 0]
 
     # Find the most common matching pattern
diff --git a/buildroot/share/scripts/rle16_compress_cpp_image_data.py b/buildroot/share/scripts/rle16_compress_cpp_image_data.py
diff --git a/buildroot/share/scripts/upload.py b/buildroot/share/scripts/upload.py
diff --git a/buildroot/share/scripts/validate_boards.py b/buildroot/share/scripts/validate_boards.py
diff --git a/slicer scripts/orca-prusa-super_slicer/CreateHeaderAndThumbnail.py b/slicer scripts/orca-prusa-super_slicer/CreateHeaderAndThumbnail.py

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"device": "stlink",`
`23`	`23`	`"executable": "${workspaceRoot}/.pio/build/STM32F407VG_btt_USB_debug/firmware.elf",`
`24`	`24`	`"openOCDLaunchCommands": [ "init", "reset init" ],`
`25`		`- "svdFile": "${env:HOME}/.platformio/platforms/ststm32@12.1.1/misc/svd/STM32F40x.svd",`
	`25`	`+ "svdFile": "${env:HOME}/.platformio/platforms/ststm32@12.1.1/misc/svd/STM32F40x.svd"`
`26`	`26`	`},`
`27`	`27`	`{`
`28`	`28`	`"name": "Launch Sim (ggdb)",`