bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Reduce E_D_ratio code

Browse Source
This commit is contained in:
Scott Lahteine
2017-03-01 17:40:07 -06:00
parent de6c40ed8f
commit b3e2bd6f29
3 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Marlin/Marlin_main.cpp
View File

@ -7601,40 +7601,23 @@ inline void gcode_M503() {
*/
inline void gcode_M905() {
stepper.synchronize();
float newD = -1;
float newW = -1;
float newH = -1;
if (code_seen('K')) {
float newK = code_value_float();
if (newK >= 0.0)
planner.set_extruder_advance_k(newK);
}
const float newK = code_seen('K') ? code_value_float() : -1,
newD = code_seen('D') ? code_value_float() : -1,
newW = code_seen('W') ? code_value_float() : -1,
newH = code_seen('H') ? code_value_float() : -1;
if (newK >= 0.0) planner.set_extruder_advance_k(newK);
SERIAL_ECHO_START;
SERIAL_ECHOPAIR("Advance factor: ", planner.get_extruder_advance_k());
SERIAL_EOL;
if (code_seen('D'))
newD = code_value_float();
if (code_seen('W'))
newW = code_value_float();
if (code_seen('H'))
newH = code_value_float();
SERIAL_ECHOLNPAIR("Advance factor: ", planner.get_extruder_advance_k());
if (newD > 0 && newW > 0 && newH > 0) {
float E_D_ratio = newW * newH / (sq(newD / 2) * M_PI);
planner.set_E_D_ratio(E_D_ratio);
if (newD >= 0 || newW >= 0 || newH >= 0) {
const float ratio = (!newD || !newW || !newH) ? 0 : (newW * newH) / (sq(newD * 0.5) * M_PI);
planner.set_advance_ed_ratio(ratio);
SERIAL_ECHO_START;
SERIAL_ECHOPAIR("E/D ratio: ", E_D_ratio);
SERIAL_EOL;
}
else if (newD != -1 || newW != -1 || newH != -1) {
planner.set_E_D_ratio(0);
SERIAL_ECHO_START;
SERIAL_ECHOPGM("E/D ratio: Automatic");
SERIAL_EOL;
SERIAL_ECHOPGM("E/D ratio: ");
if (ratio) SERIAL_ECHOLN(ratio); else SERIAL_ECHOLNPGM("Automatic");
}
}
#endif