TweaksTouchups

Marlin/Configuration.h

@@ -2267,11 +2267,11 @@
 #if ENABLED(NOZZLE_PARK_FEATURE)
 // Specify a park position as { X, Y, Z }
 #if(ENABLED(MachineEnder2))
-#define NOZZLE_PARK_POINT { (0), (0), 20 }
+#define NOZZLE_PARK_POINT { (0), (0), 10 }
 #else
-#define NOZZLE_PARK_POINT { (50), (10), 20 }
+#define NOZZLE_PARK_POINT { (50), (10), 10 }
 #endif
-#define NOZZLE_PARK_XY_FEEDRATE 70   // X and Y axes feedrate in mm/s (also used for delta printers Z axis)
+#define NOZZLE_PARK_XY_FEEDRATE 50   // X and Y axes feedrate in mm/s (also used for delta printers Z axis)
 #define NOZZLE_PARK_Z_FEEDRATE 5      // Z axis feedrate in mm/s (not used for delta printers)
 #endif
 
@@ -2356,7 +2356,7 @@
  *   M76 - Pause the print job timer
  *   M77 - Stop the print job timer
  */
-#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard))
+#if NONE(MachineCR10Orig, LowMemoryBoard)
  #define PRINTJOB_TIMER_AUTOSTART
 #endif
 /**

Marlin/src/gcode/stats/M75-M78.cpp

@@ -33,9 +33,6 @@
  */
 void GcodeSuite::M75() {
   print_job_timer.start();
-  #if ENABLED(EXTENSIBLE_UI)
-    ExtUI::onPrintTimerStarted();
-  #endif
 }
 
 /**

Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp

@@ -169,8 +169,8 @@ void onIdle()
       SERIAL_ECHOLN("==waitway 3==");
       //if(isPositionKnown() && (getActualTemp_celsius(BED) >= (getTargetTemp_celsius(BED)-1))) {
 			  rtscheck.RTS_SndData(ExchangePageBase + 64, ExchangepageAddr);
-        waitway = 2;
-        return;
+        waitway = 7;
+        //return;
       //}
 			break;
 
@@ -194,9 +194,14 @@ void onIdle()
     case 6:
       setAxisPosition_mm(0.0, (axis_t)Z);
       waitway = 0;
+      break;
+    case 7:
+      if(!commandsInQueue())
+        waitway = 0;
       break;
 		}
 
+
     #if ENABLED(POWER_LOSS_RECOVERY)
       if (PoweroffContinue)
       {
@@ -1173,7 +1178,6 @@ SERIAL_ECHOLN(PSTR("BeginSwitch"));
 
         case centerData: // Assitant Level ,  Centre 1
         {
-          setFeedrate_mm_s(NOZZLE_PARK_XY_FEEDRATE);
           setAxisPosition_mm(3.0, (axis_t)Z);
           setAxisPosition_mm(X_CENTER, (axis_t)X);
           setAxisPosition_mm(Y_CENTER, (axis_t)Y);
@@ -1182,7 +1186,6 @@ SERIAL_ECHOLN(PSTR("BeginSwitch"));
         }
         case topLeftData: // Assitant Level , Front Left 2
         {
-          setFeedrate_mm_s(NOZZLE_PARK_XY_FEEDRATE);
           setAxisPosition_mm(3.0, (axis_t)Z);
           setAxisPosition_mm((X_MIN_BED + LEVEL_CORNERS_INSET), (axis_t)X);
           setAxisPosition_mm((Y_MIN_BED + LEVEL_CORNERS_INSET), (axis_t)Y);
@@ -1191,7 +1194,6 @@ SERIAL_ECHOLN(PSTR("BeginSwitch"));
         }
         case topRightData: // Assitant Level , Front Right 3
         {
-          setFeedrate_mm_s(NOZZLE_PARK_XY_FEEDRATE);
           setAxisPosition_mm(3.0, (axis_t)Z);
           setAxisPosition_mm((X_MAX_BED - LEVEL_CORNERS_INSET), (axis_t)X);
           setAxisPosition_mm((Y_MIN_BED + LEVEL_CORNERS_INSET), (axis_t)Y);
@@ -1200,7 +1202,6 @@ SERIAL_ECHOLN(PSTR("BeginSwitch"));
         }
         case lowRightData: // Assitant Level , Back Right 4
         {
-          setFeedrate_mm_s(NOZZLE_PARK_XY_FEEDRATE);
           setAxisPosition_mm(3.0, (axis_t)Z);
           setAxisPosition_mm((X_MAX_BED - LEVEL_CORNERS_INSET), (axis_t)X);
           setAxisPosition_mm((Y_MAX_BED - LEVEL_CORNERS_INSET), (axis_t)Y);
@@ -1209,7 +1210,6 @@ SERIAL_ECHOLN(PSTR("BeginSwitch"));
         }
         case lowLeftData: // Assitant Level , Back Left 5
         {
-          setFeedrate_mm_s(NOZZLE_PARK_XY_FEEDRATE);
           setAxisPosition_mm(3.0, (axis_t)Z);
           setAxisPosition_mm((X_MIN_BED + LEVEL_CORNERS_INSET), (axis_t)X);
           setAxisPosition_mm((Y_MAX_BED - LEVEL_CORNERS_INSET), (axis_t)Y);
@@ -1660,17 +1660,19 @@ void onPrinterKilled(PGM_P msg) {
   delay_ms(3);
   int j = 0;
   char outmsg[40];
-  for (j; j < 4; j++)
+  while (j<4)
 	{
     outmsg[j] = '*';
+    j++;
   }
   while (const char c = pgm_read_byte(msg++)) {
     outmsg[j] = c;
     j++;
   }
-  for (j; j < 40; j++)
+  while(j<40)
 	{
     outmsg[j] = '*';
+    j++;
   }
   rtscheck.RTS_SndData(outmsg, MacVersion);
   delay_ms(10);

Marlin/src/lcd/extensible_ui/ui_api.cpp

@@ -320,7 +320,7 @@ namespace ExtUI {
     #endif
 
     constexpr float max_manual_feedrate[XYZE] = MANUAL_FEEDRATE;
-    setFeedrate_mm_s(max_manual_feedrate[axis]);
+    setFeedrate_mm_s(MMM_TO_MMS(max_manual_feedrate[axis]));
 
     if (!flags.manual_motion) set_destination_from_current();
     destination[axis] = clamp(position, min, max);
@@ -331,7 +331,7 @@ namespace ExtUI {
     setActiveTool(extruder, true);
 
     constexpr float max_manual_feedrate[XYZE] = MANUAL_FEEDRATE;
-    setFeedrate_mm_s(max_manual_feedrate[E_AXIS]);
+    setFeedrate_mm_s(MMM_TO_MMS(max_manual_feedrate[E_AXIS]));
     if (!flags.manual_motion) set_destination_from_current();
     destination[E_AXIS] = position;
     flags.manual_motion = true;
@@ -813,7 +813,7 @@ namespace ExtUI {
     queue.inject_P(gcode);
   }
 
-  bool commandsInQueue() { return (flags.manual_motion || planner.movesplanned() || queue.has_commands_queued()); }
+  bool commandsInQueue() { return (planner.movesplanned() || queue.has_commands_queued()); }
 
   bool isAxisPositionKnown(const axis_t axis) {
     return TEST(axis_known_position, axis);

Marlin/src/module/printcounter.cpp

@@ -272,6 +272,9 @@ bool PrintCounter::start() {
   #if ENABLED(DEBUG_PRINTCOUNTER)
     debug(PSTR("start"));
   #endif
+  #if ENABLED(EXTENSIBLE_UI)
+    ExtUI::onPrintTimerStarted();
+  #endif
 
   bool paused = isPaused();