Skip to content

Added option for short time to use with gcode on small LCDs #1233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bionik wants to merge 1 commit into
base: SteamEngine
Choose a base branch
from
Open

Added option for short time to use with gcode on small LCDs #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cura/gui/configWizard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ def StoreData(self):
if data[10]:
profile.setAlterationFile('start.gcode', """;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down
10 changes: 6 additions & 4 deletions Cura/util/profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def _(n):

setting('start.gcode', """;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -303,7 +303,7 @@ def _(n):
#######################################################################################
setting('start2.gcode', """;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -351,7 +351,7 @@ def _(n):
#######################################################################################
setting('start3.gcode', """;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -405,7 +405,7 @@ def _(n):
""", str, 'alteration', 'alteration')
setting('start4.gcode', """;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -1248,6 +1248,8 @@ def replaceTagMatch(m):
return pre + ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'][int(time.strftime('%w'))]
if tag == 'print_time':
return pre + '#P_TIME#'
if tag == 'print_time_short':
return pre + '#P_TIME_SHORT#'
if tag == 'filament_amount':
return pre + '#F_AMNT#'
if tag == 'filament_weight':
Expand Down
8 changes: 8 additions & 0 deletions Cura/util/sliceEngine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ def getPrintTime(self):
return _('%d hour %d minutes') % (int(self._printTimeSeconds / 60 / 60), int(self._printTimeSeconds / 60) % 60)
return _('%d hours %d minutes') % (int(self._printTimeSeconds / 60 / 60), int(self._printTimeSeconds / 60) % 60)

def getPrintTimeShort(self):
if self._printTimeSeconds is None:
return ''
if int(self._printTimeSeconds / 60 / 60) < 1:
return _('%dmin') % (int(self._printTimeSeconds / 60) % 60)
return _('%dh %dmin') % (int(self._printTimeSeconds / 60 / 60), int(self._printTimeSeconds / 60) % 60)

def getFilamentAmount(self, e=0):
if self._filamentMM[e] == 0.0:
return None
Expand Down Expand Up @@ -414,6 +421,7 @@ def _runEngine(self, scene, overrides, old_thread):
logThread.join()
if returnCode == 0:
self._result.addReplaceTag('#P_TIME#', self._result.getPrintTime())
self._result.addReplaceTag('#P_TIME_SHORT#', self._result.getPrintTimeShort())
self._result.addReplaceTag('#F_AMNT#', self._result.getFilamentAmountMeters(0))
self._result.addReplaceTag('#F_WGHT#', math.floor(self._result.getFilamentWeight(0) * 1000.0))
self._result.addReplaceTag('#F_COST#', self._result.getFilamentCost(0))
Expand Down
4 changes: 2 additions & 2 deletions resources/machine_profiles/DeltaBot.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ travel_speed = 150
[alterations]
start.gcode = ;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand All @@ -48,7 +48,7 @@ end.gcode = ;End GCode
G90 ;absolute positioning
start2.gcode = ;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down
2 changes: 1 addition & 1 deletion resources/machine_profiles/Hephestos.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ start.gcode =
; -- START GCODE --
;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;Uncomment to add your own temperature line
Expand Down
2 changes: 1 addition & 1 deletion resources/machine_profiles/Hephestos_XL.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ start.gcode =
; -- START GCODE --
;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;Uncomment to add your own temperature line
Expand Down
20 changes: 10 additions & 10 deletions resources/machine_profiles/RigidBot.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ fix_horrible_union_all_type_a = True
fix_horrible_union_all_type_b = False
fix_horrible_use_open_bits = False
fix_horrible_extensive_stitching = False
plugin_config =
plugin_config =
object_center_x = -1
object_center_y = -1

[alterations]
start.gcode = ;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -121,7 +121,7 @@ end.gcode = ;End GCode
;{profile_string}
start2.gcode = ;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -159,7 +159,7 @@ end2.gcode = ;End GCode
;{profile_string}
start3.gcode = ;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -203,7 +203,7 @@ end3.gcode = ;End GCode
;{profile_string}
start4.gcode = ;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -252,11 +252,11 @@ end4.gcode = ;End GCode
M84 ;steppers off
G90 ;absolute positioning
;{profile_string}
support_start.gcode =
support_end.gcode =
cool_start.gcode =
cool_end.gcode =
replace.csv =
support_start.gcode =
support_end.gcode =
cool_start.gcode =
cool_end.gcode =
replace.csv =
preswitchextruder.gcode = ;Switch between the current extruder and the next extruder, when printing with multiple extruders.
;This code is added before the T(n)
postswitchextruder.gcode = ;Switch between the current extruder and the next extruder, when printing with multiple extruders.
Expand Down
10 changes: 5 additions & 5 deletions resources/machine_profiles/RigidBotBig.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ fix_horrible_union_all_type_a = True
fix_horrible_union_all_type_b = False
fix_horrible_use_open_bits = False
fix_horrible_extensive_stitching = False
plugin_config =
plugin_config =
object_center_x = -1
object_center_y = -1

[alterations]
start.gcode = ;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -121,7 +121,7 @@ end.gcode = ;End GCode
;{profile_string}
start2.gcode = ;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -159,7 +159,7 @@ end2.gcode = ;End GCode
;{profile_string}
start3.gcode = ;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down Expand Up @@ -203,7 +203,7 @@ end3.gcode = ;End GCode
;{profile_string}
start4.gcode = ;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line
Expand Down
6 changes: 3 additions & 3 deletions resources/machine_profiles/Witbox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ fan_enabled = True
filament_flow = 100.0

[alterations]
start.gcode =
start.gcode =
; -- START GCODE --
;Sliced at: {day} {date} {time}
;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
;Print time: {print_time}
;Print time: {print_time}, short: {print_time_short}
;Filament used: {filament_amount}m {filament_weight}g
;Filament cost: {filament_cost}
;Uncomment to add your own temperature line
Expand All @@ -58,7 +58,7 @@ start.gcode =
;M117 Printing...
; -- end of START GCODE --

end.gcode =
end.gcode =
; -- END GCODE --
M104 S0 ;extruder heater off
M140 S0 ;heated bed heater off (if you have it)
Expand Down