Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
df08ccf5
Commit
df08ccf5
authored
May 07, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/dev'
parents
b5837b4d
292cd03a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
MK_Main.cpp
MK/module/MK_Main.cpp
+1
-1
MK_Main.h
MK/module/MK_Main.h
+1
-1
No files found.
MK/module/MK_Main.cpp
View file @
df08ccf5
...
@@ -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
])
...
...
MK/module/MK_Main.h
View file @
df08ccf5
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment