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
e1465c4e
Commit
e1465c4e
authored
Feb 24, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
a74796c5
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
748 additions
and
1001 deletions
+748
-1001
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+7
-27
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+741
-974
No files found.
MarlinKimbra/Marlin_main.cpp
View file @
e1465c4e
...
...
@@ -6382,33 +6382,13 @@ bool setTargetedHotend(int code)
}
float
calculate_volumetric_multiplier
(
float
diameter
)
{
float
area
=
.0
;
float
radius
=
.0
;
radius
=
diameter
*
.5
;
if
(
!
volumetric_enabled
||
radius
==
0
)
{
area
=
1
;
}
else
{
area
=
M_PI
*
pow
(
radius
,
2
);
}
return
1.0
/
area
;
float
calculate_volumetric_multiplier
(
float
diameter
)
{
if
(
!
volumetric_enabled
||
diameter
==
0
)
return
1.0
;
float
d2
=
diameter
*
0.5
;
return
1.0
/
(
M_PI
*
d2
*
d2
);
}
void
calculate_volumetric_multipliers
()
{
volumetric_multiplier
[
0
]
=
calculate_volumetric_multiplier
(
filament_size
[
0
]);
#if EXTRUDERS > 1
volumetric_multiplier
[
1
]
=
calculate_volumetric_multiplier
(
filament_size
[
1
]);
#if EXTRUDERS > 2
volumetric_multiplier
[
2
]
=
calculate_volumetric_multiplier
(
filament_size
[
2
]);
#if EXTRUDERS > 3
volumetric_multiplier
[
3
]
=
calculate_volumetric_multiplier
(
filament_size
[
3
]);
#endif //EXTRUDERS > 3
#endif //EXTRUDERS > 2
#endif //EXTRUDERS > 1
void
calculate_volumetric_multipliers
()
{
for
(
int
i
=
0
;
i
<
EXTRUDERS
;
i
++
)
volumetric_multiplier
[
i
]
=
calculate_volumetric_multiplier
(
filament_size
[
i
]);
}
MarlinKimbra/ultralcd.cpp
View file @
e1465c4e
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