Update 4.1.4 dev

Documentation/BedLeveling.md

@@ -18,7 +18,7 @@ If jumping the arduino Vcc do RAMPS 5V rail, take care to not use a power hungry
 Instructions for Both Options
 -----------------------------
 
-Uncomment the "ENABLE_AUTO_BED_LEVELING" define (commented by default)
+Uncomment the "AUTO_BED_LEVELING_FEATURE" define (commented by default)
 
 The following options define the probing positions. These are good starting values.
 I recommend to keep a better clearance from borders in the first run and then make the probes as close as possible to borders:
@@ -52,9 +52,14 @@ In order to get the servo working, you need to enable:
 
 * \#define NUM_SERVOS 1 // Servo index starts with 0 for M280 command
 
-* \#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
+* \// Define nr servo for endstop -1 not define. Servo index start 0
+* \#define X_ENDSTOP_SERVO_NR -1
+* \#define Y_ENDSTOP_SERVO_NR -1
+* \#define Z_ENDSTOP_SERVO_NR 0
 
-* \#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 165,60} // X,Y,Z Axis Extend and Retract angles
+* \#define X_ENDSTOP_SERVO_ANGLES {0,0}  // X Axis Extend and Retract angles
+* \#define Y_ENDSTOP_SERVO_ANGLES {0,0}  // Y Axis Extend and Retract angles
+* \#define Z_ENDSTOP_SERVO_ANGLES {90,0} // Z Axis Extend and Retract angles
 
 The first define tells firmware how many servos you have.
 The second tells what axis this servo will be attached to. In the example above, we have a servo in Z axis.

Documentation/changelog.md

 ### Version 4.1.4
+* Add Debug_info. Repetier button info for enabled or disabled, or M111 S2 for enabled and M111 S0 for disabled.
+* Add improve Topography Auto Bed Level.
+* Add Dryrun ABL and verbose width command G29 D or G29 V(0-4).
+* Improve Autoconfiguration for Delta printer.
+* Add support (test only) for NEXTION HMI LCD.
 * Improved firmare test dialog.
 * Bugfix for SDCONFIG routine. Now the configuration file will be readed and created only on the root of the SD.
 * Improved "Thermal Runaway Protection" now the system will be halted also if the thermistor is missing before the temperature is reached as suggested in Issue #35.

MarlinKimbra/Configuration.h

@@ -425,7 +425,6 @@
 /**
  * Nextion HMI panel
  */
-// 
 //#define NEXTION
 
 // option for invert rotary switch

MarlinKimbra/Configuration_Cartesian.h

@@ -90,15 +90,15 @@
 //If you have enabled the Auto Bed Levelling and are using the same Z Probe for Z Homing,
 //it is highly recommended you let this Z_SAFE_HOMING enabled!!!
 //#define Z_SAFE_HOMING
-#ifdef Z_SAFE_HOMING
+#if ENABLED(Z_SAFE_HOMING)
   #define Z_SAFE_HOMING_X_POINT ((X_MIN_POS + X_MAX_POS) / 2)    // X point for Z homing when homing all axis (G28)
   #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28)
 #endif
 
-//#define ENABLE_AUTO_BED_LEVELING    // Delete the comment to enable (ABL)
-//#define Z_PROBE_REPEATABILITY_TEST  // Delete the comment to enable
+//#define AUTO_BED_LEVELING_FEATURE   // Delete the comment to enable (remove // at the start of the line)
+//#define Z_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
 
-#ifdef ENABLE_AUTO_BED_LEVELING
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
 
   // There are 2 different ways to specify probing locations
   //
@@ -115,7 +115,7 @@
   // Note: this feature generates 10KB extra code size
   #define AUTO_BED_LEVELING_GRID
 
-  #ifdef AUTO_BED_LEVELING_GRID
+  #if ENABLED(AUTO_BED_LEVELING_GRID)
 
     #define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
 
