new G27

studiodyne · Jan 27, 2025 · 197e519 · 197e519
1 parent 2720501
commit 197e519
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -2848,7 +2848,7 @@
      *  [ Power-On -> T0 { T0 Activated } -> T1 { Activate & Prime T1 } -> T0 { Retract T1, Activate & Prime T0 } ]
      * Enable with M217 V1 before printing to avoid unwanted priming on host connect.
      */
-    #define TOOLCHANGE_FS_PRIME_FIRST_USED
+    //#define TOOLCHANGE_FS_PRIME_FIRST_USED
     /*
      * Tool Change Migration
      * This feature provides G-code and LCD options to switch tools mid-print.
@@ -4036,7 +4036,7 @@
 
   #define MAIN_MENU_ITEM_1_DESC "Homing"
   #define MAIN_MENU_ITEM_1_GCODE "G28"
-  #define MAIN_MENU_ITEM_1_CONFIRM          // Show a confirmation dialog before this action
+  //#define MAIN_MENU_ITEM_1_CONFIRM          // Show a confirmation dialog before this action
 
   #define MAIN_MENU_ITEM_2_DESC "PLA/PVA"
   #define MAIN_MENU_ITEM_2_GCODE "M140 S85\nM104 T0 S210\nM104 T1 S190"
@@ -4066,11 +4066,11 @@
   #define MAIN_MENU_ITEM_8_GCODE "Z-hop 2"
   //#define MAIN_MENU_ITEM_8_CONFIRM
 
-  #define MAIN_MENU_ITEM_9_DESC "T0 +G60"
+  //#define MAIN_MENU_ITEM_9_DESC "T0 +G60"
   #define MAIN_MENU_ITEM_9_GCODE "G60\nT0\nG61F14400"
   //#define MAIN_MENU_ITEM_9_CONFIRM
 
-  #define MAIN_MENU_ITEM_10_DESC "T1 +G60"
+  //#define MAIN_MENU_ITEM_10_DESC "T1 +G60"
   #define MAIN_MENU_ITEM_10_GCODE "G60\nT1\nG61F14400"
   //#define MAIN_MENU_ITEM_5_CONFIRM
 
@@ -4086,19 +4086,19 @@
   #define MAIN_MENU_ITEM_13_GCODE "G27"
   //#define MAIN_MENU_ITEM_13_CONFIRM
 
-  #define MAIN_MENU_ITEM_14_DESC "Nettoyage lignes x2"
+  #define MAIN_MENU_ITEM_14_DESC "Full Clean lines"
   #define MAIN_MENU_ITEM_14_GCODE "G60\nG27\nM280 H0\nG12 P0\nM280 C\nG61F14400"
   //#define MAIN_MENU_ITEM_18_CONFIRM
 
-  #define MAIN_MENU_ITEM_15_DESC "Nettoyage triangles x2"
+  #define MAIN_MENU_ITEM_15_DESC "Full Clean Triangles"
   #define MAIN_MENU_ITEM_15_GCODE "G60\nG27\nM280 H0\nG12\nM280 C\nG61F14400"
   //#define MAIN_MENU_ITEM_18_CONFIRM
 
   #define MAIN_MENU_ITEM_17_DESC "Calibration"
   #define MAIN_MENU_ITEM_17_GCODE "G425"
   //#define MAIN_MENU_ITEM_17_CONFIRM
 
-  #define MAIN_MENU_ITEM_19_DESC "Nettoyage en cours"
+  #define MAIN_MENU_ITEM_19_DESC "Clean one realtime"
   #define MAIN_MENU_ITEM_19_GCODE "G60\nG10\nG91\nG0Z5\nG90\nG12P0\nG91\nG0Z-5\nG90\nG11\nG61F14400"
   //#define MAIN_MENU_ITEM_19_CONFIRM
 
@@ -4122,7 +4122,7 @@
   #define MAIN_MENU_ITEM_24_GCODE "M306 E1 P70.00 C18.67 R0.4205 A0.0056 F0.0170 H0.0056"
   //#define MAIN_MENU_ITEM_24_CONFIRM
 
-  #define MAIN_MENU_ITEM_25_DESC "ToolChange neutre"
+  //#define MAIN_MENU_ITEM_25_DESC "ToolChange neutre"
   #define MAIN_MENU_ITEM_25_GCODE "M217 W0 E0 D0 G0 S0 B0 Z0"
   //#define MAIN_MENU_ITEM_25_CONFIRM
 

diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
@@ -293,8 +293,18 @@ Nozzle nozzle;
         #define NOZZLE_PARK_MOVE 0
       #endif
       constexpr feedRate_t fr_xy = NOZZLE_PARK_XY_FEEDRATE;
+
+      //Random park position (Between range possibility)
+      xyz_pos_t rand_park = park,
+                rand_start[HOTENDS] = NOZZLE_CLEAN_START_POINT,
+                rand_end[HOTENDS] = NOZZLE_CLEAN_END_POINT;
+      if (active_extruder == 0) rand_end[0].x = rand_end[1].x - hotend_offset[1].x;
+      if (active_extruder == 1) rand_start[1].x = rand_start[0].x + hotend_offset[1].x;
+      rand_park.x = random(rand_start[active_extruder].x , rand_end[active_extruder].x-5);
+      NOLESS(rand_park.x, active_extruder?X_MIN_POS+hotend_offset[active_extruder]:X_MIN_POS);
+
       switch (NOZZLE_PARK_MOVE) {
-        case 0: do_blocking_move_to_xy(park, fr_xy); break;
+        case 0: do_blocking_move_to_xy(rand_park, fr_xy); break;
         case 1: do_blocking_move_to_x(park.x, fr_xy); break;
         case 2: do_blocking_move_to_y(park.y, fr_xy); break;
         case 3: do_blocking_move_to_x(park.x, fr_xy);