CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Job_status: fix speed label, fix estimate default

Browse Source
This commit is contained in:
alfrix 2022-05-02 12:09:12 -03:00
parent 31546f0020
commit 35c4136bd5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panels/job_status.py
View File

@ -17,7 +17,7 @@ class JobStatusPanel(ScreenPanel):
filename = state_timeout = prev_pos = prev_gpos = vel_timeout = None filename = state_timeout = prev_pos = prev_gpos = vel_timeout = None
file_metadata = labels = {} file_metadata = labels = {}
state = "standby" state = "standby"
timeleft_type = "file" timeleft_type = "auto"
progress = zoffset = flowrate = vel = 0 progress = zoffset = flowrate = vel = 0
main_status_displayed = True main_status_displayed = True
close_timeouts = velstore = flowstore = [] close_timeouts = velstore = flowstore = []
@ -553,7 +553,6 @@ class JobStatusPanel(ScreenPanel):
self.labels['speed_factor'].set_text("%3d%%" % self.speed) self.labels['speed_factor'].set_text("%3d%%" % self.speed)
if "speed" in data["gcode_move"]: if "speed" in data["gcode_move"]:
self.req_speed = int(round(data["gcode_move"]["speed"] / 60 * self.speed_factor)) self.req_speed = int(round(data["gcode_move"]["speed"] / 60 * self.speed_factor))
self.labels['req_speed'].set_text("%d mm/s" % self.req_speed)
if "homing_origin" in data["gcode_move"]: if "homing_origin" in data["gcode_move"]:
self.zoffset = data["gcode_move"]["homing_origin"][2] self.zoffset = data["gcode_move"]["homing_origin"][2]
self.labels['zoffset'].set_text("%.2f" % self.zoffset) self.labels['zoffset'].set_text("%.2f" % self.zoffset)
@ -625,12 +624,13 @@ class JobStatusPanel(ScreenPanel):
def update_velocity(self): def update_velocity(self):
if len(self.velstore) > 0: if len(self.velstore) > 0:
self.vel = (self.vel + median(array(self.velstore))) / 2 self.vel = (self.vel + median(array(self.velstore))) / 2
self.labels['req_speed'].set_text("%d/%d mm/s" % (self.vel, self.req_speed))
self.velstore = [] self.velstore = []
if len(self.flowstore) > 0: if len(self.flowstore) > 0:
self.flowrate = (self.flowrate + median(array(self.flowstore))) / 2 self.flowrate = (self.flowrate + median(array(self.flowstore))) / 2
self.labels['flowrate'].set_label("%.1f mm3/s" % self.flowrate)
self.flowstore = [] self.flowstore = []
self.labels['flowrate'].set_label("%.1f mm3/s" % self.flowrate)
self.labels['req_speed'].set_text("%d/%d mm/s" % (self.vel, self.req_speed))
if self.main_status_displayed: if self.main_status_displayed:
self.speed_button.set_label("%3d%% %5d mm/s" % (self.speed, self.vel)) self.speed_button.set_label("%3d%% %5d mm/s" % (self.speed, self.vel))
self.extrusion_button.set_label("%3d%% %5.1f mm3/s" % (self.extrusion, self.flowrate)) self.extrusion_button.set_label("%3d%% %5.1f mm3/s" % (self.extrusion, self.flowrate))