Skip to content

Commit a179f6e

Browse files
committed
qtdragon/hd: -fix spindle fault pins to actually work
That's what I get for being in a hurry and not testing. Now connecting to either pin type will set the indicator.
1 parent f9a02b3 commit a179f6e

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

share/qtvcp/screens/qtdragon/qtdragon_handler.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ def init_pins(self):
309309
pin.value_changed.connect(self.spindle_pwr_changed)
310310

311311
pin = QHAL.newpin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN)
312-
pin.value_changed.connect(self.spindle_pwr_changed)
312+
pin.value_changed.connect(self.spindle_fault_changed)
313313
pin = QHAL.newpin("spindle-fault", QHAL.HAL_S32, QHAL.HAL_IN)
314314
pin.value_changed.connect(self.spindle_fault_changed)
315315

@@ -537,12 +537,11 @@ def spindle_pwr_changed(self, data):
537537
self.w.lbl_spindle_power.setText(pwr)
538538

539539
def spindle_fault_changed(self, data):
540-
fault = hex(self.h['spindle-fault'])
540+
fault = hex(data)
541541
self.w.lbl_spindle_fault.setText(fault)
542542

543543
def mb_errors_changed(self, data):
544-
errors = self.h['spindle-modbus-errors']
545-
self.w.lbl_mb_errors.setText(str(errors))
544+
self.w.lbl_mb_errors.setText(str(data))
546545

547546
def mb_connection_changed(self, data):
548547
if data:

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -564,12 +564,11 @@ def spindle_pwr_changed(self, data):
564564
self.w.spindle_power.setValue(0)
565565

566566
def spindle_fault_changed(self, data):
567-
fault = hex(self.h['spindle-fault'])
567+
fault = hex(data)
568568
self.w.lbl_spindle_fault.setText(fault)
569569

570570
def mb_errors_changed(self, data):
571-
errors = self.h['spindle-modbus-errors']
572-
self.w.lbl_mb_errors.setText(str(errors))
571+
self.w.lbl_mb_errors.setText(str(data))
573572

574573
def mb_connection_changed(self, data):
575574
if data:

0 commit comments

Comments
 (0)