|
@@ -20,6 +20,14 @@
|
20
|
20
|
*
|
21
|
21
|
*/
|
22
|
22
|
|
|
23
|
+#include "../../../inc/MarlinConfig.h"
|
|
24
|
+
|
|
25
|
+#if ENABLED(LIN_ADVANCE)
|
|
26
|
+
|
|
27
|
+#include "../../gcode.h"
|
|
28
|
+#include "../../../module/planner.h"
|
|
29
|
+#include "../../../module/stepper.h"
|
|
30
|
+
|
23
|
31
|
/**
|
24
|
32
|
* M900: Set and/or Get advance K factor and WH/D ratio
|
25
|
33
|
*
|
|
@@ -27,7 +35,7 @@
|
27
|
35
|
* R<ratio> Set ratio directly (overrides WH/D)
|
28
|
36
|
* W<width> H<height> D<diam> Set ratio from WH/D
|
29
|
37
|
*/
|
30
|
|
-void gcode_M900() {
|
|
38
|
+void GcodeSuite::M900() {
|
31
|
39
|
stepper.synchronize();
|
32
|
40
|
|
33
|
41
|
const float newK = parser.floatval('K', -1);
|
|
@@ -39,7 +47,7 @@ void gcode_M900() {
|
39
|
47
|
newW = parser.floatval('W', -1),
|
40
|
48
|
newH = parser.floatval('H', -1);
|
41
|
49
|
if (newD >= 0 && newW >= 0 && newH >= 0)
|
42
|
|
- newR = newD ? (newW * newH) / (sq(newD * 0.5) * M_PI) : 0;
|
|
50
|
+ newR = newD ? (newW * newH) / CIRCLE_AREA(newD * 0.5) : 0;
|
43
|
51
|
}
|
44
|
52
|
if (newR >= 0) planner.advance_ed_ratio = newR;
|
45
|
53
|
|
|
@@ -50,3 +58,5 @@ void gcode_M900() {
|
50
|
58
|
if (ratio) SERIAL_ECHO(ratio); else SERIAL_ECHOPGM("Auto");
|
51
|
59
|
SERIAL_EOL();
|
52
|
60
|
}
|
|
61
|
+
|
|
62
|
+#endif // LIN_ADVANCE
|