Skip to content

qtvcp: write the var file before reloading the preview on offset changes #4607

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
grandixximo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

qtvcp: write the var file before reloading the preview on offset changes #4607

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
38 changes: 19 additions & 19 deletions lib/python/qtvcp/qt_action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,12 +415,7 @@ def SET_AXIS_ORIGIN(self, axis, value):
self.lastOriginSet[jnum] = r[jnum]

# set new position
m = "G10 L20 P0 %s%f" % (axis, value)
fail, premode = self.ensure_mode(linuxcnc.MODE_MDI)
self.cmd.mdi(m)
self.cmd.wait_complete()
self.ensure_mode(premode)
self.RELOAD_DISPLAY()
self.set_offset_mdi("G10 L20 P0 %s%f" % (axis, value))

def GET_LAST_RECORDED_ORIGIN(self, axis):
j = "XYZABCUVW"
Expand Down Expand Up @@ -603,22 +598,16 @@ def SET_USER_SYSTEM(self, system):
self.ensure_mode(premode)

def ZERO_G92_OFFSET(self):
self.CALL_MDI("G92.1")
self.RELOAD_DISPLAY()
self.set_offset_mdi("G92.1")

def ZERO_ROTATIONAL_OFFSET(self):
self.CALL_MDI("G10 L2 P0 R 0")
self.RELOAD_DISPLAY()
self.set_offset_mdi("G10 L2 P0 R 0")

def ZERO_G5X_OFFSET(self, num):
fail, premode = self.ensure_mode(linuxcnc.MODE_MDI)
clear_command = "G10 L2 P%d R0" % num
for a in INFO.AVAILABLE_AXES:
clear_command += " %c0" % a
self.cmd.mdi('%s' % clear_command)
self.cmd.wait_complete()
self.ensure_mode(premode)
self.RELOAD_DISPLAY()
self.set_offset_mdi(clear_command)

def RECORD_CURRENT_MODE(self):
mode = STATUS.get_current_mode()
Expand Down Expand Up @@ -838,15 +827,13 @@ def SET_LATHE_MIRROR_X(self):
if not INFO.MACHINE_IS_LATHE:
LOG.warning('Can not set mirror mode; Machine is not a lathe')
return
self.CALL_MDI("G10 L2 P0 R180")
self.RELOAD_DISPLAY()
self.set_offset_mdi("G10 L2 P0 R180")

def UNSET_LATHE_MIRROR_X(self):
if not INFO.MACHINE_IS_LATHE:
LOG.warning('Can not unset mirror mode; Machine is not a lathe')
return
self.CALL_MDI("G10 L2 P0 R0")
self.RELOAD_DISPLAY()
self.set_offset_mdi("G10 L2 P0 R0")

# Some systems need repeat disabled for keyboard jogging because repeat rate is uneven
def DISABLE_AUTOREPEAT_KEYS(self, keys={'34','35','80','81','83','85','88','89','111','112','113','114','116','117'}):
Expand Down Expand Up @@ -1032,6 +1019,19 @@ def jnum_check(self, num):
return None
return num

# run an MDI command that changes offsets, then reload the preview
# the preview reads offsets from the var file, and the interpreter only
# writes it when it synchs, so synch explicitly: no mode change does it
# when the screen is already in MDI mode
def set_offset_mdi(self, code):
fail, premode = self.ensure_mode(linuxcnc.MODE_MDI)
self.cmd.mdi(code)
self.cmd.wait_complete()
self.cmd.task_plan_synch()
self.cmd.wait_complete()
self.ensure_mode(premode)
self.RELOAD_DISPLAY()

# check and if required set the machine mode
# return: state changed?, the original mode
def ensure_mode(self, *modes):
Expand Down
Loading