microlab
/
scube
1
1
Fork 0
Code Issues Pull Requests Releases Activity

[2.0.x] Extruder-Distinct Linear Advance K Factors (#11789)

Browse Source
2.0.x
Sam Lane 6 years ago committed by Scott Lahteine
parent fe9f088d60
commit 4f883d5971
5 changed files with 82 additions and 26 deletions
Show Stats Download Patch File Download Diff File

24
Marlin/src/gcode/feature/advance/M900.cpp
Unescape Escape View File

@ -34,18 +34,38 @@
* K<factor> Set advance K factor * K<factor> Set advance K factor
*/ */
void GcodeSuite::M900() { void GcodeSuite::M900() {
#if EXTRUDERS < 2
constexpr uint8_t tmp_extruder = 0;
#else
const uint8_t tmp_extruder = parser.seenval('T') ? parser.value_int() : active_extruder;
if (tmp_extruder >= EXTRUDERS) {
SERIAL_PROTOCOLLNPGM("?T value out of range.");
return;
}
#endif
if (parser.seenval('K')) { if (parser.seenval('K')) {
const float newK = parser.floatval('K'); const float newK = parser.floatval('K');
if (WITHIN(newK, 0, 10)) { if (WITHIN(newK, 0, 10)) {
planner.synchronize(); planner.synchronize();
planner.extruder_advance_K = newK; planner.extruder_advance_K[tmp_extruder] = newK;
} }
else else
SERIAL_PROTOCOLLNPGM("?K value out of range (0-10)."); SERIAL_PROTOCOLLNPGM("?K value out of range (0-10).");
} }
else { else {
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR("Advance K=", planner.extruder_advance_K); #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
} }
} }

32
Marlin/src/lcd/ultralcd.cpp
Unescape Escape View File

@ -3847,7 +3847,21 @@ void lcd_quick_feedback(const bool clear_buttons) {
#if DISABLED(NO_VOLUMETRICS) || ENABLED(ADVANCED_PAUSE_FEATURE) #if DISABLED(NO_VOLUMETRICS) || ENABLED(ADVANCED_PAUSE_FEATURE)
MENU_ITEM(submenu, MSG_FILAMENT, lcd_advanced_filament_menu); MENU_ITEM(submenu, MSG_FILAMENT, lcd_advanced_filament_menu);
#elif ENABLED(LIN_ADVANCE) #elif ENABLED(LIN_ADVANCE)
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K, &planner.extruder_advance_K, 0, 999); #if EXTRUDERS == 1
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
#elif EXTRUDERS > 1
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E1, &planner.extruder_advance_K[0], 0, 999);
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E2, &planner.extruder_advance_K[1], 0, 999);
#if EXTRUDERS > 2
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E3, &planner.extruder_advance_K[2], 0, 999);
#if EXTRUDERS > 3
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E4, &planner.extruder_advance_K[3], 0, 999);
#if EXTRUDERS > 4
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E5, &planner.extruder_advance_K[4], 0, 999);
#endif // EXTRUDERS > 4
#endif // EXTRUDERS > 3
#endif // EXTRUDERS > 2
#endif // EXTRUDERS > 1
#endif #endif
// M540 S - Abort on endstop hit when SD printing // M540 S - Abort on endstop hit when SD printing
@ -3882,7 +3896,21 @@ void lcd_quick_feedback(const bool clear_buttons) {
MENU_BACK(MSG_ADVANCED_SETTINGS); MENU_BACK(MSG_ADVANCED_SETTINGS);
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K, &planner.extruder_advance_K, 0, 999); #if EXTRUDERS == 1
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K, &planner.extruder_advance_K[0], 0, 999);
#elif EXTRUDERS > 1
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E1, &planner.extruder_advance_K[0], 0, 999);
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E2, &planner.extruder_advance_K[1], 0, 999);
#if EXTRUDERS > 2
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E3, &planner.extruder_advance_K[2], 0, 999);
#if EXTRUDERS > 3
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E4, &planner.extruder_advance_K[3], 0, 999);
#if EXTRUDERS > 4
MENU_ITEM_EDIT(float52, MSG_ADVANCE_K MSG_E5, &planner.extruder_advance_K[4], 0, 999);
#endif // EXTRUDERS > 4
#endif // EXTRUDERS > 3
#endif // EXTRUDERS > 2
#endif // EXTRUDERS > 1
#endif #endif
#if DISABLED(NO_VOLUMETRICS) #if DISABLED(NO_VOLUMETRICS)

34
Marlin/src/module/configuration_store.cpp
Unescape Escape View File

@ -37,7 +37,7 @@
*/ */
// Change EEPROM version if the structure changes // Change EEPROM version if the structure changes
#define EEPROM_VERSION "V56" #define EEPROM_VERSION "V57"
#define EEPROM_OFFSET 100 #define EEPROM_OFFSET 100
// Check the integrity of data offsets. // Check the integrity of data offsets.
@ -254,7 +254,7 @@ typedef struct SettingsDataStruct {
// //
// LIN_ADVANCE // LIN_ADVANCE
// //
float planner_extruder_advance_K; // M900 K planner.extruder_advance_K float planner_extruder_advance_K[EXTRUDERS]; // M900 K planner.extruder_advance_K
// //
// HAS_MOTOR_CURRENT_PWM // HAS_MOTOR_CURRENT_PWM
@ -871,14 +871,13 @@ void MarlinSettings::postprocess() {
// //
// Linear Advance // Linear Advance
// //
_FIELD_TEST(planner_extruder_advance_K); _FIELD_TEST(planner_extruder_advance_K);
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
EEPROM_WRITE(planner.extruder_advance_K); LOOP_L_N(i, EXTRUDERS) EEPROM_WRITE(planner.extruder_advance_K[i]);
#else #else
dummy = 0; dummy = 0;
EEPROM_WRITE(dummy); LOOP_L_N(i, EXTRUDERS) EEPROM_WRITE(dummy);
#endif #endif
_FIELD_TEST(motor_current_setting); _FIELD_TEST(motor_current_setting);
@ -1471,14 +1470,15 @@ void MarlinSettings::postprocess() {
// //
// Linear Advance // Linear Advance
// //
_FIELD_TEST(planner_extruder_advance_K); _FIELD_TEST(planner_extruder_advance_K);
#if ENABLED(LIN_ADVANCE) LOOP_L_N(i, EXTRUDERS) {
EEPROM_READ(planner.extruder_advance_K); #if ENABLED(LIN_ADVANCE)
#else EEPROM_READ(planner.extruder_advance_K[i]);
EEPROM_READ(dummy); #else
#endif EEPROM_READ(dummy);
#endif
}
// //
// Motor Current PWM // Motor Current PWM
@ -1957,7 +1957,7 @@ void MarlinSettings::reset(PORTARG_SOLO) {
reset_stepper_drivers(); reset_stepper_drivers();
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
planner.extruder_advance_K = LIN_ADVANCE_K; LOOP_L_N(i, EXTRUDERS) planner.extruder_advance_K[i] = LIN_ADVANCE_K;
#endif #endif
#if HAS_MOTOR_CURRENT_PWM #if HAS_MOTOR_CURRENT_PWM
@ -2720,8 +2720,16 @@ void MarlinSettings::reset(PORTARG_SOLO) {
CONFIG_ECHO_START; CONFIG_ECHO_START;
SERIAL_ECHOLNPGM_P(port, "Linear Advance:"); SERIAL_ECHOLNPGM_P(port, "Linear Advance:");
} }
CONFIG_ECHO_START; CONFIG_ECHO_START;
SERIAL_ECHOLNPAIR_P(port, " M900 K", planner.extruder_advance_K); #if EXTRUDERS < 2
SERIAL_ECHOLNPAIR_P(port, " M900 K", planner.extruder_advance_K[0]);
#else
LOOP_L_N(i, EXTRUDERS) {
SERIAL_ECHOPAIR_P(port, " M900 T", int(i));
SERIAL_ECHOLNPAIR_P(port, " K", planner.extruder_advance_K[i]);
}
#endif
#endif #endif
#if HAS_MOTOR_CURRENT_PWM #if HAS_MOTOR_CURRENT_PWM

16
Marlin/src/module/planner.cpp
Unescape Escape View File

@ -213,7 +213,7 @@ float Planner::previous_speed[NUM_AXIS],
#endif #endif
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
float Planner::extruder_advance_K; // Initialized by settings.load() float Planner::extruder_advance_K[EXTRUDERS]; // Initialized by settings.load()
#endif #endif
#if HAS_POSITION_FLOAT #if HAS_POSITION_FLOAT
@ -1082,7 +1082,7 @@ void Planner::recalculate_trapezoids() {
calculate_trapezoid_for_block(current, current_entry_speed * nomr, next_entry_speed * nomr); calculate_trapezoid_for_block(current, current_entry_speed * nomr, next_entry_speed * nomr);
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
if (current->use_advance_lead) { if (current->use_advance_lead) {
const float comp = current->e_D_ratio * extruder_advance_K * axis_steps_per_mm[E_AXIS]; const float comp = current->e_D_ratio * extruder_advance_K[active_extruder] * axis_steps_per_mm[E_AXIS];
current->max_adv_steps = current_nominal_speed * comp; current->max_adv_steps = current_nominal_speed * comp;
current->final_adv_steps = next_entry_speed * comp; current->final_adv_steps = next_entry_speed * comp;
} }
@ -1121,7 +1121,7 @@ void Planner::recalculate_trapezoids() {
calculate_trapezoid_for_block(next, next_entry_speed * nomr, float(MINIMUM_PLANNER_SPEED) * nomr); calculate_trapezoid_for_block(next, next_entry_speed * nomr, float(MINIMUM_PLANNER_SPEED) * nomr);
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
if (next->use_advance_lead) { if (next->use_advance_lead) {
const float comp = next->e_D_ratio * extruder_advance_K * axis_steps_per_mm[E_AXIS]; const float comp = next->e_D_ratio * extruder_advance_K[active_extruder] * axis_steps_per_mm[E_AXIS];
next->max_adv_steps = next_nominal_speed * comp; next->max_adv_steps = next_nominal_speed * comp;
next->final_adv_steps = (MINIMUM_PLANNER_SPEED) * comp; next->final_adv_steps = (MINIMUM_PLANNER_SPEED) * comp;
} }
@ -2130,12 +2130,12 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
* *
* esteps : This is a print move, because we checked for A, B, C steps before. * esteps : This is a print move, because we checked for A, B, C steps before.
* *
* extruder_advance_K : There is an advance factor set. * extruder_advance_K[active_extruder] : There is an advance factor set for this extruder.
* *
* de > 0 : Extruder is running forward (e.g., for "Wipe while retracting" (Slic3r) or "Combing" (Cura) moves) * de > 0 : Extruder is running forward (e.g., for "Wipe while retracting" (Slic3r) or "Combing" (Cura) moves)
*/ */
block->use_advance_lead = esteps block->use_advance_lead = esteps
&& extruder_advance_K && extruder_advance_K[active_extruder]
&& de > 0; && de > 0;
if (block->use_advance_lead) { if (block->use_advance_lead) {
@ -2154,7 +2154,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
if (block->e_D_ratio > 3.0f) if (block->e_D_ratio > 3.0f)
block->use_advance_lead = false; block->use_advance_lead = false;
else { else {
const uint32_t max_accel_steps_per_s2 = MAX_E_JERK / (extruder_advance_K * block->e_D_ratio) * steps_per_mm; const uint32_t max_accel_steps_per_s2 = MAX_E_JERK / (extruder_advance_K[active_extruder] * block->e_D_ratio) * steps_per_mm;
#if ENABLED(LA_DEBUG) #if ENABLED(LA_DEBUG)
if (accel > max_accel_steps_per_s2) SERIAL_ECHOLNPGM("Acceleration limited."); if (accel > max_accel_steps_per_s2) SERIAL_ECHOLNPGM("Acceleration limited.");
#endif #endif
@ -2190,9 +2190,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#endif #endif
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
if (block->use_advance_lead) { if (block->use_advance_lead) {
block->advance_speed = (STEPPER_TIMER_RATE) / (extruder_advance_K * block->e_D_ratio * block->acceleration * axis_steps_per_mm[E_AXIS_N]); block->advance_speed = (STEPPER_TIMER_RATE) / (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * axis_steps_per_mm[E_AXIS_N]);
#if ENABLED(LA_DEBUG) #if ENABLED(LA_DEBUG)
if (extruder_advance_K * block->e_D_ratio * block->acceleration * 2 < SQRT(block->nominal_speed_sqr) * block->e_D_ratio) if (extruder_advance_K[active_extruder] * block->e_D_ratio * block->acceleration * 2 < SQRT(block->nominal_speed_sqr) * block->e_D_ratio)
SERIAL_ECHOLNPGM("More than 2 steps per eISR loop executed."); SERIAL_ECHOLNPGM("More than 2 steps per eISR loop executed.");
if (block->advance_speed < 200) if (block->advance_speed < 200)
SERIAL_ECHOLNPGM("eISR running at > 10kHz."); SERIAL_ECHOLNPGM("eISR running at > 10kHz.");

2
Marlin/src/module/planner.h
Unescape Escape View File

@ -231,7 +231,7 @@ class Planner {
#endif #endif
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
static float extruder_advance_K; static float extruder_advance_K[EXTRUDERS];
#endif #endif
#if HAS_POSITION_FLOAT #if HAS_POSITION_FLOAT

Write Preview
Loading…
Cancel
Save