diff --git a/Marlin/boards.h b/Marlin/boards.h
index 5ccf0f82e2afb6f76e4dabff08a2d4c3de80be61..4e0241f87492e63a1125f10bf7da7b7e6a3df7f4 100644
--- a/Marlin/boards.h
+++ b/Marlin/boards.h
@@ -51,8 +51,6 @@
#define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board
#define BOARD_LEAPFROG 999 // Leapfrog
#define BOARD_MKS_BASE 40 // MKS BASE 1.0
-#define BOARD_WITBOX 41 // bq WITBOX
-#define BOARD_HEPHESTOS 42 // bq Prusa i3 Hephestos
#define BOARD_BAM_DICE 401 // 2PrintBeta BAM&DICE with STK drivers
#define BOARD_BAM_DICE_DUE 402 // 2PrintBeta BAM&DICE Due with STK drivers
diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h
index 0d8a5d422853193846c8ea3c47f93c708e09516f..ccd97868118ade72b8c5422afb21c3acc8c22400 100644
--- a/Marlin/configurator/config/Configuration.h
+++ b/Marlin/configurator/config/Configuration.h
@@ -401,7 +401,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
-#endif
+#endif
//===========================================================================
//=========================== Manual Bed Leveling ===========================
@@ -411,7 +411,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// #define MESH_BED_LEVELING // Enable mesh bed leveling
#ifdef MANUAL_BED_LEVELING
- #define MBL_Z_STEP 0.025
+ #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis
#endif // MANUAL_BED_LEVELING
#ifdef MESH_BED_LEVELING
@@ -605,7 +605,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
#ifdef EEPROM_SETTINGS
// To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
- #define EEPROM_CHITCHAT // please keep turned on if you can.
+ #define EEPROM_CHITCHAT // Please keep turned on if you can.
#endif
// @section temperature
@@ -646,7 +646,6 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
//#define LCD_FEEDBACK_FREQUENCY_HZ 1000 // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
// 0 to disable buzzer feedback. Test with M300 S<frequency Hz> P<duration ms>
-
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
//#define PANEL_ONE
@@ -779,13 +778,13 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// Uncomment below to enable
//#define FILAMENT_SENSOR
-#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
-#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
+#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
+#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
-#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
-#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
-#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
+#define DEFAULT_NOMINAL_FILAMENT_DIA 3.0 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
+#define MEASURED_UPPER_LIMIT 3.3 //upper limit factor used for sensor reading validation in mm
+#define MEASURED_LOWER_LIMIT 1.9 //lower limit factor for sensor reading validation in mm
+#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
//defines used in the code
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h
index 7fb4d70ea572bb455c6307878fc2dd25b6894814..8a05298d59a95a9a59152b8e54fd65cd44dd814f 100644
--- a/Marlin/configurator/config/Configuration_adv.h
+++ b/Marlin/configurator/config/Configuration_adv.h
@@ -36,6 +36,15 @@
#define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius
#endif
+#ifdef PIDTEMP
+ // this adds an experimental additional term to the heating power, proportional to the extrusion speed.
+ // if Kc is chosen well, the additional required power due to increased melting should be compensated.
+ #define PID_ADD_EXTRUSION_RATE
+ #ifdef PID_ADD_EXTRUSION_RATE
+ #define DEFAULT_Kc (1) //heating power=Kc*(e_speed)
+ #endif
+#endif
+
/**
* Automatic Temperature:
* The hotend target temperature is calculated by all the buffered lines of gcode.
@@ -46,23 +55,6 @@
* Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp.
* On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
*/
-#ifdef PIDTEMP
- // this adds an experimental additional term to the heating power, proportional to the extrusion speed.
- // if Kc is chosen well, the additional required power due to increased melting should be compensated.
- #define PID_ADD_EXTRUSION_RATE
- #ifdef PID_ADD_EXTRUSION_RATE
- #define DEFAULT_Kc (1) //heating power=Kc*(e_speed)
- #endif
-#endif
-
-
-//automatic temperature: The hot end target temperature is calculated by all the buffered lines of gcode.
-//The maximum buffered steps/sec of the extruder motor are called "se".
-//You enter the autotemp mode by a M109 S<mintemp> B<maxtemp> F<factor>
-// the target temperature is set to mintemp+factor*se[steps/sec] and limited by mintemp and maxtemp
-// you exit the value by any M109 without F*
-// Also, if the temperature is set to a value <mintemp, it is not changed by autotemp.
-// on an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode
#define AUTOTEMP
#ifdef AUTOTEMP
#define AUTOTEMP_OLDWEIGHT 0.98
diff --git a/Marlin/configurator/config/boards.h b/Marlin/configurator/config/boards.h
index 0e9c8c20a19142ced5d6d5c1622f396672ac94f4..4e0241f87492e63a1125f10bf7da7b7e6a3df7f4 100644
--- a/Marlin/configurator/config/boards.h
+++ b/Marlin/configurator/config/boards.h
@@ -14,6 +14,7 @@
#define BOARD_RAMPS_13_EEB 34 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Bed)
#define BOARD_RAMPS_13_EFF 35 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Fan)
#define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan)
+#define BOARD_RAMPS_13_SF 38 // RAMPS 1.3 / 1.4 (Power outputs: Spindle, Controller Fan)
#define BOARD_FELIX2 37 // Felix 2.0+ Electronics Board (RAMPS like)
#define BOARD_GEN6 5 // Gen6
#define BOARD_GEN6_DELUXE 51 // Gen6 deluxe
@@ -49,8 +50,7 @@
#define BOARD_ELEFU_3 21 // Elefu Ra Board (v3)
#define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board
#define BOARD_LEAPFROG 999 // Leapfrog
-#define BOARD_WITBOX 41 // bq WITBOX
-#define BOARD_HEPHESTOS 42 // bq Prusa i3 Hephestos
+#define BOARD_MKS_BASE 40 // MKS BASE 1.0
#define BOARD_BAM_DICE 401 // 2PrintBeta BAM&DICE with STK drivers
#define BOARD_BAM_DICE_DUE 402 // 2PrintBeta BAM&DICE Due with STK drivers
diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h
index 40d8dbe66304300c456b0d6ac9f7fd15a4ce27c5..856bd58db537de216e96344fab9d35288c6e1ab8 100644
--- a/Marlin/configurator/config/language.h
+++ b/Marlin/configurator/config/language.h
@@ -32,8 +32,8 @@
// kana_utf Japanese
// cn Chinese
+// fallback if no language is set, don't change
#ifndef LANGUAGE_INCLUDE
- // pick your language from the list above
#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
#endif
@@ -53,26 +53,14 @@
#define FIRMWARE_URL "http://3dprint.elettronicain.it/"
#elif MB(K8200)
#define MACHINE_NAME "K8200"
+ #define FIRMWARE_URL "https://github.com/CONSULitAS/Marlin-K8200"
#elif MB(5DPRINT)
#define MACHINE_NAME "Makibox"
#elif MB(SAV_MKI)
#define MACHINE_NAME "SAV MkI"
#define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
-#elif MB(WITBOX)
- #define MACHINE_NAME "WITBOX"
- #define FIRMWARE_URL "http://www.bq.com/gb/downloads-witbox.html"
-#elif MB(HEPHESTOS)
- #define MACHINE_NAME "HEPHESTOS"
- #define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
-#elif MB(BRAINWAVE_PRO)
- #define MACHINE_NAME "Kossel Pro"
- #ifndef FIRMWARE_URL
- #define FIRMWARE_URL "https://github.com/OpenBeamUSA/Marlin/"
- #endif
-#else
- #ifndef MACHINE_NAME
- #define MACHINE_NAME "3D Printer"
- #endif
+#elif !defined(MACHINE_NAME)
+ #define MACHINE_NAME "3D Printer"
#endif
#ifdef CUSTOM_MENDEL_NAME
@@ -122,6 +110,7 @@
#define MSG_FREE_MEMORY " Free Memory: "
#define MSG_PLANNER_BUFFER_BYTES " PlannerBufferBytes: "
#define MSG_OK "ok"
+#define MSG_WAIT "wait"
#define MSG_FILE_SAVED "Done saving file."
#define MSG_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: "
#define MSG_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: "
@@ -221,15 +210,16 @@
#define MSG_PID_DEBUG_PTERM " pTerm "
#define MSG_PID_DEBUG_ITERM " iTerm "
#define MSG_PID_DEBUG_DTERM " dTerm "
-#define MSG_HEATING_FAILED "Heating failed"
-#define MSG_EXTRUDER_SWITCHED_OFF "Extruder switched off. Temperature difference between temp sensors is too high !"
-
#define MSG_INVALID_EXTRUDER_NUM " - Invalid extruder number !"
-#define MSG_THERMAL_RUNAWAY_STOP "Thermal Runaway, system stopped! Heater_ID: "
-#define MSG_SWITCHED_OFF_MAX " switched off. MAXTEMP triggered !!"
-#define MSG_MINTEMP_EXTRUDER_OFF ": Extruder switched off. MINTEMP triggered !"
-#define MSG_MAXTEMP_EXTRUDER_OFF ": Extruder" MSG_SWITCHED_OFF_MAX
-#define MSG_MAXTEMP_BED_OFF "Heated bed" MSG_SWITCHED_OFF_MAX
+
+#define MSG_HEATER_BED "bed"
+#define MSG_STOPPED_HEATER ", system stopped! Heater_ID: "
+#define MSG_REDUNDANCY "Heater switched off. Temperature difference between temp sensors is too high !"
+#define MSG_T_HEATING_FAILED "Heating failed"
+#define MSG_T_THERMAL_RUNAWAY "Thermal Runaway"
+#define MSG_T_MAXTEMP "MAXTEMP triggered"
+#define MSG_T_MINTEMP "MINTEMP triggered"
+
// LCD Menu Messages
diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h
index 4e8503aa6fa5918d36b253ff513c29265f473fd5..535033599be9ccbb5fdd3b2c2e9d329e8dcd617e 100644
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@@ -57,11 +57,14 @@ Here are some standard links for getting your machine calibrated:
// The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup
-#define MOTHERBOARD BOARD_HEPHESTOS
+#define MOTHERBOARD BOARD_RAMPS_13_EFB
// Optional custom name for your RepStrap or other custom machine
// Displayed in the LCD "Ready" message
-// #define CUSTOM_MACHINE_NAME "3D Printer"
+#define CUSTOM_MACHINE_NAME "HEPHESTOS"
+
+// Added for BQ
+#define FIRMWARE_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)
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index f9543b0c45679b896496e41e2f5c73c8c6442218..142d163a82960c7a34c17181aff9d01a96dbceec 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -57,11 +57,14 @@ Here are some standard links for getting your machine calibrated:
// The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup
-#define MOTHERBOARD BOARD_WITBOX
+#define MOTHERBOARD BOARD_RAMPS_13_EFB
// Optional custom name for your RepStrap or other custom machine
// Displayed in the LCD "Ready" message
-// #define CUSTOM_MACHINE_NAME "3D Printer"
+#define CUSTOM_MACHINE_NAME "WITBOX"
+
+// Added for BQ
+#define FIRMWARE_URL "http://www.bq.com/gb/downloads-witbox.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)
diff --git a/Marlin/language.h b/Marlin/language.h
index 6e078d1dbc434321bb7f125e3808e71aca7a9772..856bd58db537de216e96344fab9d35288c6e1ab8 100644
--- a/Marlin/language.h
+++ b/Marlin/language.h
@@ -59,21 +59,8 @@
#elif MB(SAV_MKI)
#define MACHINE_NAME "SAV MkI"
#define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
-#elif MB(WITBOX)
- #define MACHINE_NAME "WITBOX"
- #define FIRMWARE_URL "http://www.bq.com/gb/downloads-witbox.html"
-#elif MB(HEPHESTOS)
- #define MACHINE_NAME "HEPHESTOS"
- #define FIRMWARE_URL "http://www.bq.com/gb/downloads-prusa-i3-hephestos.html"
-#elif MB(BRAINWAVE_PRO)
- #define MACHINE_NAME "Kossel Pro"
- #ifndef FIRMWARE_URL
- #define FIRMWARE_URL "https://github.com/OpenBeamUSA/Marlin/"
- #endif
-#else
- #ifndef MACHINE_NAME
- #define MACHINE_NAME "3D Printer"
- #endif
+#elif !defined(MACHINE_NAME)
+ #define MACHINE_NAME "3D Printer"
#endif
#ifdef CUSTOM_MENDEL_NAME
diff --git a/Marlin/pins.h b/Marlin/pins.h
index abffe2c9345d940d5dde9430cb0ca0d5553d6a55..d53f22592373f1095e6ab6b66c913315889228f7 100644
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -104,10 +104,6 @@
#include "pins_5DPRINT.h"
#elif MB(LEAPFROG)
#include "pins_LEAPFROG.h"
-#elif MB(WITBOX)
- #include "pins_WITBOX.h"
-#elif MB(HEPHESTOS)
- #include "pins_HEPHESTOS.h"
#elif MB(BAM_DICE)
#include "pins_RAMPS_13.h"
#elif MB(BAM_DICE_DUE)
diff --git a/Marlin/pins_HEPHESTOS.h b/Marlin/pins_HEPHESTOS.h
deleted file mode 100644
index ec8d3fab2d46eeca899019fc9b53c5f635941e9c..0000000000000000000000000000000000000000
--- a/Marlin/pins_HEPHESTOS.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * bq Prusa i3 Hephestos – Arduino Mega with RAMPS v1.3/1.4 pin assignments
- */
-
-#include "pins_RAMPS_13.h"
-
-#undef FAN_PIN
-#define FAN_PIN 9 // (Sprinter config)
-
-#undef HEATER_1_PIN
-#define HEATER_1_PIN -1
diff --git a/Marlin/pins_WITBOX.h b/Marlin/pins_WITBOX.h
deleted file mode 100644
index 037b38de8f08036033b0ea5899c38cf2caf74ec8..0000000000000000000000000000000000000000
--- a/Marlin/pins_WITBOX.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * bq WITBOX Arduino Mega with RAMPS v1.3/1.4 pin assignments
- */
-
-#include "pins_RAMPS_13.h"
-
-#undef FAN_PIN
-#define FAN_PIN 9 // (Sprinter config)
-
-#undef HEATER_1_PIN
-#define HEATER_1_PIN -1