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
c170bfd1
Commit
c170bfd1
authored
Mar 23, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12 from simone97/patch-8
Added support for see the Power Consumption
parents
308d1035
2c123a21
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
temperature.h
MarlinKimbra/temperature.h
+6
-1
No files found.
MarlinKimbra/temperature.h
View file @
c170bfd1
...
...
@@ -30,7 +30,7 @@
void
tp_init
();
//initialize the heating
void
manage_heater
();
//it is critical that this is called periodically.
#if
def FILAMENT_SENSOR
#if
(defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && FILWIDTH_PIN >= 0)
// For converting raw Filament Width to milimeters
float
analog2widthFil
();
...
...
@@ -38,6 +38,11 @@ void manage_heater(); //it is critical that this is called periodically.
int
widthFil_to_size_ratio
();
#endif
#if (defined(POWER_CONSUMPTION) && defined(POWER_CONSUMPTION_PIN) && POWER_CONSUMPTION_PIN >= 0)
// For converting raw Power Consumption to watt
float
analog2power
();
#endif
// low level conversion routines
// do not use these routines and variables outside of temperature.cpp
#ifndef SINGLENOZZLE
...
...
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