0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Tweak some feedrate vars

Browse source
This commit is contained in:
Scott Lahteine 2016-06-22 03:27:31 -07:00
parent 5158bd6e93
commit bb9c67b4b5
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Marlin.h
View file

@ -352,7 +352,7 @@ float code_value_temp_diff();
#if ENABLED(FWRETRACT) #if ENABLED(FWRETRACT)
extern bool autoretract_enabled; extern bool autoretract_enabled;
extern bool retracted[EXTRUDERS]; // extruder[n].retracted extern bool retracted[EXTRUDERS]; // extruder[n].retracted
extern float retract_length, retract_length_swap, retract_feedrate, retract_zlift; extern float retract_length, retract_length_swap, retract_feedrate_mm_s, retract_zlift;
extern float retract_recover_length, retract_recover_length_swap, retract_recover_feedrate; extern float retract_recover_length, retract_recover_length_swap, retract_recover_feedrate;
#endif #endif

12
Marlin/Marlin_main.cpp
View file

@ -414,7 +414,7 @@ static uint8_t target_extruder;
float retract_length = RETRACT_LENGTH; float retract_length = RETRACT_LENGTH;
float retract_length_swap = RETRACT_LENGTH_SWAP; float retract_length_swap = RETRACT_LENGTH_SWAP;
float retract_feedrate = RETRACT_FEEDRATE; float retract_feedrate_mm_s = RETRACT_FEEDRATE;
float retract_zlift = RETRACT_ZLIFT; float retract_zlift = RETRACT_ZLIFT;
float retract_recover_length = RETRACT_RECOVER_LENGTH; float retract_recover_length = RETRACT_RECOVER_LENGTH;
float retract_recover_length_swap = RETRACT_RECOVER_LENGTH_SWAP; float retract_recover_length_swap = RETRACT_RECOVER_LENGTH_SWAP;
@ -2472,13 +2472,13 @@ static void homeaxis(AxisEnum axis) {
if (retracting == retracted[active_extruder]) return; if (retracting == retracted[active_extruder]) return;
float oldFeedrate = feedrate; float old_feedrate = feedrate;
set_destination_to_current(); set_destination_to_current();
if (retracting) { if (retracting) {
feedrate = retract_feedrate * 60; feedrate = retract_feedrate_mm_s * 60;
current_position[E_AXIS] += (swapping ? retract_length_swap : retract_length) / volumetric_multiplier[active_extruder]; current_position[E_AXIS] += (swapping ? retract_length_swap : retract_length) / volumetric_multiplier[active_extruder];
sync_plan_position_e(); sync_plan_position_e();
prepare_move_to_destination(); prepare_move_to_destination();
@ -2503,7 +2503,7 @@ static void homeaxis(AxisEnum axis) {
prepare_move_to_destination(); prepare_move_to_destination();
} }
feedrate = oldFeedrate; feedrate = old_feedrate;
retracted[active_extruder] = retracting; retracted[active_extruder] = retracting;
} // retract() } // retract()
@ -5452,12 +5452,12 @@ inline void gcode_M206() {
* *
* S[+mm] retract_length * S[+mm] retract_length
* W[+mm] retract_length_swap (multi-extruder) * W[+mm] retract_length_swap (multi-extruder)
* F[mm/min] retract_feedrate * F[mm/min] retract_feedrate_mm_s
* Z[mm] retract_zlift * Z[mm] retract_zlift
*/ */
inline void gcode_M207() { inline void gcode_M207() {
if (code_seen('S')) retract_length = code_value_axis_units(E_AXIS); if (code_seen('S')) retract_length = code_value_axis_units(E_AXIS);
if (code_seen('F')) retract_feedrate = code_value_axis_units(E_AXIS) / 60; if (code_seen('F')) retract_feedrate_mm_s = code_value_axis_units(E_AXIS) / 60;
if (code_seen('Z')) retract_zlift = code_value_axis_units(Z_AXIS); if (code_seen('Z')) retract_zlift = code_value_axis_units(Z_AXIS);
#if EXTRUDERS > 1 #if EXTRUDERS > 1
if (code_seen('W')) retract_length_swap = code_value_axis_units(E_AXIS); if (code_seen('W')) retract_length_swap = code_value_axis_units(E_AXIS);

10
Marlin/configuration_store.cpp
View file

@ -107,7 +107,7 @@
* 391 M209 S autoretract_enabled (bool) * 391 M209 S autoretract_enabled (bool)
* 392 M207 S retract_length (float) * 392 M207 S retract_length (float)
* 396 M207 W retract_length_swap (float) * 396 M207 W retract_length_swap (float)
* 400 M207 F retract_feedrate (float) * 400 M207 F retract_feedrate_mm_s (float)
* 404 M207 Z retract_zlift (float) * 404 M207 Z retract_zlift (float)
* 408 M208 S retract_recover_length (float) * 408 M208 S retract_recover_length (float)
* 412 M208 W retract_recover_length_swap (float) * 412 M208 W retract_recover_length_swap (float)
@ -304,7 +304,7 @@ void Config_StoreSettings() {
dummy = 0.0f; dummy = 0.0f;
EEPROM_WRITE_VAR(i, dummy); EEPROM_WRITE_VAR(i, dummy);
#endif #endif
EEPROM_WRITE_VAR(i, retract_feedrate); EEPROM_WRITE_VAR(i, retract_feedrate_mm_s);
EEPROM_WRITE_VAR(i, retract_zlift); EEPROM_WRITE_VAR(i, retract_zlift);
EEPROM_WRITE_VAR(i, retract_recover_length); EEPROM_WRITE_VAR(i, retract_recover_length);
#if EXTRUDERS > 1 #if EXTRUDERS > 1
@ -482,7 +482,7 @@ void Config_RetrieveSettings() {
#else #else
EEPROM_READ_VAR(i, dummy); EEPROM_READ_VAR(i, dummy);
#endif #endif
EEPROM_READ_VAR(i, retract_feedrate); EEPROM_READ_VAR(i, retract_feedrate_mm_s);
EEPROM_READ_VAR(i, retract_zlift); EEPROM_READ_VAR(i, retract_zlift);
EEPROM_READ_VAR(i, retract_recover_length); EEPROM_READ_VAR(i, retract_recover_length);
#if EXTRUDERS > 1 #if EXTRUDERS > 1
@ -617,7 +617,7 @@ void Config_ResetDefault() {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
retract_length_swap = RETRACT_LENGTH_SWAP; retract_length_swap = RETRACT_LENGTH_SWAP;
#endif #endif
retract_feedrate = RETRACT_FEEDRATE; retract_feedrate_mm_s = RETRACT_FEEDRATE;
retract_zlift = RETRACT_ZLIFT; retract_zlift = RETRACT_ZLIFT;
retract_recover_length = RETRACT_RECOVER_LENGTH; retract_recover_length = RETRACT_RECOVER_LENGTH;
#if EXTRUDERS > 1 #if EXTRUDERS > 1
@ -864,7 +864,7 @@ void Config_PrintSettings(bool forReplay) {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
SERIAL_ECHOPAIR(" W", retract_length_swap); SERIAL_ECHOPAIR(" W", retract_length_swap);
#endif #endif
SERIAL_ECHOPAIR(" F", retract_feedrate * 60); SERIAL_ECHOPAIR(" F", retract_feedrate_mm_s * 60);
SERIAL_ECHOPAIR(" Z", retract_zlift); SERIAL_ECHOPAIR(" Z", retract_zlift);
SERIAL_EOL; SERIAL_EOL;
CONFIG_ECHO_START; CONFIG_ECHO_START;

2
Marlin/ultralcd.cpp
View file

@ -1797,7 +1797,7 @@ static void lcd_status_screen() {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &retract_length_swap, 0, 100); MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_SWAP, &retract_length_swap, 0, 100);
#endif #endif
MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &retract_feedrate, 1, 999); MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &retract_feedrate_mm_s, 1, 999);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999); MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999);
MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, 0, 100); MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, 0, 100);
#if EXTRUDERS > 1 #if EXTRUDERS > 1