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
50c07eba
Commit
50c07eba
authored
May 13, 2016
by
Franco (nextime) Lanza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Other fix
parent
873d87e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
MK_Main.cpp
MK/module/MK_Main.cpp
+6
-6
flowmeter.cpp
MK/module/flowmeter/flowmeter.cpp
+1
-1
No files found.
MK/module/MK_Main.cpp
View file @
50c07eba
...
...
@@ -5758,7 +5758,7 @@ inline void gcode_M104() {
inline
void
gcode_M105
()
{
if
(
setTargetedExtruder
(
105
))
return
;
#if HAS(TEMP_0) || HAS(TEMP_BED) || ENABLED(HEATER_0_USES_MAX6675) || HAS(TEMP_COOLER)
#if HAS(TEMP_0) || HAS(TEMP_BED) || ENABLED(HEATER_0_USES_MAX6675) || HAS(TEMP_COOLER)
|| ENABLED(FLOWMETER_SENSOR)
ECHO_S
(
OK
);
#if HAS(TEMP_0) || HAS(TEMP_BED) || ENABLED(HEATER_0_USES_MAX6675)
print_heaterstates
();
...
...
@@ -5766,7 +5766,7 @@ inline void gcode_M105() {
#if HAS(TEMP_COOLER)
print_coolerstates
();
#endif
#if
HAS
(FLOWMETER_SENSOR)
#if
ENABLED
(FLOWMETER_SENSOR)
print_flowratestates
();
#endif
#else // HASNT(TEMP_0) && HASNT(TEMP_BED)
...
...
@@ -9253,10 +9253,10 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
#if ENABLED(FLOWMETER_SENSOR) && ENABLED(MINFLOW_PROTECTION)
if
(
get_flowrate
()
<
(
MINFLOW_PROTECTION
*
1000
))
{
if
(
IsRunning
()
)
kill
(
PSTR
(
MSG_KILLED
));
else
stop
();
if
(
Printing
)
kill
(
PSTR
(
MSG_KILLED
));
//
else
//
stop();
}
#endif
...
...
MK/module/flowmeter/flowmeter.cpp
View file @
50c07eba
...
...
@@ -47,7 +47,7 @@ void flowrate_manage() {
detachInterrupt
(
digitalPinToInterrupt
(
FLOWMETER_PIN
));
flowrate
=
((
1000.0
/
(
now
-
flowmeter_timer
))
*
flowrate_pulsecount
)
/
FLOWMETER_CALIBRATION
;
flowmeter_timer
=
now
+
1000UL
;
flowml
=
(
flowrate
/
60
)
*
1000
;
flowml
=
(
flowrate
/
60
.0
)
*
1000
;
flowrate_pulsecount
=
0
;
attachInterrupt
(
digitalPinToInterrupt
(
FLOWMETER_PIN
),
flowrate_pulsecounter
,
FALLING
);
...
...
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