Support newer "//action" without the space

prusa3d · Jan 3, 2024 · 7858a63 · 7858a63
1 parent b775a73
commit 7858a63
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,8 @@
 # ChangeLog
 
+0.8.0alpha4
+ * Support newer "//action" without the space
+
 0.8.0alpha3
  * Improve message shown when preparing a power panic recovery
  * Fix print stats not ignoring the skipped part of gcode after PP

diff --git a/prusa/link/printer_adapter/structures/regular_expressions.py b/prusa/link/printer_adapter/structures/regular_expressions.py
@@ -64,14 +64,14 @@
 
 BUSY_REGEX = re.compile("^echo:busy: processing$")
 ATTENTION_REGEX = re.compile("^echo:busy: paused for user$")
-PAUSE_PRINT_REGEX = re.compile(r"^// action:pause$")
-PAUSED_REGEX = re.compile(r"^// action:paused$")
-RESUME_PRINT_REGEX = re.compile("^// action:resume$")
-RESUMED_REGEX = re.compile("^// action:resumed$")
-CANCEL_REGEX = re.compile("^// action:cancel$")
-READY_REGEX = re.compile("^// action:ready$")
-NOT_READY_REGEX = re.compile("^// action:not_ready$")
-REPRINT_REGEX = re.compile("^// action:start$")
+PAUSE_PRINT_REGEX = re.compile(r"^// ?action:pause$")
+PAUSED_REGEX = re.compile(r"^// ?action:paused$")
+RESUME_PRINT_REGEX = re.compile("^// ?action:resume$")
+RESUMED_REGEX = re.compile("^// ?action:resumed$")
+CANCEL_REGEX = re.compile("^// ?action:cancel$")
+READY_REGEX = re.compile("^// ?action:ready$")
+NOT_READY_REGEX = re.compile("^// ?action:not_ready$")
+REPRINT_REGEX = re.compile("^// ?action:start$")
 # This girthy regexp tries to capture all error messages requiring printer
 # reset using M999 or manual button, with connect, only manual reset shall
 # be accepted
@@ -180,4 +180,4 @@
 
 RESET_ACTIVATED_REGEX = re.compile(r"^Reset mode activated$")
 RESET_DEACTIVATED_REGEX = re.compile(r"^Reset mode deactivated$")
-PP_RECOVER_REGEX = re.compile(r"^// action:uvlo_recovery_ready$")
+PP_RECOVER_REGEX = re.compile(r"^// ?action:uvlo_recovery_ready$")