@@ -162,7 +162,7 @@
 
   //#define Z_PROBE_ENDSTOP
   
-#endif // ENABLE_AUTO_BED_LEVELING
+#endif // AUTO_BED_LEVELING_FEATURE
 
 
 // The position of the homing switches
@@ -197,15 +197,3 @@
 #define DEFAULT_XYJERK 10.0                 // (mm/sec)
 #define DEFAULT_ZJERK   0.4                 // (mm/sec)
 #define DEFAULT_EJERK  {5.0,5.0,5.0,5.0}    // E0... (mm/sec) per extruder, max initial speed for retract moves
-
-//===========================================================================
-//=============================Additional Features===========================
-//===========================================================================
-
-// Custom M code points
-//#define CUSTOM_M_CODES
-#ifdef CUSTOM_M_CODES
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
-  #define Z_PROBE_OFFSET_RANGE_MIN -20
-  #define Z_PROBE_OFFSET_RANGE_MAX 20
-#endif

MarlinKimbra/Configuration_Core.h

@@ -95,10 +95,10 @@
   #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28)
 #endif
 
-//#define ENABLE_AUTO_BED_LEVELING    // Delete the comment to enable (ABL)
-//#define Z_PROBE_REPEATABILITY_TEST  // Delete the comment to enable
+//#define AUTO_BED_LEVELING_FEATURE   // Delete the comment to enable (remove // at the start of the line)
+//#define Z_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
 
-#ifdef ENABLE_AUTO_BED_LEVELING
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
 
   // There are 2 different ways to specify probing locations
   //
@@ -115,7 +115,7 @@
   // Note: this feature generates 10KB extra code size
   #define AUTO_BED_LEVELING_GRID
 
-  #ifdef AUTO_BED_LEVELING_GRID
+  #if ENABLED(AUTO_BED_LEVELING_GRID)
 
     #define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
 
@@ -162,7 +162,7 @@
 
   //#define Z_PROBE_ENDSTOP
   
-#endif // ENABLE_AUTO_BED_LEVELING
+#endif // AUTO_BED_LEVELING_FEATURE
 
 
 // The position of the homing switches
@@ -197,15 +197,3 @@
 #define DEFAULT_XYJERK 10.0                 // (mm/sec)
 #define DEFAULT_ZJERK   0.4                 // (mm/sec)
 #define DEFAULT_EJERK  {5.0,5.0,5.0,5.0}    // E0... (mm/sec) per extruder, max initial speed for retract moves
-
-//===========================================================================
-//=============================Additional Features===========================
-//===========================================================================
-
-// Custom M code points
-//#define CUSTOM_M_CODES
-#ifdef CUSTOM_M_CODES
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
-  #define Z_PROBE_OFFSET_RANGE_MIN -20
-  #define Z_PROBE_OFFSET_RANGE_MAX 20
-#endif

MarlinKimbra/Configuration_Scara.h

@@ -118,10 +118,10 @@
   #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2)    // Y point for Z homing when homing all axis (G28)
 #endif
 
-//#define ENABLE_AUTO_BED_LEVELING    // Delete the comment to enable (ABL)
-//#define Z_PROBE_REPEATABILITY_TEST  // Delete the comment to enable
+//#define AUTO_BED_LEVELING_FEATURE   // Delete the comment to enable (remove // at the start of the line)
+//#define Z_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
 
-#ifdef ENABLE_AUTO_BED_LEVELING
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
 
   // There are 2 different ways to specify probing locations
   //
@@ -138,7 +138,7 @@
   // Note: this feature generates 10KB extra code size
   #define AUTO_BED_LEVELING_GRID
 
-  #ifdef AUTO_BED_LEVELING_GRID
+  #if ENABLED(AUTO_BED_LEVELING_GRID)
 
     #define MIN_PROBE_EDGE 10 // The probe square sides can be no smaller than this
 
@@ -185,7 +185,7 @@
 
   //#define Z_PROBE_ENDSTOP
   
