Merge branch '2.8'

LinuxCNC · Jun 21, 2020 · 09397b8 · 09397b8
2 parents f1795f5 + 2f875d6
commit 09397b8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/python/hal_glib.py b/lib/python/hal_glib.py
@@ -735,6 +735,23 @@ def forced_update(self):
         tool_info_new = self.old['tool-info']
         self.emit('tool-info-changed', tool_info_new)
 
+        # homing
+        homed_joints = 0
+        unhomed_joints = ""
+        for joint in range(0, self.stat.joints):
+            if self.stat.homed[joint]:
+                homed_joints += 1
+                self.emit('homed', joint)
+            else:
+                self.emit('unhomed', joint)
+                unhomed_joints += str(joint)
+        if homed_joints == self.stat.joints:
+            self._is_all_homed = True
+            self.emit('all-homed')
+        else:
+            self._is_all_homed = False
+            self.emit('not-all-homed', unhomed_joints)
+
         # update external ojects
         self.emit('forced-update')
 

diff --git a/share/qtvcp/screens/qtlathe/qtlathe_handler.py b/share/qtvcp/screens/qtlathe/qtlathe_handler.py
@@ -106,7 +106,8 @@ def processed_key_event__(self,receiver,event,is_pressed,key,code,shift,cntrl):
         # so we catch and process the events directly.
         # We do want ESC, F1 and F2 to call keybinding functions though
         if code not in(QtCore.Qt.Key_Escape,QtCore.Qt.Key_F1 ,QtCore.Qt.Key_F2,
-                    QtCore.Qt.Key_F3,QtCore.Qt.Key_F5,QtCore.Qt.Key_F5):
+                    QtCore.Qt.Key_F3,QtCore.Qt.Key_F4,QtCore.Qt.Key_F5,
+                    QtCore.Qt.Key_F6,QtCore.Qt.Key_F7,QtCore.Qt.Key_F12):
             raise
 
         # ok if we got here then try keybindings