diff options
| -rw-r--r-- | docs/Config_Changes.md | 6 | ||||
| -rw-r--r-- | klippy/extras/display/display.cfg | 17 |
2 files changed, 10 insertions, 13 deletions
diff --git a/docs/Config_Changes.md b/docs/Config_Changes.md index 4234e3df..2dd92d0d 100644 --- a/docs/Config_Changes.md +++ b/docs/Config_Changes.md @@ -6,6 +6,12 @@ All dates in this document are approximate. # Changes +20200603: The default 16x4 LCD layout will no longer show the +estimated time remaining in a print. (Only the elapsed time will be +shown.) If the old behavior is desired one can customize the menu +display with that information (see the description of display_data in +config/example-extras.cfg for details). + 20200531: The default USB vendor/product id is now 0x1d50/0x614e. These new ids are reserved for Klipper (thanks to the openmoko project). This change should not require any config changes, but the diff --git a/klippy/extras/display/display.cfg b/klippy/extras/display/display.cfg index 38b3d925..e6b46c8c 100644 --- a/klippy/extras/display/display.cfg +++ b/klippy/extras/display/display.cfg @@ -45,15 +45,7 @@ text: [display_template _printing_time] text: {% set ptime = printer.idle_timeout.printing_time %} - {% set progress = printer.display_status.progress %} - {% if progress >= 0.05 and ptime % 12 >= 6 %} - # Periodically show time remaining - {% set rtime = (ptime / progress) - ptime %} - { "-%02d:%02d" % (rtime // (60 * 60), (rtime // 60) % 60) } - {% else %} - {% set msg = "%02d:%02d" % (ptime // (60 * 60), (ptime // 60) % 60) %} - { "%6s" % (msg,) } - {% endif %} + { "%02d:%02d" % (ptime // (60 * 60), (ptime // 60) % 60) } [display_template _print_status] text: @@ -100,7 +92,7 @@ text: { draw_progress_bar(2, 0, 10, printer.display_status.progress) } [display_data _default_16x4 printing_time] position: 2, 10 -text: { render("_printing_time") } +text: { "%6s" % (render("_printing_time").strip(),) } [display_data _default_16x4 print_status] position: 3, 0 @@ -136,7 +128,7 @@ text: { render("_heater_temperature", param_heater_name="heater_bed") } [display_data _multiextruder_16x4 printing_time] position: 2, 10 -text: { render("_printing_time") } +text: { "%6s" % (render("_printing_time").strip(),) } [display_data _multiextruder_16x4 print_status] position: 3, 0 @@ -185,9 +177,8 @@ text: [display_data _default_20x4 printing_time] position: 2, 14 text: - {% set seconds = printer.idle_timeout.printing_time %} ~clock~ - { "%02d:%02d" % (seconds // (60 * 60), (seconds // 60) % 60) } + { render("_printing_time") } [display_data _default_20x4 print_status] position: 3, 0 |