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

Add multi-extruder condition

Browse Source
This commit is contained in:
Scott Lahteine
2020-09-20 18:29:08 -05:00
parent 8e0fac897b
commit 76d8d1742c
50 changed files with 127 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/module/settings.cpp
View File

@ -115,7 +115,7 @@
extern float other_extruder_advance_K[EXTRUDERS];
#endif
#if EXTRUDERS > 1
#if HAS_MULTI_EXTRUDER
#include "tool_change.h"
void M217_report(const bool eeprom);
#endif
@ -388,7 +388,7 @@ typedef struct SettingsDataStruct {
//
// Tool-change settings
//
#if EXTRUDERS > 1
#if HAS_MULTI_EXTRUDER
toolchange_settings_t toolchange_settings; // M217 S P R
#endif
@ -1320,7 +1320,7 @@ void MarlinSettings::postprocess() {
// Multiple Extruders
//
#if EXTRUDERS > 1
#if HAS_MULTI_EXTRUDER
_FIELD_TEST(toolchange_settings);
EEPROM_WRITE(toolchange_settings);
#endif
@ -2167,7 +2167,7 @@ void MarlinSettings::postprocess() {
//
// Tool-change settings
//
#if EXTRUDERS > 1
#if HAS_MULTI_EXTRUDER
_FIELD_TEST(toolchange_settings);
EEPROM_READ(toolchange_settings);
#endif
@ -2488,7 +2488,7 @@ void MarlinSettings::reset() {
// Tool-change Settings
//
#if EXTRUDERS > 1
#if HAS_MULTI_EXTRUDER
#if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
toolchange_settings.swap_length = TOOLCHANGE_FS_LENGTH;
toolchange_settings.extra_resume = TOOLCHANGE_FS_EXTRA_RESUME_LENGTH;
@ -3719,7 +3719,7 @@ void MarlinSettings::reset() {
#endif
#endif
#if EXTRUDERS > 1
#if HAS_MULTI_EXTRUDER
CONFIG_ECHO_HEADING("Tool-changing:");
CONFIG_ECHO_START();
M217_report(true);