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
d5cef6c9
Commit
d5cef6c9
authored
Feb 18, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix
parent
85576f91
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
MK_Main.cpp
MK/module/MK_Main.cpp
+4
-4
ultralcd.cpp
MK/module/lcd/ultralcd.cpp
+1
-1
No files found.
MK/module/MK_Main.cpp
View file @
d5cef6c9
...
@@ -2669,7 +2669,7 @@ static void clean_up_after_endstop_move() {
...
@@ -2669,7 +2669,7 @@ static void clean_up_after_endstop_move() {
if
(
debugLevel
&
DEBUG_INFO
)
if
(
debugLevel
&
DEBUG_INFO
)
ECHO_LMV
(
INFO
,
"dock_sled"
,
dock
);
ECHO_LMV
(
INFO
,
"dock_sled"
,
dock
);
if
(
axis_known_position
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
!=
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
{
if
(
axis_known_position
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
!=
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
)
))
{
LCD_MESSAGEPGM
(
MSG_POSITION_UNKNOWN
);
LCD_MESSAGEPGM
(
MSG_POSITION_UNKNOWN
);
ECHO_LM
(
DB
,
MSG_POSITION_UNKNOWN
);
ECHO_LM
(
DB
,
MSG_POSITION_UNKNOWN
);
return
;
return
;
...
@@ -3328,7 +3328,7 @@ inline void gcode_G28() {
...
@@ -3328,7 +3328,7 @@ inline void gcode_G28() {
else
if
(
homeZ
)
{
// Don't need to Home Z twice
else
if
(
homeZ
)
{
// Don't need to Home Z twice
// Let's see if X and Y are homed
// Let's see if X and Y are homed
if
(
axis_was_homed
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
==
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
{
if
(
axis_was_homed
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
==
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
)
))
{
// Make sure the probe is within the physical limits
// Make sure the probe is within the physical limits
// NOTE: This doesn't necessarily ensure the probe is also within the bed!
// NOTE: This doesn't necessarily ensure the probe is also within the bed!
...
@@ -3373,7 +3373,7 @@ inline void gcode_G28() {
...
@@ -3373,7 +3373,7 @@ inline void gcode_G28() {
if
(
home_all_axis
||
homeZ
)
{
if
(
home_all_axis
||
homeZ
)
{
// Let's see if X and Y are homed
// Let's see if X and Y are homed
if
(
axis_was_homed
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
==
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
{
if
(
axis_was_homed
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
==
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
)
))
{
current_position
[
Z_AXIS
]
=
0
;
current_position
[
Z_AXIS
]
=
0
;
sync_plan_position
();
sync_plan_position
();
...
@@ -3502,7 +3502,7 @@ inline void gcode_G28() {
...
@@ -3502,7 +3502,7 @@ inline void gcode_G28() {
ECHO_LM
(
INFO
,
"gcode_G29 >>>"
);
ECHO_LM
(
INFO
,
"gcode_G29 >>>"
);
// Don't allow auto-leveling without homing first
// Don't allow auto-leveling without homing first
if
(
axis_known_position
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
!=
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
{
if
(
axis_known_position
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
!=
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
)
))
{
LCD_MESSAGEPGM
(
MSG_POSITION_UNKNOWN
);
LCD_MESSAGEPGM
(
MSG_POSITION_UNKNOWN
);
ECHO_LM
(
ER
,
MSG_POSITION_UNKNOWN
);
ECHO_LM
(
ER
,
MSG_POSITION_UNKNOWN
);
return
;
return
;
...
...
MK/module/lcd/ultralcd.cpp
View file @
d5cef6c9
...
@@ -839,7 +839,7 @@ static void lcd_prepare_menu() {
...
@@ -839,7 +839,7 @@ static void lcd_prepare_menu() {
// Level Bed
// Level Bed
//
//
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
if
(
axis_known_position
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
==
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
if
(
axis_known_position
&
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
))
==
(
BIT
(
X_AXIS
)
|
BIT
(
Y_AXIS
)
))
MENU_ITEM
(
gcode
,
MSG_LEVEL_BED
,
PSTR
(
"G29"
));
MENU_ITEM
(
gcode
,
MSG_LEVEL_BED
,
PSTR
(
"G29"
));
#elif !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
#elif !MECH(DELTA) && DISABLED(Z_SAFE_HOMING) && Z_HOME_DIR < 0
MENU_ITEM
(
submenu
,
MSG_MBL_SETTING
,
config_lcd_level_bed
);
MENU_ITEM
(
submenu
,
MSG_MBL_SETTING
,
config_lcd_level_bed
);
...
...
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