thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add volumetric extrusion limit (#17017)

Browse Source
This commit is contained in:
MoellerDi
2020-06-08 10:24:46 +02:00
committed by GitHub
parent 8994cc8b26
commit bac760207c
9 changed files with 176 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@
*/
// Change EEPROM version if the structure changes
#define EEPROM_VERSION "V79"
#define EEPROM_VERSION "V80"
#define EEPROM_OFFSET 100
// Check the integrity of data offsets.
@@ -320,8 +320,9 @@ typedef struct SettingsDataStruct {
//
// !NO_VOLUMETRIC
//
bool parser_volumetric_enabled; // M200 D parser.volumetric_enabled
bool parser_volumetric_enabled; // M200 S parser.volumetric_enabled
float planner_filament_size[EXTRUDERS]; // M200 T D planner.filament_size[]
float planner_volumetric_extruder_limit[EXTRUDERS]; // M200 T L planner.volumetric_extruder_limit[]
//
// HAS_TRINAMIC_CONFIG
@@ -935,12 +936,20 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(parser.volumetric_enabled);
EEPROM_WRITE(planner.filament_size);
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
EEPROM_WRITE(planner.volumetric_extruder_limit);
#else
dummyf = DEFAULT_VOLUMETRIC_EXTRUDER_LIMIT;
for (uint8_t q = EXTRUDERS; q--;) EEPROM_WRITE(dummyf);
#endif
#else
const bool volumetric_enabled = false;
dummyf = DEFAULT_NOMINAL_FILAMENT_DIA;
EEPROM_WRITE(volumetric_enabled);
dummyf = DEFAULT_NOMINAL_FILAMENT_DIA;
for (uint8_t q = EXTRUDERS; q--;) EEPROM_WRITE(dummyf);
dummyf = DEFAULT_VOLUMETRIC_EXTRUDER_LIMIT;
for (uint8_t q = EXTRUDERS; q--;) EEPROM_WRITE(dummyf);
#endif
@@ -1787,6 +1796,9 @@ void MarlinSettings::postprocess() {
struct {
bool volumetric_enabled;
float filament_size[EXTRUDERS];
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
float volumetric_extruder_limit[EXTRUDERS];
#endif
} storage;
_FIELD_TEST(parser_volumetric_enabled);
@@ -1796,6 +1808,9 @@ void MarlinSettings::postprocess() {
if (!validating) {
parser.volumetric_enabled = storage.volumetric_enabled;
COPY(planner.filament_size, storage.filament_size);
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
COPY(planner.volumetric_extruder_limit, storage.volumetric_extruder_limit);
#endif
}
#endif
}
@@ -2598,6 +2613,10 @@ void MarlinSettings::reset() {
parser.volumetric_enabled = ENABLED(VOLUMETRIC_DEFAULT_ON);
LOOP_L_N(q, COUNT(planner.filament_size))
planner.filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
LOOP_L_N(q, COUNT(planner.volumetric_extruder_limit))
planner.volumetric_extruder_limit[q] = DEFAULT_VOLUMETRIC_EXTRUDER_LIMIT;
#endif
#endif
endstops.enable_globally(ENABLED(ENDSTOPS_ALWAYS_ON_DEFAULT));
@@ -2750,7 +2769,7 @@ void MarlinSettings::reset() {
SERIAL_EOL();
#if DISABLED(NO_VOLUMETRICS)
#if EXTRUDERS && DISABLED(NO_VOLUMETRICS)
/**
* Volumetric extrusion M200
@@ -2765,20 +2784,26 @@ void MarlinSettings::reset() {
#if EXTRUDERS == 1
CONFIG_ECHO_START();
SERIAL_ECHOLNPAIR(" M200 D", LINEAR_UNIT(planner.filament_size[0]));
#elif EXTRUDERS
SERIAL_ECHOLNPAIR(" M200 S", int(parser.volumetric_enabled)
, " D", LINEAR_UNIT(planner.filament_size[0]),
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
, " L", LINEAR_UNIT(planner.volumetric_extruder_limit[0])
#endif
);
#else
LOOP_L_N(i, EXTRUDERS) {
CONFIG_ECHO_START();
SERIAL_ECHOPGM(" M200");
if (i) SERIAL_ECHOPAIR_P(SP_T_STR, int(i));
SERIAL_ECHOLNPAIR(" D", LINEAR_UNIT(planner.filament_size[i]));
SERIAL_ECHOLNPAIR(" M200 T", int(i)
, " D", LINEAR_UNIT(planner.filament_size[i])
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
, " L", LINEAR_UNIT(planner.volumetric_extruder_limit[i])
#endif
);
}
CONFIG_ECHO_START();
SERIAL_ECHOLNPAIR(" M200 S", int(parser.volumetric_enabled));
#endif
if (!parser.volumetric_enabled)
CONFIG_ECHO_MSG(" M200 D0");
#endif // !NO_VOLUMETRICS
#endif // EXTRUDERS && !NO_VOLUMETRICS
CONFIG_ECHO_HEADING("Steps per unit:");
report_M92(!forReplay);