Skip to content

Commit

Permalink
Improved acceleration, enable Meatpack
Browse files Browse the repository at this point in the history
  • Loading branch information
Sophist-UK committed Mar 3, 2024
1 parent d063a9c commit 0f92f3d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
11 changes: 8 additions & 3 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 4 additions & 6 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -1498,20 +1498,18 @@
#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

// LCD Print Progress options. Multiple times may be displayed in turn.
#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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0f92f3d

Please sign in to comment.