Merge branch 'Snake-Edition:main' into main

xtomasnemec · Apr 23, 2024 · 0daa569 · 0daa569
2 parents 746317e + 5d5fd51
commit 0daa569
Show file tree

Hide file tree

Showing 1,800 changed files with 96,106 additions and 84,440 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -16,3 +16,5 @@ aa7bb070e259fb73fba4d8f4ea46abc24abbced9 # Rename marlin_client members
 2933bc5568ce0a1fd05e9221c1d8629a5a157329 # xl: Rename Dwarf::set_led() to Dwarf::set_cheese_led()
 87bb1927f87520ce063069a178291295183e1597 # Set ClangFormat AlignTrailingComments: Kind: Never
 bd27a08249dd1dc9919b547f4ca757258c779271 # Unify footer naming style with our dev guidelines
+26025874ae0798b467aa5426dc46e02ef94d8e64 # Apply clang-format InsertBraces
+95a5c28643f164c6cbc8bf4d7150aee42b571c89 # Partial reformat of hwio pins
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -47,44 +47,40 @@ repos:
     - id: mixed-line-ending
 exclude: |
   (?x)(
-    ^tests/unit/lang/translator/(keys|cs|es|fr|de|pl|it)\.txt$|
-    ^tests/unit/common/gcode/.*\.gcode$|
-    ^lib/printf|
-    ^lib/inih/|
+    ^lib/Catch2/|
+    ^lib/CrashCatcher/|
+    ^lib/Drivers/|
+    ^lib/ESP/prusa/src/serial-flasher/serial_comm.c|
+    ^lib/ESP/serial-flasher/|
     ^lib/Marlin/(?!
         Marlin/src(/gcode)?/feature/prusa/|
         Marlin/src(/gcode)?/feature/input_shaper/|
         Marlin/src(/gcode)?/feature/pressure_advance/|
         Marlin/src(/gcode)?/feature/precise_stepping/|
+        Marlin/src(/gcode)?/feature/phase_stepping/|
         Marlin/src/module/prusa/|
         Marlin/src/gcode/calibrate/M958.cpp
       )|
-    ^lib/Prusa-Error-Codes/|
-    ^lib/TMCStepper/|
+    ^lib/Middlewares/Third_Party/FatFs/|
+    ^lib/Middlewares/Third_Party/FreeRTOS/|
     ^lib/Middlewares/Third_Party/LwIP/|
-    ^lib/jsmn/|
-    ^lib/Drivers/|
-    ^lib/ESP/serial-flasher/|
-    ^lib/ESP/lwesp/|
-    ^lib/ESP/prusa/src/serial-flasher/serial_comm.c|
-    ^lib/ESP/prusa/include/sockets/lwesp_netbuf.h|
-    ^lib/ESP/prusa/include/sockets/lwesp_sockets.h|
-    ^lib/ESP/prusa/include/sockets/lwesp_sockets_priv.h|
-    ^lib/ESP/prusa/src/sockets/lwesp_netbuf.c|
-    ^lib/ESP/prusa/src/sockets/lwesp_sockets.c|
-    ^lib/Catch2/|
-    ^lib/libsysbase/|
-    ^lib/Segger|
-    ^lib/tinyusb|
     ^lib/Middlewares/Third_Party/littlefs/|
-    ^lib/Prusa-Firmware-MMU/|
-    ^lib/Middlewares/Third_Party/CycloneTCP/|
     ^lib/Middlewares/Third_Party/mbedtls/|
-    ^lib/liblightmodbus/|
+    ^lib/Prusa-Error-Codes/|
+    ^lib/Prusa-Firmware-MMU/|
     ^lib/QR/|
-    ^lib/LiquidCrystal_I2C/|
-    ^lib/CrashCatcher/|
-    ^lib/libbgcode/|
+    ^lib/Segger|
+    ^lib/TMCStepper/|
     ^lib/cpp-std-extensions/|
-    ^lib/heatshrink/
+    ^lib/heatshrink/|
+    ^lib/inih/|
+    ^lib/jsmn/|
+    ^lib/libbgcode/|
+    ^lib/liblightmodbus/|
+    ^lib/libsysbase/|
+    ^lib/printf|
+    ^lib/tinyusb/|
+    ^tests/stubs/FreeRTOS|
+    ^tests/unit/common/gcode/.*\.gcode$|
+    ^tests/unit/lang/translator/(keys|cs|es|fr|de|pl|it)\.txt$
   )
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,15 +8,26 @@
             "request": "launch",
             "type": "cortex-debug",
             "servertype": "openocd",
