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
ef9534f4
Commit
ef9534f4
authored
Apr 02, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some other SERIAL_ECHO
parent
b1fb1c6a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
laser.cpp
MK/module/laser/laser.cpp
+1
-1
planner.cpp
MK/module/motion/planner.cpp
+1
-2
stepper.cpp
MK/module/motion/stepper.cpp
+2
-2
No files found.
MK/module/laser/laser.cpp
View file @
ef9534f4
...
...
@@ -178,7 +178,7 @@ void laser_wait_for_peripherals() {
while
(
!
laser_peripherals_ok
())
{
if
(
millis
()
>
timeout
)
{
if
(
laser
.
diagnostics
)
{
ECHO_LM
(
ER
R
,
"Peripheral control board failed to respond"
);
ECHO_LM
(
ER
,
"Peripheral control board failed to respond"
);
}
Stop
();
break
;
...
...
MK/module/motion/planner.cpp
View file @
ef9534f4
...
...
@@ -889,8 +889,7 @@ float junction_deviation = 0.1;
if
(
laser
.
diagnostics
)
{
if
(
block
->
laser_status
==
LASER_ON
)
{
SERIAL_ECHO_START
;
SERIAL_ECHOLNPGM
(
"Laser firing enabled"
);
ECHO_LM
(
INFO
,
"Laser firing enabled"
);
}
}
#endif // LASER
...
...
MK/module/motion/stepper.cpp
View file @
ef9534f4
...
...
@@ -655,7 +655,7 @@ ISR(TIMER1_COMPA_vect) {
#if ENABLED(LASER)
if
(
laser
.
dur
!=
0
&&
(
laser
.
last_firing
+
laser
.
dur
<
micros
()))
{
if
(
laser
.
diagnostics
)
SERIAL_ECHOLN
(
"Laser firing duration elapsed, in interrupt handler"
);
if
(
laser
.
diagnostics
)
ECHO_LM
(
INFO
,
"Laser firing duration elapsed, in interrupt handler"
);
laser_extinguish
();
#endif
...
...
@@ -717,7 +717,7 @@ ISR(TIMER1_COMPA_vect) {
laser_fire
(
current_block
->
laser_intensity
);
}
if
(
current_block
->
laser_status
==
LASER_OFF
)
{
if
(
laser
.
diagnostics
)
SERIAL_ECHOLN
(
"Laser status set to off, in interrupt handler"
);
if
(
laser
.
diagnostics
)
ECHO_LM
(
INFO
,
"Laser status set to off, in interrupt handler"
);
laser_extinguish
();
}
#endif
...
...
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