Skip to content

Commit

Permalink
Merge pull request #4805 from thinkyhead/rc_config_adjustment
Browse files Browse the repository at this point in the history 
Additional documentation of Configuration.h
  • Loading branch information
@thinkyhead
thinkyhead authored Sep 16, 2016
2 parents b08bd84 + a1812b5 commit 5021500
Show file tree
Hide file tree
Showing 25 changed files with 1,152 additions and 319 deletions.
106 changes: 80 additions & 26 deletions Marlin/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,24 @@
//#define SHOW_CUSTOM_BOOTSCREEN
// @section machine

// SERIAL_PORT selects which serial port should 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 still used by the Arduino bootloader regardless of this setting.
// :[0,1,2,3,4,5,6,7]
/**
* 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 determines the communication speed of the printer
// :[2400,9600,19200,38400,57600,115200,250000]
#define BAUDRATE 250000
/**
* 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]
*/

// Enable the Bluetooth serial interface on AT90USB devices
//#define BLUETOOTH
Expand Down Expand Up @@ -169,14 +178,22 @@
//#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

//// The following define selects which power supply you have. Please choose the one that matches your setup
// 1 = ATX
// 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC)
// :{1:'ATX',2:'X-Box 360'}
#define POWER_SUPPLY 1
/**
* 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

// Define this to have the electronics keep the power supply off on startup. If you don't know what this is leave it.
//#define PS_DEFAULT_OFF
#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

Expand Down Expand Up @@ -355,8 +372,9 @@
#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 (X_MAX_LENGTH+Y_MAX_LENGTH)
#define EXTRUDE_MAXLENGTH 200

//===========================================================================
//======================== Thermal Runaway Protection =======================
Expand Down Expand Up @@ -436,20 +454,56 @@
//=============================================================================
// @section motion

#define DEFAULT_AXIS_STEPS_PER_UNIT {80,80,4000,500} // default steps per unit for Ultimaker
#define DEFAULT_MAX_FEEDRATE {300, 300, 5, 25} // (mm/sec)
#define DEFAULT_MAX_ACCELERATION {3000,3000,100,10000} // 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.
/**
* Default Settings
*
* These settings can be reset by M502
*
* Note that if EEPROM is enabled, saved values will override these.
*/

/**
* Default Axis Steps Per Unit (steps/mm)
* Override with M92
*/
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 }

/**
* Default Max Feed Rate (mm/s)
* Override with M203
*/
#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 }

/**
* Default Max Acceleration (change/s) change = mm/s
* Override with M201
*
* Maximum start speed for accelerated moves: { X, Y, Z, E }
*/
#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 }

#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration in mm/s^2 for printing moves
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
/**
* Default Acceleration (change/s) change = mm/s
* Override with M204
*
* M204 P Acceleration
* M204 R Retract Acceleration
* M204 T Travel Acceleration
*/
#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves

// "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_XYJERK 20.0 // (mm/sec)
#define DEFAULT_ZJERK 0.4 // (mm/sec)
#define DEFAULT_EJERK 5.0 // (mm/sec)
/**
* Defult Jerk (mm/s)
*
* "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_XYJERK 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0


//===========================================================================
Expand Down
63 changes: 50 additions & 13 deletions Marlin/example_configurations/Cartesio/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,9 @@
#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 (X_MAX_LENGTH+Y_MAX_LENGTH)
#define EXTRUDE_MAXLENGTH 200

//===========================================================================
//======================== Thermal Runaway Protection =======================
Expand Down Expand Up @@ -436,20 +437,56 @@
//=============================================================================
// @section motion

#define DEFAULT_AXIS_STEPS_PER_UNIT {71.128,71.128,640,152}
#define DEFAULT_MAX_FEEDRATE {200,200,20,20} // (mm/sec)
#define DEFAULT_MAX_ACCELERATION {1000,1000,100,10000} // 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.
/**
* Default Settings
*
* These settings can be reset by M502
*
* Note that if EEPROM is enabled, saved values will override these.
*/

/**
* Default Axis Steps Per Unit (steps/mm)
* Override with M92
*/
#define DEFAULT_AXIS_STEPS_PER_UNIT { 71.128, 71.128, 640, 152 }

/**
* Default Max Feed Rate (mm/s)
* Override with M203
*/
#define DEFAULT_MAX_FEEDRATE { 200, 200, 20, 20 } // (mm/sec)

#define DEFAULT_ACCELERATION 500 // X, Y, Z and E acceleration in mm/s^2 for printing moves
#define DEFAULT_RETRACT_ACCELERATION 10000 // E acceleration in mm/s^2 for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
/**
* Default Max Acceleration (change/s) change = mm/s
* Override with M201
*
* Maximum start speed for accelerated moves: { X, Y, Z, E }
*/
#define DEFAULT_MAX_ACCELERATION { 1000, 1000, 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 500 // X, Y, Z and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 10000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves

// "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_XYJERK 10.0 // (mm/sec)
#define DEFAULT_ZJERK 0.4 // (mm/sec)
#define DEFAULT_EJERK 5.0 // (mm/sec)
/**
* Defult Jerk (mm/s)
*
* "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_XYJERK 10.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0


//===========================================================================
Expand Down
67 changes: 52 additions & 15 deletions Marlin/example_configurations/Felix/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,9 @@
#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 (X_MAX_LENGTH+Y_MAX_LENGTH)
#define EXTRUDE_MAXLENGTH 200

//===========================================================================
//======================== Thermal Runaway Protection =======================
Expand Down Expand Up @@ -419,20 +420,56 @@
// @section motion

// default steps per unit for Felix 2.0/3.0: 0.00249mm x/y rounding error with 3mm pitch HTD belt and 14 tooth pulleys. 0 z error.
#define DEFAULT_AXIS_STEPS_PER_UNIT {76.190476, 76.190476, 1600, 164}
#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 25} // (mm/sec)
#define DEFAULT_MAX_ACCELERATION {5000,5000,100,80000} // 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.

#define DEFAULT_ACCELERATION 1750 // X, Y, Z and E max acceleration in mm/s^2 for printing moves
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration in mm/s^2 for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves

// "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_XYJERK 10.0 // (mm/sec)
#define DEFAULT_ZJERK 0.3 // (mm/sec)
#define DEFAULT_EJERK 5.0 // (mm/sec)
/**
* Default Settings
*
* These settings can be reset by M502
*
* Note that if EEPROM is enabled, saved values will override these.
*/

/**
* Default Axis Steps Per Unit (steps/mm)
* Override with M92
*/
#define DEFAULT_AXIS_STEPS_PER_UNIT { 76.190476, 76.190476, 1600, 164 }

/**
* Default Max Feed Rate (mm/s)
* Override with M203
*/
#define DEFAULT_MAX_FEEDRATE { 500, 500, 5, 25 }

/**
* Default Max Acceleration (change/s) change = mm/s
* Override with M201
*
* Maximum start speed for accelerated moves: { X, Y, Z, E }
*/
#define DEFAULT_MAX_ACCELERATION { 5000, 5000, 100, 80000 }

/**
* Default Acceleration (change/s) change = mm/s
* Override with M204
*
* M204 P Acceleration
* M204 R Retract Acceleration
* M204 T Travel Acceleration
*/
#define DEFAULT_ACCELERATION 1750 // X, Y, Z and E max acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves

/**
* Defult Jerk (mm/s)
*
* "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_XYJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0


//===========================================================================
Expand Down
67 changes: 52 additions & 15 deletions Marlin/example_configurations/Felix/DUAL/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,9 @@
#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 (X_MAX_LENGTH+Y_MAX_LENGTH)
#define EXTRUDE_MAXLENGTH 200

//===========================================================================
//======================== Thermal Runaway Protection =======================
Expand Down Expand Up @@ -417,20 +418,56 @@
// @section motion

// default steps per unit for Felix 2.0/3.0: 0.00249mm x/y rounding error with 3mm pitch HTD belt and 14 tooth pulleys. 0 z error.
#define DEFAULT_AXIS_STEPS_PER_UNIT {76.190476, 76.190476, 1600, 164}
#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 25} // (mm/sec)
#define DEFAULT_MAX_ACCELERATION {5000,5000,100,80000} // 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.

#define DEFAULT_ACCELERATION 1750 // X, Y, Z and E max acceleration in mm/s^2 for printing moves
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration in mm/s^2 for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves

// "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_XYJERK 10.0 // (mm/sec)
#define DEFAULT_ZJERK 0.3 // (mm/sec)
#define DEFAULT_EJERK 5.0 // (mm/sec)
/**
* Default Settings
*
* These settings can be reset by M502
*
* Note that if EEPROM is enabled, saved values will override these.
*/

/**
* Default Axis Steps Per Unit (steps/mm)
* Override with M92
*/
#define DEFAULT_AXIS_STEPS_PER_UNIT { 76.190476, 76.190476, 1600, 164 }

/**
* Default Max Feed Rate (mm/s)
* Override with M203
*/
#define DEFAULT_MAX_FEEDRATE { 500, 500, 5, 25 }

/**
* Default Max Acceleration (change/s) change = mm/s
* Override with M201
*
* Maximum start speed for accelerated moves: { X, Y, Z, E }
*/
#define DEFAULT_MAX_ACCELERATION { 5000, 5000, 100, 80000 }

/**
* Default Acceleration (change/s) change = mm/s
* Override with M204
*
* M204 P Acceleration
* M204 R Retract Acceleration
* M204 T Travel Acceleration
*/
#define DEFAULT_ACCELERATION 1750 // X, Y, Z and E max acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves

/**
* Defult Jerk (mm/s)
*
* "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_XYJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0


//===========================================================================
Expand Down
Loading

0 comments on commit 5021500

Please sign in to comment.