Commit df08ccf5 authored by MagoKimbra's avatar MagoKimbra

Merge remote-tracking branch 'refs/remotes/origin/dev'

parents b5837b4d 292cd03a
...@@ -2653,7 +2653,7 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio ...@@ -2653,7 +2653,7 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
set_current_to_destination(); set_current_to_destination();
} }
static void calculate_delta(float cartesian[3]) { void calculate_delta(float cartesian[3]) {
delta[TOWER_1] = sqrt(delta_diagonal_rod_1 delta[TOWER_1] = sqrt(delta_diagonal_rod_1
- sq(delta_tower1_x - cartesian[X_AXIS]) - sq(delta_tower1_x - cartesian[X_AXIS])
- sq(delta_tower1_y - cartesian[Y_AXIS]) - sq(delta_tower1_y - cartesian[Y_AXIS])
......
...@@ -45,13 +45,13 @@ void ok_to_send(); ...@@ -45,13 +45,13 @@ void ok_to_send();
#if MECH(DELTA) #if MECH(DELTA)
void set_delta_constants(); void set_delta_constants();
void calculate_delta(float cartesian[3]);
static float probe_bed(float x, float y); static float probe_bed(float x, float y);
static void adj_tower_delta(int tower); static void adj_tower_delta(int tower);
static void adj_tower_radius(int tower); static void adj_tower_radius(int tower);
static void home_delta_axis(); static void home_delta_axis();
static void calibration_report(); static void calibration_report();
static void bed_probe_all(); static void bed_probe_all();
static void calculate_delta(float cartesian[3]);
static void adjust_delta(float cartesian[3]); static void adjust_delta(float cartesian[3]);
static void adj_endstops(); static void adj_endstops();
static void reset_bed_level(); static void reset_bed_level();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment