|
|
@ -28,45 +28,115 @@ |
|
|
#include "../../../module/planner.h" |
|
|
#include "../../../module/planner.h" |
|
|
#include "../../../module/stepper.h" |
|
|
#include "../../../module/stepper.h" |
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(EXTRA_LIN_ADVANCE_K) |
|
|
|
|
|
float saved_extruder_advance_K[EXTRUDERS]; |
|
|
|
|
|
uint8_t lin_adv_slot = 0; |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
/**
|
|
|
* M900: Get or Set Linear Advance K-factor |
|
|
* M900: Get or Set Linear Advance K-factor |
|
|
* |
|
|
* T<tool> Which tool to address |
|
|
* K<factor> Set advance K factor |
|
|
* K<factor> Set current advance K factor (Slot 0). |
|
|
|
|
|
* L<factor> Set secondary advance K factor (Slot 1). Requires EXTRA_LIN_ADVANCE_K. |
|
|
|
|
|
* S<0/1> Activate slot 0 or 1. Requires EXTRA_LIN_ADVANCE_K. |
|
|
*/ |
|
|
*/ |
|
|
void GcodeSuite::M900() { |
|
|
void GcodeSuite::M900() { |
|
|
|
|
|
|
|
|
#if EXTRUDERS < 2 |
|
|
#if EXTRUDERS < 2 |
|
|
constexpr uint8_t tmp_extruder = 0; |
|
|
constexpr uint8_t tmp_extruder = 0; |
|
|
#else |
|
|
#else |
|
|
const uint8_t tmp_extruder = parser.seenval('T') ? parser.value_int() : active_extruder; |
|
|
const uint8_t tmp_extruder = parser.intval('T', active_extruder); |
|
|
if (tmp_extruder >= EXTRUDERS) { |
|
|
if (tmp_extruder >= EXTRUDERS) { |
|
|
SERIAL_ECHOLNPGM("?T value out of range."); |
|
|
SERIAL_ECHOLNPGM("?T value out of range."); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
|
|
|
if (parser.seenval('K')) { |
|
|
#if ENABLED(EXTRA_LIN_ADVANCE_K) |
|
|
const float newK = parser.floatval('K'); |
|
|
|
|
|
if (WITHIN(newK, 0, 10)) { |
|
|
bool ext_slot = bitRead(lin_adv_slot, tmp_extruder); |
|
|
planner.synchronize(); |
|
|
|
|
|
planner.extruder_advance_K[tmp_extruder] = newK; |
|
|
if (parser.seenval('S')) { |
|
|
|
|
|
const bool slot = parser.value_bool(); |
|
|
|
|
|
if (ext_slot != slot) { |
|
|
|
|
|
ext_slot = slot; |
|
|
|
|
|
bitWrite(lin_adv_slot, tmp_extruder, slot); |
|
|
|
|
|
planner.synchronize(); |
|
|
|
|
|
const float temp = planner.extruder_advance_K[tmp_extruder]; |
|
|
|
|
|
planner.extruder_advance_K[tmp_extruder] = saved_extruder_advance_K[tmp_extruder]; |
|
|
|
|
|
saved_extruder_advance_K[tmp_extruder] = temp; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
else |
|
|
|
|
|
SERIAL_ECHOLNPGM("?K value out of range (0-10)."); |
|
|
if (parser.seenval('K')) { |
|
|
} |
|
|
const float newK = parser.value_float(); |
|
|
else { |
|
|
if (WITHIN(newK, 0, 10)) { |
|
|
SERIAL_ECHO_START(); |
|
|
if (ext_slot) |
|
|
#if EXTRUDERS < 2 |
|
|
saved_extruder_advance_K[tmp_extruder] = newK; |
|
|
SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K[0]); |
|
|
else { |
|
|
#else |
|
|
planner.synchronize(); |
|
|
SERIAL_ECHOPGM("Advance K"); |
|
|
planner.extruder_advance_K[tmp_extruder] = newK; |
|
|
LOOP_L_N(i, EXTRUDERS) { |
|
|
} |
|
|
SERIAL_CHAR(' '); SERIAL_ECHO(int(i)); |
|
|
|
|
|
SERIAL_CHAR('='); SERIAL_ECHO(planner.extruder_advance_K[i]); |
|
|
|
|
|
} |
|
|
} |
|
|
SERIAL_EOL(); |
|
|
else |
|
|
#endif |
|
|
SERIAL_ECHOLNPGM("?K value out of range (0-10)."); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (parser.seenval('L')) { |
|
|
|
|
|
const float newL = parser.value_float(); |
|
|
|
|
|
if (WITHIN(newL, 0, 10)) { |
|
|
|
|
|
if (!ext_slot) |
|
|
|
|
|
saved_extruder_advance_K[tmp_extruder] = newL; |
|
|
|
|
|
else { |
|
|
|
|
|
planner.synchronize(); |
|
|
|
|
|
planner.extruder_advance_K[tmp_extruder] = newL; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
SERIAL_ECHOLNPGM("?L value out of range (0-10)."); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!parser.seen_any()) { |
|
|
|
|
|
#if EXTRUDERS < 2 |
|
|
|
|
|
SERIAL_ECHOLNPAIR("Advance S", ext_slot, " K", planner.extruder_advance_K[0]); |
|
|
|
|
|
SERIAL_ECHOLNPAIR("(Slot ", 1 - ext_slot, " K", saved_extruder_advance_K[0], ")"); |
|
|
|
|
|
#else |
|
|
|
|
|
LOOP_L_N(i, EXTRUDERS) { |
|
|
|
|
|
const int slot = (int)bitRead(lin_adv_slot, i); |
|
|
|
|
|
SERIAL_ECHOLNPAIR("Advance T", int(i), " S", slot, " K", planner.extruder_advance_K[i]); |
|
|
|
|
|
SERIAL_ECHOLNPAIR("(Slot ", 1 - slot, " K", saved_extruder_advance_K[i], ")"); |
|
|
|
|
|
SERIAL_EOL(); |
|
|
|
|
|
} |
|
|
|
|
|
#endif |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#else |
|
|
|
|
|
|
|
|
|
|
|
if (parser.seenval('K')) { |
|
|
|
|
|
const float newK = parser.value_float(); |
|
|
|
|
|
if (WITHIN(newK, 0, 10)) { |
|
|
|
|
|
planner.synchronize(); |
|
|
|
|
|
planner.extruder_advance_K[tmp_extruder] = newK; |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
SERIAL_ECHOLNPGM("?K value out of range (0-10)."); |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
SERIAL_ECHO_START(); |
|
|
|
|
|
#if EXTRUDERS < 2 |
|
|
|
|
|
SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K[0]); |
|
|
|
|
|
#else |
|
|
|
|
|
SERIAL_ECHOPGM("Advance K"); |
|
|
|
|
|
LOOP_L_N(i, EXTRUDERS) { |
|
|
|
|
|
SERIAL_CHAR(' '); SERIAL_ECHO(int(i)); |
|
|
|
|
|
SERIAL_CHAR('='); SERIAL_ECHO(planner.extruder_advance_K[i]); |
|
|
|
|
|
} |
|
|
|
|
|
SERIAL_EOL(); |
|
|
|
|
|
#endif |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#endif |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
#endif // LIN_ADVANCE
|
|
|
#endif // LIN_ADVANCE
|
|
|
|
Sam Lane
6 years ago
Scott Lahteine