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
8c0a1d9f
Commit
8c0a1d9f
authored
May 08, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
parents
2ddac526
1f66c215
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
stepper.cpp
MK/module/motion/stepper.cpp
+2
-2
No files found.
MK/module/motion/stepper.cpp
View file @
8c0a1d9f
...
@@ -296,11 +296,11 @@ FORCE_INLINE unsigned short calc_timer(unsigned short step_rate) {
...
@@ -296,11 +296,11 @@ FORCE_INLINE unsigned short calc_timer(unsigned short step_rate) {
NOMORE
(
step_rate
,
MAX_STEP_FREQUENCY
);
NOMORE
(
step_rate
,
MAX_STEP_FREQUENCY
);
if
(
step_rate
>
(
2
*
DOUBLE_STEP_FREQUENCY
))
{
// If steprate > 2*DOUBLE_STEP_FREQUENCY >> step 4 times
if
(
step_rate
>
(
2
*
DOUBLE_STEP_FREQUENCY
))
{
// If steprate > 2*DOUBLE_STEP_FREQUENCY >> step 4 times
step_rate
=
(
step_rate
>>
2
)
&
0x3fff
;
step_rate
=
(
step_rate
>>
2
);
step_loops
=
4
;
step_loops
=
4
;
}
}
else
if
(
step_rate
>
DOUBLE_STEP_FREQUENCY
)
{
// If steprate > DOUBLE_STEP_FREQUENCY >> step 2 times
else
if
(
step_rate
>
DOUBLE_STEP_FREQUENCY
)
{
// If steprate > DOUBLE_STEP_FREQUENCY >> step 2 times
step_rate
=
(
step_rate
>>
1
)
&
0x7fff
;
step_rate
=
(
step_rate
>>
1
);
step_loops
=
2
;
step_loops
=
2
;
}
}
else
{
else
{
...
...
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