diff --git a/config/examples/Formbot/T_Rex_2+/Configuration.h b/config/examples/Formbot/T_Rex_2+/Configuration.h index 4f0e454538..2c27085e43 100644 --- a/config/examples/Formbot/T_Rex_2+/Configuration.h +++ b/config/examples/Formbot/T_Rex_2+/Configuration.h @@ -152,8 +152,15 @@ // For Cyclops or any "multi-extruder" that shares a single nozzle. //#define SINGLENOZZLE +// Save and restore temperature and fan speed on tool-change. +// Set standby for the unselected tool with M104/106/109 T... +#if ENABLED(SINGLENOZZLE) + //#define SINGLENOZZLE_STANDBY_TEMP + //#define SINGLENOZZLE_STANDBY_FAN +#endif + /** - * Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants. + * Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants. * * This device allows one stepper driver on a control board to drive * two to eight stepper motors, one at a time, in a manner suitable @@ -309,15 +316,8 @@ // 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, 436.0 } // (mm) relative X-offset for each nozzle -//#define HOTEND_OFFSET_X { 0.0, 434.8 } // (mm) relative X-offset for each nozzle #define HOTEND_OFFSET_X { 0.0, 434.6 } // (mm) relative X-offset for each nozzle - -//#define HOTEND_OFFSET_Y { 0.0, 0.50 } // (mm) relative Y-offset for each nozzle -//#define HOTEND_OFFSET_Y { 0.0, -0.60 } // (mm) relative Y-offset for each nozzle #define HOTEND_OFFSET_Y { 0.0, -0.50 } // (mm) relative Y-offset for each nozzle - #define HOTEND_OFFSET_Z { 0.0, 0.45 } // (mm) relative Z-offset for each nozzle // @section machine @@ -343,8 +343,8 @@ #define AUTO_POWER_E_FANS #define AUTO_POWER_CONTROLLERFAN #define AUTO_POWER_CHAMBER_FAN - //#define AUTO_POWER_E_TEMP 50 // (°C) Turn on PSU over this temperature - //#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) Turn on PSU over this temperature + //#define AUTO_POWER_E_TEMP 50 // (°C) Turn on PSU over this temperature + //#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) Turn on PSU over this temperature #define POWER_TIMEOUT 30 #endif #endif @@ -385,7 +385,7 @@ * 10 : 100k RS thermistor 198-961 (4.7k pullup) * 11 : 100k beta 3950 1% thermistor (Used in Keenovo AC silicone mats and most Wanhao i3 machines) (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" + * 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" * 15 : 100k thermistor calibration for JGAurora A5 hotend * 18 : ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327 * 20 : Pt100 with circuit in the Ultimainboard V2.x with 5v excitation (AVR) @@ -415,8 +415,8 @@ * 1000 : Custom - Specify parameters in Configuration_adv.h * * 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. + * 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. */ #define TEMP_SENSOR_0 1 #define TEMP_SENSOR_1 1 @@ -440,12 +440,12 @@ #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 #define TEMP_RESIDENCY_TIME 3 // (seconds) Time to wait for hotend to "settle" in M109 -#define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer -#define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target +#define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer +#define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target #define TEMP_BED_RESIDENCY_TIME 3 // (seconds) Time to wait for bed to "settle" in M190 -#define TEMP_BED_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer -#define TEMP_BED_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target +#define TEMP_BED_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer +#define TEMP_BED_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target // Below this temperature the heater will be switched off // because it probably indicates a broken thermistor wire. @@ -478,99 +478,19 @@ // 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 180 // 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 #define PID_K1 0.95 // Smoothing factor within any PID loop + #if ENABLED(PIDTEMP) #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM) #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM) #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] - -/* - * For Roxy Formbot T-Rex2 Frankenstien dmachine: - * - ->>> M303 S210 E0 C5 U1 -SENDING:M303 S210 E0 C5 U1 -PID Autotune start - bias: 96 d: 96 min: 205.86 max: 216.93 - bias: 97 d: 97 min: 204.72 max: 214.45 - bias: 95 d: 95 min: 205.82 max: 214.22 Ku: 28.80 Tu: 27.53 - Classic PID - Kp: 17.28 Ki: 1.26 Kd: 59.46 - bias: 94 d: 94 min: 205.98 max: 214.02 Ku: 29.75 Tu: 27.85 - Classic PID - Kp: 17.85 Ki: 1.28 Kd: 62.14 -SENDING:T1 - bias: 94 d: 94 min: 205.55 max: 213.98 Ku: 28.37 Tu: 28.18 - Classic PID - Kp: 17.02 Ki: 1.21 Kd: 59.96 -PID Autotune finished! Put the last Kp, Ki and Kd constants from below into Configuration.h -#define DEFAULT_Kp 17.02 -#define DEFAULT_Ki 1.21 -#define DEFAULT_Kd 59.96 - -SENDING:T1 -echo:Active Extruder: 1 -Setting hotend temperature to 211.000000 degrees Celsius. - ->>> M303 S210 E1 C5 U1 -SENDING:M303 S210 E1 C5 U1 -PID Autotune start - bias: 117 d: 117 min: 205.59 max: 216.51 - bias: 123 d: 123 min: 202.88 max: 216.15 - bias: 123 d: 123 min: 203.13 max: 217.14 Ku: 22.36 Tu: 41.29 - Classic PID - Kp: 13.41 Ki: 0.65 Kd: 69.23 - bias: 123 d: 123 min: 203.06 max: 216.72 Ku: 22.92 Tu: 40.96 - Classic PID - Kp: 13.75 Ki: 0.67 Kd: 70.42 - - - ------------------------------------ - cho: PID_DEBUG 0: Input 22.73 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 -echo: PID_DEBUG 0: Input 22.62 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 -echo: PID_DEBUG 0: Input 22.50 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 -echo: PID_DEBUG 0: Input 22.66 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 ->>> M303 E0 C5 U1 S210 -SENDING:M303 E0 C5 U1 S210 -echo: PID_DEBUG 0: Input 22.66 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 -PID Autotune start - bias: 93 d: 56 min: 205.63 max: 212.42 - bias: 98 d: 51 min: 205.78 max: 212.73 - bias: 97 d: 52 min: 207.34 max: 212.62 Ku: 25.11 Tu: 29.33 - Classic PID - Kp: 15.07 Ki: 1.03 Kd: 55.23 - bias: 94 d: 55 min: 208.01 max: 212.38 Ku: 32.01 Tu: 27.20 - Classic PID - Kp: 19.21 Ki: 1.41 Kd: 65.30 - bias: 93 d: 56 min: 207.97 max: 212.38 - Ku: 32.31 Tu: 26.54 - Classic PID - Kp: 19.38 Ki: 1.46 Kd: 64.31 -PID Autotune finished! Put the last Kp, Ki and Kd constants from below into Configuration.h -#define DEFAULT_Kp 19.38 -#define DEFAULT_Ki 1.46 -#define DEFAULT_Kd 64.31 -echo: PID_DEBUG 0: Input 209.92 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 -echo: PID_DEBUG 0: Input 209.73 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 -echo: PID_DEBUG 0: Input 209.69 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 - -*/ - -//#define DEFAULT_Kp 15.17 -//#define DEFAULT_Ki 0.88 -//#define DEFAULT_Kd 65.24 -// -// -// -#define DEFAULT_Kp 19.38 -#define DEFAULT_Ki 1.46 -#define DEFAULT_Kd 64.31 + #define DEFAULT_Kp 19.38 + #define DEFAULT_Ki 1.46 + #define DEFAULT_Kd 64.31 #endif // PIDTEMP @@ -610,9 +530,9 @@ echo: PID_DEBUG 0: Input 209.69 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 //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 289.73 - #define DEFAULT_bedKi 51.26 - #define DEFAULT_bedKd 409.43 + #define DEFAULT_bedKp 289.73 + #define DEFAULT_bedKi 51.26 + #define DEFAULT_bedKd 409.43 //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) //from pidautotune @@ -892,7 +812,7 @@ echo: PID_DEBUG 0: Input 209.69 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 /** * S-Curve Acceleration * - * This option eliminates vibration during printing by fitting a Bézier + * This option eliminates vibration during printing by fitting a Bézier * curve to move acceleration, producing much smoother direction changes. * * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained @@ -1173,7 +1093,7 @@ echo: PID_DEBUG 0: Input 209.69 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 #define Z_HOMING_HEIGHT 8 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding. -//#define Z_AFTER_HOMING 8 // (mm) Height to move to after homing Z +//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing Z // Direction of endstops when homing; 1=MAX, -1=MIN // :[-1,1] @@ -1322,8 +1242,8 @@ echo: PID_DEBUG 0: Input 209.69 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 // For Cartesian machines, instead of dividing moves on mesh boundaries, // split up moves into short segments like a Delta. This follows the // contours of the bed more closely than edge-to-edge straight moves. -//#define SEGMENT_LEVELED_MOVES -//#define LEVELED_SEGMENT_LENGTH 5.0 // (mm) Length of all segments (except the last one) + //#define SEGMENT_LEVELED_MOVES + //#define LEVELED_SEGMENT_LENGTH 5.0 // (mm) Length of all segments (except the last one) /** * Enable the G26 Mesh Validation Pattern tool. @@ -1332,8 +1252,8 @@ echo: PID_DEBUG 0: Input 209.69 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 #if ENABLED(G26_MESH_VALIDATION) #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. #define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool. - #define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool. - #define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for the G26 Mesh Validation Tool. + #define MESH_TEST_HOTEND_TEMP 205 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool. + #define MESH_TEST_BED_TEMP 60 // (°C) Default bed temperature for the G26 Mesh Validation Tool. #define G26_XY_FEEDRATE 20 // (mm/s) Feedrate for XY Moves for the G26 Mesh Validation Tool. #define G26_RETRACT_MULTIPLIER 1.0 // G26 Q (retraction) used by default between mesh test elements. #endif @@ -1450,8 +1370,8 @@ echo: PID_DEBUG 0: Input 209.69 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 #define Z_SAFE_HOMING #if ENABLED(Z_SAFE_HOMING) - #define Z_SAFE_HOMING_X_POINT (((X_BED_SIZE) / 2) - 15) // X point for Z homing when homing all axes (G28). - #define Z_SAFE_HOMING_Y_POINT (((Y_BED_SIZE) / 2) - 15) // Y point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing when homing all axes (G28). #endif // Homing speeds (mm/m) @@ -2141,7 +2061,7 @@ echo: PID_DEBUG 0: Input 209.69 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 //#define OLED_PANEL_TINYBOY2 // -// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER // http://reprap.org/wiki/MKS_12864OLED // // Tiny, but very sharp OLED display @@ -2373,12 +2293,3 @@ echo: PID_DEBUG 0: Input 209.69 Output 0.00 pTerm 0.00 iTerm 0.00 dTerm 0.00 // Allow servo angle to be edited and saved to EEPROM //#define EDITABLE_SERVO_ANGLES - - -/* Make sure these pins aren't used! */ - -#ifdef ROXYs_TRex - #define LED_PIN -1 - #define BEEPER_PIN -1 - #define KILL_PIN -1 -#endif diff --git a/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/config/examples/Formbot/T_Rex_2+/Configuration_adv.h index 8b8e1819e5..4a8c7d8dd2 100644 --- a/config/examples/Formbot/T_Rex_2+/Configuration_adv.h +++ b/config/examples/Formbot/T_Rex_2+/Configuration_adv.h @@ -134,7 +134,7 @@ #if TEMP_SENSOR_CHAMBER #define CHAMBER_MINTEMP 5 #define CHAMBER_MAXTEMP 60 - #define TEMP_CHAMBER_HYSTERESIS 1 // (°C) Temperature proximity considered "close enough" to the target + #define TEMP_CHAMBER_HYSTERESIS 1 // (°C) Temperature proximity considered "close enough" to the target //#define CHAMBER_LIMIT_SWITCHING //#define HEATER_CHAMBER_PIN 44 // Chamber heater on/off pin //#define HEATER_CHAMBER_INVERTING false @@ -867,7 +867,7 @@ * and hotend offsets. * * Note: HOTEND_OFFSET and CALIBRATION_OBJECT_CENTER must be set to within - * ±5mm of true values for G425 to succeed. + * ±5mm of true values for G425 to succeed. */ //#define CALIBRATION_GCODE #if ENABLED(CALIBRATION_GCODE) @@ -1316,7 +1316,7 @@ */ #if ENABLED(U8GLIB_ST7920) // 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. + // The normal delay is 10µs. Use the lowest value that still gives a reliable display. //#define DOGM_SPI_DELAY_US 5 //#define LIGHTWEIGHT_UI @@ -1342,7 +1342,7 @@ //#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames //#define STATUS_HEAT_PERCENT // Show heating in a progress bar //#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash) - //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM. + //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM. // Frivolous Game Options //#define MARLIN_BRICKOUT @@ -1444,16 +1444,16 @@ #if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET) // Additional character groups. These characters require // full bitmaps and take up considerable storage: - //#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³ - //#define TOUCH_UI_UTF8_COPYRIGHT // © ® - //#define TOUCH_UI_UTF8_GERMANIC // ß - //#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ - //#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡ - //#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ Â¥ - //#define TOUCH_UI_UTF8_ORDINALS // º ª - //#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷ - //#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾ - //#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬ + //#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³ + //#define TOUCH_UI_UTF8_COPYRIGHT // © ® + //#define TOUCH_UI_UTF8_GERMANIC // ß + //#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ + //#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡ + //#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥ + //#define TOUCH_UI_UTF8_ORDINALS // º ª + //#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷ + //#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾ + //#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬ #endif #endif @@ -1751,7 +1751,7 @@ /** * Minimum delay before and after setting the stepper DIR (in ns) - * 0 : No delay (Expect at least 10µS since one Stepper ISR must transpire) + * 0 : No delay (Expect at least 10µS since one Stepper ISR must transpire) * 20 : Minimum for TMC2xxx drivers * 200 : Minimum for A4988 drivers * 400 : Minimum for A5984 drivers @@ -1766,7 +1766,7 @@ //#define MINIMUM_STEPPER_PRE_DIR_DELAY 650 /** - * Minimum stepper driver pulse width (in µs) + * Minimum stepper driver pulse width (in µs) * 0 : Smallest possible width the MCU can produce, compatible with TMC2xxx drivers * 0 : Minimum 500ns for LV8729, adjusted in stepper.h * 1 : Minimum for A4988 and A5984 stepper drivers @@ -1801,7 +1801,7 @@ //================================= Buffers ================================= //=========================================================================== -// @section hidden +// @section motion // The number of lineear moves that can be in the planner at once. // The value of BLOCK_BUFFER_SIZE must be a power of 2 (e.g. 8, 16, 32) @@ -2785,9 +2785,9 @@ * Example pulse data for Nikon: https://bit.ly/2FKD0Aq * IR Wiring: https://git.io/JvJf7 */ - //#define PHOTO_PULSES_US { 2000, 27850, 400, 1580, 400, 3580, 400 } // (µs) Durations for each 48.4kHz oscillation + //#define PHOTO_PULSES_US { 2000, 27850, 400, 1580, 400, 3580, 400 } // (µs) Durations for each 48.4kHz oscillation #ifdef PHOTO_PULSES_US - #define PHOTO_PULSE_DELAY_US 13 // (µs) Approximate duration of each HIGH and LOW pulse in the oscillation + #define PHOTO_PULSE_DELAY_US 13 // (µs) Approximate duration of each HIGH and LOW pulse in the oscillation #endif #endif @@ -3280,7 +3280,7 @@ #define MAX7219_GCODE // Add the M7219 G-code to control the LED matrix #define MAX7219_INIT_TEST 2 // Test pattern at startup: 0=none, 1=sweep, 2=spiral #define MAX7219_NUMBER_UNITS 3 // Number of Max7219 units in chain. - #define MAX7219_ROTATE 0 // Rotate the display clockwise (in multiples of +/- 90°) + #define MAX7219_ROTATE 0 // Rotate the display clockwise (in multiples of +/- 90°) // connector at: right=0 bottom=-90 top=90 left=180 #define MAX7219_REVERSE_ORDER // The individual LED matrix units may be in reversed order //#define MAX7219_SIDE_BY_SIDE // Big chip+matrix boards can be chained side-by-side