Skip to content

Commit

Permalink
Merge pull request #1 from gdelpierre/feat/enable_marlin_features
Browse files Browse the repository at this point in the history
feat(marlin): enable/disable features
  • Loading branch information
gdelpierre committed May 21, 2021
2 parents 837c219 + 1e5fc9b commit a59a40a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 8 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.1.0] - 2021-05-21
### Added
- M73 G-code to set the current percentage
- Show E position during printing
- Show remaining time (Use M73 command instead of estimation)
- Display Progress, Remaining and Elapsed time

### Removed
- Disable SD Card support
- Disable ARC_SUPPORT

## [1.0.0] - 2021-05-09
### Added
- BigTreeTech SKR v1.4 Turbo board
- TMC 2209 motor driver (stallguard disable)
- BigTreeTech TFT35 E3 v3.0

[Unreleased]: https://github.com/gdelpierre/ender_3_pro/compare/v1.0.0...HEAD
[Unreleased]: https://github.com/gdelpierre/ender_3_pro/compare/v1.1.0...HEAD
[1.0.0]: https://github.com/gdelpierre/ender_3_pro/releases/tag/v1.1.0
[1.0.0]: https://github.com/gdelpierre/ender_3_pro/releases/tag/v1.0.0
2 changes: 1 addition & 1 deletion Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -1545,7 +1545,7 @@
* SD Card support is disabled by default. If your controller has an SD slot,
* you must uncomment the following option or it won't work.
*/
#define SDSUPPORT
//#define SDSUPPORT

/**
* SD CARD: ENABLE CRC
Expand Down
12 changes: 6 additions & 6 deletions Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -1235,17 +1235,17 @@
//#define LCD_DECIMAL_SMALL_XY
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
#define LCD_SET_PROGRESS_MANUALLY

// Show the E position (filament used) during printing
//#define LCD_SHOW_E_TOTAL
#define LCD_SHOW_E_TOTAL
#endif

#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY) && ANY(HAS_MARLINUI_U8GLIB, HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL, EXTENSIBLE_UI)
//#define SHOW_REMAINING_TIME // Display estimated time to completion
#define SHOW_REMAINING_TIME // Display estimated time to completion
#if ENABLED(SHOW_REMAINING_TIME)
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
#endif

#if EITHER(HAS_MARLINUI_U8GLIB, EXTENSIBLE_UI)
Expand Down Expand Up @@ -1982,7 +1982,7 @@
//
// G2/G3 Arc Support
//
#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
//#define ARC_SUPPORT // Disable this feature to save ~3226 bytes
#if ENABLED(ARC_SUPPORT)
#define MM_PER_ARC_SEGMENT 1 // (mm) Length (or minimum length) of each arc segment
//#define ARC_SEGMENTS_PER_R 1 // Max segment length, MM_PER = Min
Expand Down

0 comments on commit a59a40a

Please sign in to comment.