-            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-10.3.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set bbf_over_debugger_path ./build-vscode-buddy/firmware.bbf"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_buddy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
+            "openOCDPreConfigLaunchCommands": [
+                "set bbf_over_debugger_path ./build-vscode-buddy/firmware.bbf"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_buddy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32F427ZI",
-            "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/data/STMicro/STM32F427.svd",
+            // swd file is disabled, it is known to cause issues in some cases. Enable it if you need to see register view.
+            //"svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32F427.svd",
             "rtos": "FreeRTOS",
             "breakAfterReset": false,
             "preLaunchTask": "Backup current ELF",
+            "liveWatch": {
+                "enabled": true,
+            },
             "rttConfig": {
                 "enabled": true,
                 "address": "auto",
@@ -41,13 +52,24 @@
             "request": "attach",
             "type": "cortex-debug",
             "servertype": "openocd",
-            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-10.3.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set bbf_over_debugger_path ./build-vscode-buddy/firmware.bbf"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_buddy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
+            "openOCDPreConfigLaunchCommands": [
+                "set bbf_over_debugger_path ./build-vscode-buddy/firmware.bbf"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_buddy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32F427ZI",
-            "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/data/STMicro/STM32F427.svd",
+            // swd file is disabled, it is known to cause issues in some cases. Enable it if you need to see register view.
+            //"svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32F427.svd",
             "rtos": "FreeRTOS",
+            "liveWatch": {
+                "enabled": true,
+            },
             "rttConfig": {
                 "enabled": true,
                 "address": "auto",
@@ -72,12 +94,19 @@
             "request": "launch",
             "type": "cortex-debug",
             "servertype": "openocd",
-            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-10.3.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set PUPPY_TYPE dwarf"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_puppy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
+            "openOCDPreConfigLaunchCommands": [
+                "set PUPPY_TYPE dwarf"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_puppy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32G07",
-            "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/data/STMicro/STM32G07x.svd",
+            "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32G07x.svd",
             "rtos": "FreeRTOS",
             "presentation": {
                 "group": "XL Puppies",
@@ -107,12 +136,19 @@
             "request": "attach",
             "type": "cortex-debug",
             "servertype": "openocd",
-            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-10.3.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set PUPPY_TYPE dwarf"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_puppy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
+            "openOCDPreConfigLaunchCommands": [
+                "set PUPPY_TYPE dwarf"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_puppy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32G07",
-            "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/data/STMicro/STM32G07x.svd",
+            "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32G07x.svd",
             "rtos": "FreeRTOS",
             "rttConfig": {
                 "enabled": true,
@@ -138,12 +174,19 @@
             "request": "launch",
             "type": "cortex-debug",
             "servertype": "openocd",
-            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-10.3.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set PUPPY_TYPE modularbed"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_puppy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
+            "openOCDPreConfigLaunchCommands": [
+                "set PUPPY_TYPE modularbed"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_puppy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32G07",
-            "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/data/STMicro/STM32G07x.svd",
+            "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32G07x.svd",
             "rtos": "FreeRTOS",
             "presentation": {
                 "group": "XL Puppies",
@@ -157,12 +200,19 @@
             "request": "attach",
             "type": "cortex-debug",
             "servertype": "openocd",
-            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-10.3.1/bin",
-            "openOCDPreConfigLaunchCommands": ["set PUPPY_TYPE modularbed"],
-            "configFiles": ["${workspaceRoot}/utils/debug/00_common.cfg", "${workspaceRoot}/utils/debug/10_custom_config.cfg", "${workspaceRoot}/utils/debug/20_board_puppy.cfg", "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"],
+            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
+            "openOCDPreConfigLaunchCommands": [
+                "set PUPPY_TYPE modularbed"
+            ],
+            "configFiles": [
+                "${workspaceRoot}/utils/debug/00_common.cfg",
+                "${workspaceRoot}/utils/debug/10_custom_config.cfg",
+                "${workspaceRoot}/utils/debug/20_board_puppy.cfg",
+                "${workspaceRoot}/utils/debug/30_rtt_workaround.cfg"
+            ],
             "toolchainPrefix": "arm-none-eabi",
             "device": "STM32G07",
-            "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/data/STMicro/STM32G07x.svd",
+            "svdFile": "${workspaceRoot}/.dependencies/cmsis-svd-0.4.9999/STM32G07x.svd",
             "rtos": "FreeRTOS",
         },
         {
@@ -173,7 +223,7 @@
             "windows": {
                 "serverpath": "${workspaceRoot}/.venv/Scripts/simulator_as_qemu"
             },
-            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-10.3.1/bin",
+            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
             "cwd": "${workspaceFolder}",
             "executable": "${workspaceRoot}/build-vscode-buddy/firmware",
             "request": "launch",
@@ -186,11 +236,13 @@
             "type": "cortex-debug",
             "servertype": "qemu",
             "serverpath": "${workspaceRoot}/.venv/bin/simulator_as_qemu",
-            "serverArgs": ["--scripted"],
+            "serverArgs": [
+                "--scripted"
+            ],
             "windows": {
                 "serverpath": "${workspaceRoot}/.venv/Scripts/simulator_as_qemu"
             },
-            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-10.3.1/bin",
+            "armToolchainPath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin",
             "cwd": "${workspaceFolder}",
             "executable": "${workspaceRoot}/build-vscode-buddy/firmware",
             "request": "launch",
@@ -203,7 +255,7 @@
             "target": ":1234",
             "remote": true,
             "cwd": "${workspaceRoot}",
-            "gdbpath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-10.3.1/bin/arm-none-eabi-gdb",
+            "gdbpath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin/arm-none-eabi-gdb",
             "autorun": []
         },
         {
@@ -219,7 +271,11 @@
     "compounds": [
         {
             "name": "XL - ALL",
-            "configurations": ["Launch Buddy","Launch Dwarf", "Launch ModularBed"],
+            "configurations": [
+                "Launch Buddy",
+                "Launch Dwarf",
+                "Launch ModularBed"
+            ],
             "presentation": {
                 "group": "XL Puppies",
             },

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
     "cmake.configureOnOpen": true,
     "cmake.copyCompileCommands": "${workspaceFolder}/compile_commands.json",
-    "cmake.cmakePath": "${workspaceFolder}/.dependencies/cmake-3.22.5/bin/cmake",
+    "cmake.cmakePath": "${workspaceFolder}/.dependencies/cmake-3.28.3/bin/cmake",
     "cmake.generator": "Ninja",
     "files.insertFinalNewline": true,
     "files.associations": {