|
@@ -19,33 +19,27 @@
|
19
|
19
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
20
|
20
|
*
|
21
|
21
|
*/
|
22
|
|
-#ifndef MARLIN_H
|
23
|
|
-#define MARLIN_H
|
|
22
|
+#ifndef __MARLIN_H__
|
|
23
|
+#define __MARLIN_H__
|
24
|
24
|
|
25
|
25
|
#include <math.h>
|
26
|
26
|
#include <stdio.h>
|
27
|
27
|
#include <stdlib.h>
|
28
|
|
-#include <string.h>
|
29
|
|
-#include <inttypes.h>
|
30
|
28
|
|
31
|
|
-#include "MarlinConfig.h"
|
|
29
|
+#include "inc/MarlinConfig.h"
|
32
|
30
|
|
33
|
31
|
#ifdef DEBUG_GCODE_PARSER
|
34
|
|
- #include "gcode.h"
|
|
32
|
+ #include "gcode/parser.h"
|
35
|
33
|
#endif
|
36
|
|
-#include "src/HAL/HAL.h"
|
37
|
|
-
|
38
|
|
-#include "enum.h"
|
39
|
|
-#include "types.h"
|
40
|
|
-#include "utility.h"
|
41
|
|
-#include "serial.h"
|
42
|
34
|
|
43
|
35
|
#if ENABLED(PRINTCOUNTER)
|
44
|
|
- #include "printcounter.h"
|
|
36
|
+ #include "module/printcounter.h"
|
45
|
37
|
#else
|
46
|
|
- #include "stopwatch.h"
|
|
38
|
+ #include "libs/stopwatch.h"
|
47
|
39
|
#endif
|
48
|
40
|
|
|
41
|
+void stop();
|
|
42
|
+
|
49
|
43
|
void idle(
|
50
|
44
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
51
|
45
|
bool no_stepper_sleep = false // pass true to keep steppers from disabling on timeout
|
|
@@ -195,10 +189,6 @@ void clear_command_queue();
|
195
|
189
|
extern millis_t previous_cmd_ms;
|
196
|
190
|
inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
|
197
|
191
|
|
198
|
|
-#if ENABLED(FAST_PWM_FAN)
|
199
|
|
- void setPwmFrequency(uint8_t pin, int val);
|
200
|
|
-#endif
|
201
|
|
-
|
202
|
192
|
/**
|
203
|
193
|
* Feedrate scaling and conversion
|
204
|
194
|
*/
|
|
@@ -476,4 +466,4 @@ FORCE_INLINE bool position_is_reachable_xy(const float &lx, const float &ly) {
|
476
|
466
|
return position_is_reachable_raw_xy(RAW_X_POSITION(lx), RAW_Y_POSITION(ly));
|
477
|
467
|
}
|
478
|
468
|
|
479
|
|
-#endif // MARLIN_H
|
|
469
|
+#endif // __MARLIN_H__
|