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
4199738d
Commit
4199738d
authored
Nov 16, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
5ee63302
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
stepper.cpp
MarlinKimbra/stepper.cpp
+1
-1
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+1
-3
No files found.
MarlinKimbra/stepper.cpp
View file @
4199738d
...
@@ -93,7 +93,7 @@ static volatile char endstop_hit_bits = 0; // use X_MIN, Y_MIN, Z_MIN and Z_PROB
...
@@ -93,7 +93,7 @@ static volatile char endstop_hit_bits = 0; // use X_MIN, Y_MIN, Z_MIN and Z_PROB
#else
#else
static
byte
static
byte
#endif
#endif
old_endstop_bits
=
0
;
// use X_MIN, X_MAX... Z_MAX, Z_PROBE, Z2_MIN, Z2_MAX, E_MIN
old_endstop_bits
=
0
;
// use X_MIN, X_MAX... Z_MAX, Z_PROBE, Z2_MIN, Z2_MAX, E_MIN
#if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
#if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
bool
abort_on_endstop_hit
=
false
;
bool
abort_on_endstop_hit
=
false
;
...
...
MarlinKimbra/ultralcd.cpp
View file @
4199738d
...
@@ -76,8 +76,6 @@ static void lcd_status_screen();
...
@@ -76,8 +76,6 @@ static void lcd_status_screen();
static
void
lcd_main_menu
();
static
void
lcd_main_menu
();
static
void
lcd_tune_menu
();
static
void
lcd_tune_menu
();
static
void
lcd_prepare_menu
();
static
void
lcd_prepare_menu
();
static
void
lcd_prepare_motion_menu
();
static
void
lcd_prepare_temperature_menu
();
static
void
lcd_move_menu
();
static
void
lcd_move_menu
();
static
void
lcd_control_menu
();
static
void
lcd_control_menu
();
static
void
lcd_stats_menu
();
static
void
lcd_stats_menu
();
...
@@ -2467,7 +2465,7 @@ char* ftostr52(const float& x) {
...
@@ -2467,7 +2465,7 @@ char* ftostr52(const float& x) {
LCD_Printpos
(
0
,
1
);
lcd_printPGM
(
PSTR
(
" "
));
LCD_Printpos
(
0
,
1
);
lcd_printPGM
(
PSTR
(
" "
));
delay
(
5000
);
delay
(
5000
);
enqueuecommands_P
(
PSTR
(
"G28"
));
enqueuecommands_P
(
PSTR
(
"G28"
));
lcd_goto_menu
(
lcd_prepare_m
otion_m
enu
);
lcd_goto_menu
(
lcd_prepare_menu
);
}
}
break
;
break
;
}
}
...
...
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