andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Added support for delta tower angle corrections.

pull/1/head
Jimmy Envall 8 years ago
committed by Scott Lahteine
parent
98c9de11e1
commit
f78d44e91a
8 changed files with 59 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      Marlin/Conditionals_post.h
  2. 0
      Marlin/Marlin_main.cpp
  3. 3
      Marlin/configuration_store.cpp
  4. 11
      Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
  5. 11
      Marlin/example_configurations/delta/generic/Configuration.h
  6. 11
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  7. 11
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  8. 11
      Marlin/example_configurations/delta/kossel_xl/Configuration.h

7
Marlin/Conditionals_post.h
View File

@ -658,6 +658,9 @@
* Delta radius/rod trimmers/angle trimmers
*/
#if ENABLED(DELTA)
#ifndef DELTA_ENDSTOP_ADJ
#define DELTA_ENDSTOP_ADJ { 0 }
#endif
#ifndef DELTA_RADIUS_TRIM_TOWER_1
#define DELTA_RADIUS_TRIM_TOWER_1 0.0
#endif
@ -757,10 +760,6 @@
// Stepper pulse duration, in cycles
#define STEP_PULSE_CYCLES ((MINIMUM_STEPPER_PULSE) * CYCLES_PER_MICROSECOND)
#ifndef DELTA_ENDSTOP_ADJ
#define DELTA_ENDSTOP_ADJ { 0 }
#endif
#if ENABLED(SDCARD_SORT_ALPHA)
#define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
#endif

0
Marlin/Marlin_main.cpp
View File

3
Marlin/configuration_store.cpp
View File

@ -42,7 +42,7 @@
#define EEPROM_OFFSET 100
/**
* V31 EEPROM Layout:
* V32 EEPROM Layout:
*
* 100 Version (char x4)
* 104 EEPROM Checksum (uint16_t)
@ -147,7 +147,6 @@
*
* 574 Minimum end-point
* 1895 (574 + 36 + 9 + 288 + 988) Maximum end-point
*
*/
#include "Marlin.h"
#include "language.h"

11
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
View File

@ -478,6 +478,17 @@
//#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
// Trim adjustments for individual towers
#define DELTA_RADIUS_TRIM_TOWER_1 0.0
#define DELTA_RADIUS_TRIM_TOWER_2 0.0
#define DELTA_RADIUS_TRIM_TOWER_3 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
#define DELTA_TOWER_ANGLE_TRIM_1 0.0
#define DELTA_TOWER_ANGLE_TRIM_2 0.0
#define DELTA_TOWER_ANGLE_TRIM_3 0.0
#endif
// Enable this option for Toshiba steppers

11
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -465,6 +465,17 @@
//#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
// Trim adjustments for individual towers
#define DELTA_RADIUS_TRIM_TOWER_1 0.0
#define DELTA_RADIUS_TRIM_TOWER_2 0.0
#define DELTA_RADIUS_TRIM_TOWER_3 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
#define DELTA_TOWER_ANGLE_TRIM_1 0.0
#define DELTA_TOWER_ANGLE_TRIM_2 0.0
#define DELTA_TOWER_ANGLE_TRIM_3 0.0
#endif
// Enable this option for Toshiba steppers

11
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -465,6 +465,17 @@
//#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
// Trim adjustments for individual towers
#define DELTA_RADIUS_TRIM_TOWER_1 0.0
#define DELTA_RADIUS_TRIM_TOWER_2 0.0
#define DELTA_RADIUS_TRIM_TOWER_3 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
#define DELTA_TOWER_ANGLE_TRIM_1 0.0
#define DELTA_TOWER_ANGLE_TRIM_2 0.0
#define DELTA_TOWER_ANGLE_TRIM_3 0.0
#endif
// Enable this option for Toshiba steppers

11
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -452,6 +452,17 @@
//#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
// Trim adjustments for individual towers
#define DELTA_RADIUS_TRIM_TOWER_1 0.0
#define DELTA_RADIUS_TRIM_TOWER_2 0.0
#define DELTA_RADIUS_TRIM_TOWER_3 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
#define DELTA_TOWER_ANGLE_TRIM_1 0.0
#define DELTA_TOWER_ANGLE_TRIM_2 0.0
#define DELTA_TOWER_ANGLE_TRIM_3 0.0
#endif
// Enable this option for Toshiba steppers

11
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -470,6 +470,17 @@
//#define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
// Trim adjustments for individual towers
#define DELTA_RADIUS_TRIM_TOWER_1 0.0
#define DELTA_RADIUS_TRIM_TOWER_2 0.0
#define DELTA_RADIUS_TRIM_TOWER_3 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
#define DELTA_TOWER_ANGLE_TRIM_1 0.0
#define DELTA_TOWER_ANGLE_TRIM_2 0.0
#define DELTA_TOWER_ANGLE_TRIM_3 0.0
#endif
// Enable this option for Toshiba steppers

Write Preview
Loading…
Cancel
Save