zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6278 from thinkyhead/pr_delta_angles

Browse source 
Followup to additional delta trim options
This commit is contained in:
Scott Lahteine 2017-04-08 22:25:57 -05:00 committed by GitHub
parent d3b4d84586 f78d44e91a
commit b356d73239
8 changed files with 59 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/Conditionals_post.h
View file

@ -658,6 +658,9 @@
* Delta radius/rod trimmers/angle trimmers * Delta radius/rod trimmers/angle trimmers
*/ */
#if ENABLED(DELTA) #if ENABLED(DELTA)
#ifndef DELTA_ENDSTOP_ADJ
#define DELTA_ENDSTOP_ADJ { 0 }
#endif
#ifndef DELTA_RADIUS_TRIM_TOWER_1 #ifndef DELTA_RADIUS_TRIM_TOWER_1
#define DELTA_RADIUS_TRIM_TOWER_1 0.0 #define DELTA_RADIUS_TRIM_TOWER_1 0.0
#endif #endif
@ -757,10 +760,6 @@
// 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
#define DELTA_ENDSTOP_ADJ { 0 }
#endif
#if ENABLED(SDCARD_SORT_ALPHA) #if ENABLED(SDCARD_SORT_ALPHA)
#define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE)) #define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
#endif #endif

0
Marlin/Marlin_main.cpp Executable file → Normal file
View file

3
Marlin/configuration_store.cpp
View file

@ -42,7 +42,7 @@
#define EEPROM_OFFSET 100 #define EEPROM_OFFSET 100
/** /**
* V31 EEPROM Layout: * V32 EEPROM Layout:
* *
* 100 Version (char x4) * 100 Version (char x4)
* 104 EEPROM Checksum (uint16_t) * 104 EEPROM Checksum (uint16_t)
@ -147,7 +147,6 @@
* *
* 574 Minimum end-point * 574 Minimum end-point
* 1895 (574 + 36 + 9 + 288 + 988) Maximum end-point * 1895 (574 + 36 + 9 + 288 + 988) Maximum end-point
*
*/ */
#include "Marlin.h" #include "Marlin.h"
#include "language.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 } //#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 #endif
// Enable this option for Toshiba steppers // 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 } //#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 #endif
// Enable this option for Toshiba steppers // 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 } //#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 #endif
// Enable this option for Toshiba steppers // 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 } //#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 #endif
// Enable this option for Toshiba steppers // 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 } //#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 #endif
// Enable this option for Toshiba steppers // Enable this option for Toshiba steppers