-#endif // ENABLE_AUTO_BED_LEVELING
+#endif // AUTO_BED_LEVELING_FEATURE
 
 
 // The position of the homing switches
@@ -221,15 +221,3 @@
 #define DEFAULT_XYJERK 5                // (mm/sec)
 #define DEFAULT_ZJERK  0.4              // (mm/sec)
 #define DEFAULT_EJERK {3.0,3.0,3.0,3.0} // (mm/sec)
-
-//===========================================================================
-//=============================Additional Features===========================
-//===========================================================================
-
-// Custom M code points
-//#define CUSTOM_M_CODES
-#ifdef CUSTOM_M_CODES
-  #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
-  #define Z_PROBE_OFFSET_RANGE_MIN -20
-  #define Z_PROBE_OFFSET_RANGE_MAX 20
-#endif

MarlinKimbra/Configuration_adv.h

@@ -70,7 +70,7 @@
  * some filament is retracted. The filament retracted is re-added before the next extrusion
  * or when the target temperature is less than IDLE_OOZING_MINTEMP and the actual temperature
  * is greater than IDLE_OOZING_MINTEMP.
- * PS: Always remember to set your extruder target temperature to 0°C before shoudown the printer if you enable this feature.
+ * PS: Always remember to set your extruder target temperature to 0°C before shoudown the printer if you enable this feature.
  */
 //#define IDLE_OOZING_PREVENT
 #define IDLE_OOZING_MINTEMP           EXTRUDE_MINTEMP + 5

MarlinKimbra/NexText.cpp

@@ -102,4 +102,3 @@ void NexText::detachPop(void)
 {
     NexTouch::detachPop();
 }
- 

MarlinKimbra/cardreader.cpp

@@ -316,8 +316,8 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/,
         subdirname[dirname_end - dirname_start] = 0;
         ECHO_EV(subdirname);
         if (!myDir.open(curDir, subdirname, O_READ)) {
-          ECHO_MV(MSG_SD_OPEN_FILE_FAIL, subdirname);
-          ECHO_C('.');
+          ECHO_SMV(ER, MSG_SD_OPEN_FILE_FAIL, subdirname);
+          ECHO_EM(".");
           return;
         }
         else {
@@ -357,12 +357,12 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/,
   }
   else { //write
     if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
-      ECHO_MV(MSG_SD_OPEN_FILE_FAIL, fname);
-      ECHO_PGM(".\n");
+      ECHO_SMV(ER, MSG_SD_OPEN_FILE_FAIL, fname);
+      ECHO_EM(".");
     }
     else {
       saving = true;
-      ECHO_EMV(MSG_SD_WRITE_TO_FILE, name);
+      ECHO_LMV(DB, MSG_SD_WRITE_TO_FILE, name);
       if(lcd_status) lcd_setstatus(fname);
     }
   }
