Cleanup configurations
This commit is contained in:
parent
8bf3a3fcdb
commit
7db805930a
6 changed files with 109 additions and 114 deletions
|
@ -293,6 +293,7 @@
|
||||||
#define HEATER_1_MAXTEMP 245
|
#define HEATER_1_MAXTEMP 245
|
||||||
#define HEATER_2_MAXTEMP 245
|
#define HEATER_2_MAXTEMP 245
|
||||||
#define HEATER_3_MAXTEMP 245
|
#define HEATER_3_MAXTEMP 245
|
||||||
|
#define HEATER_4_MAXTEMP 245
|
||||||
#define BED_MAXTEMP 115
|
#define BED_MAXTEMP 115
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
@ -322,6 +323,11 @@
|
||||||
#define DEFAULT_Ki 0.50
|
#define DEFAULT_Ki 0.50
|
||||||
#define DEFAULT_Kd 60.00
|
#define DEFAULT_Kd 60.00
|
||||||
|
|
||||||
|
// Ultimaker
|
||||||
|
//#define DEFAULT_Kp 22.2
|
||||||
|
//#define DEFAULT_Ki 1.08
|
||||||
|
//#define DEFAULT_Kd 114
|
||||||
|
|
||||||
// MakerGear
|
// MakerGear
|
||||||
//#define DEFAULT_Kp 7.0
|
//#define DEFAULT_Kp 7.0
|
||||||
//#define DEFAULT_Ki 0.1
|
//#define DEFAULT_Ki 0.1
|
||||||
|
@ -562,7 +568,6 @@
|
||||||
*/
|
*/
|
||||||
//#define FIX_MOUNTED_PROBE
|
//#define FIX_MOUNTED_PROBE
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Z Servo Probe, such as an endstop switch on a rotating arm.
|
* Z Servo Probe, such as an endstop switch on a rotating arm.
|
||||||
* NUM_SERVOS also needs to be set. This is found later in this file. Set it to
|
* NUM_SERVOS also needs to be set. This is found later in this file. Set it to
|
||||||
|
@ -630,8 +635,10 @@
|
||||||
#define XY_PROBE_SPEED 7500
|
#define XY_PROBE_SPEED 7500
|
||||||
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
// Speed for the "accurate" probe of each point
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
// Use double touch for probing
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
|
@ -693,7 +700,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//#define Z_MIN_PROBE_ENDSTOP
|
//#define Z_MIN_PROBE_ENDSTOP
|
||||||
|
|
||||||
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
|
||||||
|
|
||||||
// Enable Z Probe Repeatability test to see how accurate your probe is
|
// Enable Z Probe Repeatability test to see how accurate your probe is
|
||||||
|
@ -770,7 +776,6 @@
|
||||||
#define Y_HOME_DIR -1
|
#define Y_HOME_DIR -1
|
||||||
#define Z_HOME_DIR -1
|
#define Z_HOME_DIR -1
|
||||||
|
|
||||||
|
|
||||||
// @section machine
|
// @section machine
|
||||||
|
|
||||||
// Travel limits after homing (units are in mm)
|
// Travel limits after homing (units are in mm)
|
||||||
|
@ -803,7 +808,6 @@
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
//=============================== Bed Leveling ==============================
|
//=============================== Bed Leveling ==============================
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
||||||
// @section bedlevel
|
// @section bedlevel
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -850,7 +854,6 @@
|
||||||
#define AUTO_BED_LEVELING_UBL
|
#define AUTO_BED_LEVELING_UBL
|
||||||
//#define MESH_BED_LEVELING
|
//#define MESH_BED_LEVELING
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enable detailed logging of G28, G29, M48, etc.
|
* Enable detailed logging of G28, G29, M48, etc.
|
||||||
* Turn on with the command 'M111 S32'.
|
* Turn on with the command 'M111 S32'.
|
||||||
|
@ -901,7 +904,6 @@
|
||||||
|
|
||||||
// 3 arbitrary points to probe.
|
// 3 arbitrary points to probe.
|
||||||
// A simple cross-product is used to estimate the plane of the bed.
|
// A simple cross-product is used to estimate the plane of the bed.
|
||||||
|
|
||||||
#define ABL_PROBE_PT_1_X 39
|
#define ABL_PROBE_PT_1_X 39
|
||||||
#define ABL_PROBE_PT_1_Y 170
|
#define ABL_PROBE_PT_1_Y 170
|
||||||
#define ABL_PROBE_PT_2_X 39
|
#define ABL_PROBE_PT_2_X 39
|
||||||
|
@ -927,6 +929,7 @@
|
||||||
#define UBL_PROBE_PT_3_X 180
|
#define UBL_PROBE_PT_3_X 180
|
||||||
#define UBL_PROBE_PT_3_Y 25
|
#define UBL_PROBE_PT_3_Y 25
|
||||||
#define UBL_G26_MESH_EDITING // Enable G26 mesh editing
|
#define UBL_G26_MESH_EDITING // Enable G26 mesh editing
|
||||||
|
|
||||||
#elif ENABLED(MESH_BED_LEVELING)
|
#elif ENABLED(MESH_BED_LEVELING)
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
@ -1606,7 +1609,7 @@
|
||||||
*/
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (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)
|
#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 FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
|
|
|
@ -327,7 +327,7 @@
|
||||||
// Default x offset in duplication mode (typically set to half print bed width)
|
// Default x offset in duplication mode (typically set to half print bed width)
|
||||||
#define DEFAULT_DUPLICATION_X_OFFSET 100
|
#define DEFAULT_DUPLICATION_X_OFFSET 100
|
||||||
|
|
||||||
#endif //DUAL_X_CARRIAGE
|
#endif // DUAL_X_CARRIAGE
|
||||||
|
|
||||||
// Activate a solenoid on the active extruder with M380. Disable all with M381.
|
// 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 SOL0_PIN, SOL1_PIN, etc., for each extruder that has a solenoid.
|
||||||
|
@ -419,7 +419,6 @@
|
||||||
* M909, M910 & LCD - only PRINTRBOARD_REVF & RIGIDBOARD_V2
|
* M909, M910 & LCD - only PRINTRBOARD_REVF & RIGIDBOARD_V2
|
||||||
*/
|
*/
|
||||||
//#define PWM_MOTOR_CURRENT {1300, 1300, 1250} // Values in milliamps
|
//#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 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
|
//#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis
|
||||||
|
|
||||||
|
@ -587,10 +586,9 @@
|
||||||
*/
|
*/
|
||||||
#define BABYSTEPPING
|
#define BABYSTEPPING
|
||||||
#if ENABLED(BABYSTEPPING)
|
#if ENABLED(BABYSTEPPING)
|
||||||
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
|
#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
|
||||||
//not implemented for deltabots!
|
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
|
||||||
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z
|
#define BABYSTEP_MULTIPLICATOR 2 // Babysteps are very small. Increase for faster motion.
|
||||||
#define BABYSTEP_MULTIPLICATOR 2 //faster movements
|
|
||||||
//#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping
|
//#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_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
|
||||||
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
|
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
|
||||||
|
@ -1034,7 +1032,6 @@
|
||||||
* (https://github.com/ameyer/Arduino-L6470)
|
* (https://github.com/ameyer/Arduino-L6470)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
//#define HAVE_L6470DRIVER
|
//#define HAVE_L6470DRIVER
|
||||||
#if ENABLED(HAVE_L6470DRIVER)
|
#if ENABLED(HAVE_L6470DRIVER)
|
||||||
|
|
||||||
|
@ -1155,7 +1152,6 @@
|
||||||
*/
|
*/
|
||||||
//#define EXTENDED_CAPABILITIES_REPORT
|
//#define EXTENDED_CAPABILITIES_REPORT
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Volumetric extrusion default state
|
* Volumetric extrusion default state
|
||||||
* Activate to make volumetric extrusion the default method,
|
* Activate to make volumetric extrusion the default method,
|
||||||
|
|
|
@ -130,7 +130,7 @@
|
||||||
// The following define selects which electronics board you have.
|
// The following define selects which electronics board you have.
|
||||||
// Please choose the name from boards.h that matches your setup
|
// Please choose the name from boards.h that matches your setup
|
||||||
#ifndef MOTHERBOARD
|
#ifndef MOTHERBOARD
|
||||||
//#define MOTHERBOARD BOARD_RAMPS_14_EEF
|
//#define MOTHERBOARD BOARD_RAMPS_14_EEF
|
||||||
#define MOTHERBOARD BOARD_RAMPS_14_EFB // gMax users please note: This is a Roxy modification. I print on glass and
|
#define MOTHERBOARD BOARD_RAMPS_14_EFB // gMax users please note: This is a Roxy modification. I print on glass and
|
||||||
// I use Marlin to control the bed's temperature. So, if you have a single nozzle
|
// I use Marlin to control the bed's temperature. So, if you have a single nozzle
|
||||||
// machine, this will work fine for you. You just set the
|
// machine, this will work fine for you. You just set the
|
||||||
|
@ -332,9 +332,9 @@
|
||||||
#define DEFAULT_Kd 69.45
|
#define DEFAULT_Kd 69.45
|
||||||
|
|
||||||
// Ultimaker
|
// Ultimaker
|
||||||
// #define DEFAULT_Kp 22.2
|
//#define DEFAULT_Kp 22.2
|
||||||
// #define DEFAULT_Ki 1.08
|
//#define DEFAULT_Ki 1.08
|
||||||
// #define DEFAULT_Kd 114
|
//#define DEFAULT_Kd 114
|
||||||
|
|
||||||
// MakerGear
|
// MakerGear
|
||||||
//#define DEFAULT_Kp 7.0
|
//#define DEFAULT_Kp 7.0
|
||||||
|
@ -474,7 +474,7 @@
|
||||||
#define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
#define X_MAX_ENDSTOP_INVERTING false // 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 Y_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
|
||||||
#define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
#define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
||||||
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
|
||||||
|
|
||||||
// Enable this feature if all enabled endstop pins are interrupt-capable.
|
// 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.
|
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
|
||||||
|
@ -730,8 +730,6 @@
|
||||||
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
|
#define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
|
||||||
#define Z_CLEARANCE_BETWEEN_PROBES 6 // Z Clearance between probe points
|
#define Z_CLEARANCE_BETWEEN_PROBES 6 // Z Clearance between probe points
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
// For M851 give a range for adjusting the Z probe offset
|
// For M851 give a range for adjusting the Z probe offset
|
||||||
#define Z_PROBE_OFFSET_RANGE_MIN -20
|
#define Z_PROBE_OFFSET_RANGE_MIN -20
|
||||||
#define Z_PROBE_OFFSET_RANGE_MAX 20
|
#define Z_PROBE_OFFSET_RANGE_MAX 20
|
||||||
|
@ -994,8 +992,8 @@
|
||||||
#define Z_SAFE_HOMING
|
#define Z_SAFE_HOMING
|
||||||
|
|
||||||
#if ENABLED(Z_SAFE_HOMING)
|
#if ENABLED(Z_SAFE_HOMING)
|
||||||
#define Z_SAFE_HOMING_X_POINT (((X_MIN_POS+X_MAX_POS)/2)-4) // X point for Z homing when homing all axis (G28).
|
#define Z_SAFE_HOMING_X_POINT (((X_MIN_POS + X_MAX_POS) / 2) - 4) // X point for Z homing when homing all axis (G28).
|
||||||
#define Z_SAFE_HOMING_Y_POINT (((Y_MIN_POS+Y_MAX_POS)/2)+4) // Y point for Z homing when homing all axis (G28).
|
#define Z_SAFE_HOMING_Y_POINT (((Y_MIN_POS + Y_MAX_POS) / 2) + 4) // Y point for Z homing when homing all axis (G28).
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Homing speeds (mm/m)
|
// Homing speeds (mm/m)
|
||||||
|
@ -1035,7 +1033,7 @@
|
||||||
//
|
//
|
||||||
// M100 Free Memory Watcher
|
// M100 Free Memory Watcher
|
||||||
//
|
//
|
||||||
#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
|
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
|
||||||
|
|
||||||
//
|
//
|
||||||
// G20/G21 Inch mode support
|
// G20/G21 Inch mode support
|
||||||
|
@ -1619,7 +1617,7 @@
|
||||||
*/
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (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)
|
#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 FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
|
@ -1633,6 +1631,6 @@
|
||||||
|
|
||||||
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif //FILAMENT_WIDTH_SENSOR
|
#endif
|
||||||
|
|
||||||
#endif // CONFIGURATION_H
|
#endif // CONFIGURATION_H
|
||||||
|
|
|
@ -361,7 +361,7 @@
|
||||||
// Default stepper release if idle. Set to 0 to deactivate.
|
// 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.
|
// 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.
|
// Time can be set by M18 and M84.
|
||||||
#define DEFAULT_STEPPER_DEACTIVE_TIME 0 // usually is set to 120 seconds
|
#define DEFAULT_STEPPER_DEACTIVE_TIME 0 // usually set to 120 seconds
|
||||||
#define DISABLE_INACTIVE_X true
|
#define DISABLE_INACTIVE_X true
|
||||||
#define DISABLE_INACTIVE_Y 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_Z true // set to false if the nozzle will fall down on your printed part when print has finished.
|
||||||
|
|
|
@ -106,5 +106,3 @@ const unsigned char custom_start_bmp[896] PROGMEM = {
|
||||||
0x03, 0x80, 0x00, 0x20, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
|
0x03, 0x80, 0x00, 0x20, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
|
||||||
0x01, 0xff, 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
0x01, 0xff, 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Reference in a new issue