Skip to content

Commit

Permalink
🔧 Configuration updates, cleanup (#709)
Browse files Browse the repository at this point in the history
  • Loading branch information
@thisiskeithb
thisiskeithb authored Apr 19, 2022
1 parent 6c752ff commit 41eee7b
Show file tree
Hide file tree
Showing 330 changed files with 5,313 additions and 21,822 deletions.
2 changes: 1 addition & 1 deletion config/default/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2007,7 +2007,7 @@
// @section temperature

//
// Preheat Constants - Up to 5 are supported without changes
// Preheat Constants - Up to 6 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 180
Expand Down
35 changes: 17 additions & 18 deletions config/examples/3DFabXYZ/Migbot/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,21 @@
//#define NUM_AXES 3

/**
* Axis codes for additional axes:
* This defines the axis code that is used in G-code commands to
* reference a specific axis.
* 'A' for rotational axis parallel to X
* 'B' for rotational axis parallel to Y
* 'C' for rotational axis parallel to Z
* 'U' for secondary linear axis parallel to X
* 'V' for secondary linear axis parallel to Y
* 'W' for secondary linear axis parallel to Z
* Regardless of the settings, firmware-internal axis IDs are
* I (AXIS4), J (AXIS5), K (AXIS6).
* Additional Axis Settings
*
* Define AXISn_ROTATES for all axes that rotate or pivot.
* Rotational axis coordinates are expressed in degrees.
*
* AXISn_NAME defines the letter used to refer to the axis in (most) G-code commands.
* By convention the names and roles are typically:
* 'A' : Rotational axis parallel to X
* 'B' : Rotational axis parallel to Y
* 'C' : Rotational axis parallel to Z
* 'U' : Secondary linear axis parallel to X
* 'V' : Secondary linear axis parallel to Y
* 'W' : Secondary linear axis parallel to Z
*
* Regardless of these settings the axes are internally named I, J, K, U, V, W.
*/
#if NUM_AXES >= 4
#define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
Expand Down Expand Up @@ -607,6 +611,7 @@
//===========================================================================
//============================= PID Settings ================================
//===========================================================================

// Enable PIDTEMP for PID control or MPCTEMP for Predictive Model.
// temperature control. Disable both for bang-bang heating.
#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
Expand Down Expand Up @@ -2004,7 +2009,7 @@
// @section temperature

//
// Preheat Constants - Up to 5 are supported without changes
// Preheat Constants - Up to 6 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 205
Expand Down Expand Up @@ -2042,12 +2047,6 @@
#define PREHEAT_6_TEMP_CHAMBER 35
#define PREHEAT_6_FAN_SPEED 0 // Value from 0 to 255

#define PREHEAT_7_LABEL "NYLON"
#define PREHEAT_7_TEMP_HOTEND 240 // NYLON
#define PREHEAT_7_TEMP_BED 80
#define PREHEAT_7_TEMP_CHAMBER 35
#define PREHEAT_7_FAN_SPEED 0 // Value from 0 to 255

/**
* Nozzle Park
*
Expand Down
0 config/examples/3DFabXYZ/Migbot/Readme.md → config/examples/3DFabXYZ/Migbot/README.md
View file
File renamed without changes.
29 changes: 17 additions & 12 deletions config/examples/ADIMLab/Gantry v1/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,21 @@
//#define NUM_AXES 3

/**
* Axis codes for additional axes:
* This defines the axis code that is used in G-code commands to
* reference a specific axis.
* 'A' for rotational axis parallel to X
* 'B' for rotational axis parallel to Y
* 'C' for rotational axis parallel to Z
* 'U' for secondary linear axis parallel to X
* 'V' for secondary linear axis parallel to Y
* 'W' for secondary linear axis parallel to Z
* Regardless of the settings, firmware-internal axis IDs are
* I (AXIS4), J (AXIS5), K (AXIS6).
* Additional Axis Settings
*
* Define AXISn_ROTATES for all axes that rotate or pivot.
* Rotational axis coordinates are expressed in degrees.
*
* AXISn_NAME defines the letter used to refer to the axis in (most) G-code commands.
* By convention the names and roles are typically:
* 'A' : Rotational axis parallel to X
* 'B' : Rotational axis parallel to Y
* 'C' : Rotational axis parallel to Z
* 'U' : Secondary linear axis parallel to X
* 'V' : Secondary linear axis parallel to Y
* 'W' : Secondary linear axis parallel to Z
*
* Regardless of these settings the axes are internally named I, J, K, U, V, W.
*/
#if NUM_AXES >= 4
#define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
Expand Down Expand Up @@ -606,6 +610,7 @@
//===========================================================================
//============================= PID Settings ================================
//===========================================================================

// Enable PIDTEMP for PID control or MPCTEMP for Predictive Model.
// temperature control. Disable both for bang-bang heating.
#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
Expand Down Expand Up @@ -2003,7 +2008,7 @@
// @section temperature

//
// Preheat Constants - Up to 5 are supported without changes
// Preheat Constants - Up to 6 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 195
Expand Down
29 changes: 17 additions & 12 deletions config/examples/ADIMLab/Gantry v2/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,21 @@
//#define NUM_AXES 3

/**
* Axis codes for additional axes:
* This defines the axis code that is used in G-code commands to
* reference a specific axis.
* 'A' for rotational axis parallel to X
* 'B' for rotational axis parallel to Y
* 'C' for rotational axis parallel to Z
* 'U' for secondary linear axis parallel to X
* 'V' for secondary linear axis parallel to Y
* 'W' for secondary linear axis parallel to Z
* Regardless of the settings, firmware-internal axis IDs are
* I (AXIS4), J (AXIS5), K (AXIS6).
* Additional Axis Settings
*
* Define AXISn_ROTATES for all axes that rotate or pivot.
* Rotational axis coordinates are expressed in degrees.
*
* AXISn_NAME defines the letter used to refer to the axis in (most) G-code commands.
* By convention the names and roles are typically:
* 'A' : Rotational axis parallel to X
* 'B' : Rotational axis parallel to Y
* 'C' : Rotational axis parallel to Z
* 'U' : Secondary linear axis parallel to X
* 'V' : Secondary linear axis parallel to Y
* 'W' : Secondary linear axis parallel to Z
*
* Regardless of these settings the axes are internally named I, J, K, U, V, W.
*/
#if NUM_AXES >= 4
#define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
Expand Down Expand Up @@ -606,6 +610,7 @@
//===========================================================================
//============================= PID Settings ================================
//===========================================================================

// Enable PIDTEMP for PID control or MPCTEMP for Predictive Model.
// temperature control. Disable both for bang-bang heating.
#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
Expand Down Expand Up @@ -2003,7 +2008,7 @@
// @section temperature

//
// Preheat Constants - Up to 5 are supported without changes
// Preheat Constants - Up to 6 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 180
Expand Down
29 changes: 17 additions & 12 deletions config/examples/Alfawise/U20-bltouch/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,17 +223,21 @@
//#define NUM_AXES 3

/**
* Axis codes for additional axes:
* This defines the axis code that is used in G-code commands to
* reference a specific axis.
* 'A' for rotational axis parallel to X
* 'B' for rotational axis parallel to Y
* 'C' for rotational axis parallel to Z
* 'U' for secondary linear axis parallel to X
* 'V' for secondary linear axis parallel to Y
* 'W' for secondary linear axis parallel to Z
* Regardless of the settings, firmware-internal axis IDs are
* I (AXIS4), J (AXIS5), K (AXIS6).
* Additional Axis Settings
*
* Define AXISn_ROTATES for all axes that rotate or pivot.
* Rotational axis coordinates are expressed in degrees.
*
* AXISn_NAME defines the letter used to refer to the axis in (most) G-code commands.
* By convention the names and roles are typically:
* 'A' : Rotational axis parallel to X
* 'B' : Rotational axis parallel to Y
* 'C' : Rotational axis parallel to Z
* 'U' : Secondary linear axis parallel to X
* 'V' : Secondary linear axis parallel to Y
* 'W' : Secondary linear axis parallel to Z
*
* Regardless of these settings the axes are internally named I, J, K, U, V, W.
*/
#if NUM_AXES >= 4
#define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
Expand Down Expand Up @@ -661,6 +665,7 @@
//===========================================================================
//============================= PID Settings ================================
//===========================================================================

// Enable PIDTEMP for PID control or MPCTEMP for Predictive Model.
// temperature control. Disable both for bang-bang heating.
#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
Expand Down Expand Up @@ -2081,7 +2086,7 @@
// @section temperature

//
// Preheat Constants - Up to 5 are supported without changes
// Preheat Constants - Up to 6 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 200
Expand Down
29 changes: 17 additions & 12 deletions config/examples/Alfawise/U20/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,17 +223,21 @@
//#define NUM_AXES 3

/**
* Axis codes for additional axes:
* This defines the axis code that is used in G-code commands to
* reference a specific axis.
* 'A' for rotational axis parallel to X
* 'B' for rotational axis parallel to Y
* 'C' for rotational axis parallel to Z
* 'U' for secondary linear axis parallel to X
* 'V' for secondary linear axis parallel to Y
* 'W' for secondary linear axis parallel to Z
* Regardless of the settings, firmware-internal axis IDs are
* I (AXIS4), J (AXIS5), K (AXIS6).
* Additional Axis Settings
*
* Define AXISn_ROTATES for all axes that rotate or pivot.
* Rotational axis coordinates are expressed in degrees.
*
* AXISn_NAME defines the letter used to refer to the axis in (most) G-code commands.
* By convention the names and roles are typically:
* 'A' : Rotational axis parallel to X
* 'B' : Rotational axis parallel to Y
* 'C' : Rotational axis parallel to Z
* 'U' : Secondary linear axis parallel to X
* 'V' : Secondary linear axis parallel to Y
* 'W' : Secondary linear axis parallel to Z
*
* Regardless of these settings the axes are internally named I, J, K, U, V, W.
*/
#if NUM_AXES >= 4
#define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
Expand Down Expand Up @@ -661,6 +665,7 @@
//===========================================================================
//============================= PID Settings ================================
//===========================================================================

// Enable PIDTEMP for PID control or MPCTEMP for Predictive Model.
// temperature control. Disable both for bang-bang heating.
#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
Expand Down Expand Up @@ -2082,7 +2087,7 @@
// @section temperature

//
// Preheat Constants - Up to 5 are supported without changes
// Preheat Constants - Up to 6 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 200
Expand Down
29 changes: 17 additions & 12 deletions config/examples/AliExpress/CL-260/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,21 @@
//#define NUM_AXES 3

/**
* Axis codes for additional axes:
* This defines the axis code that is used in G-code commands to
* reference a specific axis.
* 'A' for rotational axis parallel to X
* 'B' for rotational axis parallel to Y
* 'C' for rotational axis parallel to Z
* 'U' for secondary linear axis parallel to X
* 'V' for secondary linear axis parallel to Y
* 'W' for secondary linear axis parallel to Z
* Regardless of the settings, firmware-internal axis IDs are
* I (AXIS4), J (AXIS5), K (AXIS6).
* Additional Axis Settings
*
* Define AXISn_ROTATES for all axes that rotate or pivot.
* Rotational axis coordinates are expressed in degrees.
*
* AXISn_NAME defines the letter used to refer to the axis in (most) G-code commands.
* By convention the names and roles are typically:
* 'A' : Rotational axis parallel to X
* 'B' : Rotational axis parallel to Y
* 'C' : Rotational axis parallel to Z
* 'U' : Secondary linear axis parallel to X
* 'V' : Secondary linear axis parallel to Y
* 'W' : Secondary linear axis parallel to Z
*
* Regardless of these settings the axes are internally named I, J, K, U, V, W.
*/
#if NUM_AXES >= 4
#define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
Expand Down Expand Up @@ -606,6 +610,7 @@
//===========================================================================
//============================= PID Settings ================================
//===========================================================================

// Enable PIDTEMP for PID control or MPCTEMP for Predictive Model.
// temperature control. Disable both for bang-bang heating.
#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
Expand Down Expand Up @@ -2002,7 +2007,7 @@
// @section temperature

//
// Preheat Constants - Up to 5 are supported without changes
// Preheat Constants - Up to 6 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 180
Expand Down
11 changes: 11 additions & 0 deletions config/examples/AliExpress/CL-260/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# AliExpress CL-260

Example configuration for the [AliExpress CL-260](https://www.aliexpress.com/item/32812528331.html) Ultimaker 2 clone.

*Note: Change `Z_MAX_POS` to 300 for the CL-260MAX.*

The setting "works" for my printer and the extruder using my calibration value, but you might want to tweak some settings, e.g enable EEPROM, increase default Z speed, adjust homing speeds,...

Have fun!

\- tobi
15 changes: 0 additions & 15 deletions config/examples/AliExpress/CL-260/README.txt
View file

This file was deleted.

29 changes: 17 additions & 12 deletions config/examples/AliExpress/UM2pExt/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,21 @@
//#define NUM_AXES 3

/**
* Axis codes for additional axes:
* This defines the axis code that is used in G-code commands to
* reference a specific axis.
* 'A' for rotational axis parallel to X
* 'B' for rotational axis parallel to Y
* 'C' for rotational axis parallel to Z
* 'U' for secondary linear axis parallel to X
* 'V' for secondary linear axis parallel to Y
* 'W' for secondary linear axis parallel to Z
* Regardless of the settings, firmware-internal axis IDs are
* I (AXIS4), J (AXIS5), K (AXIS6).
* Additional Axis Settings
*
* Define AXISn_ROTATES for all axes that rotate or pivot.
* Rotational axis coordinates are expressed in degrees.
*
* AXISn_NAME defines the letter used to refer to the axis in (most) G-code commands.
* By convention the names and roles are typically:
* 'A' : Rotational axis parallel to X
* 'B' : Rotational axis parallel to Y
* 'C' : Rotational axis parallel to Z
* 'U' : Secondary linear axis parallel to X
* 'V' : Secondary linear axis parallel to Y
* 'W' : Secondary linear axis parallel to Z
*
* Regardless of these settings the axes are internally named I, J, K, U, V, W.
*/
#if NUM_AXES >= 4
#define AXIS4_NAME 'A' // :['A', 'B', 'C', 'U', 'V', 'W']
Expand Down Expand Up @@ -606,6 +610,7 @@
//===========================================================================
//============================= PID Settings ================================
//===========================================================================

// Enable PIDTEMP for PID control or MPCTEMP for Predictive Model.
// temperature control. Disable both for bang-bang heating.
#define PIDTEMP // See the PID Tuning Guide at https://reprap.org/wiki/PID_Tuning
Expand Down Expand Up @@ -2003,7 +2008,7 @@
// @section temperature

//
// Preheat Constants - Up to 5 are supported without changes
// Preheat Constants - Up to 6 are supported without changes
//
#define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 180
Expand Down
Loading

0 comments on commit 41eee7b

Please sign in to comment.