Skip to content

Commit 0a5aa01

Browse files
c-morleyc-morley
committed
qtdragon family: update to current QHAL/QPin function/signal names
1 parent 3866d10 commit 0a5aa01

4 files changed

Lines changed: 122 additions & 122 deletions

File tree

‎share/qtvcp/screens/qtdragon/qtdragon_handler.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -327,51 +327,51 @@ def init_utils(self):
327327
#############################
328328
def init_pins(self):
329329
# spindle control pins
330-
pin = QHAL.newpin("spindle-amps", QHAL.HAL_FLOAT, QHAL.HAL_IN)
331-
pin.value_changed.connect(self.spindle_pwr_changed)
330+
pin = QHAL.newPin("spindle-amps", QHAL.HAL_FLOAT, QHAL.HAL_IN)
331+
pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v))
332332

333-
pin = QHAL.newpin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN)
334-
pin.value_changed.connect(self.spindle_pwr_changed)
333+
pin = QHAL.newPin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN)
334+
pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v))
335335

336-
pin = QHAL.newpin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN)
337-
pin.value_changed.connect(self.spindle_fault_changed)
338-
pin = QHAL.newpin("spindle-fault", QHAL.HAL_S32, QHAL.HAL_IN)
339-
pin.value_changed.connect(self.spindle_fault_changed)
336+
pin = QHAL.newPin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN)
337+
pin.pinValueChanged.connect(lambda p,v: self.spindle_fault_changed(v))
338+
pin = QHAL.newPin("spindle-fault", QHAL.HAL_S32, QHAL.HAL_IN)
339+
pin.pinValueChanged.connect(lambda p,v: self.spindle_fault_changed(v))
340340

341-
pin = QHAL.newpin("spindle-modbus-errors-u32", QHAL.HAL_U32, QHAL.HAL_IN)
342-
pin.value_changed.connect(self.mb_errors_changed)
343-
pin = QHAL.newpin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN)
344-
pin.value_changed.connect(self.mb_errors_changed)
341+
pin = QHAL.newPin("spindle-modbus-errors-u32", QHAL.HAL_U32, QHAL.HAL_IN)
342+
pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v))
343+
pin = QHAL.newPin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN)
344+
pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v))
345345

346-
pin = QHAL.newpin("spindle-modbus-connection", QHAL.HAL_BIT, QHAL.HAL_IN)
347-
pin.value_changed.connect(self.mb_connection_changed)
346+
pin = QHAL.newPin("spindle-modbus-connection", QHAL.HAL_BIT, QHAL.HAL_IN)
347+
pin.pinValueChanged.connect(lambda p,v: self.mb_connection_changed(v))
348348

349-
QHAL.newpin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
349+
QHAL.newPin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
350350

351-
pin = QHAL.newpin("external-pause", QHAL.HAL_BIT, QHAL.HAL_IN)
352-
pin.value_changed.connect(self.btn_pause_clicked)
351+
pin = QHAL.newPin("external-pause", QHAL.HAL_BIT, QHAL.HAL_IN)
352+
pin.pinValueChanged.connect(lambda p,v: self.btn_pause_clicked(v))
353353

354354
# external offset control pins
355-
QHAL.newpin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
356-
QHAL.newpin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
355+
QHAL.newPin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
356+
QHAL.newPin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
357357
self.h['eoffset-clear'] = True
358-
QHAL.newpin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT)
359-
pin = QHAL.newpin("eoffset-is-active", QHAL.HAL_BIT, QHAL.HAL_IN)
360-
pin.value_changed.connect(self.external_offset_state_changed)
358+
QHAL.newPin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT)
359+
pin = QHAL.newPin("eoffset-is-active", QHAL.HAL_BIT, QHAL.HAL_IN)
360+
pin.pinValueChanged.connect(lambda p,v: self.external_offset_state_changed(v))
361361

362362
# total external offset
363-
pin = QHAL.newpin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN)
363+
pin = QHAL.newPin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN)
364364

365365
# MPG scrolling pin
366-
self.pin_mpg_in = QHAL.newpin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN)
367-
self.pin_mpg_in.value_changed.connect(lambda s: self.external_mpg(s))
366+
self.pin_mpg_in = QHAL.newPin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN)
367+
self.pin_mpg_in.pinValueChanged.connect(lambda p,v: self.external_mpg(v))
368368

