qtplasmac: fix button interlocking for torch pulse and ohmic test

Author: snowgoer540

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -1,4 +1,4 @@
-VERSION = '1.229.223'
+VERSION = '1.229.224'
 
 '''
 qtplasmac_handler.py
@@ -3800,7 +3800,10 @@ def torch_pulse(self, state):
     def torch_pulse_states(self, state):
         self.set_tab_jog_states(state)
         if not STATUS.is_auto_paused():
-            self.set_buttons_state([self.idleList, self.idleOnList, self.idleHomedList], state)
+            if STATUS.is_on_and_idle() and STATUS.is_all_homed():
+                self.set_buttons_state([self.idleList, self.idleOnList, self.idleHomedList], state)
+            else:
+                self.set_buttons_state([self.idleList, self.idleOnList], state)
             if self.w.gcode_display.lines() > 1:
                 self.w.run.setEnabled(state)
         if state:
@@ -3815,14 +3818,14 @@ def ext_ohmic_test(self, state):
 
     def ohmic_test(self, state):
         hal.set_p('plasmac.ohmic-test', '{}'.format(str(state)))
-        buttonList = []
-        for button in self.idleOnList:
-            if button != self.otButton:
-                buttonList.append(button)
+        buttonList = [button for button in self.idleOnList if button != self.otButton]
         if not STATUS.is_auto_paused():
+            if STATUS.is_on_and_idle() and STATUS.is_all_homed():
+                self.set_buttons_state([self.idleList, self.idleHomedList, buttonList], not state)
+            else:
+                self.set_buttons_state([self.idleList, buttonList], not state)
             if self.w.gcode_display.lines() > 1:
                 self.w.run.setEnabled(not state)
-            self.set_buttons_state([self.idleList, buttonList, self.idleHomedList], not state)
 
     def ext_frame_job(self, state):
         if self.frButton and self.w[self.frButton].isEnabled():

share/qtvcp/screens/qtplasmac/versions.html

@@ -30,6 +30,12 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>v1.229.224 2022 Aug 12</u></b>
+<ul style="margin:0;">
+  <li>fix button interlocking for torch pulse and ohmic test when not homed</li>
+</ul>
+<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
+
 <br><b><u>v1.229.223 2022 Aug 11</u></b>
 <ul style="margin:0;">
   <li>make window headers/titles cohesive</li>