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
adc816d4
Commit
adc816d4
authored
Apr 02, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some compilation issues
parent
ef9534f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
planner.cpp
MK/module/motion/planner.cpp
+2
-1
stepper.cpp
MK/module/motion/stepper.cpp
+6
-5
No files found.
MK/module/motion/planner.cpp
View file @
adc816d4
...
...
@@ -885,7 +885,8 @@ float junction_deviation = 0.1;
}
else
{
block
->
steps_l
=
0
;
}
block
->
step_event_count
=
max
(
block
->
steps_x
,
max
(
block
->
steps_y
,
max
(
block
->
steps_z
,
max
(
block
->
steps_e
,
block
->
steps_l
))));
// NEXTIME
block
->
step_event_count
=
max
(
block
->
steps
[
X_AXIS
],
max
(
block
->
steps
[
Y_AXIS
],
max
(
block
->
steps
[
Z_AXIS
],
max
(
block
->
steps
[
E_AXIS
],
block
->
steps_l
))));
if
(
laser
.
diagnostics
)
{
if
(
block
->
laser_status
==
LASER_ON
)
{
...
...
MK/module/motion/stepper.cpp
View file @
adc816d4
...
...
@@ -657,6 +657,7 @@ ISR(TIMER1_COMPA_vect) {
if
(
laser
.
dur
!=
0
&&
(
laser
.
last_firing
+
laser
.
dur
<
micros
()))
{
if
(
laser
.
diagnostics
)
ECHO_LM
(
INFO
,
"Laser firing duration elapsed, in interrupt handler"
);
laser_extinguish
();
}
#endif
// If there is no current block, attempt to pop one from the buffer
...
...
@@ -808,9 +809,9 @@ ISR(TIMER1_COMPA_vect) {
if
(
current_block
->
laser_mode
==
PULSED
&&
current_block
->
laser_status
==
LASER_ON
)
{
// Pulsed Firing Mode
laser_fire
(
current_block
->
laser_intensity
);
if
(
laser
.
diagnostics
)
{
SERIAL_ECHOPAIR
(
"X: "
,
counter_x
);
SERIAL_ECHOPAIR
(
"Y: "
,
counter_y
);
SERIAL_ECHOPAIR
(
"L: "
,
counter_l
);
ECHO_MV
(
"X: "
,
counter_x
);
ECHO_MV
(
"Y: "
,
counter_y
);
ECHO_MV
(
"L: "
,
counter_l
);
}
}
#if ENABLED(LASER_RASTER)
...
...
@@ -819,7 +820,7 @@ ISR(TIMER1_COMPA_vect) {
// going from darkened paper to burning through paper.
laser_fire
(
current_block
->
laser_raster_data
[
counter_raster
]);
if
(
laser
.
diagnostics
)
{
SERIAL_ECHOPAIR
(
"Pixel: "
,
(
float
)
current_block
->
laser_raster_data
[
counter_raster
]);
ECHO_MV
(
"Pixel: "
,
(
float
)
current_block
->
laser_raster_data
[
counter_raster
]);
}
counter_raster
++
;
}
...
...
@@ -827,7 +828,7 @@ ISR(TIMER1_COMPA_vect) {
counter_l
-=
current_block
->
step_event_count
;
}
if
(
current_block
->
laser_duration
!=
0
&&
(
laser
.
last_firing
+
current_block
->
laser_duration
<
micros
()))
{
if
(
laser
.
diagnostics
)
SERIAL_ECHOLN
(
"Laser firing duration elapsed, in interrupt fast loop"
);
if
(
laser
.
diagnostics
)
ECHO_LM
(
INFO
,
"Laser firing duration elapsed, in interrupt fast loop"
);
laser_extinguish
();
}
#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