369369
# dialog answer pins
370-
pin = QHAL.newpin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN)
370+
pin = QHAL.newPin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN)
371371
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,1))
372-
pin = QHAL.newpin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN)
372+
pin = QHAL.newPin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN)
373373
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,2))
374-
pin = QHAL.newpin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN)
374+
pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN)
375375
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,0))
376376

377377
def init_preferences(self):

‎share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -256,58 +256,58 @@ def initialized__(self):
256256
#############################
257257
def init_pins(self):
258258
# spindle control pins
259-
pin = QHAL.newpin("spindle-amps", QHAL.HAL_FLOAT, QHAL.HAL_IN)
260-
pin.value_changed.connect(self.spindle_pwr_changed)
259+
pin = QHAL.newPin("spindle-amps", QHAL.HAL_FLOAT, QHAL.HAL_IN)
260+
pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v))
261261

262-
pin = QHAL.newpin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN)
263-
pin.value_changed.connect(self.spindle_pwr_changed)
262+
pin = QHAL.newPin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN)
263+
pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v))
264264

265-
pin = QHAL.newpin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN)
266-
pin.value_changed.connect(self.spindle_fault_changed)
267-
pin = QHAL.newpin("spindle-fault", QHAL.HAL_S32, QHAL.HAL_IN)
268-
pin.value_changed.connect(self.spindle_fault_changed)
265+
pin = QHAL.newPin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN)
266+
pin.pinValueChanged.connect(lambda p,v: self.spindle_fault_changed(v))
267+
pin = QHAL.newPin("spindle-fault", QHAL.HAL_S32, QHAL.HAL_IN)
268+
pin.pinValueChanged.connect(lambda p,v: self.spindle_fault_changed(v))
269269

270-
pin = QHAL.newpin("spindle-modbus-errors-u32", QHAL.HAL_U32, QHAL.HAL_IN)
271-
pin.value_changed.connect(self.mb_errors_changed)
272-
pin = QHAL.newpin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN)
273-
pin.value_changed.connect(self.mb_errors_changed)
270+
pin = QHAL.newPin("spindle-modbus-errors-u32", QHAL.HAL_U32, QHAL.HAL_IN)
271+
pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v))
272+
pin = QHAL.newPin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN)
273+
pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v))
274274

275-
pin = QHAL.newpin("spindle-modbus-connection", QHAL.HAL_BIT, QHAL.HAL_IN)
276-
pin.value_changed.connect(self.mb_connection_changed)
275+
pin = QHAL.newPin("spindle-modbus-connection", QHAL.HAL_BIT, QHAL.HAL_IN)
276+
pin.pinValueChanged.connect(lambda p,v: self.mb_connection_changed(v))
277277

278-
QHAL.newpin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
278+
QHAL.newPin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
279279

280-
pin = QHAL.newpin("external-pause", QHAL.HAL_BIT, QHAL.HAL_IN)
281-
pin.value_changed.connect(self.btn_pause_clicked)
280+
pin = QHAL.newPin("external-pause", QHAL.HAL_BIT, QHAL.HAL_IN)
281+
pin.pinValueChanged.connect(lambda p,v: self.btn_pause_clicked(v))
282282

283283
# external offset control pins
284-
QHAL.newpin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
285-
QHAL.newpin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
284+
QHAL.newPin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
285+
QHAL.newPin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
286286
self.h['eoffset-clear'] = False
287-
QHAL.newpin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT)
288-
QHAL.newpin("eoffset-count", QHAL.HAL_S32, QHAL.HAL_OUT)
289-
pin = QHAL.newpin("eoffset-is-active", QHAL.HAL_BIT, QHAL.HAL_IN)
287+
QHAL.newPin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT)
288+
QHAL.newPin("eoffset-count", QHAL.HAL_S32, QHAL.HAL_OUT)
289+
pin = QHAL.newPin("eoffset-is-active", QHAL.HAL_BIT, QHAL.HAL_IN)
290290

291291

292292
# total external offsets
293-
pin = QHAL.newpin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN)
294-
pin.value_changed.connect(self.external_offset_state_changed)
293+
pin = QHAL.newPin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN)
294+
pin.pinValueChanged.connect(lambda p,v: self.external_offset_state_changed(v))
295295