@@ -389,8 +389,8 @@ void CardReader::removeFile(char* name) {
         subdirname[dirname_end - dirname_start] = 0;
         ECHO_EV(subdirname);
         if (!myDir.open(curDir, subdirname, O_READ)) {
-          ECHO_MV(MSG_SD_OPEN_FILE_FAIL, subdirname);
-          ECHO_C('.');
+          ECHO_SMV(DB, MSG_SD_OPEN_FILE_FAIL, subdirname);
+          ECHO_EM(".");
           return;
         }
 

MarlinKimbra/conditionals.h

@@ -366,7 +366,7 @@
   /**
    * Auto Bed Leveling
    */
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
     // Boundaries for probing based on set limits
     #define MIN_PROBE_X (max(X_MIN_POS, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
     #define MAX_PROBE_X (min(X_MAX_POS, X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))

MarlinKimbra/configuration_store.cpp

@@ -488,7 +488,7 @@ void Config_ResetDefault() {
   max_z_jerk = DEFAULT_ZJERK;
   home_offset[X_AXIS] = home_offset[Y_AXIS] = home_offset[Z_AXIS] = 0;
 
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
     zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
   #elif !defined(DELTA)
     zprobe_zoffset = 0;
@@ -718,7 +718,7 @@ void Config_ResetDefault() {
         ECHO_LM(DB, "Z2 Endstop adjustement (mm):");
       }
       ECHO_LMV(DB, "  M666 Z", z_endstop_adj );
-    #elif ENABLED(ENABLE_AUTO_BED_LEVELING)
+    #elif ENABLED(AUTO_BED_LEVELING_FEATURE)
       if (!forReplay) {
         ECHO_LM(DB, "Z Probe offset (mm)");
       }

MarlinKimbra/language.h

@@ -113,7 +113,6 @@
 #define MSG_COUNT_X                         " Count X: "
 #define MSG_ERR_KILLED                      "Printer halted. kill() called!"
 #define MSG_ERR_STOPPED                     "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
-#define MSG_RESEND                          "Resend: "
 #define MSG_UNKNOWN_COMMAND                 "Unknown command: \""
 #define MSG_ACTIVE_DRIVER                   "Active Driver: "
 #define MSG_ACTIVE_EXTRUDER                 "Active Extruder: "

MarlinKimbra/pins.h

@@ -749,7 +749,7 @@
   #define LED_PIN             -1
 
   //pin for controlling the PSU.
-  #define PS_ON_PIN       14  //Alex, Do this work on the card?
+  #define PS_ON_PIN           14
 
   //Alex extras from Gen3+
   #define KILL_PIN            -1
@@ -916,7 +916,7 @@
   #define ORIG_HEATER_BED_PIN     8   // BED
   #define ORIG_TEMP_BED_PIN      14   // ANALOG NUMBERING
 
-  #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
+  #if defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL)
     #define KILL_PIN        41
   #else
     #define KILL_PIN        -1
@@ -3607,7 +3607,6 @@
 
   #define BEEPER_PIN -1  
 
- 
   #define LCD_PINS_RS -1
   #define LCD_PINS_ENABLE -1
   #define LCD_PINS_D4 -1
@@ -3615,7 +3614,6 @@
   #define LCD_PINS_D6 -1
   #define LCD_PINS_D7 -1
 
-
   //buttons are directly attached using keypad
   #define BTN_EN1 -1
   #define BTN_EN2 -1

MarlinKimbra/planner.cpp

@@ -74,14 +74,14 @@ float mintravelfeedrate;
 unsigned long axis_steps_per_sqr_second[3 + EXTRUDERS];
 uint8_t last_extruder;
 
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
   // Transform required to compensate for bed level
   matrix_3x3 plan_bed_level_matrix = {
     1.0, 0.0, 0.0,
     0.0, 1.0, 0.0,
     0.0, 0.0, 1.0
   };
-#endif // ENABLE_AUTO_BED_LEVELING
+#endif // AUTO_BED_LEVELING_FEATURE
 
 #if ENABLED(AUTOTEMP)
   float autotemp_max = 250;
@@ -480,11 +480,11 @@ float junction_deviation = 0.1;
 // Add a new linear movement to the buffer. steps[X_AXIS], _y and _z is the absolute position in 
 // mm. Microseconds specify how many microseconds the move should take to perform. To aid acceleration
 // calculation the caller must also provide the physical length of the line in millimeters.
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
   void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, const uint8_t &extruder, const uint8_t &driver)
 #else
   void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate, const uint8_t &extruder, const uint8_t &driver)
