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
7bcab335
Commit
7bcab335
authored
May 27, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
58e2369b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
planner.cpp
MK/module/motion/planner.cpp
+4
-4
stepper.cpp
MK/module/motion/stepper.cpp
+2
-2
printcounter.cpp
MK/module/printcounter/printcounter.cpp
+1
-0
No files found.
MK/module/motion/planner.cpp
View file @
7bcab335
...
...
@@ -12,11 +12,11 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program.
If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
...
...
@@ -33,11 +33,11 @@
*
* Grbl is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Grbl.
If not, see <http://www.gnu.org/licenses/>.
* along with Grbl. If not, see <http://www.gnu.org/licenses/>.
*
*
* The ring buffer implementation gleaned from the wiring_serial library by David A. Mellis.
...
...
MK/module/motion/stepper.cpp
View file @
7bcab335
...
...
@@ -297,11 +297,11 @@ FORCE_INLINE unsigned short calc_timer(unsigned short step_rate) {
NOMORE
(
step_rate
,
MAX_STEP_FREQUENCY
);
if
(
step_rate
>
(
2
*
DOUBLE_STEP_FREQUENCY
))
{
// If steprate > 2*DOUBLE_STEP_FREQUENCY >> step 4 times
s
tep_rate
=
(
step_rate
>>
2
)
;
s
step_rate
>>=
2
;
step_loops
=
4
;
}
else
if
(
step_rate
>
DOUBLE_STEP_FREQUENCY
)
{
// If steprate > DOUBLE_STEP_FREQUENCY >> step 2 times
step_rate
=
(
step_rate
>>
1
)
;
step_rate
>>=
1
;
step_loops
=
2
;
}
else
{
...
...
MK/module/printcounter/printcounter.cpp
View file @
7bcab335
...
...
@@ -165,6 +165,7 @@ bool PrintCounter::stop() {
this
->
data
.
completePrints
++
;
this
->
data
.
printTime
+=
this
->
deltaDuration
();
this
->
saveStats
();
return
true
;
}
else
return
false
;
}
...
...
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