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
8b413c82
Commit
8b413c82
authored
Mar 23, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #19 from simone97/patch-15
Added support for see the Power Consumption
parents
086a3933
acd17102
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
planner.cpp
MarlinKimbra/planner.cpp
+2
-2
No files found.
MarlinKimbra/planner.cpp
View file @
8b413c82
...
...
@@ -121,7 +121,7 @@ static long x_segment_time[3]={MAX_FREQ_TIME + 1,0,0}; // Segment times (in
static
long
y_segment_time
[
3
]
=
{
MAX_FREQ_TIME
+
1
,
0
,
0
};
#endif
#if
def FILAMENT_SENSOR
#if
(defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && FILWIDTH_PIN >= 0)
static
char
meas_sample
;
//temporary variable to hold filament measurement sample
#endif
...
...
@@ -861,7 +861,7 @@ Having the real displacement of the head, we can calculate the total movement le
block
->
nominal_speed
=
block
->
millimeters
*
inverse_second
;
// (mm/sec) Always > 0
block
->
nominal_rate
=
ceil
(
block
->
step_event_count
*
inverse_second
);
// (step/sec) Always > 0
#if
def FILAMENT_SENSOR
#if
(defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && FILWIDTH_PIN >= 0)
//FMM update ring buffer used for delay with filament measurements
...
...
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