-#endif  // ENABLE_AUTO_BED_LEVELING
+#endif  // AUTO_BED_LEVELING_FEATURE
 {
   // Calculate the buffer head after we push this byte
   int next_buffer_head = next_block_index(block_buffer_head);
@@ -493,7 +493,7 @@ float junction_deviation = 0.1;
   // Rest here until there is room in the buffer.
   while (block_buffer_tail == next_buffer_head) idle();
 
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
     apply_rotation_xyz(plan_bed_level_matrix, x, y, z);
   #endif
 
@@ -1040,7 +1040,7 @@ float junction_deviation = 0.1;
 
 } // plan_buffer_line()
 
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
   vector_3 plan_get_position() {
     vector_3 position = vector_3(st_get_position_mm(X_AXIS), st_get_position_mm(Y_AXIS), st_get_position_mm(Z_AXIS));
 
@@ -1053,15 +1053,15 @@ float junction_deviation = 0.1;
 
     return position;
   }
-#endif // ENABLE_AUTO_BED_LEVELING
+#endif // AUTO_BED_LEVELING_FEATURE
 
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
   void plan_set_position(float x, float y, float z, const float &e)
 #else
   void plan_set_position(const float &x, const float &y, const float &z, const float &e)
-#endif // ENABLE_AUTO_BED_LEVELING
+#endif // AUTO_BED_LEVELING_FEATURE
   {
-    #if ENABLED(ENABLE_AUTO_BED_LEVELING)
+    #if ENABLED(AUTO_BED_LEVELING_FEATURE)
       apply_rotation_xyz(plan_bed_level_matrix, x, y, z);
     #endif
 

MarlinKimbra/planner.h

@@ -82,7 +82,7 @@ extern volatile unsigned char block_buffer_head;
 extern volatile unsigned char block_buffer_tail;
 FORCE_INLINE uint8_t movesplanned() { return BLOCK_MOD(block_buffer_head - block_buffer_tail + BLOCK_BUFFER_SIZE); }
 
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
 
   #include "vector_3.h"
 
@@ -110,7 +110,7 @@ FORCE_INLINE uint8_t movesplanned() { return BLOCK_MOD(block_buffer_head - block
 #else
   void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate, const uint8_t &extruder, const uint8_t &driver);
   void plan_set_position(const float &x, const float &y, const float &z, const float &e);
-#endif // ENABLE_AUTO_BED_LEVELING
+#endif // AUTO_BED_LEVELING_FEATURE
 
 void plan_set_e_position(const float &e);
 

MarlinKimbra/qr_solve.cpp

@@ -260,7 +260,7 @@ double r8mat_amax ( int m, int n, double a[] )
   return value;
 }
 
-void r8mat_copy( double a2[], int m, int n, double a1[] )
+double *r8mat_copy_new ( int m, int n, double a1[] )
 
 /******************************************************************************/
 /*
@@ -294,9 +294,12 @@ void r8mat_copy( double a2[], int m, int n, double a1[] )
     Output, double R8MAT_COPY_NEW[M*N], the copy of A1.
 */
 {
+  double *a2;
   int i;
   int j;
 
+  a2 = ( double * ) malloc ( m * n * sizeof ( double ) );
+
   for ( j = 0; j < n; j++ )
   {
     for ( i = 0; i < m; i++ )
@@ -304,6 +307,8 @@ void r8mat_copy( double a2[], int m, int n, double a1[] )
       a2[i+j*m] = a1[i+j*m];
     }
   }
+
+  return a2;
 }
 
 /******************************************************************************/
@@ -721,13 +726,14 @@ void dqrank ( double a[], int lda, int m, int n, double tol, int *kr,
   int j;
   int job;
   int k;
-  double work[n];
+  double *work;
 
   for ( i = 0; i < n; i++ )
   {
     jpvt[i] = 0;
   }
 
+  work = ( double * ) malloc ( n * sizeof ( double ) );
   job = 1;
 
   dqrdc ( a, lda, m, n, qraux, jpvt, work, job );
@@ -744,6 +750,8 @@ void dqrank ( double a[], int lda, int m, int n, double tol, int *kr,
     *kr = j + 1;
   }
 
+  free ( work );
+
   return;
 }
 /******************************************************************************/
@@ -1837,7 +1845,7 @@ void dswap ( int n, double x[], int incx, double y[], int incy )
 
 /******************************************************************************/
 
