More fixes...

parent 70129fc2
...@@ -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"
......
...@@ -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->", rawBedCooler() / OVERSAMPLENR, 0); ECHO_MV("C->", rawCoolerTemp() / OVERSAMPLENR, 0);
#endif #endif
} }
#endif // HAS(TEMP_COOLER) #endif // HAS(TEMP_COOLER)
......
...@@ -55,7 +55,7 @@ void flowrate_manage() { ...@@ -55,7 +55,7 @@ void flowrate_manage() {
} }
int get_florate() { int get_flowrate() {
return flowml; return flowml;
} }
......
...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment