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
d7499136
Commit
d7499136
authored
May 11, 2016
by
Stefy Lanza (nextime / spora )
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix enqueue_commands in ultraLCD
parent
776dcdaf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
ultralcd.cpp
MK/module/lcd/ultralcd.cpp
+5
-5
No files found.
MK/module/lcd/ultralcd.cpp
View file @
d7499136
...
...
@@ -1800,11 +1800,11 @@ static void lcd_laser_test_fire_menu() {
static
void
action_laser_acc_on
()
{
enqueuecommands_P
(
PSTR
(
"M80"
));
enqueue
_and_echo_
commands_P
(
PSTR
(
"M80"
));
}
static
void
action_laser_acc_off
()
{
enqueuecommands_P
(
PSTR
(
"M81"
));
enqueue
_and_echo_
commands_P
(
PSTR
(
"M81"
));
}
static
void
action_laser_test_20_50ms
()
{
laser_test_fire
(
20
,
50
);
...
...
@@ -1827,7 +1827,7 @@ static void action_laser_test_warm() {
}
static
void
laser_test_fire
(
uint8_t
power
,
int
dwell
)
{
enqueuecommands_P
(
PSTR
(
"M80"
));
// Enable laser accessories since we don't know if its been done (and there's no penalty for doing it again).
enqueue
_and_echo_
commands_P
(
PSTR
(
"M80"
));
// Enable laser accessories since we don't know if its been done (and there's no penalty for doing it again).
laser_fire
(
power
);
delay
(
dwell
);
laser_extinguish
();
...
...
@@ -1879,14 +1879,14 @@ static void action_laser_focus_7mm() {
}
static
void
laser_set_focus
(
float
f_length
)
{
if
(
!
TEST
(
axis_was_homed
,
Z_AXIS
))
{
enqueuecommands_P
(
PSTR
(
"G28 Z F150"
));
enqueue
_and_echo_
commands_P
(
PSTR
(
"G28 Z F150"
));
}
focalLength
=
f_length
;
float
focus
=
LASER_FOCAL_HEIGHT
-
f_length
;
char
cmd
[
20
];
sprintf_P
(
cmd
,
PSTR
(
"G0 Z%s F150"
),
ftostr52
(
focus
));
enqueuecommands_P
(
cmd
);
enqueue
_and_echo_
commands_P
(
cmd
);
}
#endif // LASER
...
...
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