Combine two probes

Add some code (got from here: https://forum.linuxcnc.org/38-general-linuxcnc-questions/35861-tool-length-sensor-and-touch-probe-with-mesa7i76e) to combine to the probes into one.

Still have to check:
- the correct input for "probe-usb" and if it should be inverted or not

printnc/printnc.hal

@@ -14,18 +14,21 @@ setp    hm2_7i96s.0.watchdog.timeout_ns 5000000
 loadrt pid names=pid.x,pid.y,pid.y2,pid.z,pid.s
 loadrt abs names=abs.spindle
 loadrt lowpass names=lowpass.spindle
+loadrt or2
 
-addf hm2_7i96s.0.read          servo-thread
+addf or2.0                    servo-thread
+addf hm2_7i96s.0.read         servo-thread
 addf motion-command-handler   servo-thread
 addf motion-controller        servo-thread
 addf pid.x.do-pid-calcs       servo-thread
 addf pid.y.do-pid-calcs       servo-thread
-addf pid.y2.do-pid-calcs       servo-thread
+addf pid.y2.do-pid-calcs      servo-thread
 addf pid.z.do-pid-calcs       servo-thread
 addf pid.s.do-pid-calcs       servo-thread
 addf abs.spindle              servo-thread
 addf lowpass.spindle          servo-thread
-addf hm2_7i96s.0.write         servo-thread
+addf hm2_7i96s.0.write        servo-thread
+
 setp hm2_7i96s.0.dpll.01.timer-us -50
 setp hm2_7i96s.0.stepgen.timer-number 1
 
@@ -50,7 +53,13 @@ net home-z     <=  hm2_7i96s.0.inm.00.input-03-not
 net estop-ext     <=  hm2_7i96s.0.inm.00.input-06
 
 # --- PROBE-IN ---
-net probe-in     <=  hm2_7i96s.0.inm.00.input-07
+
+net probe-in      <=  hm2_7i96s.0.inm.00.input-07
+net probe-usb-in  <=  hm2_7i96s.0.inm.00.input-04
+net probe-in      => or2.0.in0
+net probe-usb-in  => or2.0.in1
+net probe-merge or2.0.out
+net probe-merge motion.probe-input
 
 
 #*******************
@@ -344,7 +353,8 @@ net coolant-flood     <=  iocontrol.0.coolant-flood
 
 #  ---probe signal---
 
-net probe-in     =>  motion.probe-input
+net probe-merge     =>  motion.probe-input
+
 
 #  ---motion control signals---