Skip to content

Commit

Permalink
Update 1.02
Browse files Browse the repository at this point in the history
Imported changes from updated Kossel Air dev branch
RichCattell committed Feb 10, 2014
1 parent 7942a46 commit a642423
Showing 4 changed files with 331 additions and 203 deletions.
3 changes: 1 addition & 2 deletions Configuration.h
Original file line number Diff line number Diff line change
@@ -111,6 +111,7 @@
#define Z_PROBE_RETRACT_START_LOCATION {49, 84, 20, 0} // X, Y, Z, E start location for z-probe retract sequence
#define Z_PROBE_RETRACT_END_LOCATION {49, 84, 1, 0} // X, Y, Z, E end location for z-probe retract sequence

#define AUTOLEVEL_GRID 25 // Distance between autolevel Z probing points, should be less than print surface radius/3.
//===========================================================================
//=============================Thermal Settings ============================
//===========================================================================
@@ -346,8 +347,6 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
#define MANUAL_Y_HOME_POS 0
#define MANUAL_Z_HOME_POS 258 // For delta: Distance between nozzle and print surface after homing.

#define AUTOLEVEL_GRID 25 // Distance between autolevel Z probing points, should be less than print surface radius/3.

//// MOVEMENT SETTINGS
#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
#define HOMING_FEEDRATE {200*60, 200*60, 200*60, 0} // set the homing speeds (mm/min)
10 changes: 7 additions & 3 deletions ConfigurationStore.cpp
Original file line number Diff line number Diff line change
@@ -63,6 +63,7 @@ void Config_StoreSettings()
EEPROM_WRITE_VAR(i,max_pos);
EEPROM_WRITE_VAR(i,endstop_adj);
EEPROM_WRITE_VAR(i,tower_adj);
EEPROM_WRITE_VAR(i,z_probe_offset);
#endif
#ifndef ULTIPANEL
int plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP, plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP, plaPreheatFanSpeed = PLA_PREHEAT_FAN_SPEED;
@@ -154,7 +155,7 @@ void Config_PrintSettings()
SERIAL_ECHOLN("");
#ifdef DELTA
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM("Endstop adjustment:");
SERIAL_ECHOLNPGM("Endstop adjustment (mm):");
SERIAL_ECHO_START;
SERIAL_ECHOPAIR(" M666 X",endstop_adj[0]);
SERIAL_ECHOPAIR(" Y" ,endstop_adj[1]);
@@ -169,6 +170,7 @@ void Config_PrintSettings()
SERIAL_ECHOPAIR(" R" ,delta_radius);
SERIAL_ECHOPAIR(" D" ,delta_diagonal_rod);
SERIAL_ECHOPAIR(" H" ,max_pos[2]);
SERIAL_ECHOPAIR(" P" ,z_probe_offset[3]);
SERIAL_ECHOLN("");
/*
SERIAL_ECHOLN("Tower Positions");
@@ -229,6 +231,7 @@ void Config_RetrieveSettings()
EEPROM_READ_VAR(i,max_pos);
EEPROM_READ_VAR(i,endstop_adj);
EEPROM_READ_VAR(i,tower_adj);
EEPROM_READ_VAR(i,z_probe_offset);
// Update delta constants for updated delta_radius & tower_adj values
set_delta_constants();
#endif
@@ -293,10 +296,11 @@ void Config_ResetDefault()
add_homeing[0] = add_homeing[1] = add_homeing[2] = 0;
#ifdef DELTA
delta_radius = DEFAULT_DELTA_RADIUS;
delta_diagonal_rod = DEFAULT_DELTA_DIAGONAL_ROD;
delta_diagonal_rod = DEFAULT_DELTA_DIAGONAL_ROD;
endstop_adj[0] = endstop_adj[1] = endstop_adj[2] = 0;
tower_adj[0] = tower_adj[1] = tower_adj[2] = 0;
max_pos[2] = MANUAL_Z_HOME_POS;
max_pos[2] = MANUAL_Z_HOME_POS;
set_default_z_probe_offset();
set_delta_constants();
#endif
#ifdef ULTIPANEL
6 changes: 5 additions & 1 deletion Marlin.h
Original file line number Diff line number Diff line change
@@ -161,10 +161,13 @@ void ClearToSend();

void get_coordinates();
#ifdef DELTA
float probe_bed(int bedpos, int lift);
float probe_bed(float x, float y);
void set_delta_constants();
void home_delta_axis();
void calibration_report();
void set_default_z_probe_offset();
void set_delta_constants();
void save_carriage_positions(int position_num);
void calculate_delta(float cartesian[3]);
void adjust_delta(float cartesian[3]);
extern float delta[3];
@@ -202,6 +205,7 @@ extern int extrudemultiply; // Sets extrude multiply factor (in percent)
extern float current_position[NUM_AXIS] ;
extern float add_homeing[3];
#ifdef DELTA
extern float z_probe_offset[3];
extern float endstop_adj[3];
extern float tower_adj[3];
extern float delta_radius;
Loading

0 comments on commit a642423

Please sign in to comment.