Merge pull request #2 from RichCattell/development

Development

Configuration.h

@@ -97,11 +97,14 @@
 // Effective horizontal distance bridged by diagonal push rods.
 #define DEFAULT_DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
 
+//Uncomment to enable autocalibration debug messages
+//#define DEBUG_MESSAGES
+
 // Precision for G30 delta autocalibration function
 #define AUTOCALIBRATION_PRECISION 0.03 // mm
 
-// Diameter of print bed (printable area)
-#define BED_DIAMETER 160 // mm
+// Diameter of print bed - this is used to set the distance that autocalibration probes the bed at.
+#define BED_DIAMETER 170 // mm
 
 // Z-Probe variables
 // Start and end location values are used to deploy/retract the probe (will move from start to end and back again) 
@@ -112,6 +115,7 @@
 #define Z_PROBE_RETRACT_END_LOCATION {49, 84, 1, 0}     // X, Y, Z, E end location for z-probe retract sequence 
 
 #define AUTOLEVEL_GRID 24 // Distance between autolevel Z probing points, should be less than print surface radius/3.
+
 //===========================================================================
 //=============================Thermal Settings  ============================
 //===========================================================================

ConfigurationStore.cpp

@@ -37,7 +37,7 @@ void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size)
 // the default values are used whenever there is a change to the data, to prevent
 // wrong data being written to the variables.
 // ALSO:  always make sure the variables in the Store and retrieve sections are in the same order.
-#define EEPROM_VERSION "V13"
+#define EEPROM_VERSION "V14"
 
 #ifdef EEPROM_SETTINGS
 void Config_StoreSettings() 
@@ -164,9 +164,12 @@ void Config_PrintSettings()
       SERIAL_ECHO_START;
       SERIAL_ECHOLNPGM("Delta Geometry adjustment:");
       SERIAL_ECHO_START;
-      SERIAL_ECHOPAIR("  M666 A(xa)",tower_adj[0]);
-      SERIAL_ECHOPAIR(" B(ya)" ,tower_adj[1]);
-      SERIAL_ECHOPAIR(" C(xc)" ,tower_adj[2]);
+      SERIAL_ECHOPAIR("  M666 A",tower_adj[0]);
+      SERIAL_ECHOPAIR(" B" ,tower_adj[1]);
+      SERIAL_ECHOPAIR(" C" ,tower_adj[2]);
+      SERIAL_ECHOPAIR(" E" ,tower_adj[3]);
+      SERIAL_ECHOPAIR(" F" ,tower_adj[4]);
+      SERIAL_ECHOPAIR(" G" ,tower_adj[5]);
       SERIAL_ECHOPAIR(" R" ,delta_radius);
       SERIAL_ECHOPAIR(" D" ,delta_diagonal_rod);
       SERIAL_ECHOPAIR(" H" ,max_pos[2]);
@@ -298,7 +301,7 @@ void Config_ResetDefault()
       delta_radius = DEFAULT_DELTA_RADIUS;
       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;
+      tower_adj[0] = tower_adj[1] = tower_adj[2] = tower_adj[3] = tower_adj[4] = tower_adj[5] = 0;
       max_pos[2] = MANUAL_Z_HOME_POS;
       set_default_z_probe_offset();
       set_delta_constants();

Marlin.h

@@ -165,6 +165,7 @@ float probe_bed(float x, float y);
 void set_delta_constants();
 void home_delta_axis();
 void calibration_report();
+void bed_probe_all();
 void set_default_z_probe_offset();
 void set_delta_constants();
 void save_carriage_positions(int position_num);
@@ -207,7 +208,7 @@ 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 tower_adj[6];
   extern float delta_radius;
   extern float delta_diagonal_rod;
   //*extern float Z_MAX_POS;