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

Combine more tool-change variables (#12137)

Browse Source
This commit is contained in:
InsanityAutomation
2018-11-06 22:52:20 -05:00
committed by Scott Lahteine
parent 147e270208
commit 6471a75a22
143 changed files with 1827 additions and 1382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Marlin/src/module/configuration_store.cpp
View File

@ -266,7 +266,7 @@ typedef struct SettingsDataStruct {
fil_change_settings_t fc_settings[EXTRUDERS]; // M603 T U L
//
// SINGLENOZZLE toolchange values
// Tool-change settings
//
#if EXTRUDERS > 1
toolchange_settings_t toolchange_settings; // M217 S P R
@ -990,7 +990,7 @@ void MarlinSettings::postprocess() {
}
//
// SINGLENOZZLE
// Multiple Extruders
//
#if EXTRUDERS > 1
@ -1637,7 +1637,7 @@ void MarlinSettings::postprocess() {
}
//
// SINGLENOZZLE toolchange values
// Tool-change settings
//
#if EXTRUDERS > 1
_FIELD_TEST(toolchange_settings);
@ -1905,13 +1905,13 @@ void MarlinSettings::reset(PORTARG_SOLO) {
#endif
#if EXTRUDERS > 1
#if ENABLED(SINGLENOZZLE)
toolchange_settings.swap_length = SINGLENOZZLE_SWAP_LENGTH;
toolchange_settings.prime_speed = SINGLENOZZLE_SWAP_PRIME_SPEED;
toolchange_settings.retract_speed = SINGLENOZZLE_SWAP_RETRACT_SPEED;
#if ENABLED(SINGLENOZZLE_SWAP_PARK)
toolchange_settings.change_point = SINGLENOZZLE_TOOLCHANGE_XY;
#endif
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
toolchange_settings.swap_length = TOOLCHANGE_FIL_SWAP_LENGTH;
toolchange_settings.prime_speed = TOOLCHANGE_FIL_SWAP_PRIME_SPEED;
toolchange_settings.retract_speed = TOOLCHANGE_FIL_SWAP_RETRACT_SPEED;
#endif
#if ENABLED(TOOLCHANGE_PARK)
toolchange_settings.change_point = TOOLCHANGE_PARK_XY;
#endif
toolchange_settings.z_raise = TOOLCHANGE_ZRAISE;
#endif
@ -2978,10 +2978,10 @@ void MarlinSettings::reset(PORTARG_SOLO) {
#endif // EXTRUDERS == 1
#endif // ADVANCED_PAUSE_FEATURE
#if ENABLED(SINGLENOZZLE)
#if EXTRUDERS > 1
CONFIG_ECHO_START;
if (!forReplay) {
SERIAL_ECHOLNPGM_P(port, "SINGLENOZZLE:");
SERIAL_ECHOLNPGM_P(port, "Tool-changing:");
CONFIG_ECHO_START;
}
M217_report(true);