3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'postprocess_periodic_progress' of https://github.com/KimmoHop/Cura

Browse source
This commit is contained in:
Ghostkeeper 2020-10-22 16:15:58 +02:00
commit 3fce511d67
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
1 changed files with 60 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

75
plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py
View file

@ -1,7 +1,7 @@
# Cura PostProcessingPlugin # Cura PostProcessingPlugin
# Author: Mathias Lyngklip Kjeldgaard, Alexander Gee # Author: Mathias Lyngklip Kjeldgaard, Alexander Gee, Kimmo Toivanen
# Date: July 31, 2019 # Date: July 31, 2019
# Modified: May 22, 2020 # Modified: Sep 09, 2020
# Description: This plugin displays progress on the LCD. It can output the estimated time remaining and the completion percentage. # Description: This plugin displays progress on the LCD. It can output the estimated time remaining and the completion percentage.
@ -26,9 +26,19 @@ class DisplayProgressOnLCD(Script):
"time_remaining": "time_remaining":
{ {
"label": "Time Remaining", "label": "Time Remaining",
"description": "When enabled, write Time Left: HHMMSS on the display using M117. This is updated every layer.", "description": "Select to write remaining time on the display using M117 status line message (almost all printers) or using M73 command (Prusa and Marlin 2 if enabled).",
"type": "bool", "type": "enum",
"default_value": false "options": {"none":"Disabled","m117":"M117 - All printers","m73":"M73 - Prusa, Marlin 2"},
"default_value": "none"
},
"update_frequency":
{
"label": "Update frequency",
"description": "Update remaining time for every layer or periodically every minute or faster.",
"type": "enum",
"options": {"0":"Every layer","15":"Every 15 seconds","30":"Every 30 seconds","60":"Every minute"},
"default_value": "0",
"enabled": "time_remaining != 'none'"
}, },
"percentage": "percentage":
{ {
@ -46,22 +56,29 @@ class DisplayProgressOnLCD(Script):
list_split = re.split(":", line) # Split at ":" so we can get the numerical value list_split = re.split(":", line) # Split at ":" so we can get the numerical value
return float(list_split[1]) # Convert the numerical portion to a float return float(list_split[1]) # Convert the numerical portion to a float
def outputTime(self, lines, line_index, time_left): def outputTime(self, lines, line_index, time_left, mode):
# Do some math to get the time left in seconds into the right format. (HH,MM,SS) # Do some math to get the time left in seconds into the right format. (HH,MM,SS)
time_left = max(time_left, 0)
m, s = divmod(time_left, 60) m, s = divmod(time_left, 60)
h, m = divmod(m, 60) h, m = divmod(m, 60)
# Create the string # Create the string
current_time_string = "{:d}h{:02d}m{:02d}s".format(int(h), int(m), int(s)) if mode == "m117":
# And now insert that into the GCODE current_time_string = "{:d}h{:02d}m{:02d}s".format(int(h), int(m), int(s))
lines.insert(line_index, "M117 Time Left {}".format(current_time_string)) # And now insert that into the GCODE
lines.insert(line_index, "M117 Time Left {}".format(current_time_string))
else:
mins = int(60*h + m + s / 30)
lines.insert(line_index, "M73 R{}".format(mins))
def execute(self, data): def execute(self, data):
output_time = self.getSettingValueByKey("time_remaining") output_time = self.getSettingValueByKey("time_remaining")
output_frequency = int(self.getSettingValueByKey("update_frequency"))
output_percentage = self.getSettingValueByKey("percentage") output_percentage = self.getSettingValueByKey("percentage")
line_set = {} line_set = {}
if output_percentage or output_time: if output_percentage or output_time != "none":
total_time = -1 total_time = -1
previous_layer_end_percentage = 0 previous_layer_end_percentage = 0
previous_layer_end_time = 0
for layer in data: for layer in data:
layer_index = data.index(layer) layer_index = data.index(layer)
lines = layer.split("\n") lines = layer.split("\n")
@ -72,8 +89,10 @@ class DisplayProgressOnLCD(Script):
total_time = self.getTimeValue(line) total_time = self.getTimeValue(line)
line_index = lines.index(line) line_index = lines.index(line)
if output_time: # In the beginning we may have 2 M73 lines, but it makes logic less complicated
self.outputTime(lines, line_index, total_time) if output_time != "none":
self.outputTime(lines, line_index, total_time, output_time)
if output_percentage: if output_percentage:
# Emit 0 percent to sure Marlin knows we are overriding the completion percentage # Emit 0 percent to sure Marlin knows we are overriding the completion percentage
lines.insert(line_index, "M73 P0") lines.insert(line_index, "M73 P0")
@ -95,9 +114,35 @@ class DisplayProgressOnLCD(Script):
current_time = self.getTimeValue(line) current_time = self.getTimeValue(line)
line_index = lines.index(line) line_index = lines.index(line)
if output_time: if output_time != "none":
# Here we calculate remaining time if output_frequency == 0:
self.outputTime(lines, line_index, total_time - current_time) # Here we calculate remaining time
self.outputTime(lines, line_index, total_time - current_time, output_time)
else:
# Here we calculate remaining time and how many outputs are expected for the layer
layer_time_delta = int(current_time - previous_layer_end_time)
layer_step_delta = int((current_time - previous_layer_end_time) / output_frequency)
# If this layer represents less than 1 step then we don't need to emit anything, continue to the next layer
if layer_step_delta != 0:
# Grab the index of the current line and figure out how many lines represent one second
step = line_index / layer_time_delta
# Move new lines further as we add new lines above it
lines_added = 1
# Run through layer in seconds
for seconds in range(1, layer_time_delta + 1):
# Time from start to decide when to update
line_time = int(previous_layer_end_time + seconds)
# Output every X seconds and after last layer
if line_time % output_frequency == 0 or line_time == total_time:
# Line to add the output
time_line_index = int((seconds * step) + lines_added)
# Insert remaining time into the GCODE
self.outputTime(lines, time_line_index, total_time - line_time, output_time)
# Next line will be again lower
lines_added = lines_added + 1
previous_layer_end_time = int(current_time)
if output_percentage: if output_percentage:
# Calculate percentage value this layer ends at # Calculate percentage value this layer ends at