296-
pin = QHAL.newpin("eoffset-zlevel-count", QHAL.HAL_S32, QHAL.HAL_IN)
297-
pin.value_changed.connect(self.comp_count_changed)
298-
QHAL.newpin("comp-on", Qhal.HAL_BIT, Qhal.HAL_OUT)
299-
QHAL.newpin("spindle-lift-on", Qhal.HAL_BIT, Qhal.HAL_OUT)
296+
pin = QHAL.newPin("eoffset-zlevel-count", QHAL.HAL_S32, QHAL.HAL_IN)
297+
pin.pinValueChanged.connect(lambda p,v: self.comp_count_changed(v))
298+
QHAL.newPin("comp-on", QHAL.HAL_BIT, QHAL.HAL_OUT)
299+
QHAL.newPin("spindle-lift-on", QHAL.HAL_BIT, QHAL.HAL_OUT)
300300

301301
# MPG scrolling pin
302-
self.pin_mpg_in = QHAL.newpin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN)
303-
self.pin_mpg_in.value_changed.connect(lambda s: self.external_mpg(s))
302+
self.pin_mpg_in = QHAL.newPin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN)
303+
self.pin_mpg_in.pinValueChanged.connect(lambda p,v: self.external_mpg(v))
304304

305305
# dialog answer pins
306-
pin = QHAL.newpin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN)
306+
pin = QHAL.newPin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN)
307307
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,1))
308-
pin = QHAL.newpin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN)
308+
pin = QHAL.newPin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN)
309309
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,2))
310-
pin = QHAL.newpin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN)
310+
pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN)
311311
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,0))
312312

313313
def init_preferences(self):

‎share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -256,58 +256,58 @@ def initialized__(self):
256256
#############################
257257
def init_pins(self):
258258
# spindle control pins
259-
pin = QHAL.newpin("spindle-amps", QHAL.HAL_FLOAT, QHAL.HAL_IN)
260-
pin.value_changed.connect(self.spindle_pwr_changed)
259+
pin = QHAL.newPin("spindle-amps", QHAL.HAL_FLOAT, QHAL.HAL_IN)
260+
pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v))
261261

262-
pin = QHAL.newpin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN)
263-
pin.value_changed.connect(self.spindle_pwr_changed)
262+
pin = QHAL.newPin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN)
263+
pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v))
264264

265-
pin = QHAL.newpin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN)
266-
pin.value_changed.connect(self.spindle_fault_changed)
267-
pin = QHAL.newpin("spindle-fault", QHAL.HAL_S32, QHAL.HAL_IN)
268-
pin.value_changed.connect(self.spindle_fault_changed)
265+
pin = QHAL.newPin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN)
266+
pin.pinValueChanged.connect(lambda p,v: self.spindle_fault_changed(v))
267+
pin = QHAL.newPin("spindle-fault", QHAL.HAL_S32, QHAL.HAL_IN)
268+
pin.pinValueChanged.connect(lambda p,v: self.spindle_fault_changed(v))
269269

270-
pin = QHAL.newpin("spindle-modbus-errors-u32", QHAL.HAL_U32, QHAL.HAL_IN)
271-
pin.value_changed.connect(self.mb_errors_changed)
272-
pin = QHAL.newpin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN)
273-
pin.value_changed.connect(self.mb_errors_changed)
270+
pin = QHAL.newPin("spindle-modbus-errors-u32", QHAL.HAL_U32, QHAL.HAL_IN)
271+
pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v))
272+
pin = QHAL.newPin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN)
273+
pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v))
274274

275-
pin = QHAL.newpin("spindle-modbus-connection", QHAL.HAL_BIT, QHAL.HAL_IN)
276-
pin.value_changed.connect(self.mb_connection_changed)
275+
pin = QHAL.newPin("spindle-modbus-connection", QHAL.HAL_BIT, QHAL.HAL_IN)
276+
pin.pinValueChanged.connect(lambda p,v: self.mb_connection_changed(v))
277277

278-
QHAL.newpin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
278+
QHAL.newPin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
279279

280-
pin = QHAL.newpin("external-pause", QHAL.HAL_BIT, QHAL.HAL_IN)
281-
pin.value_changed.connect(self.btn_pause_clicked)
280+
pin = QHAL.newPin("external-pause", QHAL.HAL_BIT, QHAL.HAL_IN)
281+
pin.pinValueChanged.connect(lambda p,v: self.btn_pause_clicked(v))
282282

283283
# external offset control pins
284-
QHAL.newpin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
285-
QHAL.newpin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
284+
QHAL.newPin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
285+
QHAL.newPin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
286286
self.h['eoffset-clear'] = False
287-
QHAL.newpin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT)
288-
QHAL.newpin("eoffset-count", QHAL.HAL_S32, QHAL.HAL_OUT)
289-
pin = QHAL.newpin("eoffset-is-active", QHAL.HAL_BIT, QHAL.HAL_IN)
287+
QHAL.newPin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT)
288+
QHAL.newPin("eoffset-count", QHAL.HAL_S32, QHAL.HAL_OUT)
289+
pin = QHAL.newPin("eoffset-is-active", QHAL.HAL_BIT, QHAL.HAL_IN)
290290

291291

292292
# total external offsets
293-
pin = QHAL.newpin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN)
294-
pin.value_changed.connect(self.external_offset_state_changed)
293+
pin = QHAL.newPin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN)
294+
pin.pinValueChanged.connect(lambda p,v: self.external_offset_state_changed(v))
295295

296-
pin = QHAL.newpin("eoffset-zlevel-count", QHAL.HAL_S32, QHAL.HAL_IN)
297-
pin.value_changed.connect(self.comp_count_changed)
298-
QHAL.newpin("comp-on", Qhal.HAL_BIT, Qhal.HAL_OUT)
299-
QHAL.newpin("spindle-lift-on", Qhal.HAL_BIT, Qhal.HAL_OUT)
296+
pin = QHAL.newPin("eoffset-zlevel-count", QHAL.HAL_S32, QHAL.HAL_IN)
297+
pin.pinValueChanged.connect(lambda p,v: self.comp_count_changed(v))
298+
QHAL.newPin("comp-on", Qhal.HAL_BIT, Qhal.HAL_OUT)
299+
QHAL.newPin("spindle-lift-on", Qhal.HAL_BIT, Qhal.HAL_OUT)
300300

301301
# MPG scrolling pin
302-
self.pin_mpg_in = QHAL.newpin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN)
303-
self.pin_mpg_in.value_changed.connect(lambda s: self.external_mpg(s))
302+
self.pin_mpg_in = QHAL.newPin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN)
303+
self.pin_mpg_in.pinValueChanged.connect(lambda p,v: self.external_mpg(v))
304304

305305
# dialog answer pins
306-
pin = QHAL.newpin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN)
306+
pin = QHAL.newPin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN)
307307
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,1))
308-
pin = QHAL.newpin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN)
308+
pin = QHAL.newPin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN)
309309
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,2))
310-
pin = QHAL.newpin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN)
310+
pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN)
311311
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,0))
312312

313313
def init_preferences(self):

‎share/qtvcp/screens/qtdragon_lathe/qtdragon_lathe_handler.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -318,50 +318,50 @@ def init_utils(self):
318318
#############################
319319
def init_pins(self):
320320
# spindle control pins
321-
pin = QHAL.newpin("spindle-amps", QHAL.HAL_FLOAT, QHAL.HAL_IN)
322-
pin.value_changed.connect(self.spindle_pwr_changed)
321+
pin = QHAL.newPin("spindle-amps", QHAL.HAL_FLOAT, QHAL.HAL_IN)
322+
pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v))
323323

324-
pin = QHAL.newpin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN)
325-
pin.value_changed.connect(self.spindle_pwr_changed)
324+
pin = QHAL.newPin("spindle-volts", QHAL.HAL_FLOAT, QHAL.HAL_IN)
325+
pin.pinValueChanged.connect(lambda p,v: self.spindle_pwr_changed(v))
326326

