Skip to content

Commit

Permalink
Update 1.01
Browse files Browse the repository at this point in the history
Fix for inconsistant G29/G30 probes
Update Report format to use tabs
added iteration counter to report
  • Loading branch information
RichCattell committed Jan 27, 2014
1 parent 3b64562 commit 222c2be
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 21 deletions.
45 changes: 25 additions & 20 deletions Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1060,37 +1060,42 @@ void calibration_report() {
bed_level_ox = probe_bed(6,5);

//Display Report
SERIAL_ECHOLN(" Z-Tower");
SERIAL_ECHOLN("");
SERIAL_PROTOCOLPGM(" ");
SERIAL_ECHOLN("\tZ-Tower");

SERIAL_PROTOCOLPGM("\t");
SERIAL_PROTOCOL_F(bed_level_z, 4);
SERIAL_ECHOLN(" Endstop Offsets");
SERIAL_ECHOLN("");
SERIAL_PROTOCOLPGM(" ");
SERIAL_ECHOLN("\t\t\tEndstop Offsets");

SERIAL_PROTOCOLPGM("");
SERIAL_PROTOCOL_F(bed_level_oy, 4);
SERIAL_PROTOCOLPGM(" ");
SERIAL_PROTOCOLPGM("\t\t");
SERIAL_PROTOCOL_F(bed_level_ox, 4);
SERIAL_ECHOPAIR(" X: ",endstop_adj[0]);
SERIAL_ECHOPAIR(" Y: ",endstop_adj[1]);
SERIAL_ECHOPAIR(" Z: ",endstop_adj[2]);
SERIAL_ECHOPAIR("\t\tX:",endstop_adj[0]);
SERIAL_ECHOPAIR(" Y:",endstop_adj[1]);
SERIAL_ECHOPAIR(" Z:",endstop_adj[2]);
SERIAL_ECHOLN("");
SERIAL_PROTOCOLPGM(" ");

SERIAL_PROTOCOLPGM("\t");
SERIAL_PROTOCOL_F(bed_level_c, 4);
SERIAL_ECHOLN(" Tower Position Adjust: ");
SERIAL_PROTOCOLPGM(" ");
SERIAL_ECHOLN("\t\t\tTower Position Adjust");
SERIAL_ECHOLN("");

SERIAL_PROTOCOLPGM("");
SERIAL_PROTOCOL_F(bed_level_x, 4);
SERIAL_PROTOCOLPGM(" ");
SERIAL_PROTOCOLPGM("\t\t");
SERIAL_PROTOCOL_F(bed_level_y, 4);
SERIAL_ECHOPAIR(" A: ",tower_adj[0]);
SERIAL_ECHOPAIR(" B: ",tower_adj[1]);
SERIAL_ECHOPAIR(" C: ",tower_adj[2]);
SERIAL_ECHOPAIR("\t\tA:",tower_adj[0]);
SERIAL_ECHOPAIR(" B:",tower_adj[1]);
SERIAL_ECHOPAIR(" C:",tower_adj[2]);
SERIAL_ECHOLN("");
SERIAL_PROTOCOLPGM(" ");

SERIAL_PROTOCOLPGM("\t");
SERIAL_PROTOCOL_F(bed_level_oz, 4);
SERIAL_PROTOCOLPGM(" Delta Radius: ");
SERIAL_PROTOCOLPGM("\t\t\tDelta Radius: ");
SERIAL_PROTOCOL_F(delta_radius, 4);
SERIAL_ECHOLN("");
SERIAL_PROTOCOLPGM(" X-Tower Y-Tower Diag Rod: ");

SERIAL_PROTOCOLPGM("X-Tower\t\tY-Tower\t\tDiag Rod: ");
SERIAL_PROTOCOL_F(delta_diagonal_rod, 4);
SERIAL_ECHOLN("");
}
Expand Down
2 changes: 1 addition & 1 deletion pins.h
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
#define Z_STEP_PIN 46
#define Z_DIR_PIN 48
#define Z_ENABLE_PIN 62
#define Z_MIN_PIN 18 // autolevel for deltabot
#define Z_MIN_PIN 18 // autolevel probe for deltabot
#define Z_MAX_PIN 19

#define Z2_STEP_PIN 36
Expand Down

0 comments on commit 222c2be

Please sign in to comment.