-void qr_solve ( double x[], int m, int n, double a[], double b[] )
+double *qr_solve ( int m, int n, double a[], double b[] )
 
 /******************************************************************************/
 /*
@@ -1887,22 +1895,34 @@ void qr_solve ( double x[], int m, int n, double a[], double b[] )
     Output, double QR_SOLVE[N], the least squares solution.
 */
 {
-  double a_qr[n*m];
+  double *a_qr;
   int ind;
   int itask;
-  int jpvt[n];
+  int *jpvt;
   int kr;
   int lda;
-  double qraux[n];
-  double r[m];
+  double *qraux;
+  double *r;
   double tol;
+  double *x;
 
-  r8mat_copy( a_qr, m, n, a );
+  a_qr = r8mat_copy_new ( m, n, a );
   lda = m;
   tol = r8_epsilon ( ) / r8mat_amax ( m, n, a_qr );
+  x = ( double * ) malloc ( n * sizeof ( double ) );
+  jpvt = ( int * ) malloc ( n * sizeof ( int ) );
+  qraux = ( double * ) malloc ( n * sizeof ( double ) );
+  r = ( double * ) malloc ( m * sizeof ( double ) );
   itask = 1;
 
   ind = dqrls ( a_qr, lda, m, n, tol, &kr, b, x, r, jpvt, qraux, itask );
+
+  free ( a_qr );
+  free ( jpvt );
+  free ( qraux ); 
+  free ( r );
+
+  return x;
 }
 /******************************************************************************/
 

MarlinKimbra/qr_solve.h

@@ -17,6 +17,6 @@ int dqrsl ( double a[], int lda, int n, int k, double qraux[], double y[],
   double qy[], double qty[], double b[], double rsd[], double ab[], int job );
 void dscal ( int n, double sa, double x[], int incx );
 void dswap ( int n, double x[], int incx, double y[], int incy );
-void qr_solve ( double x[], int m, int n, double a[], double b[] );
+double *qr_solve ( int m, int n, double a[], double b[] );
 
 #endif

MarlinKimbra/sanitycheck.h

@@ -124,7 +124,7 @@
   /**
    * Auto Bed Leveling
    */
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
 
     /**
      * Require a Z Min pin
@@ -134,7 +134,7 @@
         #if ENABLED(Z_PROBE_REPEATABILITY_TEST)
           #error You must have a Z_MIN or Z_PROBE endstop to enable Z_PROBE_REPEATABILITY_TEST.
         #else
-          #error ENABLE_AUTO_BED_LEVELING requires a Z_MIN or Z_PROBE endstop. Z_MIN_PIN or Z_PROBE_PIN must point to a valid hardware pin.
+          #error AUTO_BED_LEVELING_FEATURE requires a Z_MIN or Z_PROBE endstop. Z_MIN_PIN or Z_PROBE_PIN must point to a valid hardware pin.
         #endif
       #endif
     #endif
@@ -203,7 +203,7 @@
 
     #endif // !AUTO_BED_LEVELING_GRID
 
-  #endif // ENABLE_AUTO_BED_LEVELING
+  #endif // AUTO_BED_LEVELING_FEATURE
 
   /**
    * ULTIPANEL encoder

MarlinKimbra/stepper.cpp

@@ -666,7 +666,7 @@ ISR(TIMER1_COMPA_vect) {
         STEP_START(e,E);
       #endif
 
-      #ifdef STEPPER_HIGH_LOW_DELAY
+      #if ENABLED(STEPPER_HIGH_LOW_DELAY)
         delayMicroseconds(STEPPER_HIGH_LOW_DELAY);
       #endif
 

MarlinKimbra/stepper_indirection.cpp

@@ -221,4 +221,3 @@ void L6470_init()
   #endif
 }
 #endif
-

MarlinKimbra/thermistortables.h

@@ -626,69 +626,30 @@ const short temptable_11[][2] PROGMEM = {
 // Hisens thermistor B25/50 =3950 +/-1%
 
 const short temptable_13[][2] PROGMEM = {
-  {22.5 * OVERSAMPLENR,  300},
-  {24.125 * OVERSAMPLENR,  295},
-  {25.875 * OVERSAMPLENR,  290},
-  {27.8125 * OVERSAMPLENR,  285},
-  {29.9375 * OVERSAMPLENR,  280},
-  {32.25 * OVERSAMPLENR,  275},
-  {34.8125 * OVERSAMPLENR,  270},
-  {37.625 * OVERSAMPLENR,  265},
-  {40.6875 * OVERSAMPLENR,  260},
-  {44.0625 * OVERSAMPLENR,  255},
-  {47.75 * OVERSAMPLENR,  250},
-  {51.8125 * OVERSAMPLENR,  245},
-  {56.3125 * OVERSAMPLENR,  240},
-  {61.25 * OVERSAMPLENR,  235},
-  {66.75 * OVERSAMPLENR,  230},
-  {72.8125 * OVERSAMPLENR,  225},
-  {79.5 * OVERSAMPLENR,  220},
-  {87 * OVERSAMPLENR,  215},
-  {95.3125 * OVERSAMPLENR,  210},
-  {104.1875 * OVERSAMPLENR,  205},
-  {112.75 * OVERSAMPLENR,  200},
-  {123.125 * OVERSAMPLENR,  195},
-  {135.75 * OVERSAMPLENR,  190},
-  {148.3125 * OVERSAMPLENR,  185},
-  {163.8125 * OVERSAMPLENR,  180},
-  {179 * OVERSAMPLENR,  175},
-  {211.125 * OVERSAMPLENR,  170},
-  {216.125 * OVERSAMPLENR,  165},
-  {236.5625 * OVERSAMPLENR,  160},
-  {258.5 * OVERSAMPLENR,  155},
-  {279.875 * OVERSAMPLENR,  150},
-  {305.375 * OVERSAMPLENR,  145},
-  {333.25 * OVERSAMPLENR,  140},
-  {362.5625 * OVERSAMPLENR,  135},
-  {393.6875 * OVERSAMPLENR,  130},
-  {425 * OVERSAMPLENR,  125},
-  {460.625 * OVERSAMPLENR,  120},
-  {495.1875 * OVERSAMPLENR,  115},
-  {530.875 * OVERSAMPLENR,  110},
-  {567.25 * OVERSAMPLENR,  105},
-  {601.625 * OVERSAMPLENR,  100},
-  {637.875 * OVERSAMPLENR,  95},
-  {674.5625 * OVERSAMPLENR,  90},
-  {710 * OVERSAMPLENR,  85},
-  {744.125 * OVERSAMPLENR,  80},
-  {775.9375 * OVERSAMPLENR,  75},
-  {806.875 * OVERSAMPLENR,  70},
-  {835.1875 * OVERSAMPLENR,  65},
-  {861.125 * OVERSAMPLENR,  60},
-  {884.375 * OVERSAMPLENR,  55},
-  {904.5625 * OVERSAMPLENR,  50},
-  {923.8125 * OVERSAMPLENR,  45},
-  {940.375 * OVERSAMPLENR,  40},
-  {954.625 * OVERSAMPLENR,  35},
-  {966.875 * OVERSAMPLENR,  30},
-  {977.0625 * OVERSAMPLENR,  25},
-  {986 * OVERSAMPLENR,  20},
-  {993.375 * OVERSAMPLENR,  15},
-  {999.5 * OVERSAMPLENR,  10},
-  {1004.5 * OVERSAMPLENR,  5},
-  {1008.5 * OVERSAMPLENR,  0}
-
- };
+  {20.04*OVERSAMPLENR,	300	},
+  {23.19*OVERSAMPLENR,	290	},
+  {26.71*OVERSAMPLENR,	280	},
+  {31.23*OVERSAMPLENR,	270	},
+  {36.52*OVERSAMPLENR,	260	},
+  {42.75*OVERSAMPLENR,	250	},
+  {50.68*OVERSAMPLENR,	240	},
+  {60.22*OVERSAMPLENR,	230	},
+  {72.03*OVERSAMPLENR,	220	},
+  {86.84*OVERSAMPLENR,	210	},
+  {102.79*OVERSAMPLENR, 200 },
+  {124.46*OVERSAMPLENR, 190 },
+  {151.02*OVERSAMPLENR, 180 },
+  {182.86*OVERSAMPLENR, 170 },
+  {220.72*OVERSAMPLENR, 160 },
+  {316.96*OVERSAMPLENR, 140 },
+  {447.17*OVERSAMPLENR, 120 },
+  {590.61*OVERSAMPLENR, 100 },
+  {737.31*OVERSAMPLENR, 80	},
+  {857.77*OVERSAMPLENR, 60	},
+  {939.52*OVERSAMPLENR, 40	},
+  {986.03*OVERSAMPLENR, 20	},
+  {1008.7*OVERSAMPLENR, 0}
+};
 #endif
 
 #if (THERMISTORHEATER_0 == 20) || (THERMISTORHEATER_1 == 20) || (THERMISTORHEATER_2 == 20) || (THERMISTORBED == 20) // PT100 with INA826 amp on Ultimaker v2.0 electronics

MarlinKimbra/ultralcd.cpp

@@ -724,7 +724,7 @@ static void lcd_prepare_menu() {
   //
   // Level Bed
   //
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS])
       MENU_ITEM(gcode, MSG_LEVEL_BED, PSTR("G29"));
   #elif DISABLED(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
@@ -1165,7 +1165,7 @@ static void lcd_control_temperature_preheat_gum_settings_menu() {
 static void lcd_control_motion_menu() {
   START_MENU(lcd_control_menu);
   MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
-  #if ENABLED(ENABLE_AUTO_BED_LEVELING)
+  #if ENABLED(AUTO_BED_LEVELING_FEATURE)
     MENU_ITEM_EDIT(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, -50, 50);
   #endif
   MENU_ITEM_EDIT(float5, MSG_ACC, &acceleration, 10, 99000);

MarlinKimbra/vector_3.cpp

@@ -19,7 +19,7 @@
 #include <math.h>
 #include "Marlin.h"
 
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
 #include "vector_3.h"
 
 vector_3::vector_3() : x(0), y(0), z(0) { }
@@ -131,4 +131,4 @@ void matrix_3x3::debug(const char title[]) {
   }
 }
 
-#endif // ENABLE_AUTO_BED_LEVELING
+#endif // AUTO_BED_LEVELING_FEATURE

MarlinKimbra/vector_3.h

@@ -19,7 +19,7 @@
 #ifndef VECTOR_3_H
 #define VECTOR_3_H
 
-#if ENABLED(ENABLE_AUTO_BED_LEVELING)
+#if ENABLED(AUTO_BED_LEVELING_FEATURE)
 class matrix_3x3;
 
 struct vector_3
@@ -57,6 +57,6 @@ struct matrix_3x3
 
 
 void apply_rotation_xyz(matrix_3x3 rotationMatrix, float &x, float& y, float& z);
-#endif // ENABLE_AUTO_BED_LEVELING
+#endif // AUTO_BED_LEVELING_FEATURE
 
 #endif // VECTOR_3_H

README.md

@@ -34,7 +34,7 @@ Adding commands to facilitate purging of hotend.
 Step per unit varied for each extruder as well as the feedrate.
 The addition of a different feedrate for retraction. 
 Adding Debug Dryrun used by repetier.
-Added total Power on time writec in SD CARD.
+Added total Power on time writed in SD CARD.
 Added total Power consumption writed in SD CARD.
 Added anti extruder idle oozing system.
 ## Credits