327-
pin = QHAL.newpin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN)
328-
pin.value_changed.connect(self.spindle_fault_changed)
329-
pin = QHAL.newpin("spindle-fault", QHAL.HAL_S32, QHAL.HAL_IN)
330-
pin.value_changed.connect(self.spindle_fault_changed)
327+
pin = QHAL.newPin("spindle-fault-u32", QHAL.HAL_U32, QHAL.HAL_IN)
328+
pin.pinValueChanged.connect(lambda p,v: self.spindle_fault_changed(v))
329+
pin = QHAL.newPin("spindle-fault", QHAL.HAL_S32, QHAL.HAL_IN)
330+
pin.pinValueChanged.connect(lambda p,v: self.spindle_fault_changed(v))
331331

332-
pin = QHAL.newpin("spindle-modbus-errors-u32", QHAL.HAL_U32, QHAL.HAL_IN)
333-
pin.value_changed.connect(self.mb_errors_changed)
334-
pin = QHAL.newpin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN)
335-
pin.value_changed.connect(self.mb_errors_changed)
332+
pin = QHAL.newPin("spindle-modbus-errors-u32", QHAL.HAL_U32, QHAL.HAL_IN)
333+
pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v))
334+
pin = QHAL.newPin("spindle-modbus-errors", QHAL.HAL_S32, QHAL.HAL_IN)
335+
pin.pinValueChanged.connect(lambda p,v: self.mb_errors_changed(v))
336336

337-
pin = QHAL.newpin("spindle-modbus-connection", QHAL.HAL_BIT, QHAL.HAL_IN)
338-
pin.value_changed.connect(self.mb_connection_changed)
337+
pin = QHAL.newPin("spindle-modbus-connection", QHAL.HAL_BIT, QHAL.HAL_IN)
338+
pin.pinValueChanged.connect(lambda p,v: self.mb_connection_changed(v))
339339

340-
QHAL.newpin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
340+
QHAL.newPin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
341341

342-
pin = QHAL.newpin("external-pause", QHAL.HAL_BIT, QHAL.HAL_IN)
343-
pin.value_changed.connect(self.btn_pause_clicked)
342+
pin = QHAL.newPin("external-pause", QHAL.HAL_BIT, QHAL.HAL_IN)
343+
pin.pinValueChanged.connect(lambda p,v: self.btn_pause_clicked(v))
344344

345345
# external offset control pins
346-
QHAL.newpin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
347-
QHAL.newpin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
346+
QHAL.newPin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
347+
QHAL.newPin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
348348
self.h['eoffset-clear'] = True
349-
QHAL.newpin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT)
350-
pin = QHAL.newpin("eoffset-is-active", QHAL.HAL_BIT, QHAL.HAL_IN)
351-
pin.value_changed.connect(self.external_offset_state_changed)
349+
QHAL.newPin("eoffset-spindle-count", QHAL.HAL_S32, QHAL.HAL_OUT)
350+
pin = QHAL.newPin("eoffset-is-active", QHAL.HAL_BIT, QHAL.HAL_IN)
351+
pin.pinValueChanged.connect(lambda p,v: self.external_offset_state_changed(v))
352352

353353
# total external offset
354-
pin = QHAL.newpin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN)
354+
pin = QHAL.newPin("eoffset-value", QHAL.HAL_FLOAT, QHAL.HAL_IN)
355355

356-
self.pin_mpg_in = QHAL.newpin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN)
357-
self.pin_mpg_in.value_changed.connect(lambda s: self.external_mpg(s))
356+
self.pin_mpg_in = QHAL.newPin('mpg-in',QHAL.HAL_S32, QHAL.HAL_IN)
357+
self.pin_mpg_in.pinValueChanged.connect(lambda p,v: self.external_mpg(v))
358358

359359
# dialog answer pins
360-
pin = QHAL.newpin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN)
360+
pin = QHAL.newPin("dialog-ok", QHAL.HAL_BIT, QHAL.HAL_IN)
361361
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,1))
362-
pin = QHAL.newpin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN)
362+
pin = QHAL.newPin("dialog-no", QHAL.HAL_BIT, QHAL.HAL_IN)
363363
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,2))
364-
pin = QHAL.newpin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN)
364+
pin = QHAL.newPin("dialog-cancel", QHAL.HAL_BIT, QHAL.HAL_IN)
365365
pin.pinValueChanged.connect(lambda p,v: self.dialog_ext_control(p,v,0))
366366

367367
def init_preferences(self):

0 commit comments

Comments
 (0)