Skip to content

Commit b995b92

Browse files
committed
qtplasmac: move external pin creation and signal connections
Since button creation can now be done without a restart, moving these allows a user access to the external pins without the need to restart.
1 parent 2f81d48 commit b995b92

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,7 @@ def make_hal_pins(self):
677677
self.developmentPin = self.h.newpin('development', hal.HAL_BIT, hal.HAL_IN)
678678
self.extAbortPin = self.h.newpin('ext_abort', hal.HAL_BIT, hal.HAL_IN)
679679
self.extAutoVoltsEnablePin = self.h.newpin('ext_auto_volts_enable', hal.HAL_BIT, hal.HAL_IN)
680+
self.extChangeConsPin = self.h.newpin('ext_consumables', hal.HAL_BIT, hal.HAL_IN)
680681
self.extCornerLockEnablePin = self.h.newpin('ext_cornerlock_enable', hal.HAL_BIT, hal.HAL_IN)
681682
self.extCutRecCancelPin = self.h.newpin('ext_cutrec_cancel', hal.HAL_BIT, hal.HAL_IN)
682683
self.extCutRecRevPin = self.h.newpin('ext_cutrec_rev', hal.HAL_BIT, hal.HAL_IN)
@@ -689,6 +690,7 @@ def make_hal_pins(self):
689690
self.extCutRecSWPin = self.h.newpin('ext_cutrec_sw', hal.HAL_BIT, hal.HAL_IN)
690691
self.extCutRecWPin = self.h.newpin('ext_cutrec_w', hal.HAL_BIT, hal.HAL_IN)
691692
self.extCutRecNWPin = self.h.newpin('ext_cutrec_nw', hal.HAL_BIT, hal.HAL_IN)
693+
self.extFramingPin = self.h.newpin('ext_frame_job', hal.HAL_BIT, hal.HAL_IN)
692694
self.extHeightOvrCountsPin = self.h.newpin('ext_height_ovr_counts', hal.HAL_S32, hal.HAL_IN)
693695
self.extHeightOvrCountEnablePin = self.h.newpin('ext_height_ovr_count_enable', hal.HAL_BIT, hal.HAL_IN)
694696
self.extHeightOvrMinusPin = self.h.newpin('ext_height_ovr_minus', hal.HAL_BIT, hal.HAL_IN)
@@ -700,9 +702,12 @@ def make_hal_pins(self):
700702
# self.extKerfCrossEnablePin = self.h.newpin('ext_kerfcross_enable', hal.HAL_BIT, hal.HAL_IN)
701703
self.extLaserTouchOffPin = self.h.newpin('ext_laser_touchoff', hal.HAL_BIT, hal.HAL_IN)
702704
self.extMeshModePin = self.h.newpin('ext_mesh_mode', hal.HAL_BIT, hal.HAL_IN)
705+
self.extOhmicPin = self.h.newpin('ext_ohmic', hal.HAL_BIT, hal.HAL_IN)
703706
self.extOhmicProbeEnablePin = self.h.newpin('ext_ohmic_probe_enable', hal.HAL_BIT, hal.HAL_IN)
704707
self.extPausePin = self.h.newpin('ext_pause', hal.HAL_BIT, hal.HAL_IN)
705708
self.extPowerPin = self.h.newpin('ext_power', hal.HAL_BIT, hal.HAL_IN)
709+
self.extProbePin = self.h.newpin('ext_probe', hal.HAL_BIT, hal.HAL_IN)
710+
self.extPulsePin = self.h.newpin('ext_pulse', hal.HAL_BIT, hal.HAL_IN)
706711
self.extRunPausePin = self.h.newpin('ext_run_pause', hal.HAL_BIT, hal.HAL_IN)
707712
self.extRunPin = self.h.newpin('ext_run', hal.HAL_BIT, hal.HAL_IN)
708713
self.extThcEnablePin = self.h.newpin('ext_thc_enable', hal.HAL_BIT, hal.HAL_IN)
@@ -2770,6 +2775,7 @@ def set_signal_connections(self):
27702775
self.extHeightOvrResetPin.value_changed.connect(lambda v:self.height_ovr_pressed(v,0))
27712776
self.extHeightOvrCountsPin.value_changed.connect(lambda v:self.height_ovr_encoder(v))
27722777
self.extHeightOvrScalePin.value_changed.connect(lambda v:self.height_ovr_scale_change(v))
2778+
self.extChangeConsPin.value_changed.connect(lambda v:self.ext_change_consumables(v))
27732779
self.extCutRecRevPin.value_changed.connect(lambda v:self.cutrec_motion(-v))
27742780
self.extCutRecFwdPin.value_changed.connect(lambda v:self.cutrec_motion(v))
27752781
self.extCutRecNPin.value_changed.connect(lambda v:self.cutrec_move(v, 0, 1))
@@ -2790,6 +2796,10 @@ def set_signal_connections(self):
27902796
self.extOhmicProbeEnablePin.value_changed.connect(lambda v:self.ext_ohmic_probe_enable_changed(v))
27912797
self.extAutoVoltsEnablePin.value_changed.connect(lambda v:self.ext_auto_volts_enable_changed(v))
27922798
self.extJogSlowPin.value_changed.connect(self.ext_jog_slow)
2799+
self.extProbePin.value_changed.connect(lambda v:self.ext_probe_test(v))
2800+
self.extPulsePin.value_changed.connect(lambda v:self.ext_torch_pulse(v))
2801+
self.extOhmicPin.value_changed.connect(lambda v:self.ext_ohmic_test(v))
2802+
self.extFramingPin.value_changed.connect(lambda v:self.ext_frame_job(v))
27932803
self.probeTestErrorPin.value_changed.connect(lambda v:self.probe_test_error(v))
27942804
self.w.preview_stack.currentChanged.connect(self.preview_stack_changed)
27952805
self.w.gcode_stack.currentChanged.connect(self.gcode_stack_changed)
@@ -3556,8 +3566,6 @@ def user_button_setup(self):
35563566
self.ccButton = 'button_{}'.format(str(bNum))
35573567
self.idleHomedList.append(self.ccButton)
35583568
self.pausedValidList.append(self.ccButton)
3559-
self.extChangeConsPin = self.h.newpin('ext_consumables', hal.HAL_BIT, hal.HAL_IN)
3560-
self.extChangeConsPin.value_changed.connect(lambda v:self.ext_change_consumables(v))
35613569
else:
35623570
msg1 = _translate('HandlerClass', 'Check button code for invalid or missing arguments')
35633571
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}\n'.format(head, msg0, bNum, msg1))
@@ -3576,8 +3584,6 @@ def user_button_setup(self):
35763584
self.ptButton = 'button_{}'.format(str(bNum))
35773585
self.idleHomedList.append(self.ptButton)
35783586
self.probeText = self.w[self.ptButton].text()
3579-
self.extProbePin = self.h.newpin('ext_probe', hal.HAL_BIT, hal.HAL_IN)
3580-
self.extProbePin.value_changed.connect(lambda v:self.ext_probe_test(v))
35813587
else:
35823588
msg1 = _translate('HandlerClass', 'Check button code for extra arguments')
35833589
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}\n'.format(head, msg0, bNum, msg1))
@@ -3598,8 +3604,6 @@ def user_button_setup(self):
35983604
self.idleOnList.append(self.tpButton)
35993605
self.pausedValidList.append(self.tpButton)
36003606
self.tpText = self.w[self.tpButton].text()
3601-
self.extPulsePin = self.h.newpin('ext_pulse', hal.HAL_BIT, hal.HAL_IN)
3602-
self.extPulsePin.value_changed.connect(lambda v:self.ext_torch_pulse(v))
36033607
else:
36043608
msg1 = _translate('HandlerClass', 'Check button code for extra arguments')
36053609
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} #{}\n{}\n'.format(head, msg0, bNum, msg1))
@@ -3608,8 +3612,6 @@ def user_button_setup(self):
36083612
self.otButton = 'button_{}'.format(str(bNum))
36093613
self.idleOnList.append(self.otButton)
36103614
self.pausedValidList.append(self.otButton)
3611-
self.extOhmicPin = self.h.newpin('ext_ohmic', hal.HAL_BIT, hal.HAL_IN)
3612-
self.extOhmicPin.value_changed.connect(lambda v:self.ext_ohmic_test(v))
36133615
elif 'framing' in bCode:
36143616
frButton = True
36153617
self.defaultZ = True
@@ -3634,8 +3636,6 @@ def user_button_setup(self):
36343636
if frButton:
36353637
self.frButton = 'button_{}'.format(str(bNum))
36363638
self.idleHomedList.append(self.frButton)
3637-
self.extFramingPin = self.h.newpin('ext_frame_job', hal.HAL_BIT, hal.HAL_IN)
3638-
self.extFramingPin.value_changed.connect(lambda v:self.ext_frame_job(v))
36393639
elif 'cut-type' in bCode:
36403640
self.ctButton = 'button_{}'.format(str(bNum))
36413641
self.idleOnList.append(self.ctButton)

0 commit comments

Comments
 (0)