From 7236109f2a85825b3190635957c8712bdd2ade80 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 30 May 2017 17:54:28 -0500 Subject: [PATCH 01/31] Patch M24 / M125 for delta --- Marlin/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index c62fd7db7..3cd579741 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -6020,7 +6020,7 @@ inline void gcode_M17() { #if IS_KINEMATIC // Move XYZ to starting position - planner.buffer_line_kinematic(lastpos, PAUSE_PARK_XY_FEEDRATE, active_extruder); + planner.buffer_line_kinematic(resume_position, PAUSE_PARK_XY_FEEDRATE, active_extruder); #else // Move XY to starting position, then Z destination[X_AXIS] = resume_position[X_AXIS]; From df913461887fda93e87fa192ca693f81d2102fe5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 31 May 2017 11:30:01 -0500 Subject: [PATCH 02/31] Account for dual XYZ in pulse delay cycles estimate --- Marlin/stepper.cpp | 62 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 13 deletions(-) diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index 08612b490..11b51285e 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -528,33 +528,69 @@ void Stepper::isr() { _APPLY_STEP(AXIS)(_INVERT_STEP_PIN(AXIS),0); \ } + /** + * Estimate the number of cycles that the stepper logic already takes + * up between the start and stop of the X stepper pulse. + * + * Currently this uses very modest estimates of around 5 cycles. + * True values may be derived by careful testing. + * + * Once any delay is added, the cost of the delay code itself + * may be subtracted from this value to get a more accurate delay. + * Delays under 20 cycles (1.25µs) will be very accurate, using NOPs. + * Longer delays use a loop. The resolution is 8 cycles. + */ #if HAS_X_STEP - #define _COUNT_STEPPERS_1 1 + #define _CYCLE_APPROX_1 5 #else - #define _COUNT_STEPPERS_1 0 + #define _CYCLE_APPROX_1 0 + #endif + #if ENABLED(X_DUAL_STEPPER_DRIVERS) + #define _CYCLE_APPROX_2 _CYCLE_APPROX_1 + 4 + #else + #define _CYCLE_APPROX_2 _CYCLE_APPROX_1 #endif #if HAS_Y_STEP - #define _COUNT_STEPPERS_2 _COUNT_STEPPERS_1 + 1 + #define _CYCLE_APPROX_3 _CYCLE_APPROX_2 + 5 #else - #define _COUNT_STEPPERS_2 _COUNT_STEPPERS_1 + #define _CYCLE_APPROX_3 _CYCLE_APPROX_2 + #endif + #if ENABLED(Y_DUAL_STEPPER_DRIVERS) + #define _CYCLE_APPROX_4 _CYCLE_APPROX_3 + 4 + #else + #define _CYCLE_APPROX_4 _CYCLE_APPROX_3 #endif #if HAS_Z_STEP - #define _COUNT_STEPPERS_3 _COUNT_STEPPERS_2 + 1 + #define _CYCLE_APPROX_5 _CYCLE_APPROX_4 + 5 #else - #define _COUNT_STEPPERS_3 _COUNT_STEPPERS_2 + #define _CYCLE_APPROX_5 _CYCLE_APPROX_4 + #endif + #if ENABLED(Z_DUAL_STEPPER_DRIVERS) + #define _CYCLE_APPROX_6 _CYCLE_APPROX_5 + 4 + #else + #define _CYCLE_APPROX_6 _CYCLE_APPROX_5 #endif #if DISABLED(ADVANCE) && DISABLED(LIN_ADVANCE) - #define _COUNT_STEPPERS_4 _COUNT_STEPPERS_3 + 1 + #if ENABLED(MIXING_EXTRUDER) + #define _CYCLE_APPROX_7 _CYCLE_APPROX_6 + (MIXING_STEPPERS) * 6 + #else + #define _CYCLE_APPROX_7 _CYCLE_APPROX_6 + 5 + #endif #else - #define _COUNT_STEPPERS_4 _COUNT_STEPPERS_3 + #define _CYCLE_APPROX_7 _CYCLE_APPROX_6 #endif - #define CYCLES_EATEN_XYZE ((_COUNT_STEPPERS_4) * 5) + #define CYCLES_EATEN_XYZE _CYCLE_APPROX_7 #define EXTRA_CYCLES_XYZE (STEP_PULSE_CYCLES - (CYCLES_EATEN_XYZE)) - // If a minimum pulse time was specified get the timer 0 value - // which increments every 4µs on 16MHz and every 3.2µs on 20MHz. - // Two or 3 counts of TCNT0 should be a sufficient delay. + /** + * If a minimum pulse time was specified get the timer 0 value. + * + * TCNT0 has an 8x prescaler, so it increments every 8 cycles. + * That's every 0.5µs on 16MHz and every 0.4µs on 20MHz. + * 20 counts of TCNT0 -by itself- is a good pulse delay. + * 10µs = 160 or 200 cycles. + */ #if EXTRA_CYCLES_XYZE > 20 uint32_t pulse_start = TCNT0; #endif @@ -627,7 +663,7 @@ void Stepper::isr() { break; } - // For minimum pulse time wait before stopping pulses + // For minimum pulse time wait after stopping pulses also #if EXTRA_CYCLES_XYZE > 20 if (i) while (EXTRA_CYCLES_XYZE > (uint32_t)(TCNT0 - pulse_start) * (INT0_PRESCALER)) { /* nada */ } #elif EXTRA_CYCLES_XYZE > 0 From 8206bb9bb9566a4b5b343b7432f9ea5f9793dbca Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Wed, 31 May 2017 13:17:01 -0500 Subject: [PATCH 03/31] fix compile error invalid conversion from 'const char*' to 'char*' [-fpermissive] --- Marlin/gcode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/gcode.h b/Marlin/gcode.h index d7f76cbcd..3d66499ef 100644 --- a/Marlin/gcode.h +++ b/Marlin/gcode.h @@ -135,7 +135,7 @@ public: static bool seen(const char c) { const char *p = strchr(command_args, c); const bool b = !!p; - if (b) value_ptr = DECIMAL_SIGNED(p[1]) ? &p[1] : NULL; + if (b) value_ptr = (char*) (DECIMAL_SIGNED(p[1]) ? &p[1] : NULL); return b; } From 9657e7d3eeeb5461dca4525357e40d637c91d4d5 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Fri, 19 May 2017 15:21:43 -0500 Subject: [PATCH 04/31] copied file changes from PR #5685 ============================== Configuration_adv.h changes ============================== add "live" LCD update ============================== P & S version ============================== final (hopefully) tested version ============================== update M115 capabilities print ============================== Menu changes portion of the requested changes ============================== changed USEABLE_HARDWARE_PWM from a function to a series of macros ============================== changes per review --- Marlin/Configuration_adv.h | 20 ++-- Marlin/Marlin_main.cpp | 80 ++++++++++------ .../Cartesio/Configuration_adv.h | 20 ++-- .../Felix/Configuration_adv.h | 20 ++-- .../FolgerTech-i3-2020/Configuration_adv.h | 20 ++-- .../Hephestos/Configuration_adv.h | 20 ++-- .../Hephestos_2/Configuration_adv.h | 20 ++-- .../K8200/Configuration_adv.h | 20 ++-- .../K8400/Configuration_adv.h | 20 ++-- .../RigidBot/Configuration_adv.h | 20 ++-- .../SCARA/Configuration_adv.h | 20 ++-- .../TAZ4/Configuration_adv.h | 20 ++-- .../TinyBoy2/Configuration_adv.h | 20 ++-- .../WITBOX/Configuration_adv.h | 20 ++-- .../FLSUN/auto_calibrate/Configuration_adv.h | 20 ++-- .../FLSUN/kossel_mini/Configuration_adv.h | 20 ++-- .../delta/generic/Configuration_adv.h | 20 ++-- .../delta/kossel_mini/Configuration_adv.h | 20 ++-- .../delta/kossel_pro/Configuration_adv.h | 20 ++-- .../delta/kossel_xl/Configuration_adv.h | 20 ++-- .../gCreate_gMax1.5+/Configuration_adv.h | 20 ++-- .../makibox/Configuration_adv.h | 20 ++-- .../tvrrug/Round2/Configuration_adv.h | 20 ++-- .../wt150/Configuration_adv.h | 20 ++-- Marlin/fastio.h | 92 ++++++++++++++++++- Marlin/language_en.h | 4 +- Marlin/ultralcd.cpp | 36 ++++++-- Marlin/ultralcd.h | 2 +- 28 files changed, 473 insertions(+), 201 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index a23e90bc7..80bd3d2ad 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 3cd579741..2e468a29d 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -176,7 +176,7 @@ * M304 - Set bed PID parameters P I and D. (Requires PIDTEMPBED) * M350 - Set microstepping mode. (Requires digital microstepping pins.) * M351 - Toggle MS1 MS2 pins directly. (Requires digital microstepping pins.) - * M355 - Turn the Case Light on/off and set its brightness. (Requires CASE_LIGHT_PIN) + * M355 - Set Case Light on/off and set brightness. (Requires CASE_LIGHT_PIN) * M380 - Activate solenoid on active extruder. (Requires EXT_SOLENOID) * M381 - Disable all solenoids. (Requires EXT_SOLENOID) * M400 - Finish all moves. @@ -566,16 +566,6 @@ static uint8_t target_extruder; ; #endif -#if HAS_CASE_LIGHT - bool case_light_on = - #if ENABLED(CASE_LIGHT_DEFAULT_ON) - true - #else - false - #endif - ; -#endif - #if ENABLED(DELTA) float delta[ABC], @@ -720,7 +710,8 @@ static void report_current_position(); SERIAL_ECHOPAIR(", ", z); SERIAL_CHAR(')'); - suffix ? serialprintPGM(suffix) : SERIAL_EOL; + if (suffix) {serialprintPGM(suffix);} //won't compile for Teensy with the previous construction + else SERIAL_EOL; } void print_xyz(const char* prefix, const char* suffix, const float xyz[]) { @@ -5263,7 +5254,7 @@ void home_all_axes() { gcode_G28(true); } recalc_delta_settings(delta_radius, delta_diagonal_rod); } - else if(zero_std_dev >= test_precision) { // step one back + else if (zero_std_dev >= test_precision) { // step one back COPY(endstop_adj, e_old); delta_radius = dr_old; home_offset[Z_AXIS] = zh_old; @@ -7678,11 +7669,18 @@ inline void gcode_M115() { SERIAL_PROTOCOLLNPGM("Cap:SOFTWARE_POWER:0"); #endif - // TOGGLE_LIGHTS (M355) + // CASE LIGHTS (M355) #if HAS_CASE_LIGHT SERIAL_PROTOCOLLNPGM("Cap:TOGGLE_LIGHTS:1"); + bool USEABLE_HARDWARE_PWM(uint8_t pin); + if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) { + SERIAL_PROTOCOLLNPGM("Cap:CASE_LIGHT_BRIGHTNESS:1"); + } + else + SERIAL_PROTOCOLLNPGM("Cap:CASE_LIGHT_BRIGHTNESS:0"); #else SERIAL_PROTOCOLLNPGM("Cap:TOGGLE_LIGHTS:0"); + SERIAL_PROTOCOLLNPGM("Cap:CASE_LIGHT_BRIGHTNESS:0"); #endif // EMERGENCY_PARSER (M108, M112, M410) @@ -9472,30 +9470,54 @@ inline void gcode_M907() { #endif // HAS_MICROSTEPS #if HAS_CASE_LIGHT - - uint8_t case_light_brightness = 255; + #ifndef INVERT_CASE_LIGHT + #define INVERT_CASE_LIGHT false + #endif + int case_light_brightness; // LCD routine wants INT + bool case_light_on; void update_case_light() { - WRITE(CASE_LIGHT_PIN, case_light_on != INVERT_CASE_LIGHT ? HIGH : LOW); - analogWrite(CASE_LIGHT_PIN, case_light_on != INVERT_CASE_LIGHT ? case_light_brightness : 0); + pinMode(CASE_LIGHT_PIN, OUTPUT); // digitalWrite doesn't set the port mode + uint8_t case_light_bright = (uint8_t)case_light_brightness; + if (case_light_on) { + if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) { + analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness ); + } + else digitalWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? LOW : HIGH ); + } + else digitalWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? HIGH : LOW); } - #endif // HAS_CASE_LIGHT /** - * M355: Turn case lights on/off and set brightness + * M355: Turn case light on/off and set brightness * - * S Turn case light on or off - * P Set case light brightness (PWM pin required) + * P Set case light brightness (PWM pin required - ignored otherwise) + * + * S Set case light on/off + * + * When S turns on the light on a PWM pin then the current brightness level is used/restored + * + * M355 P200 S0 turns off the light & sets the brightness level + * M355 S1 turns on the light with a brightness of 200 (assuming a PWM pin) */ inline void gcode_M355() { #if HAS_CASE_LIGHT - if (parser.seen('P')) case_light_brightness = parser.value_byte(); - if (parser.seen('S')) case_light_on = parser.value_bool(); - update_case_light(); + uint8_t args = 0; + if (parser.seen('P')) ++args, case_light_brightness = parser.value_byte(); + if (parser.seen('S')) ++args, case_light_on = parser.value_bool(); + if (args) update_case_light(); + + // always report case light status SERIAL_ECHO_START; - SERIAL_ECHOPGM("Case lights "); - case_light_on ? SERIAL_ECHOLNPGM("on") : SERIAL_ECHOLNPGM("off"); + if (!case_light_on) { + SERIAL_ECHOLN("Case light: off"); + } + else { + if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLN("Case light: on"); + else SERIAL_ECHOLNPAIR("Case light: ", case_light_brightness); + } + #else SERIAL_ERROR_START; SERIAL_ERRORLNPGM(MSG_ERR_M355_NONE); @@ -10710,7 +10732,7 @@ void process_next_command() { #endif // HAS_MICROSTEPS - case 355: // M355 Turn case lights on/off + case 355: // M355 set case light brightness gcode_M355(); break; @@ -12459,6 +12481,8 @@ void setup() { #endif #if HAS_CASE_LIGHT + case_light_on = CASE_LIGHT_DEFAULT_ON; + case_light_brightness = CASE_LIGHT_DEFAULT_BRIGHTNESS; update_case_light(); #endif diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index caba55f7e..210f3de10 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 35 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 6b5718d51..851a2053e 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h index 013518b78..ee0ab8c06 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index bcef1672e..92b8e05ec 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index cb227fd8f..0a98f395f 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 692af7fab..f421c5ea4 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -233,13 +233,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/K8400/Configuration_adv.h index 7999653d2..e6e4a8c20 100644 --- a/Marlin/example_configurations/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/K8400/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 5f84cd820..793e595c0 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index fa1c96532..70bda56b4 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index 9a50d0971..271985f3a 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h index 0a498ac62..1d97f7677 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index bcef1672e..92b8e05ec 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h index e60b421a9..e601186a8 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h index 05aefb8ba..f80ca51e5 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index a37cc5572..65ab62be8 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index a37cc5572..65ab62be8 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 0e428fe65..a2716415a 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -225,13 +225,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index 99be30bf0..cf8f3ffbd 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h index c18723ee6..eded350af 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index f667868f1..98b84c6dd 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 3076378f9..aed84489b 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h index 1c0a28083..5612cd240 100644 --- a/Marlin/example_configurations/wt150/Configuration_adv.h +++ b/Marlin/example_configurations/wt150/Configuration_adv.h @@ -220,13 +220,19 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -#if PIN_EXISTS(CASE_LIGHT) - #define INVERT_CASE_LIGHT false // Set to true if HIGH is the OFF state (active low) - //#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu -#endif +// M355 Case Light command +// Set case light brightness/on/off + +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== diff --git a/Marlin/fastio.h b/Marlin/fastio.h index 402e1ba49..174e5f9cf 100644 --- a/Marlin/fastio.h +++ b/Marlin/fastio.h @@ -26,10 +26,11 @@ * Contributed by Triffid_Hunter. Modified by Kliment and the Marlin team. */ -#ifndef _FASTIO_ARDUINO_H +#ifndef _FASTIO_ARDUINO_H #define _FASTIO_ARDUINO_H #include +#include "macros.h" /** * Enable this option to use Teensy++ 2.0 assignments for AT90USB processors. @@ -238,4 +239,93 @@ typedef enum { #define SET_FOCB(T,V) SET_FOC(T,B,V) #define SET_FOCC(T,V) SET_FOC(T,C,V) + +/** + * PWM availability macros + */ +#define AVR_AT90USB1286_FAMILY (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1286P__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB646P__) || defined(__AVR_AT90USB647__)) +#define AVR_ATmega1284_FAMILY (defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__)) +#define AVR_ATmega2560_FAMILY (defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)) +#define AVR_ATmega2561_FAMILY (defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)) +#define AVR_ATmega328_FAMILY (defined(__AVR_ATmega168__) || defined(__AVR_ATmega328__) || defined(__AVR_ATmega328p__)) + +//find out which harware PWMs are already in use +#if PIN_EXISTS(CONTROLLER_FAN) + #define PWM_CHK_FAN_B(p) (p == CONTROLLER_FAN_PIN || p == E0_AUTO_FAN_PIN || p == E1_AUTO_FAN_PIN || p == E2_AUTO_FAN_PIN || p == E3_AUTO_FAN_PIN || p == E4_AUTO_FAN_PIN) +#else + #define PWM_CHK_FAN_B(p) (p == E0_AUTO_FAN_PIN || p == E1_AUTO_FAN_PIN || p == E2_AUTO_FAN_PIN || p == E3_AUTO_FAN_PIN || p == E4_AUTO_FAN_PIN) +#endif + +#if PIN_EXISTS(FAN) || PIN_EXISTS(FAN1) || PIN_EXISTS(FAN2) + #if PIN_EXISTS(FAN2) + #define PWM_CHK_FAN_A(p) (p == FAN_PIN || p == FAN1_PIN || p == FAN2_PIN) + #elif PIN_EXISTS(FAN1) + #define PWM_CHK_FAN_A(p) (p == FAN_PIN || p == FAN1_PIN) + #else + #define PWM_CHK_FAN_A(p) p == FAN_PIN + #endif +#else + #define PWM_CHK_FAN_A(p) false +#endif + +#if HAS_MOTOR_CURRENT_PWM + #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY) + #define PWM_CHK_MOTOR_CURRENT(p) (p == MOTOR_CURRENT_PWM_E || p == MOTOR_CURRENT_PWM_Z || p == MOTOR_CURRENT_PWM_XY) + #elif PIN_EXISTS(MOTOR_CURRENT_PWM_Z) + #define PWM_CHK_MOTOR_CURRENT(p) (p == MOTOR_CURRENT_PWM_E || p == MOTOR_CURRENT_PWM_Z) + #else + #define PWM_CHK_MOTOR_CURRENT(p) (p == MOTOR_CURRENT_PWM_E) + #endif +#else + #define PWM_CHK_MOTOR_CURRENT(p) false +#endif + +#if defined(NUM_SERVOS) + #if AVR_ATmega2560_FAMILY + #define PWM_CHK_SERVO(p) ( p == 5 || NUM_SERVOS > 12 && p == 6 || NUM_SERVOS > 24 && p == 46) //PWMS 3A, 4A & 5A + #elif AVR_ATmega2561_FAMILY + #define PWM_CHK_SERVO(p) p == 5 //PWM3A + #elif AVR_ATmega1284_FAMILY + #define PWM_CHK_SERVO(p) false + #elif AVR_AT90USB1286_FAMILY + #define PWM_CHK_SERVO(p) p == 16 //PWM3A + #elif AVR_ATmega328_FAMILY + #define PWM_CHK_SERVO(p) false + #endif +#else + #define PWM_CHK_SERVO(p) false +#endif + +#if ENABLED(BARICUDA) + #if HAS_HEATER_1 && HAS_HEATER_2 + #define PWM_CHK_HEATER(p) (p == HEATER_1_PIN || p == HEATER_2_PIN) + #elif HAS_HEATER_1 + #define PWM_CHK_HEATER(p) (p == HEATER_1_PIN) + #endif +#else + #define PWM_CHK_HEATER(p) false +#endif + +#define PWM_CHK(p) (PWM_CHK_HEATER(p) || PWM_CHK_SERVO(p) || PWM_CHK_MOTOR_CURRENT(p)\ + || PWM_CHK_FAN_A(p) || PWM_CHK_FAN_B(p)) + +// define which hardware PWMs are available for the current CPU +// all timer 1 PWMS deleted from this list because they are never available +#if AVR_ATmega2560_FAMILY + #define PWM_PINS(p) ((p >= 2 && p <= 10 ) || p == 13 || p == 44 || p == 45 || p == 46 ) +#elif AVR_ATmega2561_FAMILY + #define PWM_PINS(p) ((p >= 2 && p <= 6 ) || p == 9) +#elif AVR_ATmega1284_FAMILY + #define PWM_PINS(p) (p == 3 || p == 4 || p == 14 || p == 15) +#elif AVR_AT90USB1286_FAMILY + #define PWM_PINS(p) (p == 0 || p == 1 || p == 14 || p == 15 || p == 16 || p == 24) +#elif AVR_ATmega328_FAMILY + #define PWM_PINS(p) (p == 3 || p == 5 || p == 6 || p == 11) +#else + #error "unknown CPU" +#endif + +// finally - the macro that tells us if a pin is an available hardware PWM +#define USEABLE_HARDWARE_PWM(p) (PWM_PINS(p) && !PWM_CHK(p)) + #endif // _FASTIO_ARDUINO_H diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 3190a12a5..4e7256535 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -706,7 +706,9 @@ #ifndef MSG_CASE_LIGHT #define MSG_CASE_LIGHT _UxGT("Case light") #endif - +#ifndef MSG_CASE_LIGHT_BRIGHTNESS + #define MSG_CASE_LIGHT_BRIGHTNESS _UxGT("Light BRIGHTNESS") +#endif #if LCD_WIDTH >= 20 #ifndef MSG_INFO_PRINT_COUNT #define MSG_INFO_PRINT_COUNT _UxGT("Print Count") diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 7ce08055c..990e4f4c5 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -60,6 +60,7 @@ int lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2 uint8_t lcd_status_message_level; char lcd_status_message[3 * (LCD_WIDTH) + 1] = WELCOME_MSG; // worst case is kana with up to 3*LCD_WIDTH+1 + #if ENABLED(STATUS_MESSAGE_SCROLLING) uint8_t status_scroll_pos = 0; #endif @@ -726,6 +727,24 @@ void kill_screen(const char* lcd_msg) { #endif // SDSUPPORT + #if ENABLED(MENU_ITEM_CASE_LIGHT) + + extern int case_light_brightness; + extern bool case_light_on; + extern void update_case_light(); + + void case_light_menu() { + START_MENU(); + // + // ^ Main + // + MENU_BACK(MSG_MAIN); + MENU_ITEM_EDIT_CALLBACK(int3, MSG_CASE_LIGHT_BRIGHTNESS, &case_light_brightness, 0, 255, update_case_light, true); + MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, (bool*)&case_light_on, update_case_light); + END_MENU(); + } + #endif // MENU_ITEM_CASE_LIGHT + #if ENABLED(BLTOUCH) /** @@ -847,11 +866,6 @@ void kill_screen(const char* lcd_msg) { * */ - #if ENABLED(MENU_ITEM_CASE_LIGHT) - extern bool case_light_on; - extern void update_case_light(); - #endif - void lcd_main_menu() { START_MENU(); MENU_BACK(MSG_WATCH); @@ -868,10 +882,14 @@ void kill_screen(const char* lcd_msg) { #endif // - // Switch case light on/off + // Set Case light on/off/brightness // #if ENABLED(MENU_ITEM_CASE_LIGHT) - MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, &case_light_on, update_case_light); + if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) { + MENU_ITEM(submenu, MSG_CASE_LIGHT, case_light_menu); + } + else + MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, (bool*)&case_light_on, update_case_light); #endif if (planner.movesplanned() || IS_SD_PRINTING) { @@ -1847,7 +1865,7 @@ void kill_screen(const char* lcd_msg) { */ void _lcd_ubl_validate_custom_mesh() { char UBL_LCD_GCODE[24]; - const int temp = + const int temp = #if WATCH_THE_BED custom_bed_temp #else @@ -2598,7 +2616,7 @@ void kill_screen(const char* lcd_msg) { MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu); #if HAS_LCD_CONTRAST - MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, &lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true); + MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, (int) &lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true); #endif #if ENABLED(FWRETRACT) MENU_ITEM(submenu, MSG_RETRACT, lcd_control_retract_menu); diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h index a6226652e..bda80cd48 100644 --- a/Marlin/ultralcd.h +++ b/Marlin/ultralcd.h @@ -59,7 +59,7 @@ #if ENABLED(DOGLCD) extern uint16_t lcd_contrast; - void set_lcd_contrast(uint16_t value); + void set_lcd_contrast(const uint16_t value); #elif ENABLED(SHOW_BOOTSCREEN) void bootscreen(); #endif From 1b41e1f6456c73e05390a87445001bbc04a60517 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Wed, 31 May 2017 13:59:49 -0500 Subject: [PATCH 05/31] another compile error only seen if #if ENABLED(TEMPERATURE_UNITS_SUPPORT) ... #if ENABLED(ULTIPANEL) && DISABLED(DISABLE_M503) --- Marlin/gcode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/gcode.h b/Marlin/gcode.h index 3d66499ef..007bc6dcc 100644 --- a/Marlin/gcode.h +++ b/Marlin/gcode.h @@ -227,7 +227,7 @@ public: return input_temp_units == TEMPUNIT_K ? 'K' : input_temp_units == TEMPUNIT_F ? 'F' : 'C'; } FORCE_INLINE static char* temp_units_name() { - return input_temp_units == TEMPUNIT_K ? PSTR("Kelvin") : input_temp_units == TEMPUNIT_F ? PSTR("Fahrenheit") : PSTR("Celsius") + return input_temp_units == TEMPUNIT_K ? PSTR("Kelvin") : input_temp_units == TEMPUNIT_F ? PSTR("Fahrenheit") : PSTR("Celsius"); } inline static float to_temp_units(const float &f) { switch (input_temp_units) { From a5fa586642253ea4c8ae20bb0703d3df3266df06 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 31 May 2017 21:18:16 -0500 Subject: [PATCH 06/31] Preferred patch to gcode.h --- Marlin/gcode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/gcode.h b/Marlin/gcode.h index 007bc6dcc..ec5b229bd 100644 --- a/Marlin/gcode.h +++ b/Marlin/gcode.h @@ -135,7 +135,7 @@ public: static bool seen(const char c) { const char *p = strchr(command_args, c); const bool b = !!p; - if (b) value_ptr = (char*) (DECIMAL_SIGNED(p[1]) ? &p[1] : NULL); + if (b) value_ptr = DECIMAL_SIGNED(p[1]) ? &p[1] : (char*)NULL; return b; } From c74d4dede6f30afd8f3941d5d2979b183d05d149 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 31 May 2017 21:44:05 -0500 Subject: [PATCH 07/31] Prevent illegal leveling combinations Addressing issue #6901 --- Marlin/Conditionals_post.h | 5 +++++ Marlin/SanityCheck.h | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index b0c281f1f..040885fc2 100644 --- a/Marlin/Conditionals_post.h +++ b/Marlin/Conditionals_post.h @@ -847,4 +847,9 @@ // Add commands that need sub-codes to this list #define USE_GCODE_SUBCODES ENABLED(G38_PROBE_TARGET) + // MESH_BED_LEVELING overrides PROBE_MANUALLY + #if ENABLED(MESH_BED_LEVELING) + #undef PROBE_MANUALLY + #endif + #endif // CONDITIONALS_POST_H diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index f631e0d06..db36517bb 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -319,11 +319,11 @@ * Advanced Pause */ #if ENABLED(ADVANCED_PAUSE_FEATURE) - #if DISABLED(ULTIPANEL) + #if DISABLED(NEWPANEL) #error "ADVANCED_PAUSE_FEATURE currently requires an LCD controller." #elif ENABLED(EXTRUDER_RUNOUT_PREVENT) #error "EXTRUDER_RUNOUT_PREVENT is incompatible with ADVANCED_PAUSE_FEATURE." - #elif ENABLED(PARK_HEAD_ON_PAUSE) && DISABLED(SDSUPPORT) && DISABLED(ULTIPANEL) && DISABLED(EMERGENCY_PARSER) + #elif ENABLED(PARK_HEAD_ON_PAUSE) && DISABLED(SDSUPPORT) && DISABLED(NEWPANEL) && DISABLED(EMERGENCY_PARSER) #error "PARK_HEAD_ON_PAUSE requires SDSUPPORT, EMERGENCY_PARSER, or an LCD controller." #endif #endif @@ -598,8 +598,12 @@ static_assert(1 >= 0 /** * LCD_BED_LEVELING requirements */ -#if ENABLED(LCD_BED_LEVELING) && DISABLED(MESH_BED_LEVELING) && !(HAS_ABL && ENABLED(PROBE_MANUALLY)) - #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or PROBE_MANUALLY." +#if ENABLED(LCD_BED_LEVELING) + #if DISABLED(ULTIPANEL) + #error "LCD_BED_LEVELING requires an LCD controller." + #elif DISABLED(MESH_BED_LEVELING) && !(HAS_ABL && ENABLED(PROBE_MANUALLY)) + #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or PROBE_MANUALLY." + #endif #endif /** From 8d69394ae15c793f5b4dad693f4f5ed614edd7ee Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 31 May 2017 22:08:13 -0500 Subject: [PATCH 08/31] Fix LCD printing of progmem strings --- Marlin/ultralcd_impl_DOGM.h | 14 ++++++-------- Marlin/ultralcd_impl_HD44780.h | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index c7c5eb309..57165c33f 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -239,19 +239,17 @@ char lcd_print_and_count(const char c) { * On DOGM all strings go through a filter for utf * But only use lcd_print_utf and lcd_printPGM_utf for translated text */ -void lcd_print(const char* const str) { for (uint8_t i = 0; char c = str[i]; ++i) lcd_print(c); } -void lcd_printPGM(const char* str) { for (; char c = pgm_read_byte(str); ++str) lcd_print(c); } +void lcd_print(const char *str) { while (*str) lcd_print(*str++); } +void lcd_printPGM(const char *str) { while (const char c = pgm_read_byte(str)) lcd_print(c), ++str; } -void lcd_print_utf(const char* const str, const uint8_t maxLength=LCD_WIDTH) { +void lcd_print_utf(const char *str, uint8_t n=LCD_WIDTH) { char c; - for (uint8_t i = 0, n = maxLength; n && (c = str[i]); ++i) - n -= charset_mapper(c); + while (n && (c = *str)) n -= charset_mapper(c), ++str; } -void lcd_printPGM_utf(const char* str, const uint8_t maxLength=LCD_WIDTH) { +void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) { char c; - for (uint8_t i = 0, n = maxLength; n && (c = str[i]); ++i) - n -= charset_mapper(c); + while (n && (c = pgm_read_byte(str))) n -= charset_mapper(c), ++str; } // Initialize or re-initialize the LCD diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h index 909271d77..2dc93ef53 100644 --- a/Marlin/ultralcd_impl_HD44780.h +++ b/Marlin/ultralcd_impl_HD44780.h @@ -382,19 +382,17 @@ void lcd_implementation_clear() { lcd.clear(); } void lcd_print(const char c) { charset_mapper(c); } -void lcd_print(const char * const str) { for (uint8_t i = 0; char c = str[i]; ++i) lcd.print(c); } -void lcd_printPGM(const char* str) { for (; char c = pgm_read_byte(str); ++str) lcd.print(c); } +void lcd_print(const char *str) { while (*str) lcd.print(*str++); } +void lcd_printPGM(const char *str) { while (const char c = pgm_read_byte(str)) lcd.print(c), ++str; } -void lcd_print_utf(const char * const str, const uint8_t maxLength=LCD_WIDTH) { +void lcd_print_utf(const char *str, uint8_t n=LCD_WIDTH) { char c; - for (uint8_t i = 0, n = maxLength; n && (c = str[i]); ++i) - n -= charset_mapper(c); + while (n && (c = *str)) n -= charset_mapper(c), ++str; } -void lcd_printPGM_utf(const char* str, const uint8_t maxLength=LCD_WIDTH) { +void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) { char c; - for (uint8_t i = 0, n = maxLength; n && (c = str[i]); ++i) - n -= charset_mapper(c); + while (n && (c = pgm_read_byte(str))) n -= charset_mapper(c), ++str; } #if ENABLED(SHOW_BOOTSCREEN) From 4a96433b7ef3029d4a931fd15db09dafba070170 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 31 May 2017 23:25:08 -0500 Subject: [PATCH 09/31] Simplify counting of printable characters --- Marlin/macros.h | 1 - Marlin/ultralcd.cpp | 18 +++--------------- Marlin/utf_mapper.h | 9 +++++++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Marlin/macros.h b/Marlin/macros.h index c37416b47..0fb057441 100644 --- a/Marlin/macros.h +++ b/Marlin/macros.h @@ -127,7 +127,6 @@ #define DECIMAL(a) (NUMERIC(a) || a == '.') #define NUMERIC_SIGNED(a) (NUMERIC(a) || (a) == '-' || (a) == '+') #define DECIMAL_SIGNED(a) (DECIMAL(a) || (a) == '-' || (a) == '+') -#define PRINTABLE(C) (((C) & 0xC0u) != 0x80u) #define COUNT(a) (sizeof(a)/sizeof(*a)) #define ZERO(a) memset(a,0,sizeof(a)) #define COPY(a,b) memcpy(a,b,min(sizeof(a),sizeof(b))) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 990e4f4c5..8d97a8f43 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -3885,11 +3885,7 @@ void lcd_init() { int lcd_strlen(const char* s) { int i = 0, j = 0; while (s[i]) { - #if ENABLED(MAPPER_NON) - j++; - #else - if (PRINTABLE(s[i])) j++; - #endif + if (PRINTABLE(s[i])) j++; i++; } return j; @@ -3898,11 +3894,7 @@ int lcd_strlen(const char* s) { int lcd_strlen_P(const char* s) { int j = 0; while (pgm_read_byte(s)) { - #if ENABLED(MAPPER_NON) - j++; - #else - if (PRINTABLE(pgm_read_byte(s))) j++; - #endif + if (PRINTABLE(pgm_read_byte(s))) j++; s++; } return j; @@ -4167,11 +4159,7 @@ void lcd_update() { void set_utf_strlen(char* s, uint8_t n) { uint8_t i = 0, j = 0; while (s[i] && (j < n)) { - #if ENABLED(MAPPER_NON) - j++; - #else - if (PRINTABLE(s[i])) j++; - #endif + if (PRINTABLE(s[i])) j++; i++; } while (j++ < n) s[i++] = ' '; diff --git a/Marlin/utf_mapper.h b/Marlin/utf_mapper.h index 4b7975a10..edf2a6ca1 100644 --- a/Marlin/utf_mapper.h +++ b/Marlin/utf_mapper.h @@ -23,7 +23,7 @@ #ifndef UTF_MAPPER_H #define UTF_MAPPER_H -#include "language.h" +#include "language.h" #if ENABLED(DOGLCD) #define HARDWARE_CHAR_OUT u8g.print @@ -144,6 +144,8 @@ #endif // DISPLAY_CHARSET_HD44780 #endif // SIMULATE_ROMFONT +#define PRINTABLE(C) (((C) & 0xC0u) != 0x80u) + #if ENABLED(MAPPER_C2C3) char charset_mapper(const char c) { @@ -466,8 +468,11 @@ #define MAPPER_NON + #undef PRINTABLE + #define PRINTABLE(C) true + char charset_mapper(const char c) { - HARDWARE_CHAR_OUT( c ); + HARDWARE_CHAR_OUT(c); return 1; } From 4296a8b74e650c9c5abf6fd5dbc96a05edcd8c77 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 31 May 2017 23:09:44 -0500 Subject: [PATCH 10/31] For status scrolling, pad a short message --- Marlin/ultralcd.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 8d97a8f43..dc98d6570 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -4154,24 +4154,28 @@ void lcd_update() { } // ELAPSED(ms, next_lcd_update_ms) } -#if DISABLED(STATUS_MESSAGE_SCROLLING) - - void set_utf_strlen(char* s, uint8_t n) { - uint8_t i = 0, j = 0; - while (s[i] && (j < n)) { - if (PRINTABLE(s[i])) j++; - i++; - } - while (j++ < n) s[i++] = ' '; - s[i] = '\0'; +void pad_message_string() { + uint8_t i = 0, j = 0; + char c; + while ((c = lcd_status_message[i]) && j < LCD_WIDTH) { + if (PRINTABLE(c)) j++; + i++; } - -#endif // !STATUS_MESSAGE_SCROLLING + if (true + #if ENABLED(STATUS_MESSAGE_SCROLLING) + && j < LCD_WIDTH + #endif + ) { + // pad with spaces to fill up the line + while (j++ < LCD_WIDTH) lcd_status_message[i++] = ' '; + // chop off at the edge + lcd_status_message[i] = '\0'; + } +} void lcd_finishstatus(bool persist=false) { - #if DISABLED(STATUS_MESSAGE_SCROLLING) - set_utf_strlen(lcd_status_message, LCD_WIDTH); - #endif + + pad_message_string(); #if !(ENABLED(LCD_PROGRESS_BAR) && (PROGRESS_MSG_EXPIRE > 0)) UNUSED(persist); From 445865ea0301cc1fea28828a56c58d0c344ef374 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 31 May 2017 23:36:39 -0500 Subject: [PATCH 11/31] REPRAPWORLD_KEYPAD is NEWPANEL but not ULTIPANEL --- Marlin/Conditionals_LCD.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index 5ea664bb8..2ec73eb7c 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -101,12 +101,15 @@ #if ENABLED(ULTIMAKERCONTROLLER) \ || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \ || ENABLED(G3D_PANEL) \ - || ENABLED(RIGIDBOT_PANEL) \ - || ENABLED(REPRAPWORLD_KEYPAD) + || ENABLED(RIGIDBOT_PANEL) #define ULTIPANEL #define NEWPANEL #endif + #if ENABLED(REPRAPWORLD_KEYPAD) + #define NEWPANEL + #endif + #if ENABLED(RA_CONTROL_PANEL) #define LCD_I2C_TYPE_PCA8574 #define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander From a32f7b329ce1c9e78540017885bb94f005402d15 Mon Sep 17 00:00:00 2001 From: Thomas Moore Date: Wed, 31 May 2017 21:26:05 +0000 Subject: [PATCH 12/31] Fix heater status display for advanced pause --- Marlin/Marlin_main.cpp | 3 ++- Marlin/ultralcd_impl_DOGM.h | 4 +++- Marlin/ultralcd_impl_HD44780.h | 5 +---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 2e468a29d..de039330c 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5931,7 +5931,8 @@ inline void gcode_M17() { idle(); wait_for_heatup = false; HOTEND_LOOP() { - if (abs(thermalManager.degHotend(e) - thermalManager.degTargetHotend(e)) > 3) { + const int16_t target_temp = thermalManager.degTargetHotend(e); + if (target_temp && abs(thermalManager.degHotend(e) - target_temp) > 3) { wait_for_heatup = true; break; } diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index 57165c33f..fcda9be68 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -704,7 +704,9 @@ static void lcd_implementation_status_screen() { lcd_print(' '); lcd_print(itostr3(thermalManager.degHotend(active_extruder))); lcd_print('/'); - lcd_print(itostr3(thermalManager.degTargetHotend(active_extruder))); + + if (lcd_blink() || !thermalManager.is_heater_idle(active_extruder)) + lcd_print(itostr3(thermalManager.degTargetHotend(active_extruder))); } #endif // ADVANCED_PAUSE_FEATURE diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h index 2dc93ef53..776ad0aee 100644 --- a/Marlin/ultralcd_impl_HD44780.h +++ b/Marlin/ultralcd_impl_HD44780.h @@ -844,10 +844,7 @@ static void lcd_implementation_status_screen() { static void lcd_implementation_hotend_status(const uint8_t row) { if (row < LCD_HEIGHT) { lcd.setCursor(LCD_WIDTH - 9, row); - lcd.print(LCD_STR_THERMOMETER[0]); - lcd.print(itostr3(thermalManager.degHotend(active_extruder))); - lcd.print('/'); - lcd.print(itostr3(thermalManager.degTargetHotend(active_extruder))); + _draw_heater_status(active_extruder, LCD_STR_THERMOMETER[0], lcd_blink()); } } From 9a9bbfc57ccededd789f173d2a551ac5e4edd686 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Thu, 1 Jun 2017 12:33:24 -0500 Subject: [PATCH 13/31] Fix case light logic on Azteeg_X3 boards. --- Marlin/pins_AZTEEG_X3.h | 12 +++++------- Marlin/pins_AZTEEG_X3_PRO.h | 18 ++++++++---------- Marlin/pins_RAMPS.h | 3 +-- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Marlin/pins_AZTEEG_X3.h b/Marlin/pins_AZTEEG_X3.h index 430a9fa42..7756a56e4 100644 --- a/Marlin/pins_AZTEEG_X3.h +++ b/Marlin/pins_AZTEEG_X3.h @@ -32,11 +32,10 @@ #error "Azteeg X3 supports up to 2 hotends / E-steppers. Comment out this line to continue." #endif -#define BOARD_NAME "Azteeg X3" - -#if !PIN_EXISTS(CASE_LIGHT) // doesn't already exist so OK to change the definition coming - #define OK_TO_CHANGE_CASE_LIGHT // in from from the include file +#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) + #define CASE_LIGHT_PIN 6 // must define it here or else RAMPS will define it #endif +#define BOARD_NAME "Azteeg X3" #include "pins_RAMPS_13.h" @@ -75,10 +74,8 @@ // // Misc // -#if ENABLED(OK_TO_CHANGE_CASE_LIGHT) && STAT_LED_RED_PIN == 6 +#if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && PIN_EXISTS(STAT_LED_RED) && STAT_LED_RED_PIN == CASE_LIGHT_PIN #undef STAT_LED_RED_PIN - #undef CASE_LIGHT_PIN - #define CASE_LIGHT_PIN 6 // open collector FET driver #endif // @@ -94,6 +91,7 @@ #if SERVO0_PIN == 7 #undef SERVO0_PIN #def SERVO0_PIN 11 + #endif #define SPINDLE_LASER_PWM_PIN 7 // MUST BE HARDWARE PWM #define SPINDLE_LASER_ENABLE_PIN 20 // Pin should have a pullup! #define SPINDLE_DIR_PIN 21 diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h index 65a060b34..a267cb6cc 100644 --- a/Marlin/pins_AZTEEG_X3_PRO.h +++ b/Marlin/pins_AZTEEG_X3_PRO.h @@ -28,12 +28,13 @@ #error "Azteeg X3 Pro supports up to 5 hotends / E-steppers. Comment out this line to continue." #endif -#define BOARD_NAME "Azteeg X3 Pro" - -#if !PIN_EXISTS(CASE_LIGHT) // doesn't already exist so OK to change the definition coming - #define OK_TO_CHANGE_CASE_LIGHT // in from from the include file +#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) + #define CASE_LIGHT_PIN 44 // must define it here or else RAMPS will define it #endif + +#define BOARD_NAME "Azteeg X3 Pro" + #include "pins_RAMPS.h" #ifndef __AVR_ATmega2560__ @@ -144,19 +145,16 @@ // // Misc. Functions // -#if ENABLED(OK_TO_CHANGE_CASE_LIGHT) +#if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && defined(DOGLCD_A0) && DOGLCD_A0 == CASE_LIGHT_PIN #undef DOGLCD_A0 // steal pin 44 for the case light; if you have a Viki2 and have connected it #define DOGLCD_A0 57 // following the Panucatt wiring diagram, you may need to tweak these pin assignments - // as the wiring diagram uses pin 44 for DOGLCD_A0 - - #undef CASE_LIGHT_PIN - #define CASE_LIGHT_PIN 44 // must have a hardware PWM + // as the wiring diagram uses pin 44 for DOGLCD_A0 #endif // // M3/M4/M5 - Spindle/Laser Control // -#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3 board +#undef SPINDLE_LASER_PWM_PIN // Definitions in pins_RAMPS.h are no good with the AzteegX3pro board #undef SPINDLE_LASER_ENABLE_PIN #undef SPINDLE_DIR_PIN diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index d1502e7d9..629be3b91 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -204,8 +204,7 @@ #define PS_ON_PIN 12 -#if !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN) - #undef CASE_LIGHT_PIN +#if ENABLED(CASE_LIGHT_ENABLE) && !PIN_EXISTS(CASE_LIGHT) && !defined(SPINDLE_LASER_ENABLE_PIN) #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first #define CASE_LIGHT_PIN 6 // MUST BE HARDWARE PWM #elif !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) \ From 1919cb0d1e91e7c245d3af8c2183e465461971c7 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 1 Jun 2017 19:17:52 -0500 Subject: [PATCH 14/31] Config cleanups --- Marlin/Configuration.h | 3 ++- Marlin/Configuration_adv.h | 6 +++--- Marlin/example_configurations/Cartesio/Configuration.h | 2 +- Marlin/example_configurations/Cartesio/Configuration_adv.h | 6 +++--- Marlin/example_configurations/Felix/Configuration.h | 2 +- Marlin/example_configurations/Felix/Configuration_adv.h | 6 +++--- Marlin/example_configurations/Felix/DUAL/Configuration.h | 2 +- .../FolgerTech-i3-2020/Configuration.h | 2 +- .../FolgerTech-i3-2020/Configuration_adv.h | 6 +++--- Marlin/example_configurations/Hephestos/Configuration.h | 2 +- Marlin/example_configurations/Hephestos/Configuration_adv.h | 6 +++--- Marlin/example_configurations/Hephestos_2/Configuration.h | 2 +- .../example_configurations/Hephestos_2/Configuration_adv.h | 6 +++--- Marlin/example_configurations/K8200/Configuration.h | 3 ++- Marlin/example_configurations/K8200/Configuration_adv.h | 6 +++--- Marlin/example_configurations/K8400/Configuration.h | 3 ++- Marlin/example_configurations/K8400/Configuration_adv.h | 6 +++--- .../example_configurations/K8400/Dual-head/Configuration.h | 3 ++- .../RepRapWorld/Megatronics/Configuration.h | 3 ++- Marlin/example_configurations/RigidBot/Configuration.h | 2 +- Marlin/example_configurations/RigidBot/Configuration_adv.h | 6 +++--- Marlin/example_configurations/SCARA/Configuration.h | 2 +- Marlin/example_configurations/SCARA/Configuration_adv.h | 6 +++--- Marlin/example_configurations/TAZ4/Configuration.h | 2 +- Marlin/example_configurations/TAZ4/Configuration_adv.h | 6 +++--- Marlin/example_configurations/TinyBoy2/Configuration.h | 3 ++- Marlin/example_configurations/TinyBoy2/Configuration_adv.h | 6 +++--- Marlin/example_configurations/WITBOX/Configuration.h | 2 +- Marlin/example_configurations/WITBOX/Configuration_adv.h | 6 +++--- .../example_configurations/adafruit/ST7565/Configuration.h | 3 ++- .../delta/FLSUN/auto_calibrate/Configuration.h | 3 ++- .../delta/FLSUN/auto_calibrate/Configuration_adv.h | 6 +++--- .../delta/FLSUN/kossel_mini/Configuration.h | 3 ++- .../delta/FLSUN/kossel_mini/Configuration_adv.h | 6 +++--- Marlin/example_configurations/delta/generic/Configuration.h | 3 ++- .../delta/generic/Configuration_adv.h | 6 +++--- .../delta/kossel_mini/Configuration.h | 3 ++- .../delta/kossel_mini/Configuration_adv.h | 6 +++--- .../example_configurations/delta/kossel_pro/Configuration.h | 2 +- .../delta/kossel_pro/Configuration_adv.h | 6 +++--- .../example_configurations/delta/kossel_xl/Configuration.h | 2 +- .../delta/kossel_xl/Configuration_adv.h | 6 +++--- .../example_configurations/gCreate_gMax1.5+/Configuration.h | 2 +- .../gCreate_gMax1.5+/Configuration_adv.h | 6 +++--- Marlin/example_configurations/makibox/Configuration.h | 3 ++- Marlin/example_configurations/makibox/Configuration_adv.h | 6 +++--- Marlin/example_configurations/tvrrug/Round2/Configuration.h | 2 +- .../tvrrug/Round2/Configuration_adv.h | 6 +++--- Marlin/example_configurations/wt150/Configuration.h | 3 ++- Marlin/example_configurations/wt150/Configuration_adv.h | 6 +++--- 50 files changed, 109 insertions(+), 96 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 9e7e98614..8b4735df1 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -312,6 +312,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker #define DEFAULT_Kp 22.2 #define DEFAULT_Ki 1.08 @@ -1154,7 +1155,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 80bd3d2ad..97d2d95f9 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h index 61cfd8379..b3b487ed4 100644 --- a/Marlin/example_configurations/Cartesio/Configuration.h +++ b/Marlin/example_configurations/Cartesio/Configuration.h @@ -1152,7 +1152,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index 210f3de10..4eec94c07 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 35 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index a6818fffb..95ee044ec 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -1136,7 +1136,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 851a2053e..f3b44a466 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index 3ae6ef145..86e386e15 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -1136,7 +1136,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h index 85bf48ea5..46c766001 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h @@ -1158,7 +1158,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h index ee0ab8c06..662d679a8 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 1627a7380..affcb9c27 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -1144,7 +1144,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index 92b8e05ec..c4843b6ec 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 832a06e9b..cd0bae630 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -1147,7 +1147,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index 0a98f395f..385adadb9 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 953582821..6f5ce58ac 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -332,6 +332,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker //#define DEFAULT_Kp 22.2 //#define DEFAULT_Ki 1.08 @@ -1185,7 +1186,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index f421c5ea4..482d89a98 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -233,9 +233,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h index 1835a8a83..5cc90ad08 100644 --- a/Marlin/example_configurations/K8400/Configuration.h +++ b/Marlin/example_configurations/K8400/Configuration.h @@ -312,6 +312,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker //#define DEFAULT_Kp 22.2 //#define DEFAULT_Ki 1.08 @@ -1153,7 +1154,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/K8400/Configuration_adv.h index e6e4a8c20..e3c6ccf26 100644 --- a/Marlin/example_configurations/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/K8400/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index b359a5e1c..8c22763f7 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -312,6 +312,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker //#define DEFAULT_Kp 22.2 //#define DEFAULT_Ki 1.08 @@ -1153,7 +1154,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index cf42a25d5..b887f6bce 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -312,6 +312,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker #define DEFAULT_Kp 22.2 #define DEFAULT_Ki 1.08 @@ -1153,7 +1154,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 22c8ac621..92276ee9e 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -1152,7 +1152,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 793e595c0..570538c59 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 5fda591bb..45a9c37b3 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -1169,7 +1169,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 70bda56b4..718a4b90b 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 528c54e34..a22b6987a 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -1173,7 +1173,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index 271985f3a..a833712b0 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/TinyBoy2/Configuration.h b/Marlin/example_configurations/TinyBoy2/Configuration.h index b10d7b114..ace689cef 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration.h @@ -339,6 +339,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker //#define DEFAULT_Kp 22.2 //#define DEFAULT_Ki 1.08 @@ -1209,7 +1210,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h index 1d97f7677..3de9a920c 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 7df93fc10..15432ef96 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -1144,7 +1144,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index 92b8e05ec..c4843b6ec 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index e67befb2e..8e6735ecd 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -312,6 +312,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker #define DEFAULT_Kp 22.2 #define DEFAULT_Ki 1.08 @@ -1153,7 +1154,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h index ddfb6bab8..f52882ee8 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h @@ -312,6 +312,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker //#define DEFAULT_Kp 22.2 //#define DEFAULT_Ki 1.08 @@ -1271,7 +1272,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h index e601186a8..1d798fb94 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h index 564d4913b..43cad5d57 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h @@ -312,6 +312,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker //#define DEFAULT_Kp 22.2 //#define DEFAULT_Ki 1.08 @@ -1273,7 +1274,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h index f80ca51e5..5363cb3f6 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 48290d5e3..d6e183dc9 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -312,6 +312,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker #define DEFAULT_Kp 22.2 #define DEFAULT_Ki 1.08 @@ -1262,7 +1263,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 65ab62be8..53a86374b 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index d27e47c85..71ce72e19 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -312,6 +312,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker #define DEFAULT_Kp 22.2 #define DEFAULT_Ki 1.08 @@ -1265,7 +1266,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 65ab62be8..53a86374b 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 4e2bea190..9bed47b50 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -1271,7 +1271,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index a2716415a..5798c53e7 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -225,9 +225,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index b76beed37..39c44e47c 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -1329,7 +1329,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index cf8f3ffbd..fdc295253 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h index 94cb081e7..b193acca6 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h @@ -1170,7 +1170,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h index eded350af..4814b7a24 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index ca2052c8d..bdb1d2046 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -312,6 +312,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker #define DEFAULT_Kp 22.2 #define DEFAULT_Ki 1.08 @@ -1156,7 +1157,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 98b84c6dd..fbbb86690 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 0af2f5bd9..75a450d36 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -1149,7 +1149,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index aed84489b..2a5b63492 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board diff --git a/Marlin/example_configurations/wt150/Configuration.h b/Marlin/example_configurations/wt150/Configuration.h index 3b8e8b8e7..26e24c703 100644 --- a/Marlin/example_configurations/wt150/Configuration.h +++ b/Marlin/example_configurations/wt150/Configuration.h @@ -317,6 +317,7 @@ #define DEFAULT_Kd 110.78 // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + // Ultimaker //#define DEFAULT_Kp 22.2 //#define DEFAULT_Ki 1.08 @@ -1158,7 +1159,7 @@ * - Click the controller to view the LCD menu * - The LCD will display Japanese, Western, or Cyrillic text * - * See https: *github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * * :['JAPANESE', 'WESTERN', 'CYRILLIC'] */ diff --git a/Marlin/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h index 5612cd240..f78a297fc 100644 --- a/Marlin/example_configurations/wt150/Configuration_adv.h +++ b/Marlin/example_configurations/wt150/Configuration_adv.h @@ -220,9 +220,9 @@ #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -// M355 Case Light command -// Set case light brightness/on/off - +/** + * M355 Case Light on-off / brightness + */ //#define CASE_LIGHT_ENABLE #if ENABLED(CASE_LIGHT_ENABLE) #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board From 4288c4fb4f9758ca583b1107bf6a0abe73bee05d Mon Sep 17 00:00:00 2001 From: guntherv73 Date: Mon, 6 Feb 2017 20:15:40 +0100 Subject: [PATCH 15/31] Configurations for Malyan M150 --- .../M150/Configuration.h | 1611 +++++++++++++++++ .../M150/Configuration_adv.h | 1266 +++++++++++++ Marlin/example_configurations/M150/README.md | 3 + .../example_configurations/M150/_Bootscreen.h | 104 ++ 4 files changed, 2984 insertions(+) create mode 100644 Marlin/example_configurations/M150/Configuration.h create mode 100644 Marlin/example_configurations/M150/Configuration_adv.h create mode 100644 Marlin/example_configurations/M150/README.md create mode 100644 Marlin/example_configurations/M150/_Bootscreen.h diff --git a/Marlin/example_configurations/M150/Configuration.h b/Marlin/example_configurations/M150/Configuration.h new file mode 100644 index 000000000..49e8586ae --- /dev/null +++ b/Marlin/example_configurations/M150/Configuration.h @@ -0,0 +1,1611 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/** + * Maylan M150 Configuration + * Non-Automatic Bed Level config by default + */ + +/** + * Configuration.h + * + * Basic settings such as: + * + * - Type of electronics + * - Type of temperature sensor + * - Printer geometry + * - Endstop configuration + * - LCD controller + * - Extra features + * + * Advanced settings can be found in Configuration_adv.h + * + */ +#ifndef CONFIGURATION_H +#define CONFIGURATION_H +#define CONFIGURATION_H_VERSION 010100 + +//=========================================================================== +//============================= Getting Started ============================= +//=========================================================================== + +/** + * Here are some standard links for getting your machine calibrated: + * + * http://reprap.org/wiki/Calibration + * http://youtu.be/wAL9d7FgInk + * http://calculator.josefprusa.cz + * http://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide + * http://www.thingiverse.com/thing:5573 + * https://sites.google.com/site/repraplogphase/calibration-of-your-reprap + * http://www.thingiverse.com/thing:298812 + */ + +//=========================================================================== +//============================= DELTA Printer =============================== +//=========================================================================== +// For a Delta printer replace the configuration files with the files in the +// example_configurations/delta directory. +// + +//=========================================================================== +//============================= SCARA Printer =============================== +//=========================================================================== +// For a Scara printer replace the configuration files with the files in the +// example_configurations/SCARA directory. +// + +// @section info + +// User-specified version info of this build to display in [Pronterface, etc] terminal window during +// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this +// build by the user have been successfully uploaded into firmware. +#define STRING_CONFIG_H_AUTHOR "(Gunther)" // Who made the changes. +#define SHOW_BOOTSCREEN +//#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 +//#define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 + +// +// *** VENDORS PLEASE READ ***************************************************** +// +// Marlin now allow you to have a vendor boot image to be displayed on machine +// start. When SHOW_CUSTOM_BOOTSCREEN is defined Marlin will first show your +// custom boot image and then the default Marlin boot image is shown. +// +// We suggest for you to take advantage of this new feature and keep the Marlin +// boot image unmodified. For an example have a look at the bq Hephestos 2 +// example configuration folder. +// +#define SHOW_CUSTOM_BOOTSCREEN +// @section machine + +/** + * Select which serial port on the board will be used for communication with the host. + * This allows the connection of wireless adapters (for instance) to non-default port pins. + * Serial port 0 is always used by the Arduino bootloader regardless of this setting. + * + * :[0, 1, 2, 3, 4, 5, 6, 7] + */ +#define SERIAL_PORT 0 + +/** + * This setting determines the communication speed of the printer. + * + * 250000 works in most cases, but you might try a lower speed if + * you commonly experience drop-outs during host printing. + * + * :[2400, 9600, 19200, 38400, 57600, 115200, 250000] + */ +#define BAUDRATE 115200 + +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH + +// The following define selects which electronics board you have. +// Please choose the name from boards.h that matches your setup +#ifndef MOTHERBOARD + #define MOTHERBOARD BOARD_MELZI +#endif + +// Optional custom name for your RepStrap or other custom machine +// Displayed in the LCD "Ready" message +#define CUSTOM_MACHINE_NAME "Malyan M150" + +// 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" + +// @section extruder + +// This defines the number of extruders +// :[1, 2, 3, 4, 5] +#define EXTRUDERS 1 + +// For Cyclops or any "multi-extruder" that shares a single nozzle. +//#define SINGLENOZZLE + +// A dual extruder that uses a single stepper motor +//#define SWITCHING_EXTRUDER +#if ENABLED(SWITCHING_EXTRUDER) + #define SWITCHING_EXTRUDER_SERVO_NR 0 + #define SWITCHING_EXTRUDER_SERVO_ANGLES { 0, 90 } // Angles for E0, E1 +#endif + +// A dual-nozzle that uses a servomotor to raise/lower one of the nozzles +//#define SWITCHING_NOZZLE +#if ENABLED(SWITCHING_NOZZLE) + #define SWITCHING_NOZZLE_SERVO_NR 0 + #define SWITCHING_NOZZLE_SERVO_ANGLES { 0, 90 } // Angles for E0, E1 + //#define HOTEND_OFFSET_Z { 0.0, 0.0 } +#endif + +/** + * "Mixing Extruder" + * - Adds a new code, M165, to set the current mix factors. + * - Extends the stepping routines to move multiple steppers in proportion to the mix. + * - Optional support for Repetier Firmware M163, M164, and virtual extruder. + * - This implementation supports only a single extruder. + * - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation + */ +//#define MIXING_EXTRUDER +#if ENABLED(MIXING_EXTRUDER) + #define MIXING_STEPPERS 2 // Number of steppers in your mixing extruder + #define MIXING_VIRTUAL_TOOLS 16 // Use the Virtual Tool method with M163 and M164 + //#define DIRECT_MIXING_IN_G1 // Allow ABCDHI mix factors in G1 movement commands +#endif + +// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing). +// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder). +// For the other hotends it is their distance from the extruder 0 hotend. +//#define HOTEND_OFFSET_X {0.0, 20.00} // (in mm) for each extruder, offset of the hotend on the X axis +//#define HOTEND_OFFSET_Y {0.0, 5.00} // (in mm) for each extruder, offset of the hotend on the Y axis + +// @section machine + +/** + * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN + * + * 0 = No Power Switch + * 1 = ATX + * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC) + * + * :{ 0:'No power switch', 1:'ATX', 2:'X-Box 360' } + */ +#define POWER_SUPPLY 0 + +#if POWER_SUPPLY > 0 + // Enable this option to leave the PSU off at startup. + // Power to steppers and heaters will need to be turned on with M80. + //#define PS_DEFAULT_OFF +#endif + +// @section temperature + +//=========================================================================== +//============================= Thermal Settings ============================ +//=========================================================================== + +/** + * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table + * + * Temperature sensors available: + * + * -3 : thermocouple with MAX31855 (only for sensor 0) + * -2 : thermocouple with MAX6675 (only for sensor 0) + * -1 : thermocouple with AD595 + * 0 : not used + * 1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup) + * 2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup) + * 3 : Mendel-parts thermistor (4.7k pullup) + * 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !! + * 5 : 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup) + * 6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup) + * 7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup) + * 71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup) + * 8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) + * 9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup) + * 10 : 100k RS thermistor 198-961 (4.7k pullup) + * 11 : 100k beta 3950 1% thermistor (4.7k pullup) + * 12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) + * 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" + * 20 : the PT100 circuit found in the Ultimainboard V2.x + * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 + * 66 : 4.7M High Temperature thermistor from Dyze Design + * 70 : the 100K thermistor found in the bq Hephestos 2 + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor + * + * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. + * (but gives greater accuracy and more stable PID) + * 51 : 100k thermistor - EPCOS (1k pullup) + * 52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup) + * 55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup) + * + * 1047 : Pt1000 with 4k7 pullup + * 1010 : Pt1000 with 1k pullup (non standard) + * 147 : Pt100 with 4k7 pullup + * 110 : Pt100 with 1k pullup (non standard) + * + * Use these for Testing or Development purposes. NEVER for production machine. + * 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below. + * 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below. + * + * :{ '0': "Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '66':"Dyze Design 4.7M High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595",'998':"Dummy 1", '999':"Dummy 2" } + */ +#define TEMP_SENSOR_0 1 +#define TEMP_SENSOR_1 0 +#define TEMP_SENSOR_2 0 +#define TEMP_SENSOR_3 0 +#define TEMP_SENSOR_4 0 + +// For Malyan M150, some discussions around changing the TEMP_SENSOR_BED from 1 to 3 on a french discussion board. +// The reasons are inconclusive so I leave at 1 +#define TEMP_SENSOR_BED 1 + +// Dummy thermistor constant temperature readings, for use with 998 and 999 +#define DUMMY_THERMISTOR_998_VALUE 25 +#define DUMMY_THERMISTOR_999_VALUE 100 + +// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings +// from the two sensors differ too much the print will be aborted. +//#define TEMP_SENSOR_1_AS_REDUNDANT +#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 + +// Extruder temperature must be close to target for this long before M109 returns success +#define TEMP_RESIDENCY_TIME 10 // (seconds) +#define TEMP_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one +#define TEMP_WINDOW 1 // (degC) Window around target to start the residency timer x degC early. + +// Bed temperature must be close to target for this long before M190 returns success +#define TEMP_BED_RESIDENCY_TIME 10 // (seconds) +#define TEMP_BED_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one +#define TEMP_BED_WINDOW 1 // (degC) Window around target to start the residency timer x degC early. + +// The minimal temperature defines the temperature below which the heater will not be enabled It is used +// to check that the wiring to the thermistor is not broken. +// Otherwise this would lead to the heater being powered on all the time. +#define HEATER_0_MINTEMP 5 +#define HEATER_1_MINTEMP 5 +#define HEATER_2_MINTEMP 5 +#define HEATER_3_MINTEMP 5 +#define BED_MINTEMP 5 + +// When temperature exceeds max temp, your heater will be switched off. +// This feature exists to protect your hotend from overheating accidentally, but *NOT* from thermistor short/failure! +// You should use MINTEMP for thermistor short/failure protection. +#define HEATER_0_MAXTEMP 275 +#define HEATER_1_MAXTEMP 275 +#define HEATER_2_MAXTEMP 275 +#define HEATER_3_MAXTEMP 275 +#define BED_MAXTEMP 150 + +//=========================================================================== +//============================= PID Settings ================================ +//=========================================================================== +// PID Tuning Guide here: http://reprap.org/wiki/PID_Tuning + +// Comment the following line to disable PID and enable bang-bang. +#define PIDTEMP +#define BANG_MAX 255 // limits current to nozzle while in bang-bang mode; 255=full current +#define PID_MAX BANG_MAX // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current +#if ENABLED(PIDTEMP) + //#define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result. + //#define PID_DEBUG // Sends debug data to the serial port. + //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX + //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay + //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders) + // Set/get with gcode: M301 E[extruder number, 0-2] + #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature + // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. + #define K1 0.95 //smoothing factor within the PID + + // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + + // Malyan M150 example + #define DEFAULT_Kp 29 + #define DEFAULT_Ki 2 + #define DEFAULT_Kd 97 + + // MakerGear + //#define DEFAULT_Kp 7.0 + //#define DEFAULT_Ki 0.1 + //#define DEFAULT_Kd 12 + + // Mendel Parts V9 on 12V + //#define DEFAULT_Kp 63.0 + //#define DEFAULT_Ki 2.25 + //#define DEFAULT_Kd 440 + +#endif // PIDTEMP + +//=========================================================================== +//============================= PID > Bed Temperature Control =============== +//=========================================================================== +// Select PID or bang-bang with PIDTEMPBED. If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis +// +// Uncomment this to enable PID on the bed. It uses the same frequency PWM as the extruder. +// If your PID_dT is the default, and correct for your hardware/configuration, that means 7.689Hz, +// which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating. +// This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W heater. +// If your configuration is significantly different than this and you don't understand the issues involved, you probably +// shouldn't use bed PID until someone else verifies your hardware works. +// If this is enabled, find your own PID constants below. +//#define PIDTEMPBED + +//#define BED_LIMIT_SWITCHING + +// This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option. +// all forms of bed control obey this (PID, bang-bang, bang-bang with hysteresis) +// setting this to anything other than 255 enables a form of PWM to the bed just like HEATER_BED_DUTY_CYCLE_DIVIDER did, +// so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) +#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current + +#if ENABLED(PIDTEMPBED) + + //#define PID_BED_DEBUG // Sends debug data to the serial port. + + //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) + //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) + #define DEFAULT_bedKp 10.00 + #define DEFAULT_bedKi .023 + #define DEFAULT_bedKd 305.4 + + //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) + //from pidautotune + //#define DEFAULT_bedKp 97.1 + //#define DEFAULT_bedKi 1.41 + //#define DEFAULT_bedKd 1675.16 + + // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. +#endif // PIDTEMPBED + +// @section extruder + +// This option prevents extrusion if the temperature is below EXTRUDE_MINTEMP. +// It also enables the M302 command to set the minimum extrusion temperature +// or to allow moving the extruder regardless of the hotend temperature. +// *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! *** +#define PREVENT_COLD_EXTRUSION +#define EXTRUDE_MINTEMP 170 + +// This option prevents a single extrusion longer than EXTRUDE_MAXLENGTH. +// Note that for Bowden Extruders a too-small value here may prevent loading. +#define PREVENT_LENGTHY_EXTRUDE +#define EXTRUDE_MAXLENGTH 200 + +//=========================================================================== +//======================== Thermal Runaway Protection ======================= +//=========================================================================== + +/** + * Thermal Protection protects your printer from damage and fire if a + * thermistor falls out or temperature sensors fail in any way. + * + * The issue: If a thermistor falls out or a temperature sensor fails, + * Marlin can no longer sense the actual temperature. Since a disconnected + * thermistor reads as a low temperature, the firmware will keep the heater on. + * + * If you get "Thermal Runaway" or "Heating failed" errors the + * details can be tuned in Configuration_adv.h + */ + +#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders +#define THERMAL_PROTECTION_BED // Enable thermal protection for the heated bed + +//=========================================================================== +//============================= Mechanical Settings ========================= +//=========================================================================== + +// @section machine + +// Uncomment one of these options to enable CoreXY, CoreXZ, or CoreYZ kinematics +// either in the usual order or reversed +//#define COREXY +//#define COREXZ +//#define COREYZ +//#define COREYX +//#define COREZX +//#define COREZY + +//=========================================================================== +//============================== Endstop Settings =========================== +//=========================================================================== + +// @section homing + +// Specify here all the endstop connectors that are connected to any endstop or probe. +// Almost all printers will be using one per axis. Probes will use one or more of the +// extra connectors. Leave undefined any used for non-endstop and non-probe purposes. +#define USE_XMIN_PLUG +#define USE_YMIN_PLUG +#define USE_ZMIN_PLUG +//#define USE_XMAX_PLUG +//#define USE_YMAX_PLUG +//#define USE_ZMAX_PLUG + +// coarse Endstop Settings +#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors + +#if DISABLED(ENDSTOPPULLUPS) + // fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE +#endif + +// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). + +#define X_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Y_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Z_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define X_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Y_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Z_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. + +// Enable this feature if all enabled endstop pins are interrupt-capable. +// This will remove the need to poll the interrupt pins, saving many CPU cycles. +//#define ENDSTOP_INTERRUPTS_FEATURE + +//============================================================================= +//============================== Movement Settings ============================ +//============================================================================= +// @section motion + +/** + * Default Settings + * + * These settings can be reset by M502 + * + * Note that if EEPROM is enabled, saved values will override these. + * + * These defaults for the Malyan M150 are low values intended to + * give a baseline. With mods it is possible to raise jerk, etc. + * + */ + +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + +/** + * Default Axis Steps Per Unit (steps/mm) + * Override with M92 + * X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]] + */ + // Standard M150 17T MXL on X and Y +#define DEFAULT_AXIS_STEPS_PER_UNIT { 3200/34.544, 3200/34.544, 1600, 103.00 } + +// Other common M150 values: +// 16T MXL on X and Y +// #define DEFAULT_AXIS_STEPS_PER_UNIT {3200/32.512, 3200/32.512, 1600, 103.00} +// 16T GT2 on X and Y +// #define DEFAULT_AXIS_STEPS_PER_UNIT {100, 100, 1600, 103.00} + +/** + * Default Max Feed Rate (mm/s) + * Override with M203 + * X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]] + */ +#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } + +/** + * Default Max Acceleration (change/s) change = mm/s + * (Maximum start speed for accelerated moves) + * Override with M201 + * X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]] + */ +#define DEFAULT_MAX_ACCELERATION { 700, 700, 100, 10000 } + +/** + * Default Acceleration (change/s) change = mm/s + * Override with M204 + * + * M204 P Acceleration + * M204 R Retract Acceleration + * M204 T Travel Acceleration + */ +#define DEFAULT_ACCELERATION 700 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts +#define DEFAULT_TRAVEL_ACCELERATION 700 // X, Y, Z acceleration for travel (non printing) moves + +/** + * Default Jerk (mm/s) + * Override with M205 X Y Z E + * + * "Jerk" specifies the minimum speed change that requires acceleration. + * When changing speed and direction, if the difference is less than the + * value set here, it may happen instantaneously. + */ +#define DEFAULT_XJERK 8.0 +#define DEFAULT_YJERK 8.0 +#define DEFAULT_ZJERK 0.40 +#define DEFAULT_EJERK 5.0 + + +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/configuration/probes.html +// + +/** + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP + * + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. + * + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP +//#define Z_MIN_PROBE_PIN Z_MAX_PIN + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * You must activate one of these to use Auto Bed Leveling below. + */ + +/** + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. + */ +//#define PROBE_MANUALLY + +/** + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) + */ +//#define FIX_MOUNTED_PROBE + +/** + * Z Servo Probe, such as an endstop switch on a rotating arm. + */ +//#define Z_ENDSTOP_SERVO_NR 0 // Defaults to SERVO 0 connector. +//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles + +/** + * The BLTouch probe uses a Hall effect sensor and emulates a servo. + */ +//#define BLTOUCH +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed +#endif + +/** + * Enable if probing seems unreliable. Heaters and/or fans - consistent with the + * options selected below - will be disabled during probing so as to minimize + * potential EM interference by quieting/silencing the source of the 'noise' (the change + * in current flowing through the wires). This is likely most useful to users of the + * BLTouch probe, but may also help those with inductive or other probe types. + */ +//#define PROBING_HEATERS_OFF // Turn heaters off when probing +//#define PROBING_FANS_OFF // Turn fans off when probing + +// A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) +//#define SOLENOID_PROBE + +// A sled-mounted probe like those designed by Charles Bell. +//#define Z_PROBE_SLED +//#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. + +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + +/** + * Z Probe to nozzle (X,Y) offset, relative to (0, 0). + * X and Y offsets must be integers. + * + * In the following example the X and Y offsets are both positive: + * #define X_PROBE_OFFSET_FROM_EXTRUDER 10 + * #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 + * + * +-- BACK ---+ + * | | + * L | (+) P | R <-- probe (20,20) + * E | | I + * F | (-) N (+) | G <-- nozzle (10,10) + * T | | H + * | (-) | T + * | | + * O-- FRONT --+ + * (0,0) + */ + +// Set for HoolyHoo's probe mount +// http://www.thingiverse.com/thing:1960419 +// Note: HoolyHoo mount is X=35, Y=-50. +//#define X_PROBE_OFFSET_FROM_EXTRUDER 35 // X offset: -left +right [of the nozzle] +//#define Y_PROBE_OFFSET_FROM_EXTRUDER -50 // Y offset: -front +behind [the nozzle] +//#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle] + +// X and Y axis travel speed (mm/m) between probes +//#define XY_PROBE_SPEED 8000 + +// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) +//#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z + +// Speed for the "accurate" probe of each point +//#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) + +// Use double touch for probing +//#define PROBE_DOUBLE_TOUCH + +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. + */ +//#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow +//#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points + +// For M851 give a range for adjusting the Z probe offset +//#define Z_PROBE_OFFSET_RANGE_MIN -20 +//#define Z_PROBE_OFFSET_RANGE_MAX 20 + +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + +// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 +// :{ 0:'Low', 1:'High' } +#define X_ENABLE_ON 0 +#define Y_ENABLE_ON 0 +#define Z_ENABLE_ON 0 +#define E_ENABLE_ON 0 // For all extruders + +// Disables axis stepper immediately when it's not being used. +// WARNING: When motors turn off there is a chance of losing position accuracy! +#define DISABLE_X false +#define DISABLE_Y false +#define DISABLE_Z false +// Warn on display about possibly reduced accuracy +//#define DISABLE_REDUCED_ACCURACY_WARNING + +// @section extruder + +#define DISABLE_E false // For all extruders +#define DISABLE_INACTIVE_EXTRUDER true // Keep only the active extruder enabled. + +// @section machine + +// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. +#define INVERT_X_DIR false +#define INVERT_Y_DIR false +#define INVERT_Z_DIR false + +// Enable this option for Toshiba stepper drivers +//#define CONFIG_STEPPERS_TOSHIBA + +// @section extruder + +// For direct drive extruder v9 set to true, for geared extruder set to false. +#define INVERT_E0_DIR true +#define INVERT_E1_DIR false +#define INVERT_E2_DIR false +#define INVERT_E3_DIR false +#define INVERT_E4_DIR false + +// @section homing + +//#define Z_HOMING_HEIGHT 4 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ... + // Be sure you have this distance over your Z_MAX_POS in case. + +// Direction of endstops when homing; 1=MAX, -1=MIN +// :[-1,1] +#define X_HOME_DIR -1 +#define Y_HOME_DIR -1 +#define Z_HOME_DIR -1 + +// @section machine + +// Travel limits after homing (units are in mm) +#define X_MIN_POS 0 +#define Y_MIN_POS 0 +#define Z_MIN_POS 0 +#define X_MAX_POS 200 +#define Y_MAX_POS 200 +#define Z_MAX_POS 180 + +// If enabled, axes won't move below MIN_POS in response to movement commands. +#define MIN_SOFTWARE_ENDSTOPS +// If enabled, axes won't move above MAX_POS in response to movement commands. +#define MAX_SOFTWARE_ENDSTOPS + +/** + * Filament Runout Sensor + * A mechanical or opto endstop is used to check for the presence of filament. + * + * RAMPS-based boards use SERVO3_PIN. + * For other boards you may need to define FIL_RUNOUT_PIN. + * By default the firmware assumes HIGH = has filament, LOW = ran out + */ +//#define FILAMENT_RUNOUT_SENSOR +#if ENABLED(FILAMENT_RUNOUT_SENSOR) + #define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor. + #define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. + #define FILAMENT_RUNOUT_SCRIPT "M600" +#endif + +//=========================================================================== +//=============================== Bed Leveling ============================== +//=========================================================================== +// @section bedlevel + +/** + * Choose one of the options below to enable G29 Bed Leveling. The parameters + * and behavior of G29 will change depending on your selection. + * + * If using a Probe for Z Homing, enable Z_SAFE_HOMING also! + * + * - AUTO_BED_LEVELING_3POINT + * Probe 3 arbitrary points on the bed (that aren't collinear) + * You specify the XY coordinates of all 3 points. + * The result is a single tilted plane. Best for a flat bed. + * + * - AUTO_BED_LEVELING_LINEAR + * Probe several points in a grid. + * You specify the rectangle and the density of sample points. + * The result is a single tilted plane. Best for a flat bed. + * + * - AUTO_BED_LEVELING_BILINEAR + * Probe several points in a grid. + * You specify the rectangle and the density of sample points. + * The result is a mesh, best for large or uneven beds. + * + * - AUTO_BED_LEVELING_UBL (Unified Bed Leveling) + * A comprehensive bed leveling system combining the features and benefits + * of other systems. UBL also includes integrated Mesh Generation, Mesh + * Validation and Mesh Editing systems. Currently, UBL is only checked out + * for Cartesian Printers. That said, it was primarily designed to correct + * poor quality Delta Printers. If you feel adventurous and have a Delta, + * please post an issue if something doesn't work correctly. Initially, + * you will need to set a reduced bed size so you have a rectangular area + * to test on. + * + * - MESH_BED_LEVELING + * Probe a grid manually + * The result is a mesh, suitable for large or uneven beds. (See BILINEAR.) + * For machines without a probe, Mesh Bed Leveling provides a method to perform + * leveling in steps so you can manually adjust the Z height at each grid-point. + * With an LCD controller the process is guided step-by-step. + */ + +// - LINEAR - Not Available on Malyan M150 due to compile memory issues +// - Use MESH_BED_LEVELING, AUTO_BED_LEVELING_3POINT or AUTO_BED_LEVELING_BILINEAR + +//#define AUTO_BED_LEVELING_3POINT +//#define AUTO_BED_LEVELING_LINEAR +//#define AUTO_BED_LEVELING_BILINEAR +//#define AUTO_BED_LEVELING_UBL +//#define MESH_BED_LEVELING + +/** + * Enable detailed logging of G28, G29, M48, etc. + * Turn on with the command 'M111 S32'. + * NOTE: Requires a lot of PROGMEM! + */ +//#define DEBUG_LEVELING_FEATURE + +#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) + // Gradually reduce leveling correction until a set height is reached, + // at which point movement will be level to the machine's XY plane. + // The height can be set with M420 Z + #define ENABLE_LEVELING_FADE_HEIGHT +#endif + +#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR) + + // Set the number of grid points per dimension. + #define GRID_MAX_POINTS_X 3 + #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + + // Set the boundaries for probing (where the probe can reach). + #define LEFT_PROBE_BED_POSITION 50 + #define RIGHT_PROBE_BED_POSITION 150 + #define FRONT_PROBE_BED_POSITION 50 + #define BACK_PROBE_BED_POSITION 150 + + // The Z probe minimum outer margin (to validate G29 parameters). + #define MIN_PROBE_EDGE 10 + + // Probe along the Y axis, advancing X after each column + //#define PROBE_Y_FIRST + + #if ENABLED(AUTO_BED_LEVELING_BILINEAR) + + // Beyond the probed grid, continue the implied tilt? + // Default is to maintain the height of the nearest edge. + //#define EXTRAPOLATE_BEYOND_GRID + + // + // Experimental Subdivision of the grid by Catmull-Rom method. + // Synthesizes intermediate points to produce a more detailed mesh. + // + //#define ABL_BILINEAR_SUBDIVISION + #if ENABLED(ABL_BILINEAR_SUBDIVISION) + // Number of subdivisions between probe points + #define BILINEAR_SUBDIVISIONS 3 + #endif + + #endif + +#elif ENABLED(AUTO_BED_LEVELING_3POINT) + + // 3 arbitrary points to probe. + // A simple cross-product is used to estimate the plane of the bed. + #define ABL_PROBE_PT_1_X 50 + #define ABL_PROBE_PT_1_Y 150 + #define ABL_PROBE_PT_2_X 50 + #define ABL_PROBE_PT_2_Y 50 + #define ABL_PROBE_PT_3_X 150 + #define ABL_PROBE_PT_3_Y 50 + +#elif ENABLED(AUTO_BED_LEVELING_UBL) + + //=========================================================================== + //========================= Unified Bed Leveling ============================ + //=========================================================================== + + #define UBL_MESH_INSET 1 // Mesh inset margin on print area + #define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited. + #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + #define UBL_PROBE_PT_1_X 39 // These set the probe locations for when UBL does a 3-Point leveling + #define UBL_PROBE_PT_1_Y 180 // of the mesh. + #define UBL_PROBE_PT_2_X 39 + #define UBL_PROBE_PT_2_Y 20 + #define UBL_PROBE_PT_3_X 180 + #define UBL_PROBE_PT_3_Y 20 + #define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation + #define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle + +#elif ENABLED(MESH_BED_LEVELING) + + //=========================================================================== + //=================================== Mesh ================================== + //=========================================================================== + + #define MESH_INSET 10 // Mesh inset margin on print area + #define GRID_MAX_POINTS_X 3 // Don't use more than 7 points per axis, implementation limited. + #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + + //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS + +#endif // BED_LEVELING + +/** + * Use the LCD controller for bed leveling + * Requires MESH_BED_LEVELING or PROBE_MANUALLY + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MBL_Z_STEP 0.025 // Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment +#endif + +/** + * Commands to execute at the end of G29 probing. + * Useful to retract or move the Z probe out of the way. + */ +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" + + +// @section homing + +// The center of the bed is at (X=0, Y=0) +//#define BED_CENTER_AT_0_0 + +// Manually set the home position. Leave these undefined for automatic settings. +// For DELTA this is the top-center of the Cartesian print volume. +//#define MANUAL_X_HOME_POS 0 +//#define MANUAL_Y_HOME_POS 0 +//#define MANUAL_Z_HOME_POS 0 + +// Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area. +// +// With this feature enabled: +// +// - Allow Z homing only after X and Y homing AND stepper drivers still enabled. +// - If stepper drivers time out, it will need X and Y homing again before Z homing. +// - Move the Z probe (or nozzle) to a defined XY point before Z Homing when homing all axes (G28). +// - Prevent Z homing when the Z probe is outside bed area. +//#define Z_SAFE_HOMING + +#if ENABLED(Z_SAFE_HOMING) + #define Z_SAFE_HOMING_X_POINT ((X_MIN_POS + X_MAX_POS) / 2) // X point for Z homing when homing all axis (G28). + #define Z_SAFE_HOMING_Y_POINT ((Y_MIN_POS + Y_MAX_POS) / 2) // Y point for Z homing when homing all axis (G28). +#endif + +// Homing speeds (mm/m) +#define HOMING_FEEDRATE_XY (50*60) +#define HOMING_FEEDRATE_Z (4*60) + +//============================================================================= +//============================= Additional Features =========================== +//============================================================================= + +// @section extras + +// +// EEPROM +// +// The microcontroller can store settings in the EEPROM, e.g. max velocity... +// M500 - stores parameters in EEPROM +// M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). +// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. +//define this to enable EEPROM support +#define EEPROM_SETTINGS + +#if ENABLED(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. +#endif + +// +// Host Keepalive +// +// When enabled Marlin will send a busy status message to the host +// every couple of seconds when it can't accept commands. +// +#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. + +// +// M100 Free Memory Watcher +// +//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose + +// +// G20/G21 Inch mode support +// +//#define INCH_MODE_SUPPORT + +// +// M149 Set temperature units support +// +//#define TEMPERATURE_UNITS_SUPPORT + +// @section temperature + +// Preheat Constants +#define PREHEAT_1_TEMP_HOTEND 205 +#define PREHEAT_1_TEMP_BED 60 +#define PREHEAT_1_FAN_SPEED 128 // Value from 0 to 255 + +#define PREHEAT_2_TEMP_HOTEND 230 +#define PREHEAT_2_TEMP_BED 100 +#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 + +/** + * Nozzle Park -- EXPERIMENTAL + * + * Park the nozzle at the given XYZ position on idle or G27. + * + * The "P" parameter controls the action applied to the Z axis: + * + * P0 (Default) If Z is below park Z raise the nozzle. + * P1 Raise the nozzle always to Z-park height. + * P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS. + */ +//#define NOZZLE_PARK_FEATURE + +#if ENABLED(NOZZLE_PARK_FEATURE) + // Specify a park position as { X, Y, Z } + #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 } +#endif + +/** + * Clean Nozzle Feature -- EXPERIMENTAL + * + * Adds the G12 command to perform a nozzle cleaning process. + * + * Parameters: + * P Pattern + * S Strokes / Repetitions + * T Triangles (P1 only) + * + * Patterns: + * P0 Straight line (default). This process requires a sponge type material + * at a fixed bed location. "S" specifies strokes (i.e. back-forth motions) + * between the start / end points. + * + * P1 Zig-zag pattern between (X0, Y0) and (X1, Y1), "T" specifies the + * number of zig-zag triangles to do. "S" defines the number of strokes. + * Zig-zags are done in whichever is the narrower dimension. + * For example, "G12 P1 S1 T3" will execute: + * + * -- + * | (X0, Y1) | /\ /\ /\ | (X1, Y1) + * | | / \ / \ / \ | + * A | | / \ / \ / \ | + * | | / \ / \ / \ | + * | (X0, Y0) | / \/ \/ \ | (X1, Y0) + * -- +--------------------------------+ + * |________|_________|_________| + * T1 T2 T3 + * + * P2 Circular pattern with middle at NOZZLE_CLEAN_CIRCLE_MIDDLE. + * "R" specifies the radius. "S" specifies the stroke count. + * Before starting, the nozzle moves to NOZZLE_CLEAN_START_POINT. + * + * Caveats: The ending Z should be the same as starting Z. + * Attention: EXPERIMENTAL. G-code arguments may change. + * + */ +//#define NOZZLE_CLEAN_FEATURE + +#if ENABLED(NOZZLE_CLEAN_FEATURE) + // Default number of pattern repetitions + #define NOZZLE_CLEAN_STROKES 12 + + // Default number of triangles + #define NOZZLE_CLEAN_TRIANGLES 3 + + // Specify positions as { X, Y, Z } + #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} + #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + + // Moves the nozzle to the initial position + #define NOZZLE_CLEAN_GOBACK +#endif + +/** + * Print Job Timer + * + * Automatically start and stop the print job timer on M104/M109/M190. + * + * M104 (hotend, no wait) - high temp = none, low temp = stop timer + * M109 (hotend, wait) - high temp = start timer, low temp = stop timer + * M190 (bed, wait) - high temp = start timer, low temp = none + * + * The timer can also be controlled with the following commands: + * + * M75 - Start the print job timer + * M76 - Pause the print job timer + * M77 - Stop the print job timer + */ +#define PRINTJOB_TIMER_AUTOSTART + +/** + * Print Counter + * + * Track statistical data such as: + * + * - Total print jobs + * - Total successful print jobs + * - Total failed print jobs + * - Total time printing + * + * View the current statistics with M78. + */ +//#define PRINTCOUNTER + +//============================================================================= +//============================= LCD and SD support ============================ +//============================================================================= + +// @section lcd + +/** + * LCD LANGUAGE + * + * Select the language to display on the LCD. These languages are available: + * + * en, an, bg, ca, cn, cz, de, el, el-gr, es, eu, fi, fr, gl, hr, it, + * kana, kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, tr, uk, test + * + * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'tr':'Turkish', 'uk':'Ukrainian', 'test':'TEST' } + */ +#define LCD_LANGUAGE en + +/** + * LCD Character Set + * + * Note: This option is NOT applicable to Graphical Displays. + * + * All character-based LCDs provide ASCII plus one of these + * language extensions: + * + * - JAPANESE ... the most common + * - WESTERN ... with more accented characters + * - CYRILLIC ... for the Russian language + * + * To determine the language extension installed on your controller: + * + * - Compile and upload with LCD_LANGUAGE set to 'test' + * - Click the controller to view the LCD menu + * - The LCD will display Japanese, Western, or Cyrillic text + * + * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * + * :['JAPANESE', 'WESTERN', 'CYRILLIC'] + */ +#define DISPLAY_CHARSET_HD44780 JAPANESE + +/** + * LCD TYPE + * + * Enable ULTRA_LCD for a 16x2, 16x4, 20x2, or 20x4 character-based LCD. + * Enable DOGLCD for a 128x64 (ST7565R) Full Graphical Display. + * (These options will be enabled automatically for most displays.) + * + * IMPORTANT: The U8glib library is required for Full Graphic Display! + * https://github.com/olikraus/U8glib_Arduino + */ +//#define ULTRA_LCD // Character based +//#define DOGLCD // Full graphics display + +/** + * SD CARD + * + * SD Card support is disabled by default. If your controller has an SD slot, + * you must uncomment the following option or it won't work. + * + */ +#define SDSUPPORT + +/** + * SD CARD: SPI SPEED + * + * Enable one of the following items for a slower SPI transfer speed. + * This may be required to resolve "volume init" errors. + */ +//#define SPI_SPEED SPI_HALF_SPEED +//#define SPI_SPEED SPI_QUARTER_SPEED +//#define SPI_SPEED SPI_EIGHTH_SPEED + +/** + * SD CARD: ENABLE CRC + * + * Use CRC checks and retries on the SD communication. + */ +//#define SD_CHECK_AND_RETRY + +// +// ENCODER SETTINGS +// +// This option overrides the default number of encoder pulses needed to +// produce one step. Should be increased for high-resolution encoders. +// +//#define ENCODER_PULSES_PER_STEP 1 + +// +// Use this option to override the number of step signals required to +// move between next/prev menu items. +// +//#define ENCODER_STEPS_PER_MENU_ITEM 5 + +/** + * Encoder Direction Options + * + * Test your encoder's behavior first with both options disabled. + * + * Reversed Value Edit and Menu Nav? Enable REVERSE_ENCODER_DIRECTION. + * Reversed Menu Navigation only? Enable REVERSE_MENU_DIRECTION. + * Reversed Value Editing only? Enable BOTH options. + */ + +// +// This option reverses the encoder direction everywhere. +// +// Set this option if CLOCKWISE causes values to DECREASE +// +//#define REVERSE_ENCODER_DIRECTION + +// +// This option reverses the encoder direction for navigating LCD menus. +// +// If CLOCKWISE normally moves DOWN this makes it go UP. +// If CLOCKWISE normally moves UP this makes it go DOWN. +// +//#define REVERSE_MENU_DIRECTION + +// +// Individual Axis Homing +// +// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu. +// +//#define INDIVIDUAL_AXIS_HOMING_MENU + +// +// SPEAKER/BUZZER +// +// If you have a speaker that can produce tones, enable it here. +// By default Marlin assumes you have a buzzer with a fixed frequency. +// +//#define SPEAKER + +// +// The duration and frequency for the UI feedback sound. +// Set these to 0 to disable audio feedback in the LCD menus. +// +// Note: Test audio output with the G-Code: +// M300 S P +// +//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 +//#define LCD_FEEDBACK_FREQUENCY_HZ 1000 + +// +// CONTROLLER TYPE: Standard +// +// Marlin supports a wide variety of controllers. +// Enable one of the following options to specify your controller. +// + +// +// ULTIMAKER Controller. +// +//#define ULTIMAKERCONTROLLER + +// +// ULTIPANEL as seen on Thingiverse. +// +//#define ULTIPANEL + +// +// Cartesio UI +// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface +// +//#define CARTESIO_UI + +// +// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) +// http://reprap.org/wiki/PanelOne +// +//#define PANEL_ONE + +// +// MaKr3d Makr-Panel with graphic controller and SD support. +// http://reprap.org/wiki/MaKr3d_MaKrPanel +// +//#define MAKRPANEL + +// +// ReprapWorld Graphical LCD +// https://reprapworld.com/?products_details&products_id/1218 +// +//#define REPRAPWORLD_GRAPHICAL_LCD + +// +// Activate one of these if you have a Panucatt Devices +// Viki 2.0 or mini Viki with Graphic LCD +// http://panucatt.com +// +//#define VIKI2 +//#define miniVIKI + +// +// Adafruit ST7565 Full Graphic Controller. +// https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +//#define ELB_FULL_GRAPHIC_CONTROLLER + +// +// RepRapDiscount Smart Controller. +// http://reprap.org/wiki/RepRapDiscount_Smart_Controller +// +// Note: Usually sold with a white PCB. +// +//#define REPRAP_DISCOUNT_SMART_CONTROLLER + +// +// GADGETS3D G3D LCD/SD Controller +// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel +// +// Note: Usually sold with a blue PCB. +// +//#define G3D_PANEL + +// +// RepRapDiscount FULL GRAPHIC Smart Controller +// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller +// +#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + +// +// MakerLab Mini Panel with graphic +// controller and SD support - http://reprap.org/wiki/Mini_panel +// +//#define MINIPANEL + +// +// RepRapWorld REPRAPWORLD_KEYPAD v1.1 +// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626 +// +// REPRAPWORLD_KEYPAD_MOVE_STEP sets how much should the robot move when a key +// is pressed, a value of 10.0 means 10mm per click. +// +//#define REPRAPWORLD_KEYPAD +//#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0 + +// +// RigidBot Panel V1.0 +// http://www.inventapart.com/ +// +//#define RIGIDBOT_PANEL + +// +// BQ LCD Smart Controller shipped by +// default with the BQ Hephestos 2 and Witbox 2. +// +//#define BQ_LCD_SMART_CONTROLLER + +// +// CONTROLLER TYPE: I2C +// +// Note: These controllers require the installation of Arduino's LiquidCrystal_I2C +// library. For more info: https://github.com/kiyoshigawa/LiquidCrystal_I2C +// + +// +// Elefu RA Board Control Panel +// http://www.elefu.com/index.php?route=product/product&product_id=53 +// +//#define RA_CONTROL_PANEL + +// +// Sainsmart YW Robot (LCM1602) LCD Display +// +//#define LCD_I2C_SAINSMART_YWROBOT + +// +// Generic LCM1602 LCD adapter +// +//#define LCM1602 + +// +// PANELOLU2 LCD with status LEDs, +// separate encoder and click inputs. +// +// Note: This controller requires Arduino's LiquidTWI2 library v1.2.3 or later. +// For more info: https://github.com/lincomatic/LiquidTWI2 +// +// Note: The PANELOLU2 encoder click input can either be directly connected to +// a pin (if BTN_ENC defined to != -1) or read through I2C (when BTN_ENC == -1). +// +//#define LCD_I2C_PANELOLU2 + +// +// Panucatt VIKI LCD with status LEDs, +// integrated click & L/R/U/D buttons, separate encoder inputs. +// +//#define LCD_I2C_VIKI + +// +// SSD1306 OLED full graphics generic display +// +//#define U8GLIB_SSD1306 + +// +// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules +// +//#define SAV_3DGLCD +#if ENABLED(SAV_3DGLCD) + //#define U8GLIB_SSD1306 + #define U8GLIB_SH1106 +#endif + +// +// CONTROLLER TYPE: Shift register panels +// +// 2 wire Non-latching LCD SR from https://goo.gl/aJJ4sH +// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD +// +//#define SAV_3DLCD + +// +// TinyBoy2 128x64 OLED / Encoder Panel +// +//#define OLED_PANEL_TINYBOY2 + +//============================================================================= +//=============================== Extra Features ============================== +//============================================================================= + +// @section extras + +// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino +//#define FAST_PWM_FAN + +// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency +// which is not as annoying as with the hardware PWM. On the other hand, if this frequency +// is too low, you should also increment SOFT_PWM_SCALE. +//#define FAN_SOFT_PWM + +// Incrementing this by 1 will double the software PWM frequency, +// affecting heaters, and the fan if FAN_SOFT_PWM is enabled. +// However, control resolution will be halved for each increment; +// at zero value, there are 128 effective control positions. +#define SOFT_PWM_SCALE 0 + +// If SOFT_PWM_SCALE is set to a value higher than 0, dithering can +// be used to mitigate the associated resolution loss. If enabled, +// some of the PWM cycles are stretched so on average the desired +// duty cycle is attained. +//#define SOFT_PWM_DITHER + +// Temperature status LEDs that display the hotend and bed temperature. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) +//#define TEMP_STAT_LEDS + +// M240 Triggers a camera by emulating a Canon RC-1 Remote +// Data from: http://www.doc-diy.net/photo/rc-1_hacked/ +//#define PHOTOGRAPH_PIN 23 + +// SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure +//#define SF_ARC_FIX + +// Support for the BariCUDA Paste Extruder. +//#define BARICUDA + +//define BlinkM/CyzRgb Support +//#define BLINKM + +/** + * RGB LED / LED Strip Control + * + * Enable support for an RGB LED connected to 5V digital pins, or + * an RGB Strip connected to MOSFETs controlled by digital pins. + * + * Adds the M150 command to set the LED (or LED strip) color. + * If pins are PWM capable (e.g., 4, 5, 6, 11) then a range of + * luminance values can be set from 0 to 255. + * + * *** CAUTION *** + * LED Strips require a MOFSET Chip between PWM lines and LEDs, + * as the Arduino cannot handle the current the LEDs will require. + * Failure to follow this precaution can destroy your Arduino! + * *** CAUTION *** + * + */ +//#define RGB_LED +//#define RGBW_LED +#if ENABLED(RGB_LED) || ENABLED(RGBW_LED) + #define RGB_LED_R_PIN 34 + #define RGB_LED_G_PIN 43 + #define RGB_LED_B_PIN 35 + #define RGB_LED_W_PIN -1 +#endif + +/** + * Printer Event LEDs + * + * During printing, the LEDs will reflect the printer status: + * + * - Gradually change from blue to violet as the heated bed gets to target temp + * - Gradually change from violet to red as the hotend gets to temperature + * - Change to white to illuminate work surface + * - Change to green once print has finished + * - Turn off after the print has finished and the user has pushed a button + */ +#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) + #define PRINTER_EVENT_LEDS +#endif + +/*********************************************************************\ +* R/C SERVO support +* Sponsored by TrinityLabs, Reworked by codexmas +**********************************************************************/ + +// Number of servos +// +// If you select a configuration below, this will receive a default value and does not need to be set manually +// set it manually if you have more servos than extruders and wish to manually control some +// leaving it undefined or defining as 0 will disable the servo subsystem +// If unsure, leave commented / disabled +// +//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command + +// Delay (in milliseconds) before the next move will start, to give the servo time to reach its target angle. +// 300ms is a good value but you can try less delay. +// If the servo can't reach the requested position, increase it. +#define SERVO_DELAY 300 + +// Servo deactivation +// +// With this option servos are powered only during movement, then turned off to prevent jitter. +//#define DEACTIVATE_SERVOS_AFTER_MOVE + +/** + * Filament Width Sensor + * + * Measures the filament width in real-time and adjusts + * flow rate to compensate for any irregularities. + * + * Also allows the measured filament diameter to set the + * extrusion rate, so the slicer only has to specify the + * volume. + * + * Only a single extruder is supported at this time. + * + * 34 RAMPS_14 : Analog input 5 on the AUX2 connector + * 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E) + * 301 RAMBO : Analog input 3 + * + * Note: May require analog pins to be defined for other boards. + */ +//#define FILAMENT_WIDTH_SENSOR + +#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading. + +#if ENABLED(FILAMENT_WIDTH_SENSOR) + #define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3) + #define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber + + #define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading + #define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading + #define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM. + + #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially + + // Display filament width on the LCD status line. Status messages will expire after 5 seconds. + //#define FILAMENT_LCD_DISPLAY +#endif + +#endif // CONFIGURATION_H diff --git a/Marlin/example_configurations/M150/Configuration_adv.h b/Marlin/example_configurations/M150/Configuration_adv.h new file mode 100644 index 000000000..2253ce435 --- /dev/null +++ b/Marlin/example_configurations/M150/Configuration_adv.h @@ -0,0 +1,1266 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/** + * Configuration_adv.h + * + * Advanced settings. + * Only change these if you know exactly what you're doing. + * Some of these settings can damage your printer if improperly set! + * + * Basic settings can be found in Configuration.h + * + */ +#ifndef CONFIGURATION_ADV_H +#define CONFIGURATION_ADV_H +#define CONFIGURATION_ADV_H_VERSION 010100 + +// @section temperature + +//=========================================================================== +//=============================Thermal Settings ============================ +//=========================================================================== + +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif +#endif + +/** + * Thermal Protection protects your printer from damage and fire if a + * thermistor falls out or temperature sensors fail in any way. + * + * The issue: If a thermistor falls out or a temperature sensor fails, + * Marlin can no longer sense the actual temperature. Since a disconnected + * thermistor reads as a low temperature, the firmware will keep the heater on. + * + * The solution: Once the temperature reaches the target, start observing. + * If the temperature stays too far below the target (hysteresis) for too long (period), + * the firmware will halt the machine as a safety precaution. + * + * If you get false positives for "Thermal Runaway" increase THERMAL_PROTECTION_HYSTERESIS and/or THERMAL_PROTECTION_PERIOD + */ +#if ENABLED(THERMAL_PROTECTION_HOTENDS) + #define THERMAL_PROTECTION_PERIOD 40 // Seconds + #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius + + /** + * Whenever an M104 or M109 increases the target temperature the firmware will wait for the + * WATCH_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_TEMP_INCREASE + * degrees, the machine is halted, requiring a hard reset. This test restarts with any M104/M109, + * but only if the current temperature is far enough below the target for a reliable test. + * + * If you get false positives for "Heating failed" increase WATCH_TEMP_PERIOD and/or decrease WATCH_TEMP_INCREASE + * WATCH_TEMP_INCREASE should not be below 2. + */ + #define WATCH_TEMP_PERIOD 20 // Seconds + #define WATCH_TEMP_INCREASE 2 // Degrees Celsius +#endif + +/** + * Thermal Protection parameters for the bed are just as above for hotends. + */ +#if ENABLED(THERMAL_PROTECTION_BED) + #define THERMAL_PROTECTION_BED_PERIOD 120 // Seconds + #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius + + /** + * Whenever an M140 or M190 increases the target temperature the firmware will wait for the + * WATCH_BED_TEMP_PERIOD to expire, and if the temperature hasn't increased by WATCH_BED_TEMP_INCREASE + * degrees, the machine is halted, requiring a hard reset. This test restarts with any M140/M190, + * but only if the current temperature is far enough below the target for a reliable test. + * + * If you get too many "Heating failed" errors, increase WATCH_BED_TEMP_PERIOD and/or decrease + * WATCH_BED_TEMP_INCREASE. (WATCH_BED_TEMP_INCREASE should not be below 2.) + */ + #define WATCH_BED_TEMP_PERIOD 60 // Seconds + #define WATCH_BED_TEMP_INCREASE 2 // Degrees Celsius +#endif + +#if ENABLED(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_EXTRUSION_SCALING + #if ENABLED(PID_EXTRUSION_SCALING) + #define DEFAULT_Kc (100) //heating power=Kc*(e_speed) + #define LPQ_MAX_LEN 50 + #endif +#endif + +/** + * Automatic Temperature: + * The hotend target temperature is calculated by all the buffered lines of gcode. + * The maximum buffered steps/sec of the extruder motor is called "se". + * Start autotemp mode with M109 S B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by executing M109 without F* + * 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 + */ +//#define AUTOTEMP +#if ENABLED(AUTOTEMP) + #define AUTOTEMP_OLDWEIGHT 0.98 +#endif + +//Show Temperature ADC value +//The M105 command return, besides traditional information, the ADC value read from temperature sensors. +//#define SHOW_TEMP_ADC_VALUES + +/** + * High Temperature Thermistor Support + * + * Thermistors able to support high temperature tend to have a hard time getting + * good readings at room and lower temperatures. This means HEATER_X_RAW_LO_TEMP + * will probably be caught when the heating element first turns on during the + * preheating process, which will trigger a min_temp_error as a safety measure + * and force stop everything. + * To circumvent this limitation, we allow for a preheat time (during which, + * min_temp_error won't be triggered) and add a min_temp buffer to handle + * aberrant readings. + * + * If you want to enable this feature for your hotend thermistor(s) + * uncomment and set values > 0 in the constants below + */ + +// The number of consecutive low temperature errors that can occur +// before a min_temp_error is triggered. (Shouldn't be more than 10.) +//#define MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED 0 + +// The number of milliseconds a hotend will preheat before starting to check +// the temperature. This value should NOT be set to the time it takes the +// hot end to reach the target temperature, but the time it takes to reach +// the minimum temperature your thermistor can read. The lower the better/safer. +// This shouldn't need to be more than 30 seconds (30000) +//#define MILLISECONDS_PREHEAT_TIME 0 + +// @section extruder + +// Extruder runout prevention. +// If the machine is idle and the temperature over MINTEMP +// then extrude some filament every couple of SECONDS. +//#define EXTRUDER_RUNOUT_PREVENT +#if ENABLED(EXTRUDER_RUNOUT_PREVENT) + #define EXTRUDER_RUNOUT_MINTEMP 190 + #define EXTRUDER_RUNOUT_SECONDS 30 + #define EXTRUDER_RUNOUT_SPEED 1500 // mm/m + #define EXTRUDER_RUNOUT_EXTRUDE 5 // mm +#endif + +// @section temperature + +//These defines help to calibrate the AD595 sensor in case you get wrong temperature measurements. +//The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET" +#define TEMP_SENSOR_AD595_OFFSET 0.0 +#define TEMP_SENSOR_AD595_GAIN 1.0 + +/** + * Controller Fan + * To cool down the stepper drivers and MOSFETs. + * + * The fan will turn on automatically whenever any stepper is enabled + * and turn off after a set period after all steppers are turned off. + */ +//#define USE_CONTROLLER_FAN +#if ENABLED(USE_CONTROLLER_FAN) + //#define CONTROLLER_FAN_PIN FAN1_PIN // Set a custom pin for the controller fan + #define CONTROLLERFAN_SECS 60 // Duration in seconds for the fan to run after all motors are disabled + #define CONTROLLERFAN_SPEED 255 // 255 == full speed +#endif + +// When first starting the main fan, run it at full speed for the +// given number of milliseconds. This gets the fan spinning reliably +// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu) +//#define FAN_KICKSTART_TIME 100 + +// This defines the minimal speed for the main fan, run in PWM mode +// to enable uncomment and set minimal PWM speed for reliable running (1-255) +// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM +//#define FAN_MIN_PWM 50 + +// @section extruder + +/** + * Extruder cooling fans + * + * Extruder auto fans automatically turn on when their extruders' + * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE. + * + * Your board's pins file specifies the recommended pins. Override those here + * or set to -1 to disable completely. + * + * Multiple extruders can be assigned to the same pin in which case + * the fan will turn on when any selected extruder is above the threshold. + */ +#define E0_AUTO_FAN_PIN -1 +#define E1_AUTO_FAN_PIN -1 +#define E2_AUTO_FAN_PIN -1 +#define E3_AUTO_FAN_PIN -1 +#define E4_AUTO_FAN_PIN -1 +#define EXTRUDER_AUTO_FAN_TEMPERATURE 50 +#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed + +/** + * M355 Case Light on-off / brightness + */ +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 + #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM + // and if CASE_LIGHT_DEFAULT is set to on + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif + +//=========================================================================== +//============================ Mechanical Settings ========================== +//=========================================================================== + +// @section homing + +// If you want endstops to stay on (by default) even when not homing +// enable this option. Override at any time with M120, M121. +//#define ENDSTOPS_ALWAYS_ON_DEFAULT + +// @section extras + +//#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats. + +// Dual X Steppers +// Uncomment this option to drive two X axis motors. +// The next unused E driver will be assigned to the second X stepper. +//#define X_DUAL_STEPPER_DRIVERS +#if ENABLED(X_DUAL_STEPPER_DRIVERS) + // Set true if the two X motors need to rotate in opposite directions + #define INVERT_X2_VS_X_DIR true +#endif + +// Dual Y Steppers +// Uncomment this option to drive two Y axis motors. +// The next unused E driver will be assigned to the second Y stepper. +//#define Y_DUAL_STEPPER_DRIVERS +#if ENABLED(Y_DUAL_STEPPER_DRIVERS) + // Set true if the two Y motors need to rotate in opposite directions + #define INVERT_Y2_VS_Y_DIR true +#endif + +// A single Z stepper driver is usually used to drive 2 stepper motors. +// Uncomment this option to use a separate stepper driver for each Z axis motor. +// The next unused E driver will be assigned to the second Z stepper. +//#define Z_DUAL_STEPPER_DRIVERS + +#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. + // 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. + // If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it is.. think about it) and the Z adjust would be positive. + // Play a little bit with small adjustments (0.5mm) and check the behaviour. + // The M119 (endstops report) will start reporting the Z2 Endstop as well. + + //#define Z_DUAL_ENDSTOPS + + #if ENABLED(Z_DUAL_ENDSTOPS) + #define Z2_USE_ENDSTOP _XMAX_ + #define Z_DUAL_ENDSTOPS_ADJUSTMENT 0 // use M666 command to determine/test this value + #endif + +#endif // Z_DUAL_STEPPER_DRIVERS + +// Enable this for dual x-carriage printers. +// A dual x-carriage design has the advantage that the inactive extruder can be parked which +// prevents hot-end ooze contaminating the print. It also reduces the weight of each x-carriage +// allowing faster printing speeds. Connect your X2 stepper to the first unused E plug. +//#define DUAL_X_CARRIAGE +#if ENABLED(DUAL_X_CARRIAGE) + // Configuration for second X-carriage + // Note: the first x-carriage is defined as the x-carriage which homes to the minimum endstop; + // the second x-carriage always homes to the maximum endstop. + #define X2_MIN_POS 80 // set minimum to ensure second x-carriage doesn't hit the parked first X-carriage + #define X2_MAX_POS 353 // set maximum to the distance between toolheads when both heads are homed + #define X2_HOME_DIR 1 // the second X-carriage always homes to the maximum endstop position + #define X2_HOME_POS X2_MAX_POS // default home position is the maximum carriage position + // However: In this mode the HOTEND_OFFSET_X value for the second extruder provides a software + // override for X2_HOME_POS. This also allow recalibration of the distance between the two endstops + // without modifying the firmware (through the "M218 T1 X???" command). + // Remember: you should set the second extruder x-offset to 0 in your slicer. + + // There are a few selectable movement modes for dual x-carriages using M605 S + // Mode 0 (DXC_FULL_CONTROL_MODE): Full control. The slicer has full control over both x-carriages and can achieve optimal travel results + // as long as it supports dual x-carriages. (M605 S0) + // Mode 1 (DXC_AUTO_PARK_MODE) : Auto-park mode. The firmware will automatically park and unpark the x-carriages on tool changes so + // that additional slicer support is not required. (M605 S1) + // Mode 2 (DXC_DUPLICATION_MODE) : Duplication mode. The firmware will transparently make the second x-carriage and extruder copy all + // actions of the first x-carriage. This allows the printer to print 2 arbitrary items at + // once. (2nd extruder x offset and temp offset are set using: M605 S2 [Xnnn] [Rmmm]) + + // This is the default power-up mode which can be later using M605. + #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE + + // Default settings in "Auto-park Mode" + #define TOOLCHANGE_PARK_ZLIFT 0.2 // the distance to raise Z axis when parking an extruder + #define TOOLCHANGE_UNPARK_ZLIFT 1 // the distance to raise Z axis when unparking an extruder + + // Default x offset in duplication mode (typically set to half print bed width) + #define DEFAULT_DUPLICATION_X_OFFSET 100 + +#endif // DUAL_X_CARRIAGE + +// Activate a solenoid on the active extruder with M380. Disable all with M381. +// Define SOL0_PIN, SOL1_PIN, etc., for each extruder that has a solenoid. +//#define EXT_SOLENOID + +// @section homing + +//homing hits the endstop, then retracts by this distance, before it tries to slowly bump again: +#define X_HOME_BUMP_MM 5 +#define Y_HOME_BUMP_MM 5 +#define Z_HOME_BUMP_MM 2 +#define HOMING_BUMP_DIVISOR {2, 2, 4} // Re-Bump Speed Divisor (Divides the Homing Feedrate) +//#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. + +// When G28 is called, this option will make Y home before X +//#define HOME_Y_BEFORE_X + +// @section machine + +#define AXIS_RELATIVE_MODES {false, false, false, false} + +// Allow duplication mode with a basic dual-nozzle extruder +//#define DUAL_NOZZLE_DUPLICATION_MODE + +// By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step. +#define INVERT_X_STEP_PIN false +#define INVERT_Y_STEP_PIN false +#define INVERT_Z_STEP_PIN false +#define INVERT_E_STEP_PIN false + +// Default stepper release if idle. Set to 0 to deactivate. +// Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true. +// Time can be set by M18 and M84. +#define DEFAULT_STEPPER_DEACTIVE_TIME 120 +#define DISABLE_INACTIVE_X true +#define DISABLE_INACTIVE_Y true +#define DISABLE_INACTIVE_Z true // set to false if the nozzle will fall down on your printed part when print has finished. +#define DISABLE_INACTIVE_E true + +#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate +#define DEFAULT_MINTRAVELFEEDRATE 0.0 + +//#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated + +// @section lcd + +#if ENABLED(ULTIPANEL) + #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel + #define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder +#endif + +// @section extras + +// minimum time in microseconds that a movement needs to take if the buffer is emptied. +#define DEFAULT_MINSEGMENTTIME 20000 + +// If defined the movements slow down when the look ahead buffer is only half full +#define SLOWDOWN + +// Frequency limit +// See nophead's blog for more info +// Not working O +//#define XY_FREQUENCY_LIMIT 15 + +// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end +// of the buffer and all stops. This should not be much greater than zero and should only be changed +// if unwanted behavior is observed on a user's machine when running at very slow speeds. +#define MINIMUM_PLANNER_SPEED 0.05// (mm/sec) + +// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU. +#define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16] + +/** + * @section stepper motor current + * + * Some boards have a means of setting the stepper motor current via firmware. + * + * The power on motor currents are set by: + * PWM_MOTOR_CURRENT - used by MINIRAMBO & ULTIMAIN_2 + * known compatible chips: A4982 + * DIGIPOT_MOTOR_CURRENT - used by BQ_ZUM_MEGA_3D, RAMBO & SCOOVO_X9H + * known compatible chips: AD5206 + * DAC_MOTOR_CURRENT_DEFAULT - used by PRINTRBOARD_REVF & RIGIDBOARD_V2 + * known compatible chips: MCP4728 + * DIGIPOT_I2C_MOTOR_CURRENTS - used by 5DPRINT, AZTEEG_X3_PRO, MIGHTYBOARD_REVE + * known compatible chips: MCP4451, MCP4018 + * + * Motor currents can also be set by M907 - M910 and by the LCD. + * M907 - applies to all. + * M908 - BQ_ZUM_MEGA_3D, RAMBO, PRINTRBOARD_REVF, RIGIDBOARD_V2 & SCOOVO_X9H + * M909, M910 & LCD - only PRINTRBOARD_REVF & RIGIDBOARD_V2 + */ +//#define PWM_MOTOR_CURRENT {1300, 1300, 1250} // Values in milliamps +//#define DIGIPOT_MOTOR_CURRENT {135,135,135,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) +//#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis + +// Uncomment to enable an I2C based DIGIPOT like on the Azteeg X3 Pro +//#define DIGIPOT_I2C +//#define DIGIPOT_MCP4018 +#define DIGIPOT_I2C_NUM_CHANNELS 8 // 5DPRINT: 4 AZTEEG_X3_PRO: 8 +// Actual motor currents in Amps, need as many here as DIGIPOT_I2C_NUM_CHANNELS +#define DIGIPOT_I2C_MOTOR_CURRENTS {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0} // AZTEEG_X3_PRO + +//=========================================================================== +//=============================Additional Features=========================== +//=========================================================================== + +#define ENCODER_RATE_MULTIPLIER // If defined, certain menu edit operations automatically multiply the steps when the encoder is moved quickly +#define ENCODER_10X_STEPS_PER_SEC 75 // If the encoder steps per sec exceeds this value, multiply steps moved x10 to quickly advance the value +#define ENCODER_100X_STEPS_PER_SEC 300 // If the encoder steps per sec exceeds this value, multiply steps moved x100 to really quickly advance the value + +//#define CHDK 4 //Pin for triggering CHDK to take a picture see how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ +#define CHDK_DELAY 50 //How long in ms the pin should stay HIGH before going LOW again + +// @section lcd + +// Include a page of printer information in the LCD Main Menu +//#define LCD_INFO_MENU + +// Scroll a longer status message into view +//#define STATUS_MESSAGE_SCROLLING + +// On the Info Screen, display XY with one decimal place when possible +//#define LCD_DECIMAL_SMALL_XY + +// The timeout (in ms) to return to the status screen from sub-menus +//#define LCD_TIMEOUT_TO_STATUS 15000 + +#if ENABLED(SDSUPPORT) + + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED + + #define SD_FINISHED_STEPPERRELEASE true //if sd support and the file is finished: disable steppers? + #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place. + + #define SDCARD_RATHERRECENTFIRST //reverse file order of sd card menu display. Its sorted practically after the file system block order. + // if a file is deleted, it frees a block. hence, the order is not purely chronological. To still have auto0.g accessible, there is again the option to do that. + // using: + //#define MENU_ADDAUTOSTART + + /** + * Sort SD file listings in alphabetical order. + * + * With this option enabled, items on SD cards will be sorted + * by name for easier navigation. + * + * By default... + * + * - Use the slowest -but safest- method for sorting. + * - Folders are sorted to the top. + * - The sort key is statically allocated. + * - No added G-code (M34) support. + * - 40 item sorting limit. (Items after the first 40 are unsorted.) + * + * SD sorting uses static allocation (as set by SDSORT_LIMIT), allowing the + * compiler to calculate the worst-case usage and throw an error if the SRAM + * limit is exceeded. + * + * - SDSORT_USES_RAM provides faster sorting via a static directory buffer. + * - SDSORT_USES_STACK does the same, but uses a local stack-based buffer. + * - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!) + * - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!) + */ + //#define SDCARD_SORT_ALPHA + + // SD Card Sorting options + #if ENABLED(SDCARD_SORT_ALPHA) + #define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). + #define FOLDER_SORTING -1 // -1=above 0=none 1=below + #define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code. + #define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting. + #define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.) + #define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option. + #define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use! + #endif + + // Show a progress bar on HD44780 LCDs for SD printing + //#define LCD_PROGRESS_BAR + + #if ENABLED(LCD_PROGRESS_BAR) + // Amount of time (ms) to show the bar + #define PROGRESS_BAR_BAR_TIME 2000 + // Amount of time (ms) to show the status message + #define PROGRESS_BAR_MSG_TIME 3000 + // Amount of time (ms) to retain the status message (0=forever) + #define PROGRESS_MSG_EXPIRE 0 + // Enable this to show messages for MSG_TIME then hide them + //#define PROGRESS_MSG_ONCE + // Add a menu item to test the progress bar: + //#define LCD_PROGRESS_BAR_TEST + #endif + + // This allows hosts to request long names for files and folders with M33 + #define LONG_FILENAME_HOST_SUPPORT + + // This option allows you to abort SD printing when any endstop is triggered. + // This feature must be enabled with "M540 S1" or from the LCD menu. + // To have any effect, endstops must be enabled during SD printing. + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + +#endif // SDSUPPORT + +/** + * Additional options for Graphical Displays + * + * Use the optimizations here to improve printing performance, + * which can be adversely affected by graphical display drawing, + * especially when doing several short moves, and when printing + * on DELTA and SCARA machines. + * + * Some of these options may result in the display lagging behind + * controller events, as there is a trade-off between reliable + * printing performance versus fast display updates. + */ +#if ENABLED(DOGLCD) + // Enable to save many cycles by drawing a hollow frame on the Info Screen + #define XYZ_HOLLOW_FRAME + + // Enable to save many cycles by drawing a hollow frame on Menu Screens + #define MENU_HOLLOW_FRAME + + // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM. + // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese. + //#define USE_BIG_EDIT_FONT + + // A smaller font may be used on the Info Screen. Costs 2300 bytes of PROGMEM. + // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese. + //#define USE_SMALL_INFOFONT + + // Enable this option and reduce the value to optimize screen updates. + // The normal delay is 10µs. Use the lowest value that still gives a reliable display. + //#define DOGM_SPI_DELAY_US 5 +#endif // DOGLCD + +// @section safety + +// The hardware watchdog should reset the microcontroller disabling all outputs, +// in case the firmware gets stuck and doesn't do temperature regulation. +#define USE_WATCHDOG + +#if ENABLED(USE_WATCHDOG) + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL +#endif + +// @section lcd + +/** + * Babystepping enables movement of the axes by tiny increments without changing + * the current position values. This feature is used primarily to adjust the Z + * axis in the first layer of a print in real-time. + * + * Warning: Does not respect endstops! + */ +//#define BABYSTEPPING +#if ENABLED(BABYSTEPPING) + #define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! + #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way + #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion. + //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping + //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. + #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds. + // Note: Extra time may be added to mitigate controller latency. +#endif + +// @section extruder + +// extruder advance constant (s2/mm3) +// +// advance (steps) = STEPS_PER_CUBIC_MM_E * EXTRUDER_ADVANCE_K * cubic mm per second ^ 2 +// +// Hooke's law says: force = k * distance +// Bernoulli's principle says: v ^ 2 / 2 + g . h + pressure / density = constant +// so: v ^ 2 is proportional to number of steps we advance the extruder +//#define ADVANCE + +#if ENABLED(ADVANCE) + #define EXTRUDER_ADVANCE_K .0 + #define D_FILAMENT 2.85 +#endif + +/** + * Implementation of linear pressure control + * + * Assumption: advance = k * (delta velocity) + * K=0 means advance disabled. + * See Marlin documentation for calibration instructions. + */ +//#define LIN_ADVANCE + +#if ENABLED(LIN_ADVANCE) + #define LIN_ADVANCE_K 75 + + /** + * Some Slicers produce Gcode with randomly jumping extrusion widths occasionally. + * For example within a 0.4mm perimeter it may produce a single segment of 0.05mm width. + * While this is harmless for normal printing (the fluid nature of the filament will + * close this very, very tiny gap), it throws off the LIN_ADVANCE pressure adaption. + * + * For this case LIN_ADVANCE_E_D_RATIO can be used to set the extrusion:distance ratio + * to a fixed value. Note that using a fixed ratio will lead to wrong nozzle pressures + * if the slicer is using variable widths or layer heights within one print! + * + * This option sets the default E:D ratio at startup. Use `M900` to override this value. + * + * Example: `M900 W0.4 H0.2 D1.75`, where: + * - W is the extrusion width in mm + * - H is the layer height in mm + * - D is the filament diameter in mm + * + * Example: `M900 R0.0458` to set the ratio directly. + * + * Set to 0 to auto-detect the ratio based on given Gcode G1 print moves. + * + * Slic3r (including Prusa Slic3r) produces Gcode compatible with the automatic mode. + * Cura (as of this writing) may produce Gcode incompatible with the automatic mode. + */ + #define LIN_ADVANCE_E_D_RATIO 0 // The calculated ratio (or 0) according to the formula W * H / ((D / 2) ^ 2 * PI) + // Example: 0.4 * 0.2 / ((1.75 / 2) ^ 2 * PI) = 0.033260135 +#endif + +// @section leveling + +// Default mesh area is an area with an inset margin on the print area. +// Below are the macros that are used to define the borders for the mesh area, +// made available here for specialized needs, ie dual extruder setup. +#if ENABLED(MESH_BED_LEVELING) + #define MESH_MIN_X (X_MIN_POS + MESH_INSET) + #define MESH_MAX_X (X_MAX_POS - (MESH_INSET)) + #define MESH_MIN_Y (Y_MIN_POS + MESH_INSET) + #define MESH_MAX_Y (Y_MAX_POS - (MESH_INSET)) +#elif ENABLED(AUTO_BED_LEVELING_UBL) + #define UBL_MESH_MIN_X (X_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_X (X_MAX_POS - (UBL_MESH_INSET)) + #define UBL_MESH_MIN_Y (Y_MIN_POS + UBL_MESH_INSET) + #define UBL_MESH_MAX_Y (Y_MAX_POS - (UBL_MESH_INSET)) + + // If this is defined, the currently active mesh will be saved in the + // current slot on M500. + #define UBL_SAVE_ACTIVE_ON_M500 +#endif + +// @section extras + +// Arc interpretation settings: +#define ARC_SUPPORT // Disabling this saves ~2738 bytes +#define MM_PER_ARC_SEGMENT 1 +#define N_ARC_CORRECTION 25 + +// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. +//#define BEZIER_CURVE_SUPPORT + +// G38.2 and G38.3 Probe Target +// Enable PROBE_DOUBLE_TOUCH if you want G38 to double touch +//#define G38_PROBE_TARGET +#if ENABLED(G38_PROBE_TARGET) + #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move) +#endif + +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 + +// The minimum pulse width (in µs) for stepping a stepper. +// Set this if you find stepping unreliable, or if using a very fast CPU. +#define MINIMUM_STEPPER_PULSE 0 // (µs) The smallest stepper pulse allowed + +// @section temperature + +// Control heater 0 and heater 1 in parallel. +//#define HEATERS_PARALLEL + +//=========================================================================== +//================================= Buffers ================================= +//=========================================================================== + +// @section hidden + +// The number of linear motions that can be in the plan at any give time. +// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ring-buffering. +#if ENABLED(SDSUPPORT) + #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller +#else + #define BLOCK_BUFFER_SIZE 16 // maximize block buffer +#endif + +// @section serial + +// The ASCII buffer for serial input +#define MAX_CMD_SIZE 96 +#define BUFSIZE 4 + +// Transfer Buffer Size +// To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0. +// To buffer a simple "ok" you need 4 bytes. +// For ADVANCED_OK (M105) you need 32 bytes. +// For debug-echo: 128 bytes for the optimal speed. +// Other output doesn't need to be that speedy. +// :[0, 2, 4, 8, 16, 32, 64, 128, 256] +#define TX_BUFFER_SIZE 0 + +// Enable an emergency-command parser to intercept certain commands as they +// enter the serial receive buffer, so they cannot be blocked. +// Currently handles M108, M112, M410 +// Does not work on boards using AT90USB (USBCON) processors! +//#define EMERGENCY_PARSER + +// Bad Serial-connections can miss a received command by sending an 'ok' +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds + +// Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. +//#define ADVANCED_OK + +// @section fwretract + +// Firmware based and LCD controlled retract +// M207 and M208 can be used to define parameters for the retraction. +// The retraction can be called by the slicer using G10 and G11 +// until then, intended retractions can be detected by moves that only extrude and the direction. +// the moves are than replaced by the firmware controlled ones. + +//#define FWRETRACT //ONLY PARTIALLY TESTED +#if ENABLED(FWRETRACT) + #define MIN_RETRACT 0.1 //minimum extruded mm to accept a automatic gcode retraction attempt + #define RETRACT_LENGTH 3 //default retract length (positive mm) + #define RETRACT_LENGTH_SWAP 13 //default swap retract length (positive mm), for extruder change + #define RETRACT_FEEDRATE 45 //default feedrate for retracting (mm/s) + #define RETRACT_ZLIFT 0 //default retract Z-lift + #define RETRACT_RECOVER_LENGTH 0 //default additional recover length (mm, added to retract length when recovering) + #define RETRACT_RECOVER_LENGTH_SWAP 0 //default additional swap recover length (mm, added to retract length when recovering from extruder change) + #define RETRACT_RECOVER_FEEDRATE 8 //default feedrate for recovering from retraction (mm/s) +#endif + +/** + * Advanced Pause + * Experimental feature for filament change support and for parking the nozzle when paused. + * Adds the GCode M600 for initiating filament change. + * If PARK_HEAD_ON_PAUSE enabled, adds the GCode M125 to pause printing and park the nozzle. + * + * Requires an LCD display. + * This feature is required for the default FILAMENT_RUNOUT_SCRIPT. + */ +//#define ADVANCED_PAUSE_FEATURE +#if ENABLED(ADVANCED_PAUSE_FEATURE) + #define PAUSE_PARK_X_POS 3 // X position of hotend + #define PAUSE_PARK_Y_POS 3 // Y position of hotend + #define PAUSE_PARK_Z_ADD 10 // Z addition of hotend (lift) + #define PAUSE_PARK_XY_FEEDRATE 100 // X and Y axes feedrate in mm/s (also used for delta printers Z axis) + #define PAUSE_PARK_Z_FEEDRATE 5 // Z axis feedrate in mm/s (not used for delta printers) + #define PAUSE_PARK_RETRACT_FEEDRATE 60 // Initial retract feedrate in mm/s + #define PAUSE_PARK_RETRACT_LENGTH 2 // Initial retract in mm + // It is a short retract used immediately after print interrupt before move to filament exchange position + #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // Unload filament feedrate in mm/s - filament unloading can be fast + #define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // Unload filament length from hotend in mm + // Longer length for bowden printers to unload filament from whole bowden tube, + // shorter length for printers without bowden to unload filament from extruder only, + // 0 to disable unloading for manual unloading + #define FILAMENT_CHANGE_LOAD_FEEDRATE 6 // Load filament feedrate in mm/s - filament loading into the bowden tube can be fast + #define FILAMENT_CHANGE_LOAD_LENGTH 0 // Load filament length over hotend in mm + // Longer length for bowden printers to fast load filament into whole bowden tube over the hotend, + // Short or zero length for printers without bowden where loading is not used + #define ADVANCED_PAUSE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate + #define ADVANCED_PAUSE_EXTRUDE_LENGTH 50 // Extrude filament length in mm after filament is loaded over the hotend, + // 0 to disable for manual extrusion + // Filament can be extruded repeatedly from the filament exchange menu to fill the hotend, + // or until outcoming filament color is not clear for filament color change + #define PAUSE_PARK_NOZZLE_TIMEOUT 45 // Turn off nozzle if user doesn't change filament within this time limit in seconds + #define FILAMENT_CHANGE_NUMBER_OF_ALERT_BEEPS 5 // Number of alert beeps before printer goes quiet + #define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable to have stepper motors hold position during filament change + // even if it takes longer than DEFAULT_STEPPER_DEACTIVE_TIME. + //#define PARK_HEAD_ON_PAUSE // Go to filament change position on pause, return to print position on resume +#endif + +// @section tmc + +/** + * Enable this section if you have TMC26X motor drivers. + * You will need to import the TMC26XStepper library into the Arduino IDE for this + * (https://github.com/trinamic/TMC26XStepper.git) + */ +//#define HAVE_TMCDRIVER + +#if ENABLED(HAVE_TMCDRIVER) + + //#define X_IS_TMC + //#define X2_IS_TMC + //#define Y_IS_TMC + //#define Y2_IS_TMC + //#define Z_IS_TMC + //#define Z2_IS_TMC + //#define E0_IS_TMC + //#define E1_IS_TMC + //#define E2_IS_TMC + //#define E3_IS_TMC + //#define E4_IS_TMC + + #define X_MAX_CURRENT 1000 // in mA + #define X_SENSE_RESISTOR 91 // in mOhms + #define X_MICROSTEPS 16 // number of microsteps + + #define X2_MAX_CURRENT 1000 + #define X2_SENSE_RESISTOR 91 + #define X2_MICROSTEPS 16 + + #define Y_MAX_CURRENT 1000 + #define Y_SENSE_RESISTOR 91 + #define Y_MICROSTEPS 16 + + #define Y2_MAX_CURRENT 1000 + #define Y2_SENSE_RESISTOR 91 + #define Y2_MICROSTEPS 16 + + #define Z_MAX_CURRENT 1000 + #define Z_SENSE_RESISTOR 91 + #define Z_MICROSTEPS 16 + + #define Z2_MAX_CURRENT 1000 + #define Z2_SENSE_RESISTOR 91 + #define Z2_MICROSTEPS 16 + + #define E0_MAX_CURRENT 1000 + #define E0_SENSE_RESISTOR 91 + #define E0_MICROSTEPS 16 + + #define E1_MAX_CURRENT 1000 + #define E1_SENSE_RESISTOR 91 + #define E1_MICROSTEPS 16 + + #define E2_MAX_CURRENT 1000 + #define E2_SENSE_RESISTOR 91 + #define E2_MICROSTEPS 16 + + #define E3_MAX_CURRENT 1000 + #define E3_SENSE_RESISTOR 91 + #define E3_MICROSTEPS 16 + + #define E4_MAX_CURRENT 1000 + #define E4_SENSE_RESISTOR 91 + #define E4_MICROSTEPS 16 + +#endif + +// @section TMC2130 + +/** + * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. + * + * You'll also need the TMC2130Stepper Arduino library + * (https://github.com/teemuatlut/TMC2130Stepper). + * + * To use TMC2130 stepper drivers in SPI mode connect your SPI2130 pins to + * the hardware SPI interface on your board and define the required CS pins + * in your `pins_MYBOARD.h` file. (e.g., RAMPS 1.4 uses AUX3 pins `X_CS_PIN 53`, `Y_CS_PIN 49`, etc.). + */ +//#define HAVE_TMC2130 + +#if ENABLED(HAVE_TMC2130) + + // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 + + /** + * Stepper driver settings + */ + + #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 + #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current + #define INTERPOLATE 1 // Interpolate X/Y/Z_MICROSTEPS to 256 + + #define X_CURRENT 1000 // rms current in mA. Multiply by 1.41 for peak current. + #define X_MICROSTEPS 16 // 0..256 + + #define Y_CURRENT 1000 + #define Y_MICROSTEPS 16 + + #define Z_CURRENT 1000 + #define Z_MICROSTEPS 16 + + //#define X2_CURRENT 1000 + //#define X2_MICROSTEPS 16 + + //#define Y2_CURRENT 1000 + //#define Y2_MICROSTEPS 16 + + //#define Z2_CURRENT 1000 + //#define Z2_MICROSTEPS 16 + + //#define E0_CURRENT 1000 + //#define E0_MICROSTEPS 16 + + //#define E1_CURRENT 1000 + //#define E1_MICROSTEPS 16 + + //#define E2_CURRENT 1000 + //#define E2_MICROSTEPS 16 + + //#define E3_CURRENT 1000 + //#define E3_MICROSTEPS 16 + + //#define E4_CURRENT 1000 + //#define E4_MICROSTEPS 16 + + /** + * Use Trinamic's ultra quiet stepping mode. + * When disabled, Marlin will use spreadCycle stepping mode. + */ + #define STEALTHCHOP + + /** + * Let Marlin automatically control stepper current. + * This is still an experimental feature. + * Increase current every 5s by CURRENT_STEP until stepper temperature prewarn gets triggered, + * then decrease current by CURRENT_STEP until temperature prewarn is cleared. + * Adjusting starts from X/Y/Z/E_CURRENT but will not increase over AUTO_ADJUST_MAX + * Relevant g-codes: + * M906 - Set or get motor current in milliamps using axis codes X, Y, Z, E. Report values if no axis codes given. + * M906 S1 - Start adjusting current + * M906 S0 - Stop adjusting current + * M911 - Report stepper driver overtemperature pre-warn condition. + * M912 - Clear stepper driver overtemperature pre-warn condition flag. + */ + //#define AUTOMATIC_CURRENT_CONTROL + + #if ENABLED(AUTOMATIC_CURRENT_CONTROL) + #define CURRENT_STEP 50 // [mA] + #define AUTO_ADJUST_MAX 1300 // [mA], 1300mA_rms = 1840mA_peak + #define REPORT_CURRENT_CHANGE + #endif + + /** + * The driver will switch to spreadCycle when stepper speed is over HYBRID_THRESHOLD. + * This mode allows for faster movements at the expense of higher noise levels. + * STEALTHCHOP needs to be enabled. + * M913 X/Y/Z/E to live tune the setting + */ + //#define HYBRID_THRESHOLD + + #define X_HYBRID_THRESHOLD 100 // [mm/s] + #define X2_HYBRID_THRESHOLD 100 + #define Y_HYBRID_THRESHOLD 100 + #define Y2_HYBRID_THRESHOLD 100 + #define Z_HYBRID_THRESHOLD 4 + #define Z2_HYBRID_THRESHOLD 4 + #define E0_HYBRID_THRESHOLD 30 + #define E1_HYBRID_THRESHOLD 30 + #define E2_HYBRID_THRESHOLD 30 + #define E3_HYBRID_THRESHOLD 30 + #define E4_HYBRID_THRESHOLD 30 + + /** + * Use stallGuard2 to sense an obstacle and trigger an endstop. + * You need to place a wire from the driver's DIAG1 pin to the X/Y endstop pin. + * If used along with STEALTHCHOP, the movement will be louder when homing. This is normal. + * + * X/Y_HOMING_SENSITIVITY is used for tuning the trigger sensitivity. + * Higher values make the system LESS sensitive. + * Lower value make the system MORE sensitive. + * Too low values can lead to false positives, while too high values will collide the axis without triggering. + * It is advised to set X/Y_HOME_BUMP_MM to 0. + * M914 X/Y to live tune the setting + */ + //#define SENSORLESS_HOMING + + #if ENABLED(SENSORLESS_HOMING) + #define X_HOMING_SENSITIVITY 19 + #define Y_HOMING_SENSITIVITY 19 + #endif + + /** + * You can set your own advanced settings by filling in predefined functions. + * A list of available functions can be found on the library github page + * https://github.com/teemuatlut/TMC2130Stepper + * + * Example: + * #define TMC2130_ADV() { \ + * stepperX.diag0_temp_prewarn(1); \ + * stepperX.interpolate(0); \ + * } + */ + #define TMC2130_ADV() { } + +#endif // ENABLED(HAVE_TMC2130) + +// @section L6470 + +/** + * Enable this section if you have L6470 motor drivers. + * You need to import the L6470 library into the Arduino IDE for this. + * (https://github.com/ameyer/Arduino-L6470) + */ + +//#define HAVE_L6470DRIVER +#if ENABLED(HAVE_L6470DRIVER) + + //#define X_IS_L6470 + //#define X2_IS_L6470 + //#define Y_IS_L6470 + //#define Y2_IS_L6470 + //#define Z_IS_L6470 + //#define Z2_IS_L6470 + //#define E0_IS_L6470 + //#define E1_IS_L6470 + //#define E2_IS_L6470 + //#define E3_IS_L6470 + //#define E4_IS_L6470 + + #define X_MICROSTEPS 16 // number of microsteps + #define X_K_VAL 50 // 0 - 255, Higher values, are higher power. Be careful 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_MICROSTEPS 16 + #define X2_K_VAL 50 + #define X2_OVERCURRENT 2000 + #define X2_STALLCURRENT 1500 + + #define Y_MICROSTEPS 16 + #define Y_K_VAL 50 + #define Y_OVERCURRENT 2000 + #define Y_STALLCURRENT 1500 + + #define Y2_MICROSTEPS 16 + #define Y2_K_VAL 50 + #define Y2_OVERCURRENT 2000 + #define Y2_STALLCURRENT 1500 + + #define Z_MICROSTEPS 16 + #define Z_K_VAL 50 + #define Z_OVERCURRENT 2000 + #define Z_STALLCURRENT 1500 + + #define Z2_MICROSTEPS 16 + #define Z2_K_VAL 50 + #define Z2_OVERCURRENT 2000 + #define Z2_STALLCURRENT 1500 + + #define E0_MICROSTEPS 16 + #define E0_K_VAL 50 + #define E0_OVERCURRENT 2000 + #define E0_STALLCURRENT 1500 + + #define E1_MICROSTEPS 16 + #define E1_K_VAL 50 + #define E1_OVERCURRENT 2000 + #define E1_STALLCURRENT 1500 + + #define E2_MICROSTEPS 16 + #define E2_K_VAL 50 + #define E2_OVERCURRENT 2000 + #define E2_STALLCURRENT 1500 + + #define E3_MICROSTEPS 16 + #define E3_K_VAL 50 + #define E3_OVERCURRENT 2000 + #define E3_STALLCURRENT 1500 + + #define E4_MICROSTEPS 16 + #define E4_K_VAL 50 + #define E4_OVERCURRENT 2000 + #define E4_STALLCURRENT 1500 + +#endif + +/** + * TWI/I2C BUS + * + * This feature is an EXPERIMENTAL feature so it shall not be used on production + * machines. Enabling this will allow you to send and receive I2C data from slave + * devices on the bus. + * + * ; Example #1 + * ; This macro send the string "Marlin" to the slave device with address 0x63 (99) + * ; It uses multiple M260 commands with one B arg + * M260 A99 ; Target slave address + * M260 B77 ; M + * M260 B97 ; a + * M260 B114 ; r + * M260 B108 ; l + * M260 B105 ; i + * M260 B110 ; n + * M260 S1 ; Send the current buffer + * + * ; Example #2 + * ; Request 6 bytes from slave device with address 0x63 (99) + * M261 A99 B5 + * + * ; Example #3 + * ; Example serial output of a M261 request + * echo:i2c-reply: from:99 bytes:5 data:hello + */ + +// @section i2cbus + +//#define EXPERIMENTAL_I2CBUS +#define I2C_SLAVE_ADDRESS 0 // Set a value from 8 to 127 to act as a slave + +// @section extras + +/** + * Spindle & Laser control + * + * Add the M3, M4, and M5 commands to turn the spindle/laser on and off, and + * to set spindle speed, spindle direction, and laser power. + * + * SuperPid is a router/spindle speed controller used in the CNC milling community. + * Marlin can be used to turn the spindle on and off. It can also be used to set + * the spindle speed from 5,000 to 30,000 RPM. + * + * You'll need to select a pin for the ON/OFF function and optionally choose a 0-5V + * hardware PWM pin for the speed control and a pin for the rotation direction. + * + * See http://marlinfw.org/docs/configuration/laser_spindle.html for more config details. + */ +//#define SPINDLE_LASER_ENABLE +#if ENABLED(SPINDLE_LASER_ENABLE) + + #define SPINDLE_LASER_ENABLE_INVERT false // set to "true" if the on/off function is reversed + #define SPINDLE_LASER_PWM true // set to true if your controller supports setting the speed/power + #define SPINDLE_LASER_PWM_INVERT true // set to "true" if the speed/power goes up when you want it to go slower + #define SPINDLE_LASER_POWERUP_DELAY 5000 // delay in milliseconds to allow the spindle/laser to come up to speed/power + #define SPINDLE_LASER_POWERDOWN_DELAY 5000 // delay in milliseconds to allow the spindle to stop + #define SPINDLE_DIR_CHANGE true // set to true if your spindle controller supports changing spindle direction + #define SPINDLE_INVERT_DIR false + #define SPINDLE_STOP_ON_DIR_CHANGE true // set to true if Marlin should stop the spindle before changing rotation direction + + /** + * The M3 & M4 commands use the following equation to convert PWM duty cycle to speed/power + * + * SPEED/POWER = PWM duty cycle * SPEED_POWER_SLOPE + SPEED_POWER_INTERCEPT + * where PWM duty cycle varies from 0 to 255 + * + * set the following for your controller (ALL MUST BE SET) + */ + + #define SPEED_POWER_SLOPE 118.4 + #define SPEED_POWER_INTERCEPT 0 + #define SPEED_POWER_MIN 5000 + #define SPEED_POWER_MAX 30000 // SuperPID router controller 0 - 30,000 RPM + + //#define SPEED_POWER_SLOPE 0.3922 + //#define SPEED_POWER_INTERCEPT 0 + //#define SPEED_POWER_MIN 10 + //#define SPEED_POWER_MAX 100 // 0-100% +#endif + +/** + * M43 - display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins + */ +//#define PINS_DEBUGGING + +/** + * Auto-report temperatures with M155 S + */ +//#define AUTO_REPORT_TEMPERATURES + +/** + * Include capabilities in M115 output + */ +//#define EXTENDED_CAPABILITIES_REPORT + +/** + * Volumetric extrusion default state + * Activate to make volumetric extrusion the default method, + * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter. + * + * M200 D0 to disable, M200 Dn to set a new diameter. + */ +//#define VOLUMETRIC_DEFAULT_ON + +/** + * Enable this option for a leaner build of Marlin that removes all + * workspace offsets, simplifying coordinate transformations, leveling, etc. + * + * - M206 and M428 are disabled. + * - G92 will revert to its behavior from Marlin 1.0. + */ +//#define NO_WORKSPACE_OFFSETS + +/** + * Set the number of proportional font spaces required to fill up a typical character space. + * This can help to better align the output of commands like `G29 O` Mesh Output. + * + * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0. + * Otherwise, adjust according to your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + +/** + * Spend 28 bytes of SRAM to optimize the GCode parser + */ +#define FASTER_GCODE_PARSER + +/** + * User-defined menu items that execute custom GCode + */ +//#define CUSTOM_USER_MENUS +#if ENABLED(CUSTOM_USER_MENUS) + #define USER_SCRIPT_DONE "M117 User Script Done" + + #define USER_DESC_1 "Home & UBL Info" + #define USER_GCODE_1 "G28\nG29 W" + + #define USER_DESC_2 "Preheat for PLA" + #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) + + #define USER_DESC_3 "Preheat for ABS" + #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) + + #define USER_DESC_4 "Heat Bed/Home/Level" + #define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29" + + #define USER_DESC_5 "Home & Info" + #define USER_GCODE_5 "G28\nM503" +#endif + +#endif // CONFIGURATION_ADV_H diff --git a/Marlin/example_configurations/M150/README.md b/Marlin/example_configurations/M150/README.md new file mode 100644 index 000000000..f1dc0746e --- /dev/null +++ b/Marlin/example_configurations/M150/README.md @@ -0,0 +1,3 @@ +# Configuration for Malyan M150 hobbyking printer +# config without automatic bed level sensor +# or in other words, "as stock" diff --git a/Marlin/example_configurations/M150/_Bootscreen.h b/Marlin/example_configurations/M150/_Bootscreen.h new file mode 100644 index 000000000..25570b10b --- /dev/null +++ b/Marlin/example_configurations/M150/_Bootscreen.h @@ -0,0 +1,104 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/** + * Custom Bitmap for splashscreen + * + * You may use one of the following tools to generate the C++ bitmap array from + * a black and white image: + * + * - http://www.marlinfw.org/tools/u8glib/converter.html + * - http://www.digole.com/tools/PicturetoC_Hex_converter.php + */ +#include + +#define CUSTOM_BOOTSCREEN_TIMEOUT 1000 +#define CUSTOM_BOOTSCREEN_BMPWIDTH 128 +#define CUSTOM_BOOTSCREEN_BMPHEIGHT 64 + +const unsigned char custom_start_bmp[1024] PROGMEM = { + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x07,0x00,0x00,0x03,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x1f,0xc0,0x00,0x0f,0xe0,0x7c,0x03,0xe0,0x78,0x1c,0x07,0x81,0xe0,0xf0,0x3e,0x0e +,0x7f,0xe0,0x00,0x3f,0xf0,0x7e,0x07,0xe0,0xfc,0x1c,0x03,0x81,0xc1,0xf8,0x3f,0x0e +,0x7f,0xf8,0x00,0x7f,0xf0,0x7e,0x07,0xe0,0xfc,0x1c,0x03,0xc3,0xc1,0xf8,0x3f,0x0e +,0x7b,0xfe,0x01,0xfe,0xf0,0x7f,0x0f,0xe1,0xfe,0x1c,0x01,0xc3,0x83,0xfc,0x3f,0x8e +,0x7c,0xff,0x87,0xf9,0xf0,0x77,0x0e,0xe1,0xfe,0x1c,0x01,0xe7,0x83,0xfc,0x3b,0x8e +,0x7f,0x7f,0xcf,0xf7,0xf0,0x77,0x9e,0xe1,0xce,0x1c,0x00,0xe7,0x03,0x9c,0x3b,0xce +,0x7f,0x9f,0xff,0xcf,0xf0,0x73,0x9c,0xe3,0xcf,0x1c,0x00,0xff,0x07,0x9e,0x39,0xce +,0x7f,0xe7,0xff,0x3f,0xf0,0x73,0xfc,0xe3,0x87,0x1c,0x00,0x7e,0x07,0x0e,0x39,0xee +,0x7f,0xfb,0xfe,0xff,0xf0,0x71,0xf8,0xe3,0x87,0x1c,0x00,0x7e,0x0f,0x0f,0x38,0xee +,0x7f,0xfc,0xf9,0xff,0xf0,0x71,0xf8,0xe7,0xff,0x9c,0x00,0x3c,0x0f,0xff,0x38,0xfe +,0x7f,0xff,0x27,0xff,0xf0,0x70,0xf0,0xe7,0xff,0x9c,0x00,0x3c,0x0f,0xff,0x38,0x7e +,0x7f,0xff,0xdf,0xff,0xf0,0x70,0xf0,0xef,0xff,0xdc,0x00,0x3c,0x1f,0xff,0xb8,0x7e +,0x7f,0xdf,0xff,0xdf,0xf0,0x70,0x60,0xef,0x03,0xdf,0xf8,0x3c,0x1e,0x07,0xb8,0x3e +,0x7f,0xc7,0xff,0x1f,0xf0,0x70,0x60,0xee,0x01,0xdf,0xf8,0x3c,0x1c,0x03,0xb8,0x3e +,0x7f,0xc3,0xfe,0x1f,0xf0,0x70,0x00,0xee,0x01,0xdf,0xf8,0x3c,0x1c,0x03,0xb8,0x1e +,0x7f,0xc3,0xfe,0x1f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x7f,0xc3,0xde,0x1f,0xf0,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe +,0x7f,0xc3,0xde,0x1f,0xf0,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe +,0x7f,0xc3,0xde,0x1f,0xf0,0x7c,0x3f,0xfa,0xfb,0xff,0xff,0xff,0xfd,0x7a,0xbf,0xfe +,0x7f,0xc3,0xde,0x1f,0xf0,0x7d,0x9f,0xfb,0xff,0xff,0xff,0xff,0xff,0x7e,0xf7,0xfe +,0x7f,0xc3,0xde,0x1f,0xf0,0x7d,0x93,0x1a,0x8a,0x18,0xe3,0x8c,0x45,0x1a,0xa2,0xde +,0x3f,0xc3,0xde,0x0f,0xf0,0x7c,0x2d,0xca,0xca,0xd6,0xe9,0x24,0xcd,0x6a,0xb6,0xbe +,0x1f,0x83,0xde,0x07,0xe0,0x7d,0xa3,0x6a,0x9a,0xd6,0xe9,0x26,0x65,0x6a,0xb6,0x3e +,0x06,0x03,0xde,0x01,0x80,0x7d,0x91,0x0a,0x8a,0xd8,0xe3,0x8c,0x45,0x1a,0xb3,0x7e +,0x00,0x03,0xde,0x00,0x00,0x7f,0xff,0xff,0xff,0xfe,0xef,0xff,0xff,0xff,0xff,0x7e +,0x00,0x03,0xde,0x00,0x00,0x7f,0xff,0xff,0xff,0xf1,0xef,0xff,0xff,0xff,0xfe,0xfe +,0x00,0x03,0xde,0x00,0x00,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe +,0x00,0x03,0xde,0x00,0x00,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe +,0x00,0x03,0xde,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x01,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +}; From 65a0212866c586b55f43c599f07d5ec563cb93c8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 2 Jun 2017 12:04:54 -0500 Subject: [PATCH 16/31] Easier override of FILWIDTH_PIN --- Marlin/pins_CHEAPTRONICv2.h | 5 ++++- Marlin/pins_PRINTRBOARD.h | 5 ++++- Marlin/pins_PRINTRBOARD_REVF.h | 5 ++++- Marlin/pins_RAMBO.h | 5 ++++- Marlin/pins_SCOOVO_X9H.h | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Marlin/pins_CHEAPTRONICv2.h b/Marlin/pins_CHEAPTRONICv2.h index e651d085d..257380dd6 100644 --- a/Marlin/pins_CHEAPTRONICv2.h +++ b/Marlin/pins_CHEAPTRONICv2.h @@ -111,9 +111,12 @@ // // Other board specific pins // -#define FILWIDTH_PIN 37 #define LED_PIN 13 #define SPINDLE_ENABLE_PIN 4 #define FAN_PIN 3 #define PS_ON_PIN 45 #define KILL_PIN 46 + +#ifndef FILWIDTH_PIN + #define FILWIDTH_PIN 37 // should be Analog Input (0-15) +#endif diff --git a/Marlin/pins_PRINTRBOARD.h b/Marlin/pins_PRINTRBOARD.h index b53db770a..a679340e7 100644 --- a/Marlin/pins_PRINTRBOARD.h +++ b/Marlin/pins_PRINTRBOARD.h @@ -99,7 +99,10 @@ // Misc. Functions // #define SDSS 26 -#define FILWIDTH_PIN 2 // Analog Input + +#ifndef FILWIDTH_PIN + #define FILWIDTH_PIN 2 // Analog Input +#endif // // LCD / Controller diff --git a/Marlin/pins_PRINTRBOARD_REVF.h b/Marlin/pins_PRINTRBOARD_REVF.h index fa5c3a615..16753fe32 100644 --- a/Marlin/pins_PRINTRBOARD_REVF.h +++ b/Marlin/pins_PRINTRBOARD_REVF.h @@ -102,7 +102,10 @@ // Misc. Functions // #define SDSS 20 // Teensylu pin mapping -#define FILWIDTH_PIN 2 // Analog Input + +#ifndef FILWIDTH_PIN + #define FILWIDTH_PIN 2 // Analog Input +#endif // // LCD / Controller diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h index c99cd7923..a317b1b76 100644 --- a/Marlin/pins_RAMBO.h +++ b/Marlin/pins_RAMBO.h @@ -135,10 +135,13 @@ // #define SDSS 53 #define LED_PIN 13 -#define FILWIDTH_PIN 3 // Analog Input #define PS_ON_PIN 4 #define CASE_LIGHT_PIN 46 +#ifndef FILWIDTH_PIN + #define FILWIDTH_PIN 3 // Analog Input +#endif + // // LCD / Controller // diff --git a/Marlin/pins_SCOOVO_X9H.h b/Marlin/pins_SCOOVO_X9H.h index a5ef15236..a687c9728 100644 --- a/Marlin/pins_SCOOVO_X9H.h +++ b/Marlin/pins_SCOOVO_X9H.h @@ -118,7 +118,10 @@ #define SDSS 53 #define LED_PIN 13 #define PS_ON_PIN 4 -#define FILWIDTH_PIN 3 // Analog Input + +#ifndef FILWIDTH_PIN + #define FILWIDTH_PIN 3 // Analog Input +#endif // // LCD / Controller From 911079104e0b68b5189b1cd0372f15295b711b63 Mon Sep 17 00:00:00 2001 From: FATALHERMIT Date: Tue, 21 Feb 2017 22:10:04 -0500 Subject: [PATCH 17/31] Support for ZRIB v2.0 Control Board --- Marlin/boards.h | 1 + Marlin/pins.h | 2 ++ Marlin/pins_RAMPS.h | 5 +++-- Marlin/pins_ZRIB_V20.h | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 Marlin/pins_ZRIB_V20.h diff --git a/Marlin/boards.h b/Marlin/boards.h index 32165f53c..6594b30fa 100644 --- a/Marlin/boards.h +++ b/Marlin/boards.h @@ -95,6 +95,7 @@ #define BOARD_BAM_DICE 401 // 2PrintBeta BAM&DICE with STK drivers #define BOARD_BAM_DICE_DUE 402 // 2PrintBeta BAM&DICE Due with STK drivers #define BOARD_BQ_ZUM_MEGA_3D 503 // bq ZUM Mega 3D +#define BOARD_ZRIB_V20 504 // zrib V2.0 control board (Chinese knock off RAMPS replica) #define MB(board) (MOTHERBOARD==BOARD_##board) diff --git a/Marlin/pins.h b/Marlin/pins.h index aef1083b9..703df1742 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -174,6 +174,8 @@ #include "pins_MKS_13.h" #elif MB(SAINSMART_2IN1) #include "pins_SAINSMART_2IN1.h" +#elif MB(ZRIB_V20) + #include "pins_ZRIB_V20.h" #else #error "Unknown MOTHERBOARD value set in Configuration.h" #endif diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index 629be3b91..4939a2b24 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -196,8 +196,9 @@ #define SDSS 53 #define LED_PIN 13 -// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector -#define FILWIDTH_PIN 5 // Analog Input +#ifndef FILWIDTH_PIN + #define FILWIDTH_PIN 5 // Analog Input on AUX2 +#endif // define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector #define FIL_RUNOUT_PIN 4 diff --git a/Marlin/pins_ZRIB_V20.h b/Marlin/pins_ZRIB_V20.h new file mode 100644 index 000000000..1437c7184 --- /dev/null +++ b/Marlin/pins_ZRIB_V20.h @@ -0,0 +1,39 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/** + * ZRIB V2.0 pin assignments + */ + +#define ZRIB_V20_D6_PIN 6 +#define ZRIB_V20_D9_PIN 9 +#define RAMPS_D9_PIN ZRIB_V20_D6_PIN +#define ORIG_E0_AUTO_FAN_PIN ZRIB_V20_D9_PIN +#define ORIG_E1_AUTO_FAN_PIN ZRIB_V20_D9_PIN +#define ORIG_E2_AUTO_FAN_PIN ZRIB_V20_D9_PIN +#define ORIG_E3_AUTO_FAN_PIN ZRIB_V20_D9_PIN + +#ifndef FILWIDTH_PIN + #define FILWIDTH_PIN 11 // Analog Input +#endif + +#include "pins_MKS_13.h" From ebda4663c3a3cc7a9aab03e50d1a0bd255809582 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Fri, 2 Jun 2017 19:22:40 -0500 Subject: [PATCH 18/31] for discusion --- Marlin/gcode.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Marlin/gcode.cpp b/Marlin/gcode.cpp index caceb09bd..713b08910 100644 --- a/Marlin/gcode.cpp +++ b/Marlin/gcode.cpp @@ -220,8 +220,10 @@ void GCodeParser::parse(char *p) { #endif } - while (*p && *p != ' ') p++; // Skip over the parameter - while (*p == ' ') p++; // Skip over all spaces + if (!WITHIN(*p, 'A', 'Z')) { + while (*p && NUMERIC(*p)) p++; // Skip over the parameter + while (*p == ' ') p++; // Skip over all spaces + } } } From 2130f10de8e3a6aa28f1a2df4ef93e3f15c7d828 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Fri, 2 Jun 2017 19:57:22 -0500 Subject: [PATCH 19/31] allow space between parameter and value --- Marlin/gcode.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/gcode.cpp b/Marlin/gcode.cpp index 713b08910..0cb233733 100644 --- a/Marlin/gcode.cpp +++ b/Marlin/gcode.cpp @@ -183,7 +183,8 @@ void GCodeParser::parse(char *p) { #endif if (PARAM_TEST) { - + + while (*p == ' ') p++; // skip spaces vetween parameters & values const bool has_num = DECIMAL_SIGNED(*p); // The parameter has a number [-+0-9.] #if ENABLED(DEBUG_GCODE_PARSER) @@ -221,7 +222,7 @@ void GCodeParser::parse(char *p) { } if (!WITHIN(*p, 'A', 'Z')) { - while (*p && NUMERIC(*p)) p++; // Skip over the parameter + while (*p && NUMERIC(*p)) p++; // Skip over the value section of a parameter while (*p == ' ') p++; // Skip over all spaces } } From 90ccac4bcfdd24858f9c25b03526763a0cdd692b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 2 Jun 2017 22:02:52 -0500 Subject: [PATCH 20/31] Clean up after recent commits --- Marlin/Configuration_adv.h | 16 +++++++-------- Marlin/boards.h | 2 +- .../Cartesio/Configuration_adv.h | 20 +++++++++---------- .../Felix/Configuration_adv.h | 20 +++++++++---------- .../FolgerTech-i3-2020/Configuration_adv.h | 20 +++++++++---------- .../Hephestos/Configuration_adv.h | 20 +++++++++---------- .../Hephestos_2/Configuration_adv.h | 20 +++++++++---------- .../K8200/Configuration_adv.h | 20 +++++++++---------- .../K8400/Configuration_adv.h | 20 +++++++++---------- .../M150/Configuration_adv.h | 20 +++++++++---------- .../RigidBot/Configuration_adv.h | 20 +++++++++---------- .../SCARA/Configuration_adv.h | 20 +++++++++---------- .../TAZ4/Configuration_adv.h | 20 +++++++++---------- .../TinyBoy2/Configuration_adv.h | 20 +++++++++---------- .../WITBOX/Configuration_adv.h | 20 +++++++++---------- .../FLSUN/auto_calibrate/Configuration_adv.h | 20 +++++++++---------- .../FLSUN/kossel_mini/Configuration_adv.h | 20 +++++++++---------- .../delta/generic/Configuration_adv.h | 20 +++++++++---------- .../delta/kossel_mini/Configuration_adv.h | 20 +++++++++---------- .../delta/kossel_pro/Configuration_adv.h | 20 +++++++++---------- .../delta/kossel_xl/Configuration_adv.h | 20 +++++++++---------- .../gCreate_gMax1.5+/Configuration_adv.h | 20 +++++++++---------- .../makibox/Configuration_adv.h | 20 +++++++++---------- .../tvrrug/Round2/Configuration_adv.h | 20 +++++++++---------- .../wt150/Configuration_adv.h | 20 +++++++++---------- Marlin/gcode.cpp | 2 +- 26 files changed, 217 insertions(+), 263 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 97d2d95f9..16865c487 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -223,16 +223,16 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board + // pins_XXX.h file overrides this one + #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif + //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1029,7 +1029,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/boards.h b/Marlin/boards.h index 6594b30fa..24ab48c86 100644 --- a/Marlin/boards.h +++ b/Marlin/boards.h @@ -95,7 +95,7 @@ #define BOARD_BAM_DICE 401 // 2PrintBeta BAM&DICE with STK drivers #define BOARD_BAM_DICE_DUE 402 // 2PrintBeta BAM&DICE Due with STK drivers #define BOARD_BQ_ZUM_MEGA_3D 503 // bq ZUM Mega 3D -#define BOARD_ZRIB_V20 504 // zrib V2.0 control board (Chinese knock off RAMPS replica) +#define BOARD_ZRIB_V20 504 // zrib V2.0 control board (Chinese knock off RAMPS replica) #define MB(board) (MOTHERBOARD==BOARD_##board) diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index 4eec94c07..36d2a4366 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1022,7 +1020,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index f3b44a466..8a09f18c0 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1022,7 +1020,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h index 662d679a8..a5fd5c5e6 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1031,7 +1029,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index c4843b6ec..de751085a 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1022,7 +1020,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index 385adadb9..09e91b5d8 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1006,7 +1004,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 482d89a98..ddb740486 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -236,16 +236,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1035,7 +1033,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/K8400/Configuration_adv.h index e3c6ccf26..a52988805 100644 --- a/Marlin/example_configurations/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/K8400/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1022,7 +1020,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/M150/Configuration_adv.h b/Marlin/example_configurations/M150/Configuration_adv.h index 2253ce435..3962f2d40 100644 --- a/Marlin/example_configurations/M150/Configuration_adv.h +++ b/Marlin/example_configurations/M150/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1029,7 +1027,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 570538c59..f939c4d2c 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1022,7 +1020,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 718a4b90b..7fe55a0b7 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1022,7 +1020,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index a833712b0..5ee685360 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1022,7 +1020,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h index 3de9a920c..b6e6175fb 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1025,7 +1023,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index c4843b6ec..de751085a 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1022,7 +1020,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h index 1d798fb94..51f95e1f2 100644 --- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1027,7 +1025,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h index 5363cb3f6..c9dc15e7a 100644 --- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1026,7 +1024,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 53a86374b..334fba863 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1024,7 +1022,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 53a86374b..334fba863 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1024,7 +1022,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 5798c53e7..d46820b12 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -228,16 +228,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1029,7 +1027,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index fdc295253..6440d1611 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1024,7 +1022,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h index 4814b7a24..799acd32a 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1031,7 +1029,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index fbbb86690..026e2443a 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1022,7 +1020,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 2a5b63492..249166ca1 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1022,7 +1020,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h index f78a297fc..245eeee21 100644 --- a/Marlin/example_configurations/wt150/Configuration_adv.h +++ b/Marlin/example_configurations/wt150/Configuration_adv.h @@ -223,16 +223,14 @@ /** * M355 Case Light on-off / brightness */ -//#define CASE_LIGHT_ENABLE -#if ENABLED(CASE_LIGHT_ENABLE) - #define CASE_LIGHT_PIN 4 // can be defined here or in the pins_XXX.h file for your board - // pins_XXX.h file overrides this one - #define INVERT_CASE_LIGHT false // set to true if case light is ON when pin is at 0 - #define CASE_LIGHT_DEFAULT_ON true // set default power up state to on or off - #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // set power up brightness 0-255 ( only used if on PWM - // and if CASE_LIGHT_DEFAULT is set to on - //#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light entry in main menu -#endif +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu +#endif //=========================================================================== //============================ Mechanical Settings ========================== @@ -1025,7 +1023,7 @@ */ #define TMC2130_ADV() { } -#endif // ENABLED(HAVE_TMC2130) +#endif // HAVE_TMC2130 // @section L6470 diff --git a/Marlin/gcode.cpp b/Marlin/gcode.cpp index 0cb233733..d23db21f7 100644 --- a/Marlin/gcode.cpp +++ b/Marlin/gcode.cpp @@ -183,7 +183,7 @@ void GCodeParser::parse(char *p) { #endif if (PARAM_TEST) { - + while (*p == ' ') p++; // skip spaces vetween parameters & values const bool has_num = DECIMAL_SIGNED(*p); // The parameter has a number [-+0-9.] From 9a305a467b9868685d7304dea7d3b7690c1456a1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 2 Jun 2017 22:05:44 -0500 Subject: [PATCH 21/31] Patch LCD Contrast menu item --- Marlin/ultralcd.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index dc98d6570..0508bca6c 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1598,7 +1598,6 @@ void kill_screen(const char* lcd_msg) { // // The last G29 will record and enable but not move. - // Since G29 is deferred, // lcd_wait_for_move = true; enqueue_and_echo_commands_P(PSTR("G29 V1")); @@ -2592,16 +2591,9 @@ void kill_screen(const char* lcd_msg) { * */ - /** - * - * Callback for LCD contrast - * - */ #if HAS_LCD_CONTRAST - void lcd_callback_set_contrast() { set_lcd_contrast(lcd_contrast); } - - #endif // HAS_LCD_CONTRAST + #endif static void lcd_factory_settings() { settings.reset(); @@ -2616,7 +2608,7 @@ void kill_screen(const char* lcd_msg) { MENU_ITEM(submenu, MSG_FILAMENT, lcd_control_filament_menu); #if HAS_LCD_CONTRAST - MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, (int) &lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true); + MENU_ITEM_EDIT_CALLBACK(int3, MSG_CONTRAST, (int*)&lcd_contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX, lcd_callback_set_contrast, true); #endif #if ENABLED(FWRETRACT) MENU_ITEM(submenu, MSG_RETRACT, lcd_control_retract_menu); From 0282452ceae9f3c40c0dad7aff3466fa06fe6fcc Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 28 May 2017 18:59:02 -0500 Subject: [PATCH 22/31] Make Parser::seen volatile --- Marlin/gcode.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/gcode.h b/Marlin/gcode.h index ec5b229bd..506a71878 100644 --- a/Marlin/gcode.h +++ b/Marlin/gcode.h @@ -120,7 +120,7 @@ public: // Code seen bit was set. If not found, value_ptr is unchanged. // This allows "if (seen('A')||seen('B'))" to use the last-found value. - static bool seen(const char c) { + static volatile bool seen(const char c) { const uint8_t ind = c - 'A'; if (ind >= COUNT(param)) return false; // Only A-Z const bool b = TEST(codebits[ind >> 3], ind & 0x7); @@ -132,7 +132,7 @@ public: // Code is found in the string. If not found, value_ptr is unchanged. // This allows "if (seen('A')||seen('B'))" to use the last-found value. - static bool seen(const char c) { + static volatile bool seen(const char c) { const char *p = strchr(command_args, c); const bool b = !!p; if (b) value_ptr = DECIMAL_SIGNED(p[1]) ? &p[1] : (char*)NULL; From fc7d7f87b4dd67891b5c92a8b89507a87d4f9e4e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 28 May 2017 18:59:34 -0500 Subject: [PATCH 23/31] Init probe test pin with FastIO --- Marlin/Marlin_main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index de039330c..3acb1a0d0 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -6354,9 +6354,8 @@ inline void gcode_M42() { #endif SERIAL_PROTOCOLLNPGM(". deploy & stow 4 times"); - pinMode(PROBE_TEST_PIN, INPUT_PULLUP); - bool deploy_state; - bool stow_state; + SET_INPUT_PULLUP(PROBE_TEST_PIN); + bool deploy_state, stow_state; for (uint8_t i = 0; i < 4; i++) { servo[probe_index].move(z_servo_angle[0]); //deploy safe_delay(500); From 789b2928a8c0343f0c679a8ab29c211c1b235c39 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 30 May 2017 15:07:31 -0500 Subject: [PATCH 24/31] Tweak scrolling message code --- Marlin/ultralcd_impl_DOGM.h | 4 ++-- Marlin/ultralcd_impl_HD44780.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h index fcda9be68..80f2c4a47 100644 --- a/Marlin/ultralcd_impl_DOGM.h +++ b/Marlin/ultralcd_impl_DOGM.h @@ -410,8 +410,8 @@ inline void lcd_implementation_status_message() { const uint8_t slen = lcd_strlen(lcd_status_message); if (slen > LCD_WIDTH) { // Skip any non-printing bytes - while (!PRINTABLE(lcd_status_message[status_scroll_pos])) ++status_scroll_pos; - if (++status_scroll_pos > slen - LCD_WIDTH) status_scroll_pos = 0; + while (!PRINTABLE(lcd_status_message[status_scroll_pos++])) { /* nada */ } + if (status_scroll_pos > slen - LCD_WIDTH) status_scroll_pos = 0; } #else lcd_print_utf(lcd_status_message); diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h index 776ad0aee..9192912a8 100644 --- a/Marlin/ultralcd_impl_HD44780.h +++ b/Marlin/ultralcd_impl_HD44780.h @@ -829,8 +829,8 @@ static void lcd_implementation_status_screen() { const uint8_t slen = lcd_strlen(lcd_status_message); if (slen > LCD_WIDTH) { // Skip any non-printing bytes - while (!PRINTABLE(lcd_status_message[status_scroll_pos])) ++status_scroll_pos; - if (++status_scroll_pos > slen - LCD_WIDTH) status_scroll_pos = 0; + while (!PRINTABLE(lcd_status_message[status_scroll_pos++])) { /* nada */ } + if (status_scroll_pos > slen - LCD_WIDTH) status_scroll_pos = 0; } #else lcd_print_utf(lcd_status_message); From 6a5d3b580d35f0dfd2466e962e9248915ec22ca6 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Sat, 3 Jun 2017 13:19:55 -0500 Subject: [PATCH 25/31] fix "hex_address not defined" when UBL is enabled --- Marlin/Marlin.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index c2e84e628..5a9b3191d 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -35,6 +35,10 @@ #include "MarlinConfig.h" +#ifdef DEBUG_GCODE_PARSER + #include "gcode.h" +#endif + #include "enum.h" #include "types.h" #include "fastio.h" From c34d7a29a6803f59b8732fdac74f404890c91573 Mon Sep 17 00:00:00 2001 From: Bob-the-Kuhn Date: Sat, 3 Jun 2017 16:40:14 -0500 Subject: [PATCH 26/31] fix redefinition errors for redundant_temperature Removing redundant_temperature from public section and leaving it in the private section --- Marlin/temperature.cpp | 4 ---- Marlin/temperature.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index 376740b9f..40df64b67 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -73,10 +73,6 @@ int16_t Temperature::current_temperature_raw[HOTENDS] = { 0 }, int16_t Temperature::target_temperature_bed = 0; #endif -#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) - float Temperature::redundant_temperature = 0.0; -#endif - #if ENABLED(PIDTEMP) #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1 float Temperature::Kp[HOTENDS] = ARRAY_BY_HOTENDS1(DEFAULT_Kp), diff --git a/Marlin/temperature.h b/Marlin/temperature.h index c75349681..0e0556f94 100644 --- a/Marlin/temperature.h +++ b/Marlin/temperature.h @@ -112,10 +112,6 @@ class Temperature { static volatile bool in_temp_isr; - #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) - static float redundant_temperature; - #endif - static uint8_t soft_pwm_amount[HOTENDS], soft_pwm_amount_bed; From 9f295581f0d6ae274a1f7be683cdc175681bec80 Mon Sep 17 00:00:00 2001 From: oldmcg Date: Sat, 3 Jun 2017 17:11:43 -0500 Subject: [PATCH 27/31] Ubl delta fixes and improvements (#6941) * Change all direct changes of ubl.state.active to set_bed_leveling_enabled() which handles apply/unapply leveling to maintain current_position consistency. Fix invalidation of UBL mesh to invalid unreachable mesh points as well (delta corners). Fix UBL_DELTA unapply_leveling logic and when it gets applied, including fade_height changes. Add optional M114 D for detailed position information, disabled from compilation by default (M114_DETAIL). * UBL_DELTA raw and inline kinematics * UBL planner fall through fix * consistent variable names * Cleanup orphaned code and whitespace changes. Use _O2. * compile warnings cleanup * Remove redundant #ifdef condition --- Marlin/G26_Mesh_Validation_Tool.cpp | 5 +- Marlin/Marlin_main.cpp | 207 ++++++++++++++++++++++++---- Marlin/planner.cpp | 38 ++--- Marlin/ubl.cpp | 16 ++- Marlin/ubl.h | 3 +- Marlin/ubl_G29.cpp | 61 +++++--- Marlin/ubl_motion.cpp | 206 ++++++++++++++++----------- 7 files changed, 380 insertions(+), 156 deletions(-) diff --git a/Marlin/G26_Mesh_Validation_Tool.cpp b/Marlin/G26_Mesh_Validation_Tool.cpp index 23bb34198..7cdfab55d 100644 --- a/Marlin/G26_Mesh_Validation_Tool.cpp +++ b/Marlin/G26_Mesh_Validation_Tool.cpp @@ -718,7 +718,7 @@ /** * Wait until all parameters are verified before altering the state! */ - state.active = !parser.seen('D'); + set_bed_leveling_enabled(!parser.seen('D')); return UBL_OK; } @@ -734,7 +734,7 @@ * wait for them to get up to temperature. */ bool unified_bed_leveling::turn_on_heaters() { - millis_t next; + millis_t next = millis() + 5000UL; #if HAS_TEMP_BED #if ENABLED(ULTRA_LCD) if (g26_bed_temp > 25) { @@ -743,7 +743,6 @@ #endif has_control_of_lcd_panel = true; thermalManager.setTargetBed(g26_bed_temp); - next = millis() + 5000UL; while (abs(thermalManager.degBed() - g26_bed_temp) > 3) { if (ubl_lcd_clicked()) return exit_from_g26(); if (PENDING(millis(), next)) { diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 3acb1a0d0..6fbc9a60b 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -699,7 +699,8 @@ void set_current_from_steppers_for_axis(const AxisEnum axis); #endif void tool_change(const uint8_t tmp_extruder, const float fr_mm_s=0.0, bool no_move=false); -static void report_current_position(); +void report_current_position(); +void report_current_position_detail(); #if ENABLED(DEBUG_LEVELING_FEATURE) void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z) { @@ -1536,14 +1537,21 @@ inline void set_destination_to_current() { COPY(destination, current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("prepare_uninterpolated_move_to_destination", destination); #endif - if ( current_position[X_AXIS] == destination[X_AXIS] - && current_position[Y_AXIS] == destination[Y_AXIS] - && current_position[Z_AXIS] == destination[Z_AXIS] - && current_position[E_AXIS] == destination[E_AXIS] - ) return; - refresh_cmd_timeout(); - planner.buffer_line_kinematic(destination, MMS_SCALED(fr_mm_s ? fr_mm_s : feedrate_mm_s), active_extruder); + + #if UBL_DELTA + // ubl segmented line will do z-only moves in single segment + ubl.prepare_segmented_line_to(destination, MMS_SCALED(fr_mm_s ? fr_mm_s : feedrate_mm_s)); + #else + if ( current_position[X_AXIS] == destination[X_AXIS] + && current_position[Y_AXIS] == destination[Y_AXIS] + && current_position[Z_AXIS] == destination[Z_AXIS] + && current_position[E_AXIS] == destination[E_AXIS] + ) return; + + planner.buffer_line_kinematic(destination, MMS_SCALED(fr_mm_s ? fr_mm_s : feedrate_mm_s), active_extruder); + #endif + set_current_to_destination(); } #endif // IS_KINEMATIC @@ -2345,18 +2353,21 @@ static void clean_up_after_endstop_or_probe_move() { if (enabling) planner.unapply_leveling(current_position); #elif ENABLED(AUTO_BED_LEVELING_UBL) - #if PLANNER_LEVELING - - if (!enable) // leveling from on to off + if (ubl.state.active) { // leveling from on to off + // change unleveled current_position to physical current_position without moving steppers. planner.apply_leveling(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS]); - else - planner.unapply_leveling(current_position); - + ubl.state.active = false; // disable only AFTER calling apply_leveling + } + else { // leveling from off to on + ubl.state.active = true; // enable BEFORE calling unapply_leveling, otherwise ignored + // change physical current_position to unleveled current_position without moving steppers. + planner.unapply_leveling(current_position); + } + #else + ubl.state.active = enable; // just flip the bit, current_position will be wrong until next move. #endif - ubl.state.active = enable; - #else // ABL #if ENABLED(AUTO_BED_LEVELING_BILINEAR) @@ -2384,17 +2395,34 @@ static void clean_up_after_endstop_or_probe_move() { #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) void set_z_fade_height(const float zfh) { - planner.z_fade_height = zfh; - planner.inverse_z_fade_height = RECIPROCAL(zfh); - if (leveling_is_active()) - set_current_from_steppers_for_axis( - #if ABL_PLANAR - ALL_AXES - #else - Z_AXIS - #endif - ); + #if ENABLED(AUTO_BED_LEVELING_UBL) + + const bool level_active = leveling_is_active(); + if (level_active) { + set_bed_leveling_enabled(false); // turn off before changing fade height for proper apply/unapply leveling to maintain current_position + } + planner.z_fade_height = zfh; + planner.inverse_z_fade_height = RECIPROCAL(zfh); + if (level_active) { + set_bed_leveling_enabled(true); // turn back on after changing fade height + } + + #else + + planner.z_fade_height = zfh; + planner.inverse_z_fade_height = RECIPROCAL(zfh); + + if (leveling_is_active()) { + set_current_from_steppers_for_axis( + #if ABL_PLANAR + ALL_AXES + #else + Z_AXIS + #endif + ); + } + #endif } #endif // LEVELING_FADE_HEIGHT @@ -3656,6 +3684,7 @@ inline void gcode_G28(const bool always_home_all) { #if ENABLED(DELTA) home_delta(); + UNUSED(always_home_all); #else // NOT DELTA @@ -7592,7 +7621,7 @@ inline void gcode_M92() { /** * Output the current position to serial */ -static void report_current_position() { +void report_current_position() { SERIAL_PROTOCOLPGM("X:"); SERIAL_PROTOCOL(current_position[X_AXIS]); SERIAL_PROTOCOLPGM(" Y:"); @@ -7611,10 +7640,119 @@ static void report_current_position() { #endif } +#ifdef M114_DETAIL + + static const char axis_char[XYZE] = {'X','Y','Z','E'}; + + void report_xyze(const float pos[XYZE], uint8_t n = 4, uint8_t precision = 3) { + char str[12]; + for(uint8_t i=0; i= planner.z_fade_height) + z_logical = LOGICAL_Z_POSITION(z_physical - ubl.state.z_offset); } #endif // ENABLE_LEVELING_FADE_HEIGHT - logical[Z_AXIS] = z_unlevel; + logical[Z_AXIS] = z_logical; } - return; // don't fall thru to HAS_ABL or other ENABLE_LEVELING_FADE_HEIGHT logic + return; // don't fall thru to other ENABLE_LEVELING_FADE_HEIGHT logic #endif diff --git a/Marlin/ubl.cpp b/Marlin/ubl.cpp index cdfc401ad..e243c6d88 100644 --- a/Marlin/ubl.cpp +++ b/Marlin/ubl.cpp @@ -83,7 +83,7 @@ } void unified_bed_leveling::reset() { - state.active = false; + set_bed_leveling_enabled(false); state.z_offset = 0; state.storage_slot = -1; #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) @@ -94,11 +94,17 @@ } void unified_bed_leveling::invalidate() { - state.active = false; + set_bed_leveling_enabled(false); state.z_offset = 0; - for (int x = 0; x < GRID_MAX_POINTS_X; x++) - for (int y = 0; y < GRID_MAX_POINTS_Y; y++) - z_values[x][y] = NAN; + set_all_mesh_points_to_value(NAN); + } + + void unified_bed_leveling::set_all_mesh_points_to_value(float value) { + for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) { + for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) { + z_values[x][y] = value; + } + } } void unified_bed_leveling::display_map(const int map_type) { diff --git a/Marlin/ubl.h b/Marlin/ubl.h index 028eff52f..29ee83c35 100644 --- a/Marlin/ubl.h +++ b/Marlin/ubl.h @@ -154,6 +154,7 @@ static mesh_index_pair find_closest_mesh_point_of_type(const MeshPointType, const float&, const float&, const bool, unsigned int[16], bool); static void reset(); static void invalidate(); + static void set_all_mesh_points_to_value(float); static bool sanity_check(); static void G29() _O0; // O0 for no optimization @@ -385,7 +386,7 @@ FORCE_INLINE static float mesh_index_to_xpos(const uint8_t i) { return pgm_read_float(&_mesh_index_to_xpos[i]); } FORCE_INLINE static float mesh_index_to_ypos(const uint8_t i) { return pgm_read_float(&_mesh_index_to_ypos[i]); } - static bool prepare_linear_move_to(const float ltarget[XYZE], const float &feedrate); + static bool prepare_segmented_line_to(const float ltarget[XYZE], const float &feedrate); static void line_to_destination_cartesian(const float &fr, uint8_t e); }; // class unified_bed_leveling diff --git a/Marlin/ubl_G29.cpp b/Marlin/ubl_G29.cpp index d6453a948..9201fe910 100644 --- a/Marlin/ubl_G29.cpp +++ b/Marlin/ubl_G29.cpp @@ -30,6 +30,7 @@ #include "configuration_store.h" #include "ultralcd.h" #include "stepper.h" + #include "planner.h" #include "gcode.h" #include @@ -48,6 +49,7 @@ extern long babysteps_done; extern float probe_pt(const float &x, const float &y, bool, int); extern bool set_probe_deployed(bool); + extern void set_bed_leveling_enabled(bool); #define SIZE_OF_LITTLE_RAISE 1 #define BIG_RAISE_NOT_NEEDED 0 @@ -325,15 +327,23 @@ if (parser.seen('I')) { uint8_t cnt = 0; g29_repetition_cnt = parser.has_value() ? parser.value_int() : 1; - while (g29_repetition_cnt--) { - if (cnt > 20) { cnt = 0; idle(); } - const mesh_index_pair location = find_closest_mesh_point_of_type(REAL, g29_x_pos, g29_y_pos, USE_NOZZLE_AS_REFERENCE, NULL, false); - if (location.x_index < 0) { - SERIAL_PROTOCOLLNPGM("Entire Mesh invalidated.\n"); - break; // No more invalid Mesh Points to populate + if (g29_repetition_cnt >= GRID_MAX_POINTS) { + set_all_mesh_points_to_value(NAN); + } else { + while (g29_repetition_cnt--) { + if (cnt > 20) { cnt = 0; idle(); } + const mesh_index_pair location = find_closest_mesh_point_of_type(REAL, g29_x_pos, g29_y_pos, USE_NOZZLE_AS_REFERENCE, NULL, false); + if (location.x_index < 0) { + // No more REACHABLE mesh points to invalidate, so we ASSUME the user + // meant to invalidate the ENTIRE mesh, which cannot be done with + // find_closest_mesh_point loop which only returns REACHABLE points. + set_all_mesh_points_to_value(NAN); + SERIAL_PROTOCOLLNPGM("Entire Mesh invalidated.\n"); + break; // No more invalid Mesh Points to populate + } + z_values[location.x_index][location.y_index] = NAN; + cnt++; } - z_values[location.x_index][location.y_index] = NAN; - cnt++; } SERIAL_PROTOCOLLNPGM("Locations invalidated.\n"); } @@ -497,18 +507,26 @@ * - Specify a constant with the 'C' parameter. * - Allow 'G29 P3' to choose a 'reasonable' constant. */ + if (g29_c_flag) { if (g29_repetition_cnt >= GRID_MAX_POINTS) { - for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) { - for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) { - z_values[x][y] = g29_constant; - } - } + set_all_mesh_points_to_value(g29_constant); } else { while (g29_repetition_cnt--) { // this only populates reachable mesh points near const mesh_index_pair location = find_closest_mesh_point_of_type(INVALID, g29_x_pos, g29_y_pos, USE_NOZZLE_AS_REFERENCE, NULL, false); - if (location.x_index < 0) break; // No more reachable invalid Mesh Points to populate + if (location.x_index < 0) { + // No more REACHABLE INVALID mesh points to populate, so we ASSUME + // user meant to populate ALL INVALID mesh points to value + for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) { + for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) { + if ( isnan(z_values[x][y])) { + z_values[x][y] = g29_constant; + } + } + } + break; // No more invalid Mesh Points to populate + } z_values[location.x_index][location.y_index] = g29_constant; } } @@ -999,12 +1017,15 @@ serialprintPGM(parser.seen('B') ? PSTR("Place shim & measure") : PSTR("Measure")); // TODO: Make translatable strings + const float z_step = 0.01; // existing behavior: 0.01mm per click, occasionally step + //const float z_step = 1.0 / planner.axis_steps_per_mm[Z_AXIS]; // approx one step each click + while (ubl_lcd_clicked()) delay(50); // wait for user to release encoder wheel delay(50); // debounce while (!ubl_lcd_clicked()) { // we need the loop to move the nozzle based on the encoder wheel here! idle(); if (encoder_diff) { - do_blocking_move_to_z(current_position[Z_AXIS] + float(encoder_diff) / 100.0); + do_blocking_move_to_z(current_position[Z_AXIS] + float(encoder_diff) * z_step); encoder_diff = 0; } } @@ -1115,11 +1136,11 @@ SERIAL_PROTOCOLLNPGM("?Can't activate and deactivate at the same time.\n"); return UBL_ERR; } - state.active = true; + set_bed_leveling_enabled(true); report_state(); } else if (parser.seen('D')) { - state.active = false; + set_bed_leveling_enabled(false); report_state(); } @@ -1158,7 +1179,7 @@ return; } ubl_state_at_invocation = state.active; - state.active = 0; + set_bed_leveling_enabled(false); } void unified_bed_leveling::restore_ubl_active_state_and_leave() { @@ -1168,7 +1189,7 @@ lcd_quick_feedback(); return; } - state.active = ubl_state_at_invocation; + set_bed_leveling_enabled(ubl_state_at_invocation); } /** @@ -1695,6 +1716,8 @@ SERIAL_EOL; } #endif + + if (do_ubl_mesh_map) display_map(g29_map_type); } #if ENABLED(UBL_G29_P31) diff --git a/Marlin/ubl_motion.cpp b/Marlin/ubl_motion.cpp index 5131315e1..3eccee9b5 100644 --- a/Marlin/ubl_motion.cpp +++ b/Marlin/ubl_motion.cpp @@ -32,7 +32,25 @@ extern float destination[XYZE]; extern void set_current_to_destination(); - extern float delta_segments_per_second; + +#if ENABLED(DELTA) + + extern float delta[ABC], + endstop_adj[ABC]; + + extern float delta_radius, + delta_tower_angle_trim[2], + delta_tower[ABC][2], + delta_diagonal_rod, + delta_calibration_radius, + delta_diagonal_rod_2_tower[ABC], + delta_segments_per_second, + delta_clip_start_height; + + extern float delta_safe_distance_from_top(); + +#endif + static void debug_echo_axis(const AxisEnum axis) { if (current_position[axis] == destination[axis]) @@ -470,51 +488,76 @@ #endif // We don't want additional apply_leveling() performed by regular buffer_line or buffer_line_kinematic, - // so we call _buffer_line directly here. Per-segmented leveling performed first. + // so we call _buffer_line directly here. Per-segmented leveling and kinematics performed first. - static inline void ubl_buffer_line_segment(const float ltarget[XYZE], const float &fr_mm_s, const uint8_t extruder) { + inline void _O2 ubl_buffer_segment_raw( float rx, float ry, float rz, float le, float fr ) { - #if IS_KINEMATIC + #if ENABLED(DELTA) // apply delta inverse_kinematics - inverse_kinematics(ltarget); // this writes delta[ABC] from ltarget[XYZ] but does not modify ltarget - float feedrate = fr_mm_s; + const float delta_A = rz + sqrt( delta_diagonal_rod_2_tower[A_AXIS] + - HYPOT2( delta_tower[A_AXIS][X_AXIS] - rx, + delta_tower[A_AXIS][Y_AXIS] - ry )); - #if IS_SCARA // scale the feed rate from mm/s to degrees/s - float adiff = abs(delta[A_AXIS] - scara_oldA), - bdiff = abs(delta[B_AXIS] - scara_oldB); - scara_oldA = delta[A_AXIS]; - scara_oldB = delta[B_AXIS]; - feedrate = max(adiff, bdiff) * scara_feed_factor; - #endif + const float delta_B = rz + sqrt( delta_diagonal_rod_2_tower[B_AXIS] + - HYPOT2( delta_tower[B_AXIS][X_AXIS] - rx, + delta_tower[B_AXIS][Y_AXIS] - ry )); - planner._buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], ltarget[E_AXIS], feedrate, extruder); + const float delta_C = rz + sqrt( delta_diagonal_rod_2_tower[C_AXIS] + - HYPOT2( delta_tower[C_AXIS][X_AXIS] - rx, + delta_tower[C_AXIS][Y_AXIS] - ry )); - #else // cartesian + planner._buffer_line(delta_A, delta_B, delta_C, le, fr, active_extruder); - planner._buffer_line(ltarget[X_AXIS], ltarget[Y_AXIS], ltarget[Z_AXIS], ltarget[E_AXIS], fr_mm_s, extruder); + #elif IS_SCARA // apply scara inverse_kinematics (should be changed to save raw->logical->raw) + + const float lseg[XYZ] = { LOGICAL_X_POSITION(rx), + LOGICAL_Y_POSITION(ry), + LOGICAL_Z_POSITION(rz) + }; + + inverse_kinematics(lseg); // this writes delta[ABC] from lseg[XYZ] + // should move the feedrate scaling to scara inverse_kinematics + + float adiff = abs(delta[A_AXIS] - scara_oldA), + bdiff = abs(delta[B_AXIS] - scara_oldB); + scara_oldA = delta[A_AXIS]; + scara_oldB = delta[B_AXIS]; + float s_feedrate = max(adiff, bdiff) * scara_feed_factor; + + planner._buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], le, s_feedrate, active_extruder); + + #else // CARTESIAN + + // Cartesian _buffer_line seems to take LOGICAL, not RAW coordinates + + const float lx = LOGICAL_X_POSITION(rx), + ly = LOGICAL_Y_POSITION(ry), + lz = LOGICAL_Z_POSITION(rz); + + planner._buffer_line(lx, ly, lz, le, fr, active_extruder); #endif + } + /** - * Prepare a linear move for DELTA/SCARA/CARTESIAN with UBL and FADE semantics. + * Prepare a segmented linear move for DELTA/SCARA/CARTESIAN with UBL and FADE semantics. * This calls planner._buffer_line multiple times for small incremental moves. - * Returns true if the caller did NOT update current_position, otherwise false. + * Returns true if did NOT move, false if moved (requires current_position update). */ - static bool unified_bed_leveling::prepare_linear_move_to(const float ltarget[XYZE], const float &feedrate) { + bool _O2 unified_bed_leveling::prepare_segmented_line_to(const float ltarget[XYZE], const float &feedrate) { if (!position_is_reachable_xy(ltarget[X_AXIS], ltarget[Y_AXIS])) // fail if moving outside reachable boundary return true; // did not move, so current_position still accurate - const float difference[XYZE] = { // cartesian distances moved in XYZE - ltarget[X_AXIS] - current_position[X_AXIS], - ltarget[Y_AXIS] - current_position[Y_AXIS], - ltarget[Z_AXIS] - current_position[Z_AXIS], - ltarget[E_AXIS] - current_position[E_AXIS] - }; + const float tot_dx = ltarget[X_AXIS] - current_position[X_AXIS], + tot_dy = ltarget[Y_AXIS] - current_position[Y_AXIS], + tot_dz = ltarget[Z_AXIS] - current_position[Z_AXIS], + tot_de = ltarget[E_AXIS] - current_position[E_AXIS]; - const float cartesian_xy_mm = HYPOT(difference[X_AXIS], difference[Y_AXIS]); // total horizontal xy distance + const float cartesian_xy_mm = HYPOT(tot_dx, tot_dy); // total horizontal xy distance #if IS_KINEMATIC const float seconds = cartesian_xy_mm / feedrate; // seconds to move xy distance at requested rate @@ -534,16 +577,19 @@ scara_oldB = stepper.get_axis_position_degrees(B_AXIS); #endif - const float segment_distance[XYZE] = { // length for each segment - difference[X_AXIS] * inv_segments, - difference[Y_AXIS] * inv_segments, - difference[Z_AXIS] * inv_segments, - difference[E_AXIS] * inv_segments - }; + const float seg_dx = tot_dx * inv_segments, + seg_dy = tot_dy * inv_segments, + seg_dz = tot_dz * inv_segments, + seg_de = tot_de * inv_segments; // Note that E segment distance could vary slightly as z mesh height // changes for each segment, but small enough to ignore. + float seg_rx = RAW_X_POSITION(current_position[X_AXIS]), + seg_ry = RAW_Y_POSITION(current_position[Y_AXIS]), + seg_rz = RAW_Z_POSITION(current_position[Z_AXIS]), + seg_le = current_position[E_AXIS]; + const bool above_fade_height = ( #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) planner.z_fade_height != 0 && planner.z_fade_height < RAW_Z_POSITION(ltarget[Z_AXIS]) @@ -558,21 +604,24 @@ const float z_offset = state.active ? state.z_offset : 0.0; - float seg_dest[XYZE]; // per-segment destination, - COPY_XYZE(seg_dest, current_position); // starting from current position + do { - while (--segments) { - LOOP_XYZE(i) seg_dest[i] += segment_distance[i]; - float ztemp = seg_dest[Z_AXIS]; - seg_dest[Z_AXIS] += z_offset; - ubl_buffer_line_segment(seg_dest, feedrate, active_extruder); - seg_dest[Z_AXIS] = ztemp; - } + if (--segments) { // not the last segment + seg_rx += seg_dx; + seg_ry += seg_dy; + seg_rz += seg_dz; + seg_le += seg_de; + } else { // last segment, use exact destination + seg_rx = RAW_X_POSITION(ltarget[X_AXIS]); + seg_ry = RAW_Y_POSITION(ltarget[Y_AXIS]); + seg_rz = RAW_Z_POSITION(ltarget[Z_AXIS]); + seg_le = ltarget[E_AXIS]; + } + + ubl_buffer_segment_raw( seg_rx, seg_ry, seg_rz + z_offset, seg_le, feedrate ); + + } while (segments); - // Since repeated adding segment_distance accumulates small errors, final move to exact destination. - COPY_XYZE(seg_dest, ltarget); - seg_dest[Z_AXIS] += z_offset; - ubl_buffer_line_segment(seg_dest, feedrate, active_extruder); return false; // moved but did not set_current_to_destination(); } @@ -582,14 +631,11 @@ const float fade_scaling_factor = fade_scaling_factor_for_z(ltarget[Z_AXIS]); #endif - float seg_dest[XYZE]; // per-segment destination, initialize to first segment - LOOP_XYZE(i) seg_dest[i] = current_position[i] + segment_distance[i]; - - const float &dx_seg = segment_distance[X_AXIS]; // alias for clarity - const float &dy_seg = segment_distance[Y_AXIS]; - - float rx = RAW_X_POSITION(seg_dest[X_AXIS]), // assume raw vs logical coordinates shifted but not scaled. - ry = RAW_Y_POSITION(seg_dest[Y_AXIS]); + // increment to first segment destination + seg_rx += seg_dx; + seg_ry += seg_dy; + seg_rz += seg_dz; + seg_le += seg_de; for(;;) { // for each mesh cell encountered during the move @@ -600,20 +646,16 @@ // in top of loop and again re-find same adjacent cell and use it, just less efficient // for mesh inset area. - int8_t cell_xi = (rx - (UBL_MESH_MIN_X)) * (1.0 / (MESH_X_DIST)), - cell_yi = (ry - (UBL_MESH_MIN_Y)) * (1.0 / (MESH_X_DIST)); + int8_t cell_xi = (seg_rx - (UBL_MESH_MIN_X)) * (1.0 / (MESH_X_DIST)), + cell_yi = (seg_ry - (UBL_MESH_MIN_Y)) * (1.0 / (MESH_X_DIST)); cell_xi = constrain(cell_xi, 0, (GRID_MAX_POINTS_X) - 1); cell_yi = constrain(cell_yi, 0, (GRID_MAX_POINTS_Y) - 1); - const float x0 = mesh_index_to_xpos(cell_xi), // 64 byte table lookup avoids mul+add - y0 = mesh_index_to_ypos(cell_yi), // 64 byte table lookup avoids mul+add - x1 = mesh_index_to_xpos(cell_xi + 1), // 64 byte table lookup avoids mul+add - y1 = mesh_index_to_ypos(cell_yi + 1); // 64 byte table lookup avoids mul+add + const float x0 = mesh_index_to_xpos(cell_xi), // 64 byte table lookup avoids mul+add + y0 = mesh_index_to_ypos(cell_yi); - float cx = rx - x0, // cell-relative x - cy = ry - y0, // cell-relative y - z_x0y0 = z_values[cell_xi ][cell_yi ], // z at lower left corner + float z_x0y0 = z_values[cell_xi ][cell_yi ], // z at lower left corner z_x1y0 = z_values[cell_xi+1][cell_yi ], // z at upper left corner z_x0y1 = z_values[cell_xi ][cell_yi+1], // z at lower right corner z_x1y1 = z_values[cell_xi+1][cell_yi+1]; // z at upper right corner @@ -623,15 +665,18 @@ if (isnan(z_x0y1)) z_x0y1 = 0; // in order to avoid isnan tests per cell, if (isnan(z_x1y1)) z_x1y1 = 0; // thus guessing zero for undefined points + float cx = seg_rx - x0, // cell-relative x and y + cy = seg_ry - y0; + const float z_xmy0 = (z_x1y0 - z_x0y0) * (1.0 / (MESH_X_DIST)), // z slope per x along y0 (lower left to lower right) z_xmy1 = (z_x1y1 - z_x0y1) * (1.0 / (MESH_X_DIST)); // z slope per x along y1 (upper left to upper right) - float z_cxy0 = z_x0y0 + z_xmy0 * cx; // z height along y0 at cx + float z_cxy0 = z_x0y0 + z_xmy0 * cx; // z height along y0 at cx (changes for each cx in cell) const float z_cxy1 = z_x0y1 + z_xmy1 * cx, // z height along y1 at cx z_cxyd = z_cxy1 - z_cxy0; // z height difference along cx from y0 to y1 - float z_cxym = z_cxyd * (1.0 / (MESH_Y_DIST)); // z slope per y along cx from y0 to y1 + float z_cxym = z_cxyd * (1.0 / (MESH_Y_DIST)); // z slope per y along cx from y0 to y1 (changes for each cx in cell) // float z_cxcy = z_cxy0 + z_cxym * cy; // interpolated mesh z height along cx at cy (do inside the segment loop) @@ -639,8 +684,8 @@ // and the z_cxym slope will change, both as a function of cx within the cell, and // each change by a constant for fixed segment lengths. - const float z_sxy0 = z_xmy0 * dx_seg, // per-segment adjustment to z_cxy0 - z_sxym = (z_xmy1 - z_xmy0) * (1.0 / (MESH_Y_DIST)) * dx_seg; // per-segment adjustment to z_cxym + const float z_sxy0 = z_xmy0 * seg_dx, // per-segment adjustment to z_cxy0 + z_sxym = (z_xmy1 - z_xmy0) * (1.0 / (MESH_Y_DIST)) * seg_dx; // per-segment adjustment to z_cxym for(;;) { // for all segments within this mesh cell @@ -650,28 +695,29 @@ z_cxcy *= fade_scaling_factor; // apply fade factor to interpolated mesh height #endif - z_cxcy += state.z_offset; // add fixed mesh offset from G29 Z + z_cxcy += state.z_offset; // add fixed mesh offset from G29 Z if (--segments == 0) { // if this is last segment, use ltarget for exact - COPY_XYZE(seg_dest, ltarget); - seg_dest[Z_AXIS] += z_cxcy; - ubl_buffer_line_segment(seg_dest, feedrate, active_extruder); - return false; // did not set_current_to_destination() + seg_rx = RAW_X_POSITION(ltarget[X_AXIS]); + seg_ry = RAW_Y_POSITION(ltarget[Y_AXIS]); + seg_rz = RAW_Z_POSITION(ltarget[Z_AXIS]); + seg_le = ltarget[E_AXIS]; } - const float z_orig = seg_dest[Z_AXIS]; // remember the pre-leveled segment z value - seg_dest[Z_AXIS] = z_orig + z_cxcy; // adjust segment z height per mesh leveling - ubl_buffer_line_segment(seg_dest, feedrate, active_extruder); - seg_dest[Z_AXIS] = z_orig; // restore pre-leveled z before incrementing + ubl_buffer_segment_raw( seg_rx, seg_ry, seg_rz + z_cxcy, seg_le, feedrate ); - LOOP_XYZE(i) seg_dest[i] += segment_distance[i]; // adjust seg_dest for next segment + if (segments == 0 ) // done with last segment + return false; // did not set_current_to_destination() - cx += dx_seg; - cy += dy_seg; + seg_rx += seg_dx; + seg_ry += seg_dy; + seg_rz += seg_dz; + seg_le += seg_de; + + cx += seg_dx; + cy += seg_dy; if (!WITHIN(cx, 0, MESH_X_DIST) || !WITHIN(cy, 0, MESH_Y_DIST)) { // done within this cell, break to next - rx = RAW_X_POSITION(seg_dest[X_AXIS]); - ry = RAW_Y_POSITION(seg_dest[Y_AXIS]); break; } From 663ff7f92a299ace2aa87dfe9771ffe1b040d79c Mon Sep 17 00:00:00 2001 From: MagoKimbra Date: Sun, 4 Jun 2017 14:39:31 +0200 Subject: [PATCH 28/31] Fix G29 with 3 point --- Marlin/Marlin_main.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 6fbc9a60b..77076dac3 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -4198,19 +4198,19 @@ void home_all_axes() { gcode_G28(true); } ABL_VAR int left_probe_bed_position, right_probe_bed_position, front_probe_bed_position, back_probe_bed_position; ABL_VAR float xGridSpacing, yGridSpacing; - #if ABL_PLANAR + #if ENABLED(AUTO_BED_LEVELING_LINEAR) ABL_VAR uint8_t abl_grid_points_x = GRID_MAX_POINTS_X, abl_grid_points_y = GRID_MAX_POINTS_Y; ABL_VAR bool do_topography_map; - #else // 3-point + #else // Bilinear uint8_t constexpr abl_grid_points_x = GRID_MAX_POINTS_X, abl_grid_points_y = GRID_MAX_POINTS_Y; #endif #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(PROBE_MANUALLY) - #if ABL_PLANAR + #if ENABLED(AUTO_BED_LEVELING_LINEAR) ABL_VAR int abl2; - #else // 3-point + #else // Bilinear int constexpr abl2 = GRID_MAX_POINTS; #endif #endif @@ -4230,6 +4230,8 @@ void home_all_axes() { gcode_G28(true); } #elif ENABLED(AUTO_BED_LEVELING_3POINT) + int constexpr abl2 = 3; + // Probe at 3 arbitrary points ABL_VAR vector_3 points[3] = { vector_3(ABL_PROBE_PT_1_X, ABL_PROBE_PT_1_Y, 0), @@ -4522,7 +4524,7 @@ void home_all_axes() { gcode_G28(true); } #elif ENABLED(AUTO_BED_LEVELING_3POINT) - points[i].z = measured_z; + points[abl_probe_index].z = measured_z; #endif } From 1aab9906e60890d5f28bd31ae104fe585526b481 Mon Sep 17 00:00:00 2001 From: fixoid Date: Sun, 4 Jun 2017 16:40:57 +0300 Subject: [PATCH 29/31] Initializing extruder/nozzle servo when when turning on the printer --- Marlin/Marlin_main.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 6fbc9a60b..186c9c987 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -12723,6 +12723,14 @@ void setup() { #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE) setup_endstop_interrupts(); #endif + + #if ENABLED(SWITCHING_EXTRUDER) + move_extruder_servo(0); // Initialize extruder servo + #endif + + #if ENABLED(SWITCHING_NOZZLE) + move_nozzle_servo(0); // Initialize nozzle servo + #endif } /** From e4937b02853fdf9eb12dfc35be69dba056de29e8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 4 Jun 2017 11:30:03 -0500 Subject: [PATCH 30/31] Cleanup of spacing and formatting --- Marlin/Marlin_main.cpp | 25 +++++++++++-------- .../FolgerTech-i3-2020/Configuration_adv.h | 2 +- .../M150/Configuration.h | 2 +- Marlin/example_configurations/M150/README.md | 4 +-- .../gCreate_gMax1.5+/Configuration_adv.h | 2 +- Marlin/pins_AZTEEG_X3.h | 2 +- Marlin/pins_AZTEEG_X3_PRO.h | 2 +- Marlin/stepper.cpp | 2 +- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 6fbc9a60b..e56fdaf32 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1551,7 +1551,7 @@ inline void set_destination_to_current() { COPY(destination, current_position); planner.buffer_line_kinematic(destination, MMS_SCALED(fr_mm_s ? fr_mm_s : feedrate_mm_s), active_extruder); #endif - + set_current_to_destination(); } #endif // IS_KINEMATIC @@ -2362,7 +2362,7 @@ static void clean_up_after_endstop_or_probe_move() { else { // leveling from off to on ubl.state.active = true; // enable BEFORE calling unapply_leveling, otherwise ignored // change physical current_position to unleveled current_position without moving steppers. - planner.unapply_leveling(current_position); + planner.unapply_leveling(current_position); } #else ubl.state.active = enable; // just flip the bit, current_position will be wrong until next move. @@ -2376,8 +2376,12 @@ static void clean_up_after_endstop_or_probe_move() { (void)bilinear_z_offset(reset); #endif + // Enable or disable leveling compensation in the planner planner.abl_enabled = enable; + if (!enable) + // When disabling just get the current position from the steppers. + // This will yield the smallest error when first converted back to steps. set_current_from_steppers_for_axis( #if ABL_PLANAR ALL_AXES @@ -2386,9 +2390,11 @@ static void clean_up_after_endstop_or_probe_move() { #endif ); else + // When enabling, remove compensation from the current position, + // so compensation will give the right stepper counts. planner.unapply_leveling(current_position); - #endif + #endif // ABL } } @@ -2396,24 +2402,23 @@ static void clean_up_after_endstop_or_probe_move() { void set_z_fade_height(const float zfh) { + const bool level_active = leveling_is_active(); + #if ENABLED(AUTO_BED_LEVELING_UBL) - const bool level_active = leveling_is_active(); - if (level_active) { + if (level_active) set_bed_leveling_enabled(false); // turn off before changing fade height for proper apply/unapply leveling to maintain current_position - } planner.z_fade_height = zfh; planner.inverse_z_fade_height = RECIPROCAL(zfh); - if (level_active) { + if (level_active) set_bed_leveling_enabled(true); // turn back on after changing fade height - } #else planner.z_fade_height = zfh; planner.inverse_z_fade_height = RECIPROCAL(zfh); - if (leveling_is_active()) { + if (level_active) { set_current_from_steppers_for_axis( #if ABL_PLANAR ALL_AXES @@ -9643,7 +9648,7 @@ inline void gcode_M355() { #if HAS_CASE_LIGHT uint8_t args = 0; if (parser.seen('P')) ++args, case_light_brightness = parser.value_byte(); - if (parser.seen('S')) ++args, case_light_on = parser.value_bool(); + if (parser.seen('S')) ++args, case_light_on = parser.value_bool(); if (args) update_case_light(); // always report case light status diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h index a5fd5c5e6..803fd44ba 100644 --- a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h +++ b/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h @@ -788,7 +788,7 @@ #define PAUSE_PARK_Z_FEEDRATE 5 // Z axis feedrate in mm/s (not used for delta printers) #define PAUSE_PARK_RETRACT_FEEDRATE 60 // Initial retract feedrate in mm/s #define PAUSE_PARK_RETRACT_LENGTH 2 // Initial retract in mm - + // It is a short retract used immediately after print interrupt before move to filament exchange position #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // Unload filament feedrate in mm/s - filament unloading can be fast #define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // Unload filament length from hotend in mm diff --git a/Marlin/example_configurations/M150/Configuration.h b/Marlin/example_configurations/M150/Configuration.h index 49e8586ae..7a1a0eaf4 100644 --- a/Marlin/example_configurations/M150/Configuration.h +++ b/Marlin/example_configurations/M150/Configuration.h @@ -318,7 +318,7 @@ #define K1 0.95 //smoothing factor within the PID // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it - + // Malyan M150 example #define DEFAULT_Kp 29 #define DEFAULT_Ki 2 diff --git a/Marlin/example_configurations/M150/README.md b/Marlin/example_configurations/M150/README.md index f1dc0746e..1d3117769 100644 --- a/Marlin/example_configurations/M150/README.md +++ b/Marlin/example_configurations/M150/README.md @@ -1,3 +1,3 @@ # Configuration for Malyan M150 hobbyking printer -# config without automatic bed level sensor -# or in other words, "as stock" +# config without automatic bed level sensor +# or in other words, "as stock" diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h index 799acd32a..d5082fdb8 100644 --- a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h +++ b/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h @@ -788,7 +788,7 @@ #define PAUSE_PARK_Z_FEEDRATE 5 // Z axis feedrate in mm/s (not used for delta printers) #define PAUSE_PARK_RETRACT_FEEDRATE 60 // Initial retract feedrate in mm/s #define PAUSE_PARK_RETRACT_LENGTH 2 // Initial retract in mm - + // It is a short retract used immediately after print interrupt before move to filament exchange position #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // Unload filament feedrate in mm/s - filament unloading can be fast #define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // Unload filament length from hotend in mm diff --git a/Marlin/pins_AZTEEG_X3.h b/Marlin/pins_AZTEEG_X3.h index 7756a56e4..efe9e2f0f 100644 --- a/Marlin/pins_AZTEEG_X3.h +++ b/Marlin/pins_AZTEEG_X3.h @@ -74,7 +74,7 @@ // // Misc // -#if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && PIN_EXISTS(STAT_LED_RED) && STAT_LED_RED_PIN == CASE_LIGHT_PIN +#if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && PIN_EXISTS(STAT_LED_RED) && STAT_LED_RED_PIN == CASE_LIGHT_PIN #undef STAT_LED_RED_PIN #endif diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h index a267cb6cc..53ecb4c18 100644 --- a/Marlin/pins_AZTEEG_X3_PRO.h +++ b/Marlin/pins_AZTEEG_X3_PRO.h @@ -145,7 +145,7 @@ // // Misc. Functions // -#if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && defined(DOGLCD_A0) && DOGLCD_A0 == CASE_LIGHT_PIN +#if ENABLED(CASE_LIGHT_ENABLE) && PIN_EXISTS(CASE_LIGHT) && defined(DOGLCD_A0) && DOGLCD_A0 == CASE_LIGHT_PIN #undef DOGLCD_A0 // steal pin 44 for the case light; if you have a Viki2 and have connected it #define DOGLCD_A0 57 // following the Panucatt wiring diagram, you may need to tweak these pin assignments // as the wiring diagram uses pin 44 for DOGLCD_A0 diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index 11b51285e..4c35113e9 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -586,7 +586,7 @@ void Stepper::isr() { /** * If a minimum pulse time was specified get the timer 0 value. * - * TCNT0 has an 8x prescaler, so it increments every 8 cycles. + * TCNT0 has an 8x prescaler, so it increments every 8 cycles. * That's every 0.5µs on 16MHz and every 0.4µs on 20MHz. * 20 counts of TCNT0 -by itself- is a good pulse delay. * 10µs = 160 or 200 cycles. From 6411d65c48b60c1fc08e90263a44becaf1f7727a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 4 Jun 2017 12:24:09 -0500 Subject: [PATCH 31/31] Fix Morgan SCARA S2 calculation --- Marlin/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index c5261f9da..c3635ca8d 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -12003,7 +12003,7 @@ void prepare_move_to_destination() { else C2 = (HYPOT2(sx, sy) - (L1_2 + L2_2)) / (2.0 * L1 * L2); - S2 = sqrt(sq(C2) - 1); + S2 = sqrt(1 - sq(C2)); // Unrotated Arm1 plus rotated Arm2 gives the distance from Center to End SK1 = L1 + L2 * C2;