Browse Source

Patch delta endstop adjustment config

pull/1/head
Scott Lahteine 8 years ago
parent
commit
48761f2021
  1. 10
      Marlin/Conditionals_post.h
  2. 7
      Marlin/configuration_store.cpp
  3. 2
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  4. 2
      Marlin/example_configurations/delta/generic/Configuration.h
  5. 2
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  6. 2
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  7. 2
      Marlin/example_configurations/delta/kossel_xl/Configuration.h

10
Marlin/Conditionals_post.h

@ -706,14 +706,8 @@
// Stepper pulse duration, in cycles // Stepper pulse duration, in cycles
#define STEP_PULSE_CYCLES ((MINIMUM_STEPPER_PULSE) * CYCLES_PER_MICROSECOND) #define STEP_PULSE_CYCLES ((MINIMUM_STEPPER_PULSE) * CYCLES_PER_MICROSECOND)
#ifndef DELTA_ENDSTOP_ADJ_X #ifndef DELTA_ENDSTOP_ADJ
#define DELTA_ENDSTOP_ADJ_X 0 #define DELTA_ENDSTOP_ADJ { 0 }
#endif
#ifndef DELTA_ENDSTOP_ADJ_Y
#define DELTA_ENDSTOP_ADJ_Y 0
#endif
#ifndef DELTA_ENDSTOP_ADJ_Z
#define DELTA_ENDSTOP_ADJ_Z 0
#endif #endif
#endif // CONDITIONALS_POST_H #endif // CONDITIONALS_POST_H

7
Marlin/configuration_store.cpp

@ -589,9 +589,10 @@ void Config_ResetDefault() {
#endif #endif
#if ENABLED(DELTA) #if ENABLED(DELTA)
endstop_adj[X_AXIS] = DELTA_ENDSTOP_ADJ_X; const float adj[ABC] = DELTA_ENDSTOP_ADJ;
endstop_adj[Y_AXIS] = DELTA_ENDSTOP_ADJ_Y; endstop_adj[A_AXIS] = adj[A_AXIS];
endstop_adj[Z_AXIS] = DELTA_ENDSTOP_ADJ_Z; endstop_adj[B_AXIS] = adj[B_AXIS];
endstop_adj[C_AXIS] = adj[C_AXIS];
delta_radius = DELTA_RADIUS; delta_radius = DELTA_RADIUS;
delta_diagonal_rod = DELTA_DIAGONAL_ROD; delta_diagonal_rod = DELTA_DIAGONAL_ROD;
delta_segments_per_second = DELTA_SEGMENTS_PER_SECOND; delta_segments_per_second = DELTA_SEGMENTS_PER_SECOND;

2
Marlin/example_configurations/delta/biv2.5/Configuration.h

@ -441,6 +441,8 @@
// in ultralcd.cpp@lcd_delta_calibrate_menu() // in ultralcd.cpp@lcd_delta_calibrate_menu()
//#define DELTA_CALIBRATION_MENU //#define DELTA_CALIBRATION_MENU
//#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
#endif #endif
// Enable this option for Toshiba steppers // Enable this option for Toshiba steppers

2
Marlin/example_configurations/delta/generic/Configuration.h

@ -441,6 +441,8 @@
// in ultralcd.cpp@lcd_delta_calibrate_menu() // in ultralcd.cpp@lcd_delta_calibrate_menu()
//#define DELTA_CALIBRATION_MENU //#define DELTA_CALIBRATION_MENU
//#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
#endif #endif
// Enable this option for Toshiba steppers // Enable this option for Toshiba steppers

2
Marlin/example_configurations/delta/kossel_mini/Configuration.h

@ -441,6 +441,8 @@
// in ultralcd.cpp@lcd_delta_calibrate_menu() // in ultralcd.cpp@lcd_delta_calibrate_menu()
//#define DELTA_CALIBRATION_MENU //#define DELTA_CALIBRATION_MENU
//#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
#endif #endif
// Enable this option for Toshiba steppers // Enable this option for Toshiba steppers

2
Marlin/example_configurations/delta/kossel_pro/Configuration.h

@ -430,6 +430,8 @@
// in ultralcd.cpp@lcd_delta_calibrate_menu() // in ultralcd.cpp@lcd_delta_calibrate_menu()
//#define DELTA_CALIBRATION_MENU //#define DELTA_CALIBRATION_MENU
//#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
#endif #endif
// Enable this option for Toshiba steppers // Enable this option for Toshiba steppers

2
Marlin/example_configurations/delta/kossel_xl/Configuration.h

@ -439,6 +439,8 @@
// in ultralcd.cpp@lcd_delta_calibrate_menu() // in ultralcd.cpp@lcd_delta_calibrate_menu()
//#define DELTA_CALIBRATION_MENU //#define DELTA_CALIBRATION_MENU
//#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
#endif #endif
// Enable this option for Toshiba steppers // Enable this option for Toshiba steppers

Loading…
Cancel
Save