Browse Source
Moved DELTA radius/rod default trimmer values to Conditionals.h
pull/1/head
João Brázio
9 years ago
No known key found for this signature in database
GPG Key ID: F62CFD37DFFDB540
2 changed files with
24 additions and
18 deletions
-
Marlin/Conditionals.h
-
Marlin/Marlin.h
|
@ -751,5 +751,29 @@ |
|
|
#define HAS_Z_MIN_PROBE |
|
|
#define HAS_Z_MIN_PROBE |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
* Delta radius/rod trimmers |
|
|
|
|
|
*/ |
|
|
|
|
|
#if ENABLED(DELTA) |
|
|
|
|
|
#ifndef DELTA_RADIUS_TRIM_TOWER_1 |
|
|
|
|
|
#define DELTA_RADIUS_TRIM_TOWER_1 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#ifndef DELTA_RADIUS_TRIM_TOWER_2 |
|
|
|
|
|
#define DELTA_RADIUS_TRIM_TOWER_2 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#ifndef DELTA_RADIUS_TRIM_TOWER_3 |
|
|
|
|
|
#define DELTA_RADIUS_TRIM_TOWER_3 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_1 |
|
|
|
|
|
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_2 |
|
|
|
|
|
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_3 |
|
|
|
|
|
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
#endif //CONFIGURATION_LCD
|
|
|
#endif //CONFIGURATION_LCD
|
|
|
#endif //CONDITIONALS_H
|
|
|
#endif //CONDITIONALS_H
|
|
|
|
@ -290,24 +290,6 @@ extern long code_value_long(); |
|
|
extern int16_t code_value_short(); |
|
|
extern int16_t code_value_short(); |
|
|
|
|
|
|
|
|
#if ENABLED(DELTA) |
|
|
#if ENABLED(DELTA) |
|
|
#ifndef DELTA_RADIUS_TRIM_TOWER_1 |
|
|
|
|
|
#define DELTA_RADIUS_TRIM_TOWER_1 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#ifndef DELTA_RADIUS_TRIM_TOWER_2 |
|
|
|
|
|
#define DELTA_RADIUS_TRIM_TOWER_2 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#ifndef DELTA_RADIUS_TRIM_TOWER_3 |
|
|
|
|
|
#define DELTA_RADIUS_TRIM_TOWER_3 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_1 |
|
|
|
|
|
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_1 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_2 |
|
|
|
|
|
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_2 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
#ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_3 |
|
|
|
|
|
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0 |
|
|
|
|
|
#endif |
|
|
|
|
|
extern float delta[3]; |
|
|
extern float delta[3]; |
|
|
extern float endstop_adj[3]; // axis[n].endstop_adj
|
|
|
extern float endstop_adj[3]; // axis[n].endstop_adj
|
|
|
extern float delta_radius; |
|
|
extern float delta_radius; |
|
|