Changes in Labists X1 vs EasyThreeD X1

Labists.diff

diff --git Marlin/Configuration.h Marlin/Configuration.h
index 949f021d6a..55f5baa152 100644
--- Marlin/Configuration.h
+++ Marlin/Configuration.h
@@ -296,8 +296,8 @@ Here are some standard links for getting your machine calibrated:
  * the firmware will halt as a safety precaution.
  */
 
-#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders
-#define THERMAL_PROTECTION_BED     // Enable thermal protection for the heated bed
+//#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders
+//#define THERMAL_PROTECTION_BED     // Enable thermal protection for the heated bed
 
 //===========================================================================
 //============================= Mechanical Settings =========================
@@ -598,9 +598,9 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
 #define DEFAULT_TRAVEL_ACCELERATION   300//3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
 
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
-#define DEFAULT_XYJERK               2       // (mm/sec)
+#define DEFAULT_XYJERK               2 //20.0    // (mm/sec)
 #define DEFAULT_ZJERK                0.4     // (mm/sec)
-#define DEFAULT_EJERK                1       // (mm/sec)
+#define DEFAULT_EJERK                1// 5.0    // (mm/sec)
 
 
 //=============================================================================
diff --git Marlin/Configuration_adv.h Marlin/Configuration_adv.h
index eabe93c00d..8452954a3b 100644
--- Marlin/Configuration_adv.h
+++ Marlin/Configuration_adv.h
@@ -18,7 +18,7 @@
  * Thermal Protection parameters
  */
 #if ENABLED(THERMAL_PROTECTION_HOTENDS)
-  #define THERMAL_PROTECTION_PERIOD 16        // Seconds
+  #define THERMAL_PROTECTION_PERIOD 40        // Seconds
   #define THERMAL_PROTECTION_HYSTERESIS 4     // Degrees Celsius
 
   /**
diff --git Marlin/blinkm.cpp Marlin/blinkm.cpp
index 5ad1edc200..9269cb2470 100644
--- Marlin/blinkm.cpp
+++ Marlin/blinkm.cpp
@@ -202,7 +202,7 @@ void PrintOneKey(void)
           }
           card.openFile(card.filename,true);
           card.startFileprint();
-          BLINK_LED(LED_BLINK_2);
+          BLINK_LED(LED_BLINK_0);
           print_key_flag = 1;
           key_flag = 4;
         }
@@ -279,7 +279,7 @@ void feed_filament(void)
   if(IsRunning())
   {
   //    MYSERIAL.print("jin_liao");
-      destination[E_AXIS] += 50;
+      destination[E_AXIS] += 100;
       feedrate = 1.5*60;
       prepare_move();
   }
@@ -290,12 +290,12 @@ void retract_filament(void)
   if(IsRunning())
   {
       //  MYSERIAL.print("tui_liao");
-            destination[E_AXIS] += 14;
-          feedrate = 2*60;
+            destination[E_AXIS] += 2;
+          feedrate = 3*60;
           prepare_move();
 
-    destination[E_AXIS] -= 80;
-    feedrate =5*60;
+    destination[E_AXIS] -= 300;
+    feedrate =15.0*60;
     prepare_move();
   }
 }
@@ -355,7 +355,7 @@ void LoadFilament(void)
   }
   else if(filament_status == 3) //(4)按键的执行状态,等待加热
   {
-    if(current_temperature[0] >= 190) //等待温度加热到210度
+    if(current_temperature[0] >= 210) //等待温度加热到210度
     {
       filament_status++;
     }
diff --git Marlin/planner.cpp Marlin/planner.cpp
index e2dc2a9e50..3260ee97a4 100644
--- Marlin/planner.cpp
+++ Marlin/planner.cpp
@@ -547,9 +547,7 @@ float junction_deviation = 0.1;
   
   uint8_t dx_t = 0, dy_t = 0, dz_t = 0; 
   static uint8_t dx_p = 0, dy_p = 0, dz_p = 0; 
-  float x_dc = 0, y_dc = 0, z_dc = 0;
-
-  float x_offset = 0.001,y_offset = 0.001,z_offset = 0;
+  uint8_t x_offset = 0.02,y_offset = 0.02,z_offset = 0;
   
   #if ENABLED(COREXY)
   if (dx < 0) db |= BIT(X_HEAD); // Save the real Extruder (head) direction in X Axis
@@ -569,9 +567,9 @@ float junction_deviation = 0.1;
   if (dy < 0) {db |= BIT(Y_AXIS); dy_t = 1;}
   if (dz < 0) {db |= BIT(Z_AXIS); dz_t = 1;}
 
-  if(dx_t != dx_p){dx_p = dx_t; x_dc = 1;}
-  if(dy_t != dy_p){dy_p = dy_t; y_dc = 1;} 
-  if (dz_t != dz_p){dz_p = dz_t; z_dc = 1;} 
+  if(dx_t != dx_p){dx_p = dx_t; x_offset = 0;}
+  if(dy_t != dy_p){dy_p = dy_t; y_offset = 0;} 
+ // if(dz_t != dz_p){dz_p = dz_t; z_offset = 0;} 
   
   #endif
   if (de < 0) db |= BIT(E_AXIS);
@@ -594,9 +592,9 @@ float junction_deviation = 0.1;
     block->steps[C_AXIS] = labs(dx - dz);
   #else
     // default non-h-bot planning
-    block->steps[X_AXIS] = labs(dx) + lround(x_offset * x_dc * axis_steps_per_unit[X_AXIS]);
-    block->steps[Y_AXIS] = labs(dy) + lround(y_offset * y_dc * axis_steps_per_unit[Y_AXIS]);
-    block->steps[Z_AXIS] = labs(dz) + lround(z_offset * z_dc * axis_steps_per_unit[Z_AXIS]);
+    block->steps[X_AXIS] = labs(dx) + lround(x_offset * axis_steps_per_unit[X_AXIS]);
+    block->steps[Y_AXIS] = labs(dy) + lround(y_offset * axis_steps_per_unit[Y_AXIS]);
+    block->steps[Z_AXIS] = labs(dz) + lround(z_offset * axis_steps_per_unit[Z_AXIS]);
   #endif
 
   block->steps[E_AXIS] = labs(de);