MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Static delta[] for SCARA

Browse Source
This commit is contained in:
Scott Lahteine 2015-04-03 16:46:56 -07:00
parent 6b919e14c1
commit 92119d0f7d
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Marlin/Marlin_main.cpp
View File

@ -309,37 +309,35 @@ bool target_direction;
; ;
#endif #endif
#if defined(DELTA) || defined(SCARA) #ifdef DELTA
static float delta[3] = { 0, 0, 0 }; float delta[3] = { 0 };
#ifdef DELTA #define SIN_60 0.8660254037844386
#define SIN_60 0.8660254037844386 #define COS_60 0.5
#define COS_60 0.5 float endstop_adj[3] = { 0 };
float endstop_adj[3] = { 0 }; // these are the default values, can be overriden with M665
// these are the default values, can be overriden with M665 float delta_radius = DELTA_RADIUS;
float delta_radius = DELTA_RADIUS; float delta_tower1_x = -SIN_60 * delta_radius; // front left tower
float delta_tower1_x = -SIN_60 * delta_radius; // front left tower float delta_tower1_y = -COS_60 * delta_radius;
float delta_tower1_y = -COS_60 * delta_radius; float delta_tower2_x = SIN_60 * delta_radius; // front right tower
float delta_tower2_x = SIN_60 * delta_radius; // front right tower float delta_tower2_y = -COS_60 * delta_radius;
float delta_tower2_y = -COS_60 * delta_radius; float delta_tower3_x = 0; // back middle tower
float delta_tower3_x = 0; // back middle tower float delta_tower3_y = delta_radius;
float delta_tower3_y = delta_radius; float delta_diagonal_rod = DELTA_DIAGONAL_ROD;
float delta_diagonal_rod = DELTA_DIAGONAL_ROD; float delta_diagonal_rod_2 = sq(delta_diagonal_rod);
float delta_diagonal_rod_2 = sq(delta_diagonal_rod); float delta_segments_per_second = DELTA_SEGMENTS_PER_SECOND;
float delta_segments_per_second = DELTA_SEGMENTS_PER_SECOND; #ifdef ENABLE_AUTO_BED_LEVELING
#ifdef ENABLE_AUTO_BED_LEVELING int delta_grid_spacing[2] = { 0, 0 };
int delta_grid_spacing[2] = { 0, 0 }; float bed_level[AUTO_BED_LEVELING_GRID_POINTS][AUTO_BED_LEVELING_GRID_POINTS];
float bed_level[AUTO_BED_LEVELING_GRID_POINTS][AUTO_BED_LEVELING_GRID_POINTS];
#endif
#endif #endif
#else
#ifdef SCARA
float axis_scaling[3] = { 1, 1, 1 }; // Build size scaling, default to 1
#endif
#elif !defined(DELTA)
static bool home_all_axis = true; static bool home_all_axis = true;
#endif #endif
#ifdef SCARA
static float delta[3] = { 0 };
float axis_scaling[3] = { 1, 1, 1 }; // Build size scaling, default to 1
#endif
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
//Variables for Filament Sensor input //Variables for Filament Sensor input
float filament_width_nominal = DEFAULT_NOMINAL_FILAMENT_DIA; //Set nominal filament width, can be changed with M404 float filament_width_nominal = DEFAULT_NOMINAL_FILAMENT_DIA; //Set nominal filament width, can be changed with M404