Fix EEPROM Editor Octoprint Plugin - M503 (#198)

* Fix issues #196 + #168 * Update workflow versions * Remove "Mesh # Loaded" message from loading screen * Update Python scripts + format
classicrocker883 · Feb 21, 2025 · 88eb455 · 88eb455
1 parent b4aed96
commit 88eb455
Show file tree

Hide file tree

Showing 38 changed files with 1,203 additions and 824 deletions.
diff --git a/.github/workflows/compile-configs.yml b/.github/workflows/compile-configs.yml
diff --git a/.github/workflows/compile-configs_Ender.yml b/.github/workflows/compile-configs_Ender.yml
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
@@ -3441,7 +3441,9 @@ void MarlinSettings::postprocess() {
 
       #if ENABLED(DWIN_LCD_PROUI)
         if (bedLevelTools.meshValidate()) {
-          ui.status_printf(0, GET_TEXT_F(MSG_MESH_LOADED), slot);
+          if (init_eeprom() || persistentStore.access_finish()) {
+            ui.status_printf(0, GET_TEXT_F(MSG_MESH_LOADED), slot);
+          }
         }
         else {
           status = true;

diff --git a/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py b/buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py
@@ -14,5 +14,5 @@
         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))
diff --git a/buildroot/share/PlatformIO/scripts/STM32F1_build_flags.py b/buildroot/share/PlatformIO/scripts/STM32F1_build_flags.py
@@ -15,19 +15,15 @@
         "-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"
@@ -43,9 +39,7 @@
     if pioutil.is_pio_build():
         pioutil.env.Append(
             ARFLAGS=["rcs"],
-
             ASFLAGS=["-x", "assembler-with-cpp"],
-
             CXXFLAGS=[
                 "-fabi-version=0",
                 "-fno-use-cxa-atexit",

diff --git a/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py b/buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py
@@ -38,6 +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(BUILD_FLAGS=[f"-I{src}", f"-L{src}/ld"])  # Add include path for variant
diff --git a/buildroot/share/PlatformIO/scripts/chitu_crypt.py b/buildroot/share/PlatformIO/scripts/chitu_crypt.py
@@ -73,7 +73,7 @@ def encrypt_file(input, output_file, file_length):
         # the input file is exepcted to be in chunks of 0x800
         # so round the size
         while len(input_file) % block_size != 0:
-            input_file.extend(b'0x0')
+            input_file.extend(b"0x0")
 
         # write the file header
         output_file.write(struct.pack(">I", 0x443D2D3F))

diff --git a/buildroot/share/PlatformIO/scripts/common-dependencies.py b/buildroot/share/PlatformIO/scripts/common-dependencies.py
@@ -6,7 +6,7 @@
 if pioutil.is_pio_build():
 
     import os, re, fnmatch, glob
-    srcfilepattern = re.compile(r".*[.](cpp|c)$")
+    srcfilepattern = re.compile(r'.*[.](cpp|c)$')
     marlinbasedir = os.path.join(os.getcwd(), "Marlin/")
     env = pioutil.env
 
@@ -218,7 +218,7 @@ def addentry(fullpath, info=None):
                     # Add all the things from the pattern by GLOB.
                     def srepl(matchi):
                         g0 = matchi.group(0)
-                        return r"**" + g0[1:]
+                        return r'**' + g0[1:]
 
                     gpattern = re.sub(r'[*]($|[^*])', srepl, plain)
                     gpattern = os.path.join(marlinbasedir, gpattern)