From 9d1961ebe378c1906bb4e1db514cc420d059c47b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 May 2015 21:33:23 -0700 Subject: [PATCH 1/2] Witbox and Hephestos are just RAMPS_13_EFB --- Marlin/boards.h | 2 -- .../Hephestos/Configuration.h | 7 +++++-- .../WITBOX/Configuration.h | 7 +++++-- Marlin/language.h | 17 ++--------------- Marlin/pins.h | 4 ---- Marlin/pins_HEPHESTOS.h | 11 ----------- Marlin/pins_WITBOX.h | 11 ----------- 7 files changed, 12 insertions(+), 47 deletions(-) delete mode 100644 Marlin/pins_HEPHESTOS.h delete mode 100644 Marlin/pins_WITBOX.h diff --git a/Marlin/boards.h b/Marlin/boards.h index 5ccf0f82e2..4e0241f874 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/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 4e8503aa6f..535033599b 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 f9543b0c45..142d163a82 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 6e078d1dbc..856bd58db5 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 abffe2c934..d53f225923 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 ec8d3fab2d..0000000000 --- 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 037b38de8f..0000000000 --- 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 From 6eb4f90ce7d8381edf319433e4e5a9bf84e3cb30 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 20 May 2015 21:34:00 -0700 Subject: [PATCH 2/2] Also synchronize configurator copies of configs --- Marlin/configurator/config/Configuration.h | 19 +++++----- .../configurator/config/Configuration_adv.h | 26 +++++-------- Marlin/configurator/config/boards.h | 4 +- Marlin/configurator/config/language.h | 38 +++++++------------ 4 files changed, 34 insertions(+), 53 deletions(-) diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 0d8a5d4228..ccd9786811 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 P - // 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 91d8c9dc01..8818b1b665 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 B F -// 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