Browse Source

Relocate configs above Marlin/src folder (#13299)

pull/1/head
InsanityAutomation 6 years ago
committed by Scott Lahteine
parent
commit
bf8b38e0f7
  1. 2
      Marlin/Configuration_adv.h
  2. 2262
      Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h
  3. 2
      buildroot/bin/restore_configs
  4. 2
      buildroot/bin/update_defaults
  5. 16
      buildroot/bin/use_example_configs
  6. 0
      config/default/Configuration.h
  7. 0
      config/default/Configuration_adv.h
  8. 0
      config/examples/3DFabXYZ/Migbot/Configuration.h
  9. 1
      config/examples/3DFabXYZ/Migbot/Configuration_adv.h
  10. 0
      config/examples/3DFabXYZ/Migbot/Readme.md
  11. 2
      config/examples/AlephObjects/TAZ4/Configuration.h
  12. 0
      config/examples/AlephObjects/TAZ4/Configuration_adv.h
  13. 2
      config/examples/AliExpress/CL-260/Configuration.h
  14. 0
      config/examples/AliExpress/CL-260/README.txt
  15. 0
      config/examples/AliExpress/UM2pExt/Configuration.h
  16. 2
      config/examples/AliExpress/UM2pExt/Configuration_adv.h
  17. 2
      config/examples/Anet/A2/Configuration.h
  18. 0
      config/examples/Anet/A2/Configuration_adv.h
  19. 2
      config/examples/Anet/A2plus/Configuration.h
  20. 0
      config/examples/Anet/A2plus/Configuration_adv.h
  21. 2
      config/examples/Anet/A6/Configuration.h
  22. 0
      config/examples/Anet/A6/Configuration_adv.h
  23. 2
      config/examples/Anet/A8/Configuration.h
  24. 0
      config/examples/Anet/A8/Configuration_adv.h
  25. 0
      config/examples/AnimationExample/_Bootscreen.h
  26. 0
      config/examples/AnyCubic/i3/Configuration.h
  27. 2
      config/examples/AnyCubic/i3/Configuration_adv.h
  28. 2
      config/examples/ArmEd/Configuration.h
  29. 1
      config/examples/ArmEd/Configuration_adv.h
  30. 6
      config/examples/Azteeg/X5GT/Configuration.h
  31. 10
      config/examples/BIBO/TouchX/cyclops/Configuration.h
  32. 1
      config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
  33. 10
      config/examples/BIBO/TouchX/default/Configuration.h
  34. 0
      config/examples/BIBO/TouchX/default/Configuration_adv.h
  35. 2
      config/examples/BQ/Hephestos/Configuration.h
  36. 0
      config/examples/BQ/Hephestos/Configuration_adv.h
  37. 2
      config/examples/BQ/Hephestos_2/Configuration.h
  38. 0
      config/examples/BQ/Hephestos_2/Configuration_adv.h
  39. 0
      config/examples/BQ/Hephestos_2/README.md
  40. 0
      config/examples/BQ/Hephestos_2/_Bootscreen.h
  41. 2
      config/examples/BQ/WITBOX/Configuration.h
  42. 0
      config/examples/BQ/WITBOX/Configuration_adv.h
  43. 2
      config/examples/Cartesio/Configuration.h
  44. 0
      config/examples/Cartesio/Configuration_adv.h
  45. 0
      config/examples/Cartesio/_Bootscreen.h
  46. 2
      config/examples/Creality/CR-10/Configuration.h
  47. 0
      config/examples/Creality/CR-10/Configuration_adv.h
  48. 0
      config/examples/Creality/CR-10/_Bootscreen.h
  49. 0
      config/examples/Creality/CR-10/_Statusscreen.h
  50. 2
      config/examples/Creality/CR-10S/Configuration.h
  51. 0
      config/examples/Creality/CR-10S/Configuration_adv.h
  52. 0
      config/examples/Creality/CR-10S/_Bootscreen.h
  53. 0
      config/examples/Creality/CR-10S/_Statusscreen.h
  54. 2
      config/examples/Creality/CR-10_5S/Configuration.h
  55. 0
      config/examples/Creality/CR-10_5S/Configuration_adv.h
  56. 0
      config/examples/Creality/CR-10_5S/_Bootscreen.h
  57. 2
      config/examples/Creality/CR-10mini/Configuration.h
  58. 0
      config/examples/Creality/CR-10mini/Configuration_adv.h
  59. 0
      config/examples/Creality/CR-10mini/_Bootscreen.h
  60. 0
      config/examples/Creality/CR-10mini/_Statusscreen.h
  61. 2
      config/examples/Creality/CR-8/Configuration.h
  62. 0
      config/examples/Creality/CR-8/Configuration_adv.h
  63. 2
      config/examples/Creality/Ender-2/Configuration.h
  64. 0
      config/examples/Creality/Ender-2/Configuration_adv.h
  65. 0
      config/examples/Creality/Ender-2/README.md
  66. 0
      config/examples/Creality/Ender-2/_Bootscreen.h
  67. 0
      config/examples/Creality/Ender-2/_Statusscreen.h
  68. 2
      config/examples/Creality/Ender-3/Configuration.h
  69. 0
      config/examples/Creality/Ender-3/Configuration_adv.h
  70. 0
      config/examples/Creality/Ender-3/README.md
  71. 0
      config/examples/Creality/Ender-3/_Bootscreen.h
  72. 0
      config/examples/Creality/Ender-3/_Statusscreen.h
  73. 2
      config/examples/Creality/Ender-4/Configuration.h
  74. 0
      config/examples/Creality/Ender-4/Configuration_adv.h
  75. 2
      config/examples/Einstart-S/Configuration.h
  76. 0
      config/examples/Einstart-S/Configuration_adv.h
  77. 0
      config/examples/Einstart-S/readme.md
  78. 2
      config/examples/Felix/Configuration.h
  79. 0
      config/examples/Felix/Configuration_adv.h
  80. 2
      config/examples/Felix/DUAL/Configuration.h
  81. 0
      config/examples/Felix/README.md
  82. 0
      config/examples/FlashForge/CreatorPro/Configuration.h
  83. 0
      config/examples/FlashForge/CreatorPro/Configuration_adv.h
  84. 2
      config/examples/FolgerTech/i3-2020/Configuration.h
  85. 0
      config/examples/FolgerTech/i3-2020/Configuration_adv.h
  86. 6
      config/examples/Formbot/Raptor/Configuration.h
  87. 0
      config/examples/Formbot/Raptor/Configuration_adv.h
  88. 0
      config/examples/Formbot/Raptor/_Bootscreen.h
  89. 0
      config/examples/Formbot/Raptor/_Statusscreen.h
  90. 2
      config/examples/Formbot/T_Rex_2+/Configuration.h
  91. 1
      config/examples/Formbot/T_Rex_2+/Configuration_adv.h
  92. 0
      config/examples/Formbot/T_Rex_2+/_Bootscreen.h
  93. 0
      config/examples/Formbot/T_Rex_2+/_Statusscreen.h
  94. 2
      config/examples/Formbot/T_Rex_3/Configuration.h
  95. 0
      config/examples/Formbot/T_Rex_3/Configuration_adv.h
  96. 0
      config/examples/Formbot/T_Rex_3/_Bootscreen.h
  97. 0
      config/examples/Formbot/T_Rex_3/_Statusscreen.h
  98. 0
      config/examples/Geeetech/A10M/Configuration.h
  99. 0
      config/examples/Geeetech/A10M/Configuration_adv.h
  100. 0
      config/examples/Geeetech/A20M/Configuration.h

2
Marlin/Configuration_adv.h

@ -906,6 +906,7 @@
#define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating
#define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating
//#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap
//#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
//#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
@ -951,7 +952,6 @@
#endif
#endif
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets

2262
Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h

File diff suppressed because it is too large

2
buildroot/bin/restore_configs

@ -1,6 +1,6 @@
#!/usr/bin/env bash
cp Marlin/src/config/default/Configuration*.h Marlin
cp config/default/Configuration*.h Marlin
[ -f Marlin/src/pins/pins_RAMPS.h.backup ] && cp Marlin/src/pins/pins_RAMPS.h.backup Marlin/src/pins/pins_RAMPS.h
rm -f Marlin/src/pins/pins_RAMPS.h.backup

2
buildroot/bin/update_defaults

@ -1,3 +1,3 @@
#!/usr/bin/env bash
cp Marlin/Configuration*.h Marlin/src/config/default
cp Marlin/Configuration*.h config/default

16
buildroot/bin/use_example_configs

@ -2,18 +2,18 @@
restore_configs
if [ -f "Marlin/src/config/examples/$@/Configuration.h" ]; then
cp "Marlin/src/config/examples/$@/Configuration.h" Marlin/
if [ -f "config/examples/$@/Configuration.h" ]; then
cp "config/examples/$@/Configuration.h" Marlin/
fi
if [ -f "Marlin/src/config/examples/$@/Configuration_adv.h" ]; then
cp "Marlin/src/config/examples/$@/Configuration_adv.h" Marlin/
if [ -f "config/examples/$@/Configuration_adv.h" ]; then
cp "config/examples/$@/Configuration_adv.h" Marlin/
fi
if [ -f "Marlin/src/config/examples/$@/_Bootscreen.h" ]; then
cp "Marlin/src/config/examples/$@/_Bootscreen.h" Marlin/
if [ -f "config/examples/$@/_Bootscreen.h" ]; then
cp "config/examples/$@/_Bootscreen.h" Marlin/
fi
if [ -f "Marlin/src/config/examples/$@/_Statusscreen.h" ]; then
cp "Marlin/src/config/examples/$@/_Statusscreen.h" Marlin/
if [ -f "config/examples/$@/_Statusscreen.h" ]; then
cp "config/examples/$@/_Statusscreen.h" Marlin/
fi

0
Marlin/src/config/default/Configuration.h → config/default/Configuration.h

0
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h → config/default/Configuration_adv.h

0
Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration.h → config/examples/3DFabXYZ/Migbot/Configuration.h

1
Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h → config/examples/3DFabXYZ/Migbot/Configuration_adv.h

@ -952,7 +952,6 @@
#endif
#endif
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets

0
Marlin/src/config/examples/3DFabXYZ/Migbot/Readme.md → config/examples/3DFabXYZ/Migbot/Readme.md

2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h → config/examples/AlephObjects/TAZ4/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h → config/examples/AlephObjects/TAZ4/Configuration_adv.h

2
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h → config/examples/AliExpress/CL-260/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/AliExpress/CL-260/README.txt → config/examples/AliExpress/CL-260/README.txt

0
Marlin/src/config/examples/AliExpress/UM2pExt/Configuration.h → config/examples/AliExpress/UM2pExt/Configuration.h

2
Marlin/src/config/examples/AliExpress/UM2pExt/Configuration_adv.h → config/examples/AliExpress/UM2pExt/Configuration_adv.h

@ -906,6 +906,7 @@
#define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating
#define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating
//#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap
//#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap
//#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
@ -951,7 +952,6 @@
#endif
#endif
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets

2
Marlin/src/config/examples/Anet/A2/Configuration.h → config/examples/Anet/A2/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Anet/A2/Configuration_adv.h → config/examples/Anet/A2/Configuration_adv.h

2
Marlin/src/config/examples/Anet/A2plus/Configuration.h → config/examples/Anet/A2plus/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h → config/examples/Anet/A2plus/Configuration_adv.h

2
Marlin/src/config/examples/Anet/A6/Configuration.h → config/examples/Anet/A6/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Anet/A6/Configuration_adv.h → config/examples/Anet/A6/Configuration_adv.h

2
Marlin/src/config/examples/Anet/A8/Configuration.h → config/examples/Anet/A8/Configuration.h

@ -222,7 +222,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Anet/A8/Configuration_adv.h → config/examples/Anet/A8/Configuration_adv.h

0
Marlin/src/config/examples/AnimationExample/_Bootscreen.h → config/examples/AnimationExample/_Bootscreen.h

0
Marlin/src/config/examples/AnyCubic/i3/Configuration.h → config/examples/AnyCubic/i3/Configuration.h

2
Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h → config/examples/AnyCubic/i3/Configuration_adv.h

@ -952,7 +952,6 @@
#endif
#endif
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
@ -1263,6 +1262,7 @@
// Set to 0 for manual extrusion.
// Filament can be extruded repeatedly from the Filament Change menu
// until extrusion is consistent, and to purge old filament.
#define ADVANCED_PAUSE_RESUME_PRIME 0 // (mm) Extra distance to prime nozzle after returning from park.
// Filament Unload does a Retract, Delay, and Purge first:
#define FILAMENT_UNLOAD_RETRACT_LENGTH 13 // (mm) Unload initial retract length.

2
Marlin/src/config/examples/ArmEd/Configuration.h → config/examples/ArmEd/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

1
Marlin/src/config/examples/ArmEd/Configuration_adv.h → config/examples/ArmEd/Configuration_adv.h

@ -956,7 +956,6 @@
#endif
#endif
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets

6
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h → config/examples/Azteeg/X5GT/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)
@ -1259,8 +1259,8 @@
#define Z_SAFE_HOMING
#if ENABLED(Z_SAFE_HOMING)
#define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axis (G28).
#define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axis (G28).
#define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28).
#define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28).
#endif
// Homing speeds (mm/m)

10
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h → config/examples/BIBO/TouchX/cyclops/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)
@ -1122,10 +1122,10 @@
*/
#define G26_MESH_VALIDATION
#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.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
#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.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
#endif
#endif

1
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h → config/examples/BIBO/TouchX/cyclops/Configuration_adv.h

@ -364,6 +364,7 @@
* X1 is the left carriage, X2 the right. They park and home at opposite ends of the X axis.
* By default the X2 stepper is assigned to the first unused E plug on the board.
*/
//#define DUAL_X_CARRIAGE
#if ENABLED(DUAL_X_CARRIAGE)
#define X1_MIN_POS X_MIN_POS // set minimum to ensure first x-carriage doesn't hit the parked second X-carriage
#define X1_MAX_POS X_BED_SIZE // set maximum to ensure first x-carriage doesn't hit the parked second X-carriage

10
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h → config/examples/BIBO/TouchX/default/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)
@ -1122,10 +1122,10 @@
*/
#define G26_MESH_VALIDATION
#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.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
#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.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool.
#define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool.
#endif
#endif

0
Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h → config/examples/BIBO/TouchX/default/Configuration_adv.h

2
Marlin/src/config/examples/BQ/Hephestos/Configuration.h → config/examples/BQ/Hephestos/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h → config/examples/BQ/Hephestos/Configuration_adv.h

2
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h → config/examples/BQ/Hephestos_2/Configuration.h

@ -229,7 +229,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h → config/examples/BQ/Hephestos_2/Configuration_adv.h

0
Marlin/src/config/examples/BQ/Hephestos_2/README.md → config/examples/BQ/Hephestos_2/README.md

0
Marlin/src/config/examples/BQ/Hephestos_2/_Bootscreen.h → config/examples/BQ/Hephestos_2/_Bootscreen.h

2
Marlin/src/config/examples/BQ/WITBOX/Configuration.h → config/examples/BQ/WITBOX/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h → config/examples/BQ/WITBOX/Configuration_adv.h

2
Marlin/src/config/examples/Cartesio/Configuration.h → config/examples/Cartesio/Configuration.h

@ -222,7 +222,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Cartesio/Configuration_adv.h → config/examples/Cartesio/Configuration_adv.h

0
Marlin/src/config/examples/Cartesio/_Bootscreen.h → config/examples/Cartesio/_Bootscreen.h

2
Marlin/src/config/examples/Creality/CR-10/Configuration.h → config/examples/Creality/CR-10/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h → config/examples/Creality/CR-10/Configuration_adv.h

0
Marlin/src/config/examples/Creality/CR-10/_Bootscreen.h → config/examples/Creality/CR-10/_Bootscreen.h

0
Marlin/src/config/examples/Creality/CR-10/_Statusscreen.h → config/examples/Creality/CR-10/_Statusscreen.h

2
Marlin/src/config/examples/Creality/CR-10S/Configuration.h → config/examples/Creality/CR-10S/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h → config/examples/Creality/CR-10S/Configuration_adv.h

0
Marlin/src/config/examples/Creality/CR-10S/_Bootscreen.h → config/examples/Creality/CR-10S/_Bootscreen.h

0
Marlin/src/config/examples/Creality/CR-10S/_Statusscreen.h → config/examples/Creality/CR-10S/_Statusscreen.h

2
Marlin/src/config/examples/Creality/CR-10_5S/Configuration.h → config/examples/Creality/CR-10_5S/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Creality/CR-10_5S/Configuration_adv.h → config/examples/Creality/CR-10_5S/Configuration_adv.h

0
Marlin/src/config/examples/Creality/CR-10_5S/_Bootscreen.h → config/examples/Creality/CR-10_5S/_Bootscreen.h

2
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h → config/examples/Creality/CR-10mini/Configuration.h

@ -230,7 +230,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h → config/examples/Creality/CR-10mini/Configuration_adv.h

0
Marlin/src/config/examples/Creality/CR-10mini/_Bootscreen.h → config/examples/Creality/CR-10mini/_Bootscreen.h

0
Marlin/src/config/examples/Creality/CR-10mini/_Statusscreen.h → config/examples/Creality/CR-10mini/_Statusscreen.h

2
Marlin/src/config/examples/Creality/CR-8/Configuration.h → config/examples/Creality/CR-8/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h → config/examples/Creality/CR-8/Configuration_adv.h

2
Marlin/src/config/examples/Creality/Ender-2/Configuration.h → config/examples/Creality/Ender-2/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h → config/examples/Creality/Ender-2/Configuration_adv.h

0
Marlin/src/config/examples/Creality/Ender-2/README.md → config/examples/Creality/Ender-2/README.md

0
Marlin/src/config/examples/Creality/Ender-2/_Bootscreen.h → config/examples/Creality/Ender-2/_Bootscreen.h

0
Marlin/src/config/examples/Creality/Ender-2/_Statusscreen.h → config/examples/Creality/Ender-2/_Statusscreen.h

2
Marlin/src/config/examples/Creality/Ender-3/Configuration.h → config/examples/Creality/Ender-3/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h → config/examples/Creality/Ender-3/Configuration_adv.h

0
Marlin/src/config/examples/Creality/Ender-3/README.md → config/examples/Creality/Ender-3/README.md

0
Marlin/src/config/examples/Creality/Ender-3/_Bootscreen.h → config/examples/Creality/Ender-3/_Bootscreen.h

0
Marlin/src/config/examples/Creality/Ender-3/_Statusscreen.h → config/examples/Creality/Ender-3/_Statusscreen.h

2
Marlin/src/config/examples/Creality/Ender-4/Configuration.h → config/examples/Creality/Ender-4/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h → config/examples/Creality/Ender-4/Configuration_adv.h

2
Marlin/src/config/examples/Einstart-S/Configuration.h → config/examples/Einstart-S/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Einstart-S/Configuration_adv.h → config/examples/Einstart-S/Configuration_adv.h

0
Marlin/src/config/examples/Einstart-S/readme.md → config/examples/Einstart-S/readme.md

2
Marlin/src/config/examples/Felix/Configuration.h → config/examples/Felix/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Felix/Configuration_adv.h → config/examples/Felix/Configuration_adv.h

2
Marlin/src/config/examples/Felix/DUAL/Configuration.h → config/examples/Felix/DUAL/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Felix/README.md → config/examples/Felix/README.md

0
Marlin/src/config/examples/FlashForge/CreatorPro/Configuration.h → config/examples/FlashForge/CreatorPro/Configuration.h

0
Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h → config/examples/FlashForge/CreatorPro/Configuration_adv.h

2
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h → config/examples/FolgerTech/i3-2020/Configuration.h

@ -221,7 +221,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h → config/examples/FolgerTech/i3-2020/Configuration_adv.h

6
Marlin/src/config/examples/Formbot/Raptor/Configuration.h → config/examples/Formbot/Raptor/Configuration.h

@ -262,7 +262,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)
@ -1364,8 +1364,8 @@
#define Z_SAFE_HOMING
#if ENABLED(Z_SAFE_HOMING)
#define Z_SAFE_HOMING_X_POINT 50 // X point for Z homing when homing all axis (G28).
#define Z_SAFE_HOMING_Y_POINT 50 // Y point for Z homing when homing all axis (G28).
#define Z_SAFE_HOMING_X_POINT 50 // X point for Z homing when homing all axes (G28).
#define Z_SAFE_HOMING_Y_POINT 50 // Y point for Z homing when homing all axes (G28).
#endif
// Homing speeds (mm/m)

0
Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h → config/examples/Formbot/Raptor/Configuration_adv.h

0
Marlin/src/config/examples/Formbot/Raptor/_Bootscreen.h → config/examples/Formbot/Raptor/_Bootscreen.h

0
Marlin/src/config/examples/Formbot/Raptor/_Statusscreen.h → config/examples/Formbot/Raptor/_Statusscreen.h

2
Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h → config/examples/Formbot/T_Rex_2+/Configuration.h

@ -224,7 +224,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

1
Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h → config/examples/Formbot/T_Rex_2+/Configuration_adv.h

@ -956,7 +956,6 @@
#endif
#endif
//#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets

0
Marlin/src/config/examples/Formbot/T_Rex_2+/_Bootscreen.h → config/examples/Formbot/T_Rex_2+/_Bootscreen.h

0
Marlin/src/config/examples/Formbot/T_Rex_2+/_Statusscreen.h → config/examples/Formbot/T_Rex_2+/_Statusscreen.h

2
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h → config/examples/Formbot/T_Rex_3/Configuration.h

@ -225,7 +225,7 @@
#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER)
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
#if ENABLED(PARKING_EXTRUDER)

0
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h → config/examples/Formbot/T_Rex_3/Configuration_adv.h

0
Marlin/src/config/examples/Formbot/T_Rex_3/_Bootscreen.h → config/examples/Formbot/T_Rex_3/_Bootscreen.h

0
Marlin/src/config/examples/Formbot/T_Rex_3/_Statusscreen.h → config/examples/Formbot/T_Rex_3/_Statusscreen.h

0
Marlin/src/config/examples/Geeetech/A10M/Configuration.h → config/examples/Geeetech/A10M/Configuration.h

0
Marlin/src/config/examples/Geeetech/A10M/Configuration_adv.h → config/examples/Geeetech/A10M/Configuration_adv.h

0
Marlin/src/config/examples/Geeetech/A20M/Configuration.h → config/examples/Geeetech/A20M/Configuration.h

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save