From 0f92f3dfe1861a72db21ef4a16727f276e188f9a Mon Sep 17 00:00:00 2001 From: Sophist <3001893+Sophist-UK@users.noreply.github.com> Date: Sun, 3 Mar 2024 14:18:59 +0000 Subject: [PATCH] Improved acceleration, enable Meatpack --- Marlin/Configuration.h | 11 ++++++++--- Marlin/Configuration_adv.h | 10 ++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index bbd84dfc85e6..cf0e14f1cad3 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1512,9 +1512,14 @@ * M204 R Retract Acceleration * M204 T Travel Acceleration */ -#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves -#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts -#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves +// #define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves +// #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts +// #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves + +// Large values so that each axis acceleration applies instead i.e. increase E acceleration. +#define DEFAULT_ACCELERATION 90000 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_RETRACT_ACCELERATION 90000 // E acceleration for retracts +#define DEFAULT_TRAVEL_ACCELERATION 90000 // X, Y, Z acceleration for travel (non printing) moves /** * Default Jerk limits (mm/s) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index e0cf15d3df76..14d34c8a0235 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1498,12 +1498,10 @@ #if ENABLED(SET_PROGRESS_MANUALLY) #define SET_PROGRESS_PERCENT // Add 'P' parameter to set percentage done #define SET_REMAINING_TIME // Add 'R' parameter to set remaining time - #if ENABLED(DE200_EXTRUDER_PLUS) - #define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction - #endif + #define SET_INTERACTION_TIME // Add 'C' parameter to set time until next filament change or other user interaction #define M73_REPORT // Report M73 values to host #if BOTH(M73_REPORT, SDSUPPORT) - #define M73_REPORT_SD_ONLY // Report only when printing from SD + //#define M73_REPORT_SD_ONLY // Report only when printing from SD #endif #endif @@ -1511,7 +1509,7 @@ #if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY) #define SHOW_PROGRESS_PERCENT // Show print progress percentage (doesn't affect progress bar) #define SHOW_ELAPSED_TIME // Display elapsed printing time (prefix 'E') - #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') + #define SHOW_REMAINING_TIME // Display estimated time to completion (prefix 'R') #if ENABLED(SET_INTERACTION_TIME) #define SHOW_INTERACTION_TIME // Display time until next user interaction ('C' = filament change) #endif @@ -3728,7 +3726,7 @@ /** * Support for MeatPack G-code compression (https://github.com/scottmudge/OctoPrint-MeatPack) */ -//#define MEATPACK_ON_SERIAL_PORT_1 +#define MEATPACK_ON_SERIAL_PORT_1 //#define MEATPACK_ON_SERIAL_PORT_2 //#define GCODE_CASE_INSENSITIVE // Accept G-code sent to the firmware in lowercase