From 880999c5d033e95e6b997a1cd331c46ee0e2eb09 Mon Sep 17 00:00:00 2001 From: Jason Rhubottom Date: Wed, 24 Aug 2016 16:50:17 -0700 Subject: [PATCH] Updated configuration based on V1.1.0.8 Gladiola Disabled FWRetract --- Marlin/Configuration.h | 85 ++++++++++++++++++++++---------------- Marlin/Configuration_adv.h | 26 ++++++------ 2 files changed, 63 insertions(+), 48 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index ca465a45ffba..5122df2b0737 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -79,7 +79,7 @@ Here are some standard links for getting your machine calibrated: // 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" +#define MACHINE_UUID "351487b6-ca9a-4c1a-8765-d468b1da6585" // This defines the number of extruders // :[1,2,3,4] @@ -155,8 +155,8 @@ Here are some standard links for getting your machine calibrated: //#define TEMP_SENSOR_1_AS_REDUNDANT #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 -// Actual temperature must be close to target for this long before M109 returns success -#define TEMP_RESIDENCY_TIME 0.5 // (seconds) +// Extruder temperature must be close to target for this long before M109 returns success +#define TEMP_RESIDENCY_TIME 1 // (seconds) #define TEMP_HYSTERESIS 10 // (degC) range of +/- temperatures considered "close" to the target one #define TEMP_WINDOW 10 // (degC) Window around target to start the residency timer x degC early. @@ -193,22 +193,22 @@ Here are some standard links for getting your machine calibrated: // Comment the following line to disable PID and enable bang-bang. #define PIDTEMP -#define BANG_MAX 220 // limits current to nozzle while in bang-bang mode; 255=full current -#define PID_MAX 225 // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current +#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 #ifdef PIDTEMP //#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_EXTRUDER // 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 16 // If the temperature difference between the target temperature and the actual temperature - // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. - #define PID_INTEGRAL_DRIVE_MAX 220 //limit for the integral term + #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 PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term #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 + // LulzBot AO-Hexagon (24V) -// AO-Hexagon (24V) #define DEFAULT_Kp 28.79 #define DEFAULT_Ki 1.91 #define DEFAULT_Kd 108.51 @@ -330,13 +330,13 @@ Here are some standard links for getting your machine calibrated: #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 + #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). @@ -394,20 +394,20 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // Sets direction of endstops when homing; 1=MAX, -1=MIN // :[-1,1] #define X_HOME_DIR -1 -#define Y_HOME_DIR -1 +#define Y_HOME_DIR 1 #define Z_HOME_DIR 1 -#define min_software_endstops false // If true, axis won't move to coordinates less than HOME_POS. +#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS. #define max_software_endstops true // If true, axis won't move to coordinates greater than the defined lengths below. // @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 165 -#define Y_MAX_POS 185 +#define Y_MIN_POS -10 +#define Z_MIN_POS -2 +#define X_MAX_POS 175 +#define Y_MAX_POS 191 #define Y_MAX_BED_POS 170 #define Z_MAX_POS 159 @@ -467,7 +467,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // This mode is preferred because there are more measurements. // // - "3-point" mode - // Probe 3 arbitrary points on the bed (that aren't colinear) + // Probe 3 arbitrary points on the bed (that aren't collinear) // You specify the XY coordinates of all 3 points. // Enable this to sample the bed in a grid (least squares solution). @@ -477,9 +477,9 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #if ENABLED(AUTO_BED_LEVELING_GRID) #define LEFT_PROBE_BED_POSITION 0 - #define RIGHT_PROBE_BED_POSITION 160 - #define FRONT_PROBE_BED_POSITION 0 - #define BACK_PROBE_BED_POSITION 160 + #define RIGHT_PROBE_BED_POSITION 164 + #define FRONT_PROBE_BED_POSITION -6 + #define BACK_PROBE_BED_POSITION 162 #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this. @@ -500,20 +500,35 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #endif // AUTO_BED_LEVELING_GRID - // Offsets to the Z probe relative to the nozzle tip. + // Z Probe to nozzle (X,Y) offset, relative to (0, 0). // X and Y offsets must be integers. - #define X_PROBE_OFFSET_FROM_EXTRUDER 0 // Z probe to nozzle X offset: -left +right - #define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Z probe to nozzle Y offset: -front +behind - #define Z_PROBE_OFFSET_FROM_EXTRUDER -1.375 // Z probe to nozzle Z offset: -below (always!) + // + // 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) + #define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle] + #define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle] + #define Z_PROBE_OFFSET_FROM_EXTRUDER -1.43 // Z offset: -below +above [the nozzle] #define Z_RAISE_BEFORE_HOMING 5 // (in mm) Raise Z axis before homing (G28) for Z probe clearance. // Be sure you have this distance over your Z_MAX_POS in case. - #define XY_TRAVEL_SPEED 18000 // X and Y axis travel speed between probes, in mm/min. + #define XY_TRAVEL_SPEED 8000 // X and Y axis travel speed between probes, in mm/min. #define Z_RAISE_BEFORE_PROBING 5 // How much the Z axis will be raised before traveling to the first probing point. #define Z_RAISE_BETWEEN_PROBINGS 5 // How much the Z axis will be raised when traveling from between next probing points. - #define Z_RAISE_AFTER_PROBING 15 // How much the Z axis will be raised after the last probing point. + #define Z_RAISE_AFTER_PROBING 0 // How much the Z axis will be raised after the last probing point. //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine. // Useful to retract a deployable Z probe. @@ -598,7 +613,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // default settings -#define DEFAULT_AXIS_STEPS_PER_UNIT {100.5,100.5,1600,833} // default steps per unit for Ultimaker +#define DEFAULT_AXIS_STEPS_PER_UNIT {100.5,100.5,1600,833} // default steps per unit for LulzBot Mini #define DEFAULT_MAX_FEEDRATE {800, 800, 8, 40} // (mm/sec) #define DEFAULT_MAX_ACCELERATION {9000,9000,100,1000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot. @@ -609,7 +624,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously) #define DEFAULT_XYJERK 12.0 // (mm/sec) #define DEFAULT_ZJERK 0.4 // (mm/sec) -#define DEFAULT_EJERK 10.0 // (mm/sec) +#define DEFAULT_EJERK 10.0 // (mm/sec) //============================================================================= @@ -623,7 +638,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #if ENABLED(CUSTOM_M_CODES) #if ENABLED(AUTO_BED_LEVELING_FEATURE) #define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851 - #define Z_PROBE_OFFSET_RANGE_MIN -15 + #define Z_PROBE_OFFSET_RANGE_MIN -2 #define Z_PROBE_OFFSET_RANGE_MAX 5 #endif #endif diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 8fd26bebe862..ced82f9bbfa3 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -18,8 +18,8 @@ * Thermal Protection parameters */ #if ENABLED(THERMAL_PROTECTION_HOTENDS) - #define THERMAL_PROTECTION_PERIOD 40 // Seconds - #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius + #define THERMAL_PROTECTION_PERIOD 15 // Seconds + #define THERMAL_PROTECTION_HYSTERESIS 30 // Degrees Celsius /** * Whenever an M104 or M109 increases the target temperature the firmware will wait for the @@ -27,13 +27,13 @@ * 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. */ - #define WATCH_TEMP_PERIOD 16 // Seconds - #define WATCH_TEMP_INCREASE 4 // Degrees Celsius + #define WATCH_TEMP_PERIOD 20 // Seconds + #define WATCH_TEMP_INCREASE 2 // Degrees Celsius #endif #if ENABLED(THERMAL_PROTECTION_BED) - #define THERMAL_PROTECTION_BED_PERIOD 20 // Seconds - #define THERMAL_PROTECTION_BED_HYSTERESIS 2 // Degrees Celsius + #define THERMAL_PROTECTION_BED_PERIOD 15 // Seconds + #define THERMAL_PROTECTION_BED_HYSTERESIS 10 // Degrees Celsius #endif #if ENABLED(PIDTEMP) @@ -41,7 +41,7 @@ // if Kc is chosen well, the additional required power due to increased melting should be compensated. #define PID_ADD_EXTRUSION_RATE #if ENABLED(PID_ADD_EXTRUSION_RATE) - #define DEFAULT_Kc (1) //heating power=Kc*(e_speed) + #define DEFAULT_Kc (100) //heating power=Kc*(e_speed) #define LPQ_MAX_LEN 50 #endif #endif @@ -56,7 +56,7 @@ * 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 +//#define AUTOTEMP #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 #endif @@ -213,7 +213,7 @@ #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. +#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 @@ -265,7 +265,7 @@ #define MICROSTEP_MODES {16,16,16,16,16} // [1,2,4,8,16] // Motor Current setting (Only functional when motor driver current ref pins are connected to a digital trimpot on supported boards) -#define DIGIPOT_MOTOR_CURRENT {175,175,220,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) +//#define DIGIPOT_MOTOR_CURRENT {175,175,220,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) // uncomment to enable an I2C based DIGIPOT like on the Azteeg X3 Pro //#define DIGIPOT_I2C @@ -343,7 +343,7 @@ // @section more // 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 +#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. @@ -413,7 +413,7 @@ const unsigned int dropsegments = 5; //everything with less than this number of //The ASCII buffer for receiving from the serial: #define MAX_CMD_SIZE 96 -#define BUFSIZE 4 +#define BUFSIZE 10 // Bad Serial-connections can miss a received command by sending an 'ok' // Therefore some clients abort after 30 seconds in a timeout. @@ -432,7 +432,7 @@ const unsigned int dropsegments = 5; //everything with less than this number of // 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 +//#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 1.5 //default retract length (positive mm)