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
1693134e
Commit
1693134e
authored
Mar 13, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix decimal in G29
parent
cb6236ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
10 deletions
+16
-10
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+12
-6
vector_3.cpp
MarlinKimbra/vector_3.cpp
+4
-4
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
1693134e
...
@@ -2768,14 +2768,15 @@ inline void gcode_G28(boolean home_x=false, boolean home_y=false) {
...
@@ -2768,14 +2768,15 @@ inline void gcode_G28(boolean home_x=false, boolean home_y=false) {
if
(
verbose_level
)
{
if
(
verbose_level
)
{
SERIAL_PROTOCOLPGM
(
"Eqn coefficients: a: "
);
SERIAL_PROTOCOLPGM
(
"Eqn coefficients: a: "
);
SERIAL_PROTOCOL
(
plane_equation_coefficients
[
0
]
+
0.0001
);
SERIAL_PROTOCOL
_F
(
plane_equation_coefficients
[
0
],
8
);
SERIAL_PROTOCOLPGM
(
" b: "
);
SERIAL_PROTOCOLPGM
(
" b: "
);
SERIAL_PROTOCOL
(
plane_equation_coefficients
[
1
]
+
0.0001
);
SERIAL_PROTOCOL
_F
(
plane_equation_coefficients
[
1
],
8
);
SERIAL_PROTOCOLPGM
(
" d: "
);
SERIAL_PROTOCOLPGM
(
" d: "
);
SERIAL_PROTOCOLLN
(
plane_equation_coefficients
[
2
]
+
0.0001
);
SERIAL_PROTOCOL_F
(
plane_equation_coefficients
[
2
],
8
);
SERIAL_EOL
;
if
(
verbose_level
>
2
)
{
if
(
verbose_level
>
2
)
{
SERIAL_PROTOCOLPGM
(
"Mean of sampled points: "
);
SERIAL_PROTOCOLPGM
(
"Mean of sampled points: "
);
SERIAL_PROTOCOL_F
(
mean
,
6
);
SERIAL_PROTOCOL_F
(
mean
,
8
);
SERIAL_EOL
;
SERIAL_EOL
;
}
}
}
}
...
@@ -2786,15 +2787,20 @@ inline void gcode_G28(boolean home_x=false, boolean home_y=false) {
...
@@ -2786,15 +2787,20 @@ inline void gcode_G28(boolean home_x=false, boolean home_y=false) {
SERIAL_PROTOCOLPGM
(
"
\n
Bed Height Topography:
\n
"
);
SERIAL_PROTOCOLPGM
(
"
\n
Bed Height Topography:
\n
"
);
#if TOPO_ORIGIN == OriginFrontLeft
#if TOPO_ORIGIN == OriginFrontLeft
SERIAL_PROTOCOLPGM
(
"+-----------+
\n
"
);
SERIAL_PROTOCOLPGM
(
"|...Back....|
\n
"
);
SERIAL_PROTOCOLPGM
(
"|Left..Right|
\n
"
);
SERIAL_PROTOCOLPGM
(
"|...Front...|
\n
"
);
SERIAL_PROTOCOLPGM
(
"+-----------+
\n
"
);
for
(
yy
=
auto_bed_leveling_grid_points
-
1
;
yy
>=
0
;
yy
--
)
for
(
yy
=
auto_bed_leveling_grid_points
-
1
;
yy
>=
0
;
yy
--
)
#else
#else
for
(
yy
=
0
;
yy
<
auto_bed_leveling_grid_points
;
yy
++
)
for
(
yy
=
0
;
yy
<
auto_bed_leveling_grid_points
;
yy
++
)
#endif
#endif
{
{
#if TOPO_ORIGIN == OriginBackRight
#if TOPO_ORIGIN == OriginBackRight
for
(
xx
=
auto_bed_leveling_grid_points
-
1
;
xx
>=
0
;
xx
--
)
#else
for
(
xx
=
0
;
xx
<
auto_bed_leveling_grid_points
;
xx
++
)
for
(
xx
=
0
;
xx
<
auto_bed_leveling_grid_points
;
xx
++
)
#else
for
(
xx
=
auto_bed_leveling_grid_points
-
1
;
xx
>=
0
;
xx
--
)
#endif
#endif
{
{
int
ind
=
int
ind
=
...
...
MarlinKimbra/vector_3.cpp
View file @
1693134e
...
@@ -79,11 +79,11 @@ void vector_3::debug(char* title)
...
@@ -79,11 +79,11 @@ void vector_3::debug(char* title)
{
{
SERIAL_PROTOCOL
(
title
);
SERIAL_PROTOCOL
(
title
);
SERIAL_PROTOCOLPGM
(
" x: "
);
SERIAL_PROTOCOLPGM
(
" x: "
);
SERIAL_PROTOCOL
(
x
);
SERIAL_PROTOCOL
_F
(
x
,
6
);
SERIAL_PROTOCOLPGM
(
" y: "
);
SERIAL_PROTOCOLPGM
(
" y: "
);
SERIAL_PROTOCOL
(
y
);
SERIAL_PROTOCOL
_F
(
y
,
6
);
SERIAL_PROTOCOLPGM
(
" z: "
);
SERIAL_PROTOCOLPGM
(
" z: "
);
SERIAL_PROTOCOL
(
z
);
SERIAL_PROTOCOL
_F
(
z
,
6
);
SERIAL_EOL
;
SERIAL_EOL
;
}
}
...
@@ -150,7 +150,7 @@ void matrix_3x3::debug(char* title) {
...
@@ -150,7 +150,7 @@ void matrix_3x3::debug(char* title) {
int
count
=
0
;
int
count
=
0
;
for
(
int
i
=
0
;
i
<
3
;
i
++
)
{
for
(
int
i
=
0
;
i
<
3
;
i
++
)
{
for
(
int
j
=
0
;
j
<
3
;
j
++
)
{
for
(
int
j
=
0
;
j
<
3
;
j
++
)
{
SERIAL_PROTOCOL
(
matrix
[
count
]
+
0.0001
);
SERIAL_PROTOCOL
_F
(
matrix
[
count
],
6
);
SERIAL_PROTOCOLPGM
(
" "
);
SERIAL_PROTOCOLPGM
(
" "
);
count
++
;
count
++
;
}
}
...
...
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