sv/Marlin
1
1
Fork 0
Code Issues Pull Requests Wiki Activity

[1.1.x] LIN_ADVANCE v1.5 (#9700)

Browse Source
This commit is contained in:
Sebastianv650
2018-02-23 07:53:41 +01:00
committed by Scott Lahteine
parent e41b2274b0
commit 9c65890644
45 changed files with 774 additions and 1429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Marlin/Marlin_main.cpp
View File

@@ -10458,33 +10458,18 @@ inline void gcode_M502() {
#if ENABLED(LIN_ADVANCE)
/**
* M900: Set and/or Get advance K factor and WH/D ratio
* M900: Set and/or Get advance K factor
*
* K<factor> Set advance K factor
* R<ratio> Set ratio directly (overrides WH/D)
* W<width> H<height> D<diam> Set ratio from WH/D
*/
inline void gcode_M900() {
stepper.synchronize();
const float newK = parser.floatval('K', -1);
if (newK >= 0) planner.extruder_advance_k = newK;
float newR = parser.floatval('R', -1);
if (newR < 0) {
const float newD = parser.floatval('D', -1),
newW = parser.floatval('W', -1),
newH = parser.floatval('H', -1);
if (newD >= 0 && newW >= 0 && newH >= 0)
newR = newD ? (newW * newH) / (sq(newD * 0.5) * M_PI) : 0;
}
if (newR >= 0) planner.advance_ed_ratio = newR;
if (newK >= 0) planner.extruder_advance_K = newK;
SERIAL_ECHO_START();
SERIAL_ECHOPAIR("Advance K=", planner.extruder_advance_k);
SERIAL_ECHOPGM(" E/D=");
const float ratio = planner.advance_ed_ratio;
if (ratio) SERIAL_ECHO(ratio); else SERIAL_ECHOPGM("Auto");
SERIAL_ECHOPAIR("Advance K=", planner.extruder_advance_K);
SERIAL_EOL();
}
#endif // LIN_ADVANCE