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
078e021e
Commit
078e021e
authored
9 years ago
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ARC move
parent
d0edfc65
master
dev
k40_flow_cooler
k40_noflow_nocooler
nextime
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+1
-1
language_de.h
MarlinKimbra/language_de.h
+3
-3
planner.cpp
MarlinKimbra/planner.cpp
+7
-7
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
078e021e
...
...
@@ -7795,7 +7795,7 @@ void plan_arc(
// Ensure last segment arrives at target location.
#if MECH(DELTA) || MECH(SCARA)
calculate_delta
(
target
);
adjust_delta
(
arc_
target
);
adjust_delta
(
target
);
plan_buffer_line
(
delta
[
X_AXIS
],
delta
[
Y_AXIS
],
delta
[
Z_AXIS
],
target
[
E_AXIS
],
feed_rate
,
active_extruder
,
active_driver
);
#else
plan_buffer_line
(
target
[
X_AXIS
],
target
[
Y_AXIS
],
target
[
Z_AXIS
],
target
[
E_AXIS
],
feed_rate
,
active_extruder
,
active_driver
);
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/language_de.h
View file @
078e021e
...
...
@@ -148,9 +148,9 @@
#define MSG_ERR_MINTEMP "Err: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED"
#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED"
#define MSG_END_DAY "
days
"
#define MSG_END_HOUR "
hours
"
#define MSG_END_MINUTE "minute
s
"
#define MSG_END_DAY "
tage
"
#define MSG_END_HOUR "
uur
"
#define MSG_END_MINUTE "minute
n
"
// Debug
#define MSG_DEBUG_ECHO "DEBUG ECHO ENABLED"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/planner.cpp
View file @
078e021e
...
...
@@ -988,18 +988,18 @@ float junction_deviation = 0.1;
float
safe_speed
=
vmax_junction
;
if
((
moves_queued
>
1
)
&&
(
previous_nominal_speed
>
0.0001
))
{
float
dx
=
current_speed
[
X_AXIS
]
-
previous_speed
[
X_AXIS
],
dy
=
current_speed
[
Y_AXIS
]
-
previous_speed
[
Y_AXIS
],
dz
=
fabs
(
csz
-
previous_speed
[
Z_AXIS
]),
de
=
fabs
(
cse
-
previous_speed
[
E_AXIS
]),
jerk
=
sqrt
(
d
x
*
dx
+
dy
*
d
y
);
float
d
s
x
=
current_speed
[
X_AXIS
]
-
previous_speed
[
X_AXIS
],
d
s
y
=
current_speed
[
Y_AXIS
]
-
previous_speed
[
Y_AXIS
],
d
s
z
=
fabs
(
csz
-
previous_speed
[
Z_AXIS
]),
d
s
e
=
fabs
(
cse
-
previous_speed
[
E_AXIS
]),
jerk
=
sqrt
(
d
sx
*
dsx
+
dsy
*
ds
y
);
// if ((fabs(previous_speed[X_AXIS]) > 0.0001) || (fabs(previous_speed[Y_AXIS]) > 0.0001)) {
vmax_junction
=
block
->
nominal_speed
;
// }
if
(
jerk
>
max_xy_jerk
)
vmax_junction_factor
=
max_xy_jerk
/
jerk
;
if
(
d
z
>
max_z_jerk
)
vmax_junction_factor
=
min
(
vmax_junction_factor
,
max_z_jerk
/
d
z
);
if
(
d
e
>
max_e_jerk
[
extruder
])
vmax_junction_factor
=
min
(
vmax_junction_factor
,
max_e_jerk
[
extruder
]
/
d
e
);
if
(
d
sz
>
max_z_jerk
)
vmax_junction_factor
=
min
(
vmax_junction_factor
,
max_z_jerk
/
ds
z
);
if
(
d
se
>
max_e_jerk
[
extruder
])
vmax_junction_factor
=
min
(
vmax_junction_factor
,
max_e_jerk
[
extruder
]
/
ds
e
);
vmax_junction
=
min
(
previous_nominal_speed
,
vmax_junction
*
vmax_junction_factor
);
// Limit speed to max previous speed
}
...
...
This diff is collapsed.
Click to expand it.
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