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
873d87e8
Commit
873d87e8
authored
May 13, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More fixes...
parent
70129fc2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
9 deletions
+4
-9
base.h
MK/base.h
+1
-1
MK_Main.cpp
MK/module/MK_Main.cpp
+1
-1
flowmeter.cpp
MK/module/flowmeter/flowmeter.cpp
+1
-1
flowmeter.h
MK/module/flowmeter/flowmeter.h
+1
-6
No files found.
MK/base.h
View file @
873d87e8
...
@@ -38,7 +38,6 @@
...
@@ -38,7 +38,6 @@
#include "Configuration_Feature.h"
#include "Configuration_Feature.h"
#include "Configuration_Overall.h"
#include "Configuration_Overall.h"
#include "module/flowmeter/flowmeter.h"
#if ENABLED(LASER)
#if ENABLED(LASER)
#include "Configuration_Laser.h"
#include "Configuration_Laser.h"
...
@@ -66,6 +65,7 @@
...
@@ -66,6 +65,7 @@
#include "module/motion/qr_solve.h"
#include "module/motion/qr_solve.h"
#include "module/motion/cartesian_correction.h"
#include "module/motion/cartesian_correction.h"
#include "module/temperature/temperature.h"
#include "module/temperature/temperature.h"
#include "module/flowmeter/flowmeter.h"
#include "module/temperature/thermistortables.h"
#include "module/temperature/thermistortables.h"
#include "module/lcd/ultralcd.h"
#include "module/lcd/ultralcd.h"
#include "module/lcd/buzzer.h"
#include "module/lcd/buzzer.h"
...
...
MK/module/MK_Main.cpp
View file @
873d87e8
...
@@ -2962,7 +2962,7 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
...
@@ -2962,7 +2962,7 @@ inline void do_blocking_move_to_z(float z) { do_blocking_move_to(current_positio
#endif
#endif
#if ENABLED(SHOW_TEMP_ADC_VALUES)
#if ENABLED(SHOW_TEMP_ADC_VALUES)
ECHO_MV
(
" ADC C:"
,
degCooler
(),
1
);
ECHO_MV
(
" ADC C:"
,
degCooler
(),
1
);
ECHO_MV
(
"C->"
,
raw
BedCooler
()
/
OVERSAMPLENR
,
0
);
ECHO_MV
(
"C->"
,
raw
CoolerTemp
()
/
OVERSAMPLENR
,
0
);
#endif
#endif
}
}
#endif // HAS(TEMP_COOLER)
#endif // HAS(TEMP_COOLER)
...
...
MK/module/flowmeter/flowmeter.cpp
View file @
873d87e8
...
@@ -55,7 +55,7 @@ void flowrate_manage() {
...
@@ -55,7 +55,7 @@ void flowrate_manage() {
}
}
int
get_florate
()
{
int
get_flo
w
rate
()
{
return
flowml
;
return
flowml
;
}
}
...
...
MK/module/flowmeter/flowmeter.h
View file @
873d87e8
...
@@ -19,18 +19,13 @@
...
@@ -19,18 +19,13 @@
#ifndef FLOWMETER_H
#ifndef FLOWMETER_H
#define FLOWMETER_H
#define FLOWMETER_H
#include <inttypes.h>
#include "../../base.h"
#define FLOWMETER_CALIBRATION (FLOWMETER_MAXFREQ/FLOWMETER_MAXFLOW)
#define FLOWMETER_CALIBRATION (FLOWMETER_MAXFREQ/FLOWMETER_MAXFLOW)
#if ENABLED(FLOWMETER_SENSOR)
#if ENABLED(FLOWMETER_SENSOR)
void
flowrate_manage
();
void
flowrate_manage
();
void
flow_init
();
void
flow_init
();
int
get_flowrate
();
int
get_flowrate
();
#endif
#endif // FLOWMETER_SENSOR
#endif // FLOWMETER_H
#endif // FLOWMETER_H
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