浏览代码

Make M117 message persistent when using G4 command

This is also supported in Marlin 2 FW

Fixes #1443
Fixes #2970
Guðni Már Gilbert 3 年之前
父节点
当前提交
bf38241afe
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      Firmware/Marlin_main.cpp

+ 7 - 1
Firmware/Marlin_main.cpp

@@ -4939,7 +4939,13 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
       codenum = 0;
       if(code_seen('P')) codenum = code_value(); // milliseconds to wait
       if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
-	  if(codenum != 0) LCD_MESSAGERPGM(_n("Sleep..."));////MSG_DWELL
+      if(codenum != 0)
+      {
+        if(custom_message_type != CustomMsg::M117)
+        {
+          LCD_MESSAGERPGM(_n("Sleep..."));////MSG_DWELL
+        }
+      }
       st_synchronize();
       codenum += _millis();  // keep track of when we started waiting
       previous_millis_cmd.start();