diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 5da249fcc5159ec9302bb9db94e13cc9ea7bbf06..c4fa028cec7f8b59adf96fc5a7b6ff9c5914e25b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -853,11 +853,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/MarlinSerial.cpp b/Marlin/MarlinSerial.cpp
index bd81bf51cf833eb8c33451830aceb2b7d3b20952..ad23a062051a64d3063ffe5a35e77dbc69dfd755 100644
--- a/Marlin/MarlinSerial.cpp
+++ b/Marlin/MarlinSerial.cpp
@@ -78,7 +78,8 @@ void MarlinSerial::begin(long baud) {
if (useU2X) {
M_UCSRxA = BIT(M_U2Xx);
baud_setting = (F_CPU / 4 / baud - 1) / 2;
- } else {
+ }
+ else {
M_UCSRxA = 0;
baud_setting = (F_CPU / 8 / baud - 1) / 2;
}
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 066845a3278955c3ffd408573aa6eb2c11dfc136..4d29ebc7ab8b8577ee11de0feb731bc098700c63 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -45,13 +45,16 @@
#include "stepper.h"
#include "temperature.h"
#include "cardreader.h"
-#include "watchdog.h"
#include "configuration_store.h"
#include "language.h"
#include "pins_arduino.h"
#include "math.h"
#include "buzzer.h"
+#if ENABLED(USE_WATCHDOG)
+ #include "watchdog.h"
+#endif
+
#if ENABLED(BLINKM)
#include "blinkm.h"
#include "Wire.h"
@@ -681,7 +684,11 @@ void setup() {
tp_init(); // Initialize temperature loop
plan_init(); // Initialize planner;
- watchdog_init();
+
+ #if ENABLED(USE_WATCHDOG)
+ watchdog_init();
+ #endif
+
st_init(); // Initialize stepper, this enables interrupts!
setup_photpin();
servo_init();
@@ -827,8 +834,10 @@ void get_command() {
fromsd[cmd_queue_index_w] = false;
#endif
- char *npos = strchr(command, 'N');
- char *apos = strchr(command, '*');
+ while (*command == ' ') command++; // skip any leading spaces
+ char* npos = (*command == 'N') ? command : NULL; // Require the N parameter to start the line
+ char* apos = strchr(command, '*');
+
if (npos) {
boolean M110 = strstr_P(command, PSTR("M110")) != NULL;
@@ -1688,7 +1697,8 @@ static void setup_for_endstop_move() {
if (a < b) {
if (b < c) median = b;
if (c < a) median = a;
- } else { // b <= a
+ }
+ else { // b <= a
if (c < b) median = b;
if (a < c) median = a;
}
@@ -1783,7 +1793,8 @@ static void setup_for_endstop_move() {
#endif
do_blocking_move_to_x(X_MAX_POS + SLED_DOCKING_OFFSET + offset - 1); // Dock sled a bit closer to ensure proper capturing
digitalWrite(SLED_PIN, LOW); // turn off magnet
- } else {
+ }
+ else {
float z_loc = current_position[Z_AXIS];
if (z_loc < Z_RAISE_BEFORE_PROBING + 5) z_loc = Z_RAISE_BEFORE_PROBING;
do_blocking_move_to(X_MAX_POS + SLED_DOCKING_OFFSET + offset, current_position[Y_AXIS], z_loc); // this also updates current_position
@@ -2696,7 +2707,8 @@ inline void gcode_G28() {
SERIAL_PROTOCOLPGM("X out of range (1-" STRINGIFY(MESH_NUM_X_POINTS) ").\n");
return;
}
- } else {
+ }
+ else {
SERIAL_PROTOCOLPGM("X not entered.\n");
return;
}
@@ -2706,7 +2718,8 @@ inline void gcode_G28() {
SERIAL_PROTOCOLPGM("Y out of range (1-" STRINGIFY(MESH_NUM_Y_POINTS) ").\n");
return;
}
- } else {
+ }
+ else {
SERIAL_PROTOCOLPGM("Y not entered.\n");
return;
}
@@ -4653,13 +4666,8 @@ inline void gcode_M220() {
inline void gcode_M221() {
if (code_seen('S')) {
int sval = code_value();
- if (code_seen('T')) {
- if (setTargetedHotend(221)) return;
- extruder_multiplier[target_extruder] = sval;
- }
- else {
- extruder_multiplier[active_extruder] = sval;
- }
+ if (setTargetedHotend(221)) return;
+ extruder_multiplier[target_extruder] = sval;
}
}
@@ -6381,25 +6389,29 @@ void mesh_plan_buffer_line(float x, float y, float z, const float e, float feed_
ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
x_splits ^= BIT(ix);
- } else if (ix < pix && (x_splits) & BIT(pix)) {
+ }
+ else if (ix < pix && (x_splits) & BIT(pix)) {
nx = mbl.get_x(pix);
normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]);
ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
x_splits ^= BIT(pix);
- } else if (iy > piy && (y_splits) & BIT(iy)) {
+ }
+ else if (iy > piy && (y_splits) & BIT(iy)) {
ny = mbl.get_y(iy);
normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
y_splits ^= BIT(iy);
- } else if (iy < piy && (y_splits) & BIT(piy)) {
+ }
+ else if (iy < piy && (y_splits) & BIT(piy)) {
ny = mbl.get_y(piy);
normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
y_splits ^= BIT(piy);
- } else {
+ }
+ else {
// Already split on a border
plan_buffer_line(x, y, z, e, feed_rate, extruder);
set_current_to_destination();
diff --git a/Marlin/Sd2Card.cpp b/Marlin/Sd2Card.cpp
index 5063d74ef28d2dad9d9855a6e8fa71b713b3a153..dbb025f5d0518e3573d7a344e0e10b671f09c305 100644
--- a/Marlin/Sd2Card.cpp
+++ b/Marlin/Sd2Card.cpp
@@ -192,11 +192,13 @@ uint32_t Sd2Card::cardSize() {
uint8_t c_size_mult = (csd.v1.c_size_mult_high << 1)
| csd.v1.c_size_mult_low;
return (uint32_t)(c_size + 1) << (c_size_mult + read_bl_len - 7);
- } else if (csd.v2.csd_ver == 1) {
+ }
+ else if (csd.v2.csd_ver == 1) {
uint32_t c_size = ((uint32_t)csd.v2.c_size_high << 16)
| (csd.v2.c_size_mid << 8) | csd.v2.c_size_low;
return (c_size + 1) << 10;
- } else {
+ }
+ else {
error(SD_CARD_ERROR_BAD_CSD);
return 0;
}
diff --git a/Marlin/Sd2PinMap.h b/Marlin/Sd2PinMap.h
index 7496ae641b5a1b3dbdfb8aec7a2f8d050200f6b9..94dbd6df759796e489b3b7af017859ce2f2d1d6d 100644
--- a/Marlin/Sd2PinMap.h
+++ b/Marlin/Sd2PinMap.h
@@ -396,7 +396,8 @@ static inline __attribute__((always_inline))
bool getPinMode(uint8_t pin) {
if (__builtin_constant_p(pin) && pin < digitalPinCount) {
return (*digitalPinMap[pin].ddr >> digitalPinMap[pin].bit) & 1;
- } else {
+ }
+ else {
return badPinNumber();
}
}
@@ -405,10 +406,12 @@ static inline __attribute__((always_inline))
if (__builtin_constant_p(pin) && pin < digitalPinCount) {
if (mode) {
*digitalPinMap[pin].ddr |= BIT(digitalPinMap[pin].bit);
- } else {
+ }
+ else {
*digitalPinMap[pin].ddr &= ~BIT(digitalPinMap[pin].bit);
}
- } else {
+ }
+ else {
badPinNumber();
}
}
@@ -416,7 +419,8 @@ static inline __attribute__((always_inline))
bool fastDigitalRead(uint8_t pin) {
if (__builtin_constant_p(pin) && pin < digitalPinCount) {
return (*digitalPinMap[pin].pin >> digitalPinMap[pin].bit) & 1;
- } else {
+ }
+ else {
return badPinNumber();
}
}
@@ -425,10 +429,12 @@ static inline __attribute__((always_inline))
if (__builtin_constant_p(pin) && pin < digitalPinCount) {
if (value) {
*digitalPinMap[pin].port |= BIT(digitalPinMap[pin].bit);
- } else {
+ }
+ else {
*digitalPinMap[pin].port &= ~BIT(digitalPinMap[pin].bit);
}
- } else {
+ }
+ else {
badPinNumber();
}
}
diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp
index e88c06f6d4147ab8e6fa094c2297102018a72bff..3fcd64973cf7afd4cb8f9589caf444b97954cd1b 100644
--- a/Marlin/configuration_store.cpp
+++ b/Marlin/configuration_store.cpp
@@ -410,7 +410,7 @@ void Config_RetrieveSettings() {
EEPROM_READ_VAR(i, dummy); // bedKp
if (dummy != DUMMY_PID_VALUE) {
- bedKp = dummy;
+ bedKp = dummy; UNUSED(bedKp);
EEPROM_READ_VAR(i, bedKi);
EEPROM_READ_VAR(i, bedKd);
}
@@ -540,7 +540,7 @@ void Config_ResetDefault() {
#if ENABLED(PID_PARAMS_PER_EXTRUDER)
for (int e = 0; e < EXTRUDERS; e++)
#else
- int e = 0; // only need to write once
+ int e = 0; UNUSED(e); // only need to write once
#endif
{
PID_PARAM(Kp, e) = DEFAULT_Kp;
diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h
index 8fc1c3129145154ad84f8521c8157b9156d4f9b0..3d00134fb0d359aca6bad10dc70c0dbc564c04d2 100644
--- a/Marlin/configurator/config/Configuration.h
+++ b/Marlin/configurator/config/Configuration.h
@@ -852,11 +852,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h
index 355ca834d448a6a126e8f0605cc506162ef0804f..4e2cbf9ef52e989df065fa3f10ab93e728e52fec 100644
--- a/Marlin/dogm_lcd_implementation.h
+++ b/Marlin/dogm_lcd_implementation.h
@@ -197,18 +197,20 @@ char lcd_printPGM(const char* str) {
/* Warning: This function is called from interrupt context */
static void lcd_implementation_init() {
- #if ENABLED(LCD_PIN_BL) // Enable LCD backlight
+ #if defined(LCD_PIN_BL) && LCD_PIN_BL > -1 // Enable LCD backlight
pinMode(LCD_PIN_BL, OUTPUT);
digitalWrite(LCD_PIN_BL, HIGH);
#endif
- #if ENABLED(LCD_PIN_RESET)
+ #if defined(LCD_PIN_RESET) && LCD_PIN_RESET > -1
pinMode(LCD_PIN_RESET, OUTPUT);
digitalWrite(LCD_PIN_RESET, HIGH);
#endif
+
#if DISABLED(MINIPANEL) // setContrast not working for Mini Panel
u8g.setContrast(lcd_contrast);
#endif
+
// FIXME: remove this workaround
// Uncomment this if you have the first generation (V1.10) of STBs board
// pinMode(17, OUTPUT); // Enable LCD backlight
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index bf5eeb2f0d9eec166b57ac39c66638d5ae39eac7..a3ffe2903982ef6cccfea34fd79316c604af14ff 100644
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@@ -725,7 +725,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -835,11 +835,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h
index a64eba453e4c3c0ccfe34694afdf6d865a331e8d..09adeae13c562f3ee2aed1f5f1477ef9add07f15 100644
--- a/Marlin/example_configurations/Felix/Configuration_DUAL.h
+++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h
@@ -366,7 +366,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
-
+
//===========================================================================
//=========================== Manual Bed Leveling ===========================
//===========================================================================
@@ -459,7 +459,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
// Useful to retract a deployable Z probe.
-
+
//#define Z_PROBE_SLED // Turn on if you have a Z probe mounted on a sled like those designed by Charles Bell.
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
@@ -799,11 +799,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h
index 8ae05cfbda99a0c9d11ed877118da45659d99db0..139c1fca21d18162d3a8127895380a027d7035fc 100644
--- a/Marlin/example_configurations/Felix/Configuration_adv.h
+++ b/Marlin/example_configurations/Felix/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -343,8 +343,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -466,7 +466,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -479,56 +479,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -539,67 +539,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h
index b61cf1988fe12d09ec54626dc699fc1b80bb054c..519f3c7899a924e84933d28832eee5e1b2e4f398 100644
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@@ -79,7 +79,7 @@ Here are some standard links for getting your machine calibrated:
// Added for BQ
#define SOURCE_CODE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
-
+
// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines)
// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4)
//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
@@ -734,7 +734,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -844,11 +844,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h
index 5d25cd62a8472372e662b62dfab6faf912b7f408..9722db624d5518a1d95f2b669c35704b77226aea 100644
--- a/Marlin/example_configurations/Hephestos/Configuration_adv.h
+++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -343,8 +343,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -466,7 +466,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -479,56 +479,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -539,67 +539,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h
index ffa2ba9530aa1a928c2a6fe4dfdecc1c03dfbd15..66af2bbe92cfb6970e3804741b29a64947be9301 100644
--- a/Marlin/example_configurations/K8200/Configuration.h
+++ b/Marlin/example_configurations/K8200/Configuration.h
@@ -730,7 +730,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -840,11 +840,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h
index d51ed247f770e975283ec10f2cf198a94e2932a9..77717bc5066bf98cc800ffc05ba3ab470a5e48bf 100644
--- a/Marlin/example_configurations/K8200/Configuration_adv.h
+++ b/Marlin/example_configurations/K8200/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -343,8 +343,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -466,7 +466,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -479,56 +479,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -539,67 +539,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
index 7834101437cb70e44dc58f68f1c25bfc5b0365db..630830f706e0952cb8ba171a6c0ba63b740efab5 100644
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@@ -742,7 +742,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -852,11 +852,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h
index d4a0b841f6157dd8d30486829f0dbd5c984d6bbb..7cd0f005c913d3a5d228771c81a04465297ca1b2 100644
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@@ -732,7 +732,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -842,11 +842,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h
index 264a4040181eadeaae6ac72f5ca2763a0fac43da..f933c68fa23ec45257b29050e356c5ceadb00387 100644
--- a/Marlin/example_configurations/RigidBot/Configuration_adv.h
+++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h
@@ -137,7 +137,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -336,8 +336,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -461,7 +461,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -474,56 +474,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -534,67 +534,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index 7e0e31d3cc8276dc22cdaf9add9ac1aabd53261d..068f93b8dc4f1387973e46836214310a3391f3ed 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -37,16 +37,16 @@ Here are some standard links for getting your machine calibrated:
// QHARLEYS Autobedlevelling has not been ported, because Marlin has now Bed-levelling
// You might need Z-Min endstop on SCARA-Printer to use this feature. Actually untested!
// Uncomment to use Morgan scara mode
-#define SCARA
+#define SCARA
#define SCARA_SEGMENTS_PER_SECOND 200 // If movement is choppy try lowering this value
// Length of inner support arm
#define Linkage_1 150 //mm Preprocessor cannot handle decimal point...
-// Length of outer support arm Measure arm lengths precisely and enter
-#define Linkage_2 150 //mm
+// Length of outer support arm Measure arm lengths precisely and enter
+#define Linkage_2 150 //mm
-// SCARA tower offset (position of Tower relative to bed zero position)
+// SCARA tower offset (position of Tower relative to bed zero position)
// This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
-#define SCARA_offset_x 100 //mm
+#define SCARA_offset_x 100 //mm
#define SCARA_offset_y -56 //mm
#define SCARA_RAD2DEG 57.2957795 // to convert RAD to degrees
@@ -750,7 +750,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -860,11 +860,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h
index 2fa80655f82f28d037b9861f98158a82a769b511..2a2ba71dd5d973e25a846cd35a94c25dd0d591d6 100644
--- a/Marlin/example_configurations/SCARA/Configuration_adv.h
+++ b/Marlin/example_configurations/SCARA/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -343,8 +343,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -466,7 +466,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -479,56 +479,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -539,67 +539,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h
index 9610488d7d8c14d77a9875267ed78ea10cd09595..1c42c65795dcd0c979ac90d39be1de046e7e6152 100644
--- a/Marlin/example_configurations/TAZ4/Configuration.h
+++ b/Marlin/example_configurations/TAZ4/Configuration.h
@@ -761,7 +761,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -871,11 +871,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h
index ffc126fb19c9e572258ad4ef877128d80b2318e8..abbc5963110d87330b7346c38913a2fb57388be1 100644
--- a/Marlin/example_configurations/TAZ4/Configuration_adv.h
+++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -343,8 +343,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -469,7 +469,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -482,56 +482,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -542,67 +542,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index d6775586e478a728df196cab3657c249d299ea45..f0666e74d2e163fa219f68ca11fedcf0e5450759 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -733,7 +733,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -843,11 +843,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h
index 2036af08cd19679d323246d06d5bf8b8b607e496..a19cf4dd066d6a0fb77f6e480ac3414b18f5e8e2 100644
--- a/Marlin/example_configurations/WITBOX/Configuration_adv.h
+++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -343,8 +343,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -466,7 +466,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -479,56 +479,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -539,67 +539,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
index 048e8b05073690336aece2c5aa14f292dbf1bbcb..e3cf3a3385a44afe863a7f5e8b1fbdd03c9b6d5f 100644
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@@ -742,7 +742,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -852,11 +852,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h
index 6108b4eff2c513badedcdc468ed2dfd2d512bc84..1565375928a9bb8e77df3f5d61721b1647c33116 100644
--- a/Marlin/example_configurations/delta/biv2.5/Configuration.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h
@@ -867,7 +867,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -977,11 +977,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
index 3dc7c222dd6d5718946b05b9f65f82716e3a2c23..b80ae83a77ca3cdf3668f4fb3cf2cd6ffea6c5a9 100644
--- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -345,8 +345,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -467,7 +467,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -480,56 +480,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -540,67 +540,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index 84f18c02a91dfb862693c2507a7660c4ef268e41..6776940b289e1e6b6a5b5e160aa5668f73530d2d 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -872,7 +872,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -982,11 +982,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h
index 2426f2bf4913ffc093ae11a120e32df0cf474a51..8212e768961409775c8218db02c0d9a975d6c9fa 100644
--- a/Marlin/example_configurations/delta/generic/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -345,8 +345,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -468,7 +468,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -481,56 +481,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -541,67 +541,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index 0313d9957c83096cdfdd6ad96fbe08128800f421..4167bd419fd099be49a2878db0198aefc16e3716 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -872,7 +872,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -982,11 +982,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
index ee2437868822bdf18b2b7c507cb97d0d12bcc4e3..ef31f06f8f4ab9ba4c166d0dbb5f6103f722553f 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -344,8 +344,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -467,7 +467,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -480,56 +480,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -540,67 +540,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
index eb4f59724b347911739fab6e100a37d8e2f1111d..b47dab659ab4ff832b371adb35e74525b0f86c31 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@@ -862,7 +862,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -972,11 +972,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
index 372328bb0e3b52c1d4c7936d66ce6d08617c9268..31541c90b51380bd87c78bfff183191774ec3065 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
@@ -149,7 +149,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -348,8 +348,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -471,7 +471,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -484,56 +484,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -544,67 +544,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h
index d2870e8074f59d1f3c97fcebc332cb8fb1cea938..bc74b6dc0104d30d461eb161e3a594914d1eb681 100644
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@@ -590,7 +590,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// default settings
#define DEFAULT_AXIS_STEPS_PER_UNIT {400, 400, 400, 163} // default steps per unit for ***** MakiBox A6 *****
-#define DEFAULT_MAX_FEEDRATE {60, 60, 20, 45} // (mm/sec)
+#define DEFAULT_MAX_FEEDRATE {60, 60, 20, 45} // (mm/sec)
#define DEFAULT_MAX_ACCELERATION {2000,2000,30,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration in mm/s^2 for printing moves
@@ -744,7 +744,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -854,11 +854,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h
index ef9c9c1402b60501db35e2a85c06dce9003907fd..4e62ab84d1ea582440617ebc3161552141315386 100644
--- a/Marlin/example_configurations/makibox/Configuration_adv.h
+++ b/Marlin/example_configurations/makibox/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -342,8 +342,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -465,7 +465,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -478,56 +478,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -538,67 +538,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index 7d0f1135741e83c24b4eb69823fca0d51193d755..2636192d119ea7443d4d9a7e5a39bfb5da8d5414 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -581,7 +581,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//#define DEFAULT_AXIS_STEPS_PER_UNIT {81.26, 80.01, 2561, 599.14} // Michel TVRR old
//#define DEFAULT_AXIS_STEPS_PER_UNIT {71.1, 71.1, 2560, 739.65} // Michel TVRR
#define DEFAULT_AXIS_STEPS_PER_UNIT {71.1, 71.1, 2560, 600} // David TVRR
-#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 45} // (mm/sec) David TVRR
+#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 45} // (mm/sec) David TVRR
#define DEFAULT_MAX_ACCELERATION {9000,9000,100,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
/* MICHEL: This has an impact on the "ripples" in print walls */
@@ -737,7 +737,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs
//#define LCD_I2C_VIKI
-
+
// SSD1306 OLED generic display support
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define U8GLIB_SSD1306
@@ -847,11 +847,6 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
//#define FILAMENT_LCD_DISPLAY
-
-
-
-
-
#include "Configuration_adv.h"
#include "thermistortables.h"
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
index c1c9313dd0b7a5133a87a65ce8bf9f3bd3c41462..f5b6a7e19f83e817c2fa1d94de923ebe62c47468 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
@@ -145,7 +145,7 @@
#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
// Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z steppers - Let's call them Z stepper and Z2 stepper.
- // That way the machine is capable to align the bed during home, since both Z steppers are homed.
+ // That way the machine is capable to align the bed during home, since both Z steppers are homed.
// There is also an implementation of M666 (software endstops adjustment) to this feature.
// After Z homing, this adjustment is applied to just one of the steppers in order to align the bed.
// One just need to home the Z axis and measure the distance difference between both Z axis and apply the math: Z adjust = Z - Z2.
@@ -343,8 +343,8 @@
// save 3120 bytes of PROGMEM by commenting out #define USE_BIG_EDIT_FONT
// we don't have a big font for Cyrillic, Kana
//#define USE_BIG_EDIT_FONT
-
- // If you have spare 2300Byte of progmem and want to use a
+
+ // If you have spare 2300Byte of progmem and want to use a
// smaller font on the Info-screen uncomment the next line.
//#define USE_SMALL_INFOFONT
#endif // DOGLCD
@@ -466,7 +466,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#endif
/******************************************************************************\
- * enable this section if you have TMC26X motor drivers.
+ * enable this section if you have TMC26X motor drivers.
* you need to import the TMC26XStepper library into the arduino IDE for this
******************************************************************************/
@@ -479,56 +479,56 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#define X_MAX_CURRENT 1000 //in mA
#define X_SENSE_RESISTOR 91 //in mOhms
#define X_MICROSTEPS 16 //number of microsteps
-
+
//#define X2_IS_TMC
#define X2_MAX_CURRENT 1000 //in mA
#define X2_SENSE_RESISTOR 91 //in mOhms
#define X2_MICROSTEPS 16 //number of microsteps
-
+
//#define Y_IS_TMC
#define Y_MAX_CURRENT 1000 //in mA
#define Y_SENSE_RESISTOR 91 //in mOhms
#define Y_MICROSTEPS 16 //number of microsteps
-
+
//#define Y2_IS_TMC
#define Y2_MAX_CURRENT 1000 //in mA
#define Y2_SENSE_RESISTOR 91 //in mOhms
- #define Y2_MICROSTEPS 16 //number of microsteps
-
+ #define Y2_MICROSTEPS 16 //number of microsteps
+
//#define Z_IS_TMC
#define Z_MAX_CURRENT 1000 //in mA
#define Z_SENSE_RESISTOR 91 //in mOhms
#define Z_MICROSTEPS 16 //number of microsteps
-
+
//#define Z2_IS_TMC
#define Z2_MAX_CURRENT 1000 //in mA
#define Z2_SENSE_RESISTOR 91 //in mOhms
#define Z2_MICROSTEPS 16 //number of microsteps
-
+
//#define E0_IS_TMC
#define E0_MAX_CURRENT 1000 //in mA
#define E0_SENSE_RESISTOR 91 //in mOhms
#define E0_MICROSTEPS 16 //number of microsteps
-
+
//#define E1_IS_TMC
#define E1_MAX_CURRENT 1000 //in mA
#define E1_SENSE_RESISTOR 91 //in mOhms
- #define E1_MICROSTEPS 16 //number of microsteps
-
+ #define E1_MICROSTEPS 16 //number of microsteps
+
//#define E2_IS_TMC
#define E2_MAX_CURRENT 1000 //in mA
#define E2_SENSE_RESISTOR 91 //in mOhms
- #define E2_MICROSTEPS 16 //number of microsteps
-
+ #define E2_MICROSTEPS 16 //number of microsteps
+
//#define E3_IS_TMC
#define E3_MAX_CURRENT 1000 //in mA
#define E3_SENSE_RESISTOR 91 //in mOhms
- #define E3_MICROSTEPS 16 //number of microsteps
+ #define E3_MICROSTEPS 16 //number of microsteps
#endif
/******************************************************************************\
- * enable this section if you have L6470 motor drivers.
+ * enable this section if you have L6470 motor drivers.
* you need to import the L6470 library into the arduino IDE for this
******************************************************************************/
@@ -539,67 +539,64 @@ const unsigned int dropsegments=5; //everything with less than this number of st
//#define X_IS_L6470
#define X_MICROSTEPS 16 //number of microsteps
- #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define X2_IS_L6470
#define X2_MICROSTEPS 16 //number of microsteps
- #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define X2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define X2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define X2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y_IS_L6470
#define Y_MICROSTEPS 16 //number of microsteps
- #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Y_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Y2_IS_L6470
- #define Y2_MICROSTEPS 16 //number of microsteps
- #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Y2_MICROSTEPS 16 //number of microsteps
+ #define Y2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Y2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
- #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+ #define Y2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
+
//#define Z_IS_L6470
#define Z_MICROSTEPS 16 //number of microsteps
- #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define Z2_IS_L6470
#define Z2_MICROSTEPS 16 //number of microsteps
- #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define Z2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define Z2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define Z2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E0_IS_L6470
#define E0_MICROSTEPS 16 //number of microsteps
- #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E0_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E0_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E0_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E1_IS_L6470
- #define E1_MICROSTEPS 16 //number of microsteps
#define E1_MICROSTEPS 16 //number of microsteps
- #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E1_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E1_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E1_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E2_IS_L6470
- #define E2_MICROSTEPS 16 //number of microsteps
#define E2_MICROSTEPS 16 //number of microsteps
- #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E2_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E2_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E2_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
//#define E3_IS_L6470
- #define E3_MICROSTEPS 16 //number of microsteps
#define E3_MICROSTEPS 16 //number of microsteps
- #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
+ #define E3_K_VAL 50 // 0 - 255, Higher values, are higher power. Be carefull not to go too high
#define E3_OVERCURRENT 2000 //maxc current in mA. If the current goes over this value, the driver will switch off
#define E3_STALLCURRENT 1500 //current in mA where the driver will detect a stall
-
+
#endif
#include "Conditionals.h"
diff --git a/Marlin/fastio.h b/Marlin/fastio.h
index 76012d522d1682d12c47277128cd02389347f525..5871e228787856c4e972d2f6410ea1fc7a2d7f65 100644
--- a/Marlin/fastio.h
+++ b/Marlin/fastio.h
@@ -30,15 +30,15 @@
#define _WRITE_C(IO, v) do { if (v) { \
CRITICAL_SECTION_START; \
- {DIO ## IO ## _WPORT |= MASK(DIO ## IO ## _PIN); }\
+ {DIO ## IO ## _WPORT |= MASK(DIO ## IO ## _PIN); } \
CRITICAL_SECTION_END; \
- }\
- else {\
+ } \
+ else { \
CRITICAL_SECTION_START; \
- {DIO ## IO ## _WPORT &= ~MASK(DIO ## IO ## _PIN); }\
+ {DIO ## IO ## _WPORT &= ~MASK(DIO ## IO ## _PIN); } \
CRITICAL_SECTION_END; \
- }\
- }\
+ } \
+ } \
while (0)
#define _WRITE(IO, v) do { if (&(DIO ## IO ## _RPORT) >= (uint8_t *)0x100) {_WRITE_C(IO, v); } else {_WRITE_NC(IO, v); }; } while (0)
diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index 8e2d108120ca0f27cb787946be4c7885a7f2cc41..b2d91606d5a43a6c88496a94912229a104f5c417 100644
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -439,10 +439,12 @@ void check_axes_activity() {
// Just starting up fan - run at full power.
fan_kick_end = ms + FAN_KICKSTART_TIME;
tail_fan_speed = 255;
- } else if (fan_kick_end > ms)
+ }
+ else if (fan_kick_end > ms)
// Fan still spinning up.
tail_fan_speed = 255;
- } else {
+ }
+ else {
fan_kick_end = 0;
}
#endif //FAN_KICKSTART_TIME
diff --git a/Marlin/qr_solve.cpp b/Marlin/qr_solve.cpp
index f968590ca0b009ef1e1e4609ae022709027e745b..1e085c95be97703d6f93f7a603fc100cb01e9695 100644
--- a/Marlin/qr_solve.cpp
+++ b/Marlin/qr_solve.cpp
@@ -494,7 +494,8 @@ double dnrm2(int n, double x[], int incx)
if (scale < absxi) {
ssq = 1.0 + ssq * (scale / absxi) * (scale / absxi);
scale = absxi;
- } else
+ }
+ else
ssq = ssq + (absxi / scale) * (absxi / scale);
}
ix += incx;
@@ -1023,7 +1024,7 @@ void dqrlss(double a[], int lda, int m, int n, int kr, double b[], double x[],
if (kr != 0) {
job = 110;
- info = dqrsl(a, lda, m, kr, qraux, b, rsd, rsd, x, rsd, rsd, job);
+ info = dqrsl(a, lda, m, kr, qraux, b, rsd, rsd, x, rsd, rsd, job); UNUSED(info);
}
for (i = 0; i < n; i++)
@@ -1404,7 +1405,8 @@ void dscal(int n, double sa, double x[], int incx)
x[i + 3] = sa * x[i + 3];
x[i + 4] = sa * x[i + 4];
}
- } else {
+ }
+ else {
if (0 <= incx)
ix = 0;
else
@@ -1486,15 +1488,10 @@ void dswap(int n, double x[], int incx, double y[], int incy)
x[i + 2] = y[i + 2];
y[i + 2] = temp;
}
- } else {
- if (0 <= incx)
- ix = 0;
- else
- ix = (- n + 1) * incx;
- if (0 <= incy)
- iy = 0;
- else
- iy = (- n + 1) * incy;
+ }
+ else {
+ ix = (incx >= 0) ? 0 : (-n + 1) * incx;
+ iy = (incy >= 0) ? 0 : (-n + 1) * incy;
for (i = 0; i < n; i++) {
temp = x[ix];
x[ix] = y[iy];
@@ -1566,7 +1563,7 @@ void qr_solve(double x[], int m, int n, double a[], double b[])
tol = r8_epsilon() / r8mat_amax(m, n, a_qr);
itask = 1;
- ind = dqrls(a_qr, lda, m, n, tol, &kr, b, x, r, jpvt, qraux, itask);
+ ind = dqrls(a_qr, lda, m, n, tol, &kr, b, x, r, jpvt, qraux, itask); UNUSED(ind);
}
/******************************************************************************/
diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp
index e5639c5e520ab3e28aaf4dcb5cf6db9f3eeb4568..327b6449afecebe57099a154bac2800f5d8d873d 100644
--- a/Marlin/stepper.cpp
+++ b/Marlin/stepper.cpp
@@ -139,11 +139,13 @@ volatile signed char count_direction[NUM_AXIS] = { 1, 1, 1, 1 };
if (Z_HOME_DIR > 0) {\
if (!(TEST(old_endstop_bits, Z_MAX) && (count_direction[Z_AXIS] > 0)) && !locked_z_motor) Z_STEP_WRITE(v); \
if (!(TEST(old_endstop_bits, Z2_MAX) && (count_direction[Z_AXIS] > 0)) && !locked_z2_motor) Z2_STEP_WRITE(v); \
- } else {\
+ } \
+ else { \
if (!(TEST(old_endstop_bits, Z_MIN) && (count_direction[Z_AXIS] < 0)) && !locked_z_motor) Z_STEP_WRITE(v); \
if (!(TEST(old_endstop_bits, Z2_MIN) && (count_direction[Z_AXIS] < 0)) && !locked_z2_motor) Z2_STEP_WRITE(v); \
} \
- } else { \
+ } \
+ else { \
Z_STEP_WRITE(v); \
Z2_STEP_WRITE(v); \
}
@@ -397,7 +399,7 @@ inline void update_endstops() {
COPY_BIT(current_endstop_bits, Z_MIN, Z2_MIN);
#endif
- byte z_test = TEST_ENDSTOP(Z_MIN) << 0 + TEST_ENDSTOP(Z2_MIN) << 1; // bit 0 for Z, bit 1 for Z2
+ byte z_test = TEST_ENDSTOP(Z_MIN) | (TEST_ENDSTOP(Z2_MIN) << 1); // bit 0 for Z, bit 1 for Z2
if (z_test && current_block->steps[Z_AXIS] > 0) { // z_test = Z_MIN || Z2_MIN
endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
@@ -433,7 +435,7 @@ inline void update_endstops() {
COPY_BIT(current_endstop_bits, Z_MAX, Z2_MAX);
#endif
- byte z_test = TEST_ENDSTOP(Z_MAX) << 0 + TEST_ENDSTOP(Z2_MAX) << 1; // bit 0 for Z, bit 1 for Z2
+ byte z_test = TEST_ENDSTOP(Z_MAX) | (TEST_ENDSTOP(Z2_MAX) << 1); // bit 0 for Z, bit 1 for Z2
if (z_test && current_block->steps[Z_AXIS] > 0) { // t_test = Z_MAX || Z2_MAX
endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp
index 40d1a4bfcdef709d174611a5cd742d0d10b0a0c7..3a8c6a8b5f696e5efef28ecf5e9e0f5f1475a758 100644
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@@ -21,11 +21,13 @@
#include "Marlin.h"
#include "ultralcd.h"
#include "temperature.h"
-#include "watchdog.h"
#include "language.h"
-
#include "Sd2PinMap.h"
+#if ENABLED(USE_WATCHDOG)
+ #include "watchdog.h"
+#endif
+
//===========================================================================
//================================== macros =================================
//===========================================================================
@@ -207,7 +209,7 @@ void PID_autotune(float temp, int extruder, int ncycles) {
long bias, d;
float Ku, Tu;
- float Kp, Ki, Kd;
+ float Kp = 0, Ki = 0, Kd = 0;
float max = 0, min = 10000;
#if HAS_AUTO_FAN
@@ -511,7 +513,8 @@ float get_pid_output(int e) {
if (e_position > last_position[e]) {
lpq[lpq_ptr++] = e_position - last_position[e];
last_position[e] = e_position;
- } else {
+ }
+ else {
lpq[lpq_ptr++] = 0;
}
if (lpq_ptr >= lpq_len) lpq_ptr = 0;
@@ -818,8 +821,11 @@ static void updateTemperaturesFromRawValues() {
#if HAS_FILAMENT_SENSOR
filament_width_meas = analog2widthFil();
#endif
- //Reset the watchdog after we know we have a temperature measurement.
- watchdog_reset();
+
+ #if ENABLED(USE_WATCHDOG)
+ // Reset the watchdog after we know we have a temperature measurement.
+ watchdog_reset();
+ #endif
CRITICAL_SECTION_START;
temp_meas_ready = false;
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 54c1bfc9b0c971b6ce80cfec8ccf8ee0be0301d2..1a0ee8a4abca1a4ac663bd9931340b0023418101 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -475,53 +475,51 @@ void lcd_set_home_offsets() {
#endif //BABYSTEPPING
/**
- *
- * "Tune" submenu
- *
+ * Watch temperature callbacks
*/
+#if TEMP_SENSOR_0 != 0
+ void watch_temp_callback_E0() { start_watching_heater(0); }
+#endif
+#if EXTRUDERS > 1 && TEMP_SENSOR_1 != 0
+ void watch_temp_callback_E1() { start_watching_heater(1); }
+ #if EXTRUDERS > 2 && TEMP_SENSOR_2 != 0
+ void watch_temp_callback_E2() { start_watching_heater(2); }
+ #if EXTRUDERS > 3 && TEMP_SENSOR_3 != 0
+ void watch_temp_callback_E3() { start_watching_heater(3); }
+ #endif // EXTRUDERS > 3
+ #endif // EXTRUDERS > 2
+#endif // EXTRUDERS > 1
-static void lcd_tune_menu() {
- START_MENU();
-
- //
- // ^ Main
- //
- MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
-
- //
- // Speed:
- //
- MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_multiplier, 10, 999);
-
+/**
+ * Items shared between Tune and Temperature menus
+ */
+static void nozzle_bed_fan_menu_items(uint8_t &encoderLine, uint8_t &_lineNr, uint8_t &_drawLineNr, uint8_t &_menuItemNr, bool &wasClicked, bool &itemSelected) {
//
// Nozzle:
- // Nozzle 1:
- // Nozzle 2:
- // Nozzle 3:
- // Nozzle 4:
+ // Nozzle [1-4]:
//
#if EXTRUDERS == 1
#if TEMP_SENSOR_0 != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
#endif
#else //EXTRUDERS > 1
#if TEMP_SENSOR_0 != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15, watch_temp_callback_E0);
#endif
#if TEMP_SENSOR_1 != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15, watch_temp_callback_E1);
#endif
#if EXTRUDERS > 2
#if TEMP_SENSOR_2 != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N3, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N3, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15, watch_temp_callback_E2);
#endif
#if EXTRUDERS > 3
#if TEMP_SENSOR_3 != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N4, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
+ MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_NOZZLE MSG_N4, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15, watch_temp_callback_E3);
#endif
- #endif //EXTRUDERS > 3
- #endif //EXTRUDERS > 2
- #endif //EXTRUDERS > 1
+ #endif // EXTRUDERS > 3
+ #endif // EXTRUDERS > 2
+ #endif // EXTRUDERS > 1
//
// Bed:
@@ -534,11 +532,29 @@ static void lcd_tune_menu() {
// Fan Speed:
//
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
+}
+
+
+/**
+ *
+ * "Tune" submenu
+ *
+ */
+static void lcd_tune_menu() {
+ START_MENU();
//
- // Flow:
+ // ^ Main
+ //
+ MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
+
+ //
+ // Speed:
//
- MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[active_extruder], 10, 999);
+ MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_multiplier, 10, 999);
+
+ // Nozzle, Bed, and Fan Control
+ nozzle_bed_fan_menu_items(encoderLine, _lineNr, _drawLineNr, _menuItemNr, wasClicked, itemSelected);
//
// Flow:
@@ -550,6 +566,7 @@ static void lcd_tune_menu() {
#if EXTRUDERS == 1
MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[0], 10, 999);
#else // EXTRUDERS > 1
+ MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[active_extruder], 10, 999);
MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiplier[0], 10, 999);
MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiplier[1], 10, 999);
#if EXTRUDERS > 2
@@ -1002,44 +1019,8 @@ static void lcd_control_temperature_menu() {
//
MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
- //
- // Nozzle
- // Nozzle 1, Nozzle 2, Nozzle 3, Nozzle 4
- //
- #if EXTRUDERS == 1
- #if TEMP_SENSOR_0 != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
- #endif
- #else //EXTRUDERS > 1
- #if TEMP_SENSOR_0 != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
- #endif
- #if TEMP_SENSOR_1 != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
- #endif
- #if EXTRUDERS > 2
- #if TEMP_SENSOR_2 != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N3, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
- #endif
- #if EXTRUDERS > 3
- #if TEMP_SENSOR_3 != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N4, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
- #endif
- #endif // EXTRUDERS > 3
- #endif // EXTRUDERS > 2
- #endif // EXTRUDERS > 1
-
- //
- // Bed
- //
- #if TEMP_SENSOR_BED != 0
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
- #endif
-
- //
- // Fan Speed
- //
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
+ // Nozzle, Bed, and Fan Control
+ nozzle_bed_fan_menu_items(encoderLine, _lineNr, _drawLineNr, _menuItemNr, wasClicked, itemSelected);
//
// Autotemp, Min, Max, Fact
diff --git a/Marlin/ultralcd_implementation_hitachi_HD44780.h b/Marlin/ultralcd_implementation_hitachi_HD44780.h
index 6c2828c70f15bd133b725942e99a96e1e17b695b..ccb09b425e188b3e8f4d3598179f9c6ee322eb64 100644
--- a/Marlin/ultralcd_implementation_hitachi_HD44780.h
+++ b/Marlin/ultralcd_implementation_hitachi_HD44780.h
@@ -716,8 +716,8 @@ static void lcd_implementation_status_screen() {
lcd.print(ftostr12ns(filament_width_meas));
lcd_printPGM(PSTR(" V"));
lcd.print(itostr3(100.0 * volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]));
- lcd.print('%');
- return;
+ lcd.print('%');
+ return;
}
#endif // FILAMENT_LCD_DISPLAY
diff --git a/Marlin/utf_mapper.h b/Marlin/utf_mapper.h
index 76425364bb720a24d928ffde90aec77daa9b91f9..6367be66eb5a65fb204ec8a25d4313dce04416d4 100644
--- a/Marlin/utf_mapper.h
+++ b/Marlin/utf_mapper.h
@@ -123,14 +123,17 @@
#endif // SIMULATE_ROMFONT
#if ENABLED(MAPPER_NON)
- char charset_mapper(char c){
+
+ char charset_mapper(char c) {
HARDWARE_CHAR_OUT( c );
return 1;
}
+
#elif ENABLED(MAPPER_C2C3)
- uint8_t utf_hi_char; // UTF-8 high part
- bool seen_c2 = false;
- char charset_mapper(char c){
+
+ char charset_mapper(char c) {
+ static uint8_t utf_hi_char; // UTF-8 high part
+ static bool seen_c2 = false;
uint8_t d = c;
if ( d >= 0x80 ) { // UTF-8 handling
if ( (d >= 0xc0) && (!seen_c2) ) {
@@ -138,16 +141,16 @@
seen_c2 = true;
return 0;
}
- else if (seen_c2){
+ else if (seen_c2) {
d &= 0x3f;
#ifndef MAPPER_ONE_TO_ONE
- HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
+ HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
#else
- HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d) ) ;
+ HARDWARE_CHAR_OUT((char)(0x80 + (utf_hi_char << 6) + d)) ;
#endif
}
else {
- HARDWARE_CHAR_OUT('?');
+ HARDWARE_CHAR_OUT('?');
}
}
else {
@@ -156,96 +159,116 @@
seen_c2 = false;
return 1;
}
+
#elif ENABLED(MAPPER_D0D1_MOD)
- uint8_t utf_hi_char; // UTF-8 high part
- bool seen_d5 = false;
- char charset_mapper(char c){
+
+ char charset_mapper(char c) {
// it is a Russian alphabet translation
// except 0401 --> 0xa2 = Ð, 0451 --> 0xb5 = Ñ‘
+ static uint8_t utf_hi_char; // UTF-8 high part
+ static bool seen_d5 = false;
uint8_t d = c;
- if ( d >= 0x80 ) { // UTF-8 handling
- if ((d >= 0xd0) && (!seen_d5)) {
+ if (d >= 0x80) { // UTF-8 handling
+ if (d >= 0xd0 && !seen_d5) {
utf_hi_char = d - 0xd0;
seen_d5 = true;
return 0;
- } else if (seen_d5) {
- d &= 0x3f;
- if ( !utf_hi_char && ( d == 1 )) {
- HARDWARE_CHAR_OUT((char) 0xa2 ); // Ð
- } else if ((utf_hi_char == 1) && (d == 0x11)) {
- HARDWARE_CHAR_OUT((char) 0xb5 ); // Ñ‘
- } else {
- HARDWARE_CHAR_OUT((char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x10 ) );
- }
+ }
+ else if (seen_d5) {
+ d &= 0x3f;
+ if (!utf_hi_char && d == 1) {
+ HARDWARE_CHAR_OUT((char) 0xa2); // Ð
+ }
+ else if (utf_hi_char == 1 && d == 0x11) {
+ HARDWARE_CHAR_OUT((char)0xb5); // Ñ‘
}
else {
- HARDWARE_CHAR_OUT('?');
+ HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x10));
}
- } else {
+ }
+ else {
+ HARDWARE_CHAR_OUT('?');
+ }
+ }
+ else {
HARDWARE_CHAR_OUT((char) c );
}
seen_d5 = false;
return 1;
}
+
#elif ENABLED(MAPPER_D0D1)
- uint8_t utf_hi_char; // UTF-8 high part
- bool seen_d5 = false;
+
char charset_mapper(char c) {
+ static uint8_t utf_hi_char; // UTF-8 high part
+ static bool seen_d5 = false;
uint8_t d = c;
- if ( d >= 0x80u ) { // UTF-8 handling
- if ((d >= 0xd0u) && (!seen_d5)) {
+ if (d >= 0x80u) { // UTF-8 handling
+ if (d >= 0xd0u && !seen_d5) {
utf_hi_char = d - 0xd0u;
seen_d5 = true;
return 0;
- } else if (seen_d5) {
- d &= 0x3fu;
+ }
+ else if (seen_d5) {
+ d &= 0x3fu;
#ifndef MAPPER_ONE_TO_ONE
- HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
+ HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
#else
- HARDWARE_CHAR_OUT( (char) (0xa0u + ( utf_hi_char << 6 ) + d ) ) ;
+ HARDWARE_CHAR_OUT((char)(0xa0u + (utf_hi_char << 6) + d)) ;
#endif
- } else {
+ }
+ else {
HARDWARE_CHAR_OUT('?');
}
- } else {
+ }
+ else {
HARDWARE_CHAR_OUT((char) c );
}
seen_d5 = false;
return 1;
}
+
#elif ENABLED(MAPPER_E382E383)
- uint8_t utf_hi_char; // UTF-8 high part
- bool seen_e3 = false;
- bool seen_82_83 = false;
- char charset_mapper(char c){
+
+ char charset_mapper(char c) {
+ static uint8_t utf_hi_char; // UTF-8 high part
+ static bool seen_e3 = false;
+ static bool seen_82_83 = false;
uint8_t d = c;
- if ( d >= 0x80 ) { // UTF-8 handling
- if ( (d == 0xe3) && (seen_e3 == false)) {
+ if (d >= 0x80) { // UTF-8 handling
+ if (d == 0xe3 && !seen_e3) {
seen_e3 = true;
return 0; // eat 0xe3
- } else if ( (d >= 0x82) && (seen_e3 == true) && (seen_82_83 == false)) {
+ }
+ else if (d >= 0x82 && seen_e3 && !seen_82_83) {
utf_hi_char = d - 0x82;
seen_82_83 = true;
return 0;
- } else if ((seen_e3 == true) && (seen_82_83 == true)){
+ }
+ else if (seen_e3 && seen_82_83) {
d &= 0x3f;
#ifndef MAPPER_ONE_TO_ONE
- HARDWARE_CHAR_OUT( (char) pgm_read_byte_near( utf_recode + d + ( utf_hi_char << 6 ) - 0x20 ) );
+ HARDWARE_CHAR_OUT((char)pgm_read_byte_near(utf_recode + d + (utf_hi_char << 6) - 0x20));
#else
- HARDWARE_CHAR_OUT( (char) (0x80 + ( utf_hi_char << 6 ) + d ) ) ;
+ HARDWARE_CHAR_OUT((char)(0x80 + (utf_hi_char << 6) + d)) ;
#endif
- } else {
+ }
+ else {
HARDWARE_CHAR_OUT((char) '?' );
}
- } else {
+ }
+ else {
HARDWARE_CHAR_OUT((char) c );
}
seen_e3 = false;
seen_82_83 = false;
return 1;
}
+
#else
+
#error "You have to define one of the DISPLAY_INPUT_CODE_MAPPERs in your language_xx.h file" // should not occur because (en) will set.
+
#endif // code mappers
#endif // UTF_MAPPER_H
diff --git a/Marlin/watchdog.cpp b/Marlin/watchdog.cpp
index c30cb54c5884bba7d0a2450f72ebf4a9f29a1899..e7632797161b6a5902014c425202fa8aeb99b322 100644
--- a/Marlin/watchdog.cpp
+++ b/Marlin/watchdog.cpp
@@ -1,25 +1,14 @@
#include "Marlin.h"
#if ENABLED(USE_WATCHDOG)
-#include <avr/wdt.h>
#include "watchdog.h"
-#include "ultralcd.h"
-//===========================================================================
-//============================ private variables ============================
-//===========================================================================
-
-//===========================================================================
-//================================ functions ================================
-//===========================================================================
-
-
-/// intialise watch dog with a 4 sec interrupt time
+// Initialize watchdog with a 4 sec interrupt time
void watchdog_init() {
#if ENABLED(WATCHDOG_RESET_MANUAL)
- //We enable the watchdog timer, but only for the interrupt.
- //Take care, as this requires the correct order of operation, with interrupts disabled. See the datasheet of any AVR chip for details.
+ // We enable the watchdog timer, but only for the interrupt.
+ // Take care, as this requires the correct order of operation, with interrupts disabled. See the datasheet of any AVR chip for details.
wdt_reset();
_WD_CONTROL_REG = _BV(_WD_CHANGE_BIT) | _BV(WDE);
_WD_CONTROL_REG = _BV(WDIE) | WDTO_4S;
@@ -28,23 +17,18 @@ void watchdog_init() {
#endif
}
-/// reset watchdog. MUST be called every 1s after init or avr will reset.
-void watchdog_reset() {
- wdt_reset();
-}
-
//===========================================================================
//=================================== ISR ===================================
//===========================================================================
-//Watchdog timer interrupt, called if main program blocks >1sec and manual reset is enabled.
+// Watchdog timer interrupt, called if main program blocks >1sec and manual reset is enabled.
#if ENABLED(WATCHDOG_RESET_MANUAL)
-ISR(WDT_vect) {
- SERIAL_ERROR_START;
- SERIAL_ERRORLNPGM("Something is wrong, please turn off the printer.");
- kill(PSTR("ERR:Please Reset")); //kill blocks //16 characters so it fits on a 16x2 display
- while (1); //wait for user or serial reset
-}
-#endif//RESET_MANUAL
-
-#endif//USE_WATCHDOG
+ ISR(WDT_vect) {
+ SERIAL_ERROR_START;
+ SERIAL_ERRORLNPGM("Something is wrong, please turn off the printer.");
+ kill(PSTR("ERR:Please Reset")); //kill blocks //16 characters so it fits on a 16x2 display
+ while (1); //wait for user or serial reset
+ }
+#endif //WATCHDOG_RESET_MANUAL
+
+#endif //USE_WATCHDOG
diff --git a/Marlin/watchdog.h b/Marlin/watchdog.h
index 6416f13decb6264b97848e52ca6d2a535008c575..c8a671fe80a999f06137f958d531c1b821ac6f60 100644
--- a/Marlin/watchdog.h
+++ b/Marlin/watchdog.h
@@ -2,16 +2,13 @@
#define WATCHDOG_H
#include "Marlin.h"
+#include <avr/wdt.h>
-#if ENABLED(USE_WATCHDOG)
- // initialize watch dog with a 1 sec interrupt time
- void watchdog_init();
- // pad the dog/reset watchdog. MUST be called at least every second after the first watchdog_init or AVR will go into emergency procedures..
- void watchdog_reset();
-#else
- //If we do not have a watchdog, then we can have empty functions which are optimized away.
- FORCE_INLINE void watchdog_init() {};
- FORCE_INLINE void watchdog_reset() {};
-#endif
+// Initialize watchdog with a 4 second interrupt time
+void watchdog_init();
+
+// Reset watchdog. MUST be called at least every 4 seconds after the
+// first watchdog_init or AVR will go into emergency procedures.
+inline void watchdog_reset() { wdt_reset(); }
#endif