From 3396d218ed04c848f2667285b9a2392c732a379b Mon Sep 17 00:00:00 2001
From: electrolab <electrolab@Maurice.hq.electrolab.fr>
Date: Tue, 15 Dec 2020 02:45:19 +0100
Subject: [PATCH] Last know working before transferring huge hal changes

---
 classicladder.hal    |  20 +++-
 gmoccapy_postgui.hal |  53 ++++++++--
 maurice-common.ini   |  13 ++-
 maurice.clp          | 228 +++++++++++++++++++++++++++++++++++++++++--
 maurice.hal          |   4 +-
 mb2hal.hal           |  58 +++++------
 mb2hal.ini           |   4 +-
 7 files changed, 328 insertions(+), 52 deletions(-)

diff --git a/classicladder.hal b/classicladder.hal
index 24de8db..cf6a834 100644
--- a/classicladder.hal
+++ b/classicladder.hal
@@ -22,7 +22,7 @@ net Home-Z		classicladder.0.in-10
 
 net ModeManual		classicladder.0.in-19
 
-#Tool Change Logic -> 20-29
+#Tool Change Logic -> 20-35
 
 net TurretLS9		classicladder.0.in-20
 net TurretLS10		classicladder.0.in-21
@@ -42,6 +42,24 @@ net PanelTurret4	classicladder.0.in-31
 
 net ToolChangeButton	classicladder.0.in-32
 
+#Panel Logic -> 30-
+
+net PanelTurret1        classicladder.0.in-28
+net PanelTurret2        classicladder.0.in-29
+net PanelTurret3        classicladder.0.in-30
+net PanelTurret4        classicladder.0.in-31
+net ModeSelect1		classicladder.0.in-36		
+net ModeSelect2		classicladder.0.in-37
+net ModeSelect3		classicladder.0.in-38
+net ModeSelect4		classicladder.0.in-39
+net FeedOv1		classicladder.0.in-40
+net FeedOv2		classicladder.0.in-41
+net FeedOv3		classicladder.0.in-42
+net FeedOv4		classicladder.0.in-43
+net RapidOv1		classicladder.0.in-44
+net RapidOv2		classicladder.0.in-45
+
+
 #==============================================================
 #ClassicLadder Inputs
 #==============================================================
diff --git a/gmoccapy_postgui.hal b/gmoccapy_postgui.hal
index 552c394..9757b48 100755
--- a/gmoccapy_postgui.hal
+++ b/gmoccapy_postgui.hal
@@ -1,7 +1,46 @@
-net X-homed	    => halui.joint.0.home
-net Z-homed	    => halui.joint.2.home
-
-net Home-All	<= gmoccapy.joint.all.home
-net Home-X	    <= gmoccapy.joint.0.home
-net Home-Z	    <= gmoccapy.joint.2.home
-
+net X-homed     => halui.joint.0.home
+net Z-homed     => halui.joint.2.home
+
+net Home-All    <= gmoccapy.joint.all.home
+net Home-X      <= gmoccapy.joint.0.home
+net Home-Z      <= gmoccapy.joint.2.home
+
+net ToolChangeFailed	halui.program.stop
+
+net SpindleNormal	halui.spindle.0.forward
+net SpindleOff		halui.spindle.0.stop
+net SpindleReverse	halui.spindle.0.reverse
+
+net CoolantBtnOn	halui.lube.on
+net CoolantBtnOff	halui.lube.off
+net CoolantLed		halui.lube.is-on
+
+net CycleStartBtn	halui.program.run
+net FeedHoldBtn		halui.program.pause
+
+net XSelect		halui.axis.x.select
+net ZSelect		halui.axis.z.select
+net XJogPlus		halui.axis.x.plus
+net XJogMinus		halui.axis.x.minus
+net ZJogPlus		halui.axis.z.plus
+net ZJogMinus		halui.axis.z.minus
+
+net XZeroed		halui.joint.0.is-homed
+net ZZeroed		halui.joint.2.is-homed
+net MachineIsOn		halui.machine.is-on
+#net ModeManual     halui.mode.is−manual
+
+#net ToolChangeRequest	iocontrol.0.tool-change
+#net ToolPrepPrepPocket	iocontrol.0.tool-prep-pocket
+
+#net ToolChangeOk   iocontrol.0.tool-changed
+
+#net ManualTC1       => halui.mdi−command−01
+#net ManualTC2       => halui.mdi−command−02
+#net ManualTC3       => halui.mdi−command−03
+#net ManualTC4       => halui.mdi−command−04
+#net ManualTC5       => halui.mdi−command−05
+#net ManualTC6       => halui.mdi−command−06
+#net ManualTC7       => halui.mdi−command−07
+#net ManualTC8       => halui.mdi−command−08
+
diff --git a/maurice-common.ini b/maurice-common.ini
index 6c198b2..2ce179d 100755
--- a/maurice-common.ini
+++ b/maurice-common.ini
@@ -58,12 +58,24 @@ CYCLE_TIME = 0.005
 
 [HALUI]
 
+# MDI commands
+
+MDI_COMMAND = T1 M6 G43
+MDI_COMMAND = T2 M6 G43
+MDI_COMMAND = T3 M6 G43
+MDI_COMMAND = T4 M6 G43
+MDI_COMMAND = T5 M6 G43
+MDI_COMMAND = T6 M6 G43
+MDI_COMMAND = T7 M6 G43
+MDI_COMMAND = T8 M6 G43
+
 [TRAJ]
 COORDINATES = X Z
 LINEAR_UNITS = mm
 ANGULAR_UNITS = deg
 DEFAULT_LINEAR_VELOCITY = 100
 MAX_LINEAR_VELOCITY = 400
+NO_FORCE_HOMING = 1
 
 [EMCIO]
 EMCIO = io
@@ -133,4 +145,3 @@ HOME_LATCH_VEL =                 0
 HOME_USE_INDEX =                 NO
 HOME_IGNORE_LIMITS =             YES
 HOME_SEQUENCE = 1
-
diff --git a/maurice.clp b/maurice.clp
index 13b62f6..52b1e86 100644
--- a/maurice.clp
+++ b/maurice.clp
@@ -3,6 +3,19 @@ _FILE-modbusioconf.csv
 #VER=1.0
 1,5,3240,1,0,0
 _/FILE-modbusioconf.csv
+_FILE-rung_7.csv
+#VER=2.0
+#LABEL=
+#COMMENT=
+#PREVRUNG=8
+#NEXTRUNG=-1
+0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
+1-0-50/20 , 9-0-0/0 , 1-0-50/21 , 9-0-0/0 , 1-0-50/25 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 60-0-0/0
+1-0-50/23 , 9-0-0/0 , 1-0-50/24 , 9-0-0/0 , 1-0-50/25 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 60-0-0/1
+1-0-50/22 , 9-0-0/0 , 1-0-50/24 , 9-0-0/0 , 1-0-50/25 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 60-0-0/2
+1-0-50/21 , 9-0-0/0 , 1-0-50/23 , 9-0-0/0 , 1-0-50/25 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 60-0-0/3
+0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
+_/FILE-rung_7.csv
 _FILE-ioconf.csv
 #VER=1.0
 _/FILE-ioconf.csv
@@ -24,7 +37,7 @@ _FILE-rung_4.csv
 #LABEL=
 #COMMENT=
 #PREVRUNG=-1
-#NEXTRUNG=-1
+#NEXTRUNG=11
 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
@@ -44,6 +57,36 @@ _FILE-timers_iec.csv
 1,3,1
 2,5,2
 2,5,2
+1,5,0
+1,2,0
+1,60,0
+1,5,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
+1,0,0
 1,0,0
 1,0,0
 _/FILE-timers_iec.csv
@@ -61,7 +104,33 @@ _FILE-monostables.csv
 _/FILE-monostables.csv
 _FILE-arithmetic_expressions.csv
 #VER=2.0
+0000,@200/0@=1
+0001,@200/0@=2
+0002,@200/0@=3
+0003,@200/0@=4
+0004,@200/0@=5
+0005,@200/0@=6
+0006,@200/0@=7
+0007,@200/0@=8
+0008,@200/0@=@270/0@
+0009,@270/0@-@200/0@>4
+0010,@270/0@-@200/0@<0
+0011,@270/0@-@200/0@>=-4
+0012,@270/0@=0
 _/FILE-arithmetic_expressions.csv
+_FILE-rung_11.csv
+#VER=2.0
+#LABEL=
+#COMMENT=
+#PREVRUNG=4
+#NEXTRUNG=10
+0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 9-0-0/0 , 9-0-0/0 , 53-0-60/25
+1-0-50/26 , 2-0-0/3 , 9-0-60/0 , 9-0-0/0 , 2-0-60/25 , 9-0-60/0 , 9-0-0/0 , 99-1-0/0 , 13-0-0/10 , 50-0-60/26
+9-0-0/0 , 1-0-60/24 , 2-0-60/26 , 0-1-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 99-1-0/0 , 99-0-0/0 , 0-0-0/0
+1-0-60/21 , 9-0-0/0 , 99-0-0/0 , 13-0-0/11 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 9-1-60/0 , 9-0-0/0 , 50-0-60/24
+0-0-0/0 , 0-0-0/0 , 99-0-60/21 , 99-0-0/0 , 9-1-50/25 , 9-0-0/0 , 9-0-0/0 , 9-0-0/12 , 9-0-0/12 , 52-0-60/25
+1-0-50/26 , 9-0-0/0 , 1-0-0/3 , 9-0-0/0 , 2-0-60/24 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 50-0-60/25
+_/FILE-rung_11.csv
 _FILE-symbols.csv
 #VER=1.0
 %I0,XStatHome,
@@ -97,7 +166,7 @@ _FILE-symbols.csv
 %B0,XToHome,
 %B1,ZToHome,
 %B2,HomeSeq,
-%B3,%B3,
+%B3,TInPos,
 %B4,%B4,
 %B5,%B5,
 %B6,%B6,
@@ -114,8 +183,8 @@ _FILE-symbols.csv
 %B17,%B17,
 %B18,%B18,
 %B19,%B19,
-%W0,%W0,
-%W1,%W1,
+%W0,TPosition,
+%W1,TToGo,
 %W2,%W2,
 %W3,%W3,
 %W4,%W4,
@@ -134,7 +203,7 @@ _FILE-symbols.csv
 %W17,%W17,
 %W18,%W18,
 %W19,%W19,
-%IW0,%IW0,
+%IW0,ToolNbr,
 %IW1,%IW1,
 %IW2,%IW2,
 %IW3,%IW3,
@@ -224,6 +293,106 @@ _FILE-symbols.csv
 %E7,%E7,Error Flag Bit
 %E8,%E8,Error Flag Bit
 %E9,%E9,Error Flag Bit
+%I15,%I15,
+%I16,%I16,
+%I17,%I17,
+%I18,%I18,
+%I19,%I19,
+%I20,LS9,
+%I21,LS10,
+%I22,LS11,
+%I23,LS12,
+%I24,LS13,
+%I25,TIndex,
+%I26,TcReq,
+%I27,%I27,
+%I28,%I28,
+%I29,%I29,
+%I30,%I30,
+%I31,%I31,
+%I32,%I32,
+%I33,%I33,
+%I34,%I34,
+%I35,%I35,
+%I36,%I36,
+%I37,%I37,
+%I38,%I38,
+%I39,%I39,
+%I40,%I40,
+%I41,%I41,
+%I42,%I42,
+%I43,%I43,
+%I44,%I44,
+%I45,%I45,
+%I46,%I46,
+%I47,%I47,
+%I48,%I48,
+%I49,%I49,
+%Q15,%Q15,
+%Q16,%Q16,
+%Q17,%Q17,
+%Q18,%Q18,
+%Q19,%Q19,no signal connected
+%Q20,TUnclamp,
+%Q21,TClamp,
+%Q22,TReverse,
+%Q23,TSpin,
+%Q24,TcRun,
+%Q25,TcOk,
+%Q26,TcFail,
+%Q27,%Q27,
+%Q28,%Q28,
+%Q29,%Q29,
+%Q30,%Q30,
+%Q31,%Q31,
+%Q32,%Q32,
+%Q33,%Q33,
+%Q34,%Q34,
+%Q35,%Q35,
+%Q36,%Q36,
+%Q37,%Q37,
+%Q38,%Q38,
+%Q39,%Q39,
+%Q40,%Q40,
+%Q41,%Q41,
+%Q42,%Q42,
+%Q43,%Q43,
+%Q44,%Q44,
+%Q45,%Q45,
+%Q46,%Q46,
+%Q47,%Q47,
+%Q48,%Q48,
+%Q49,%Q49,
+%TM10,%TM10,New Timer
+%TM11,%TM11,New Timer
+%TM12,%TM12,New Timer
+%TM13,%TM13,New Timer
+%TM14,%TM14,New Timer
+%TM15,%TM15,New Timer
+%TM16,%TM16,New Timer
+%TM17,%TM17,New Timer
+%TM18,%TM18,New Timer
+%TM19,%TM19,New Timer
+%TM20,%TM20,New Timer
+%TM21,%TM21,New Timer
+%TM22,%TM22,New Timer
+%TM23,%TM23,New Timer
+%TM24,%TM24,New Timer
+%TM25,%TM25,New Timer
+%TM26,%TM26,New Timer
+%TM27,%TM27,New Timer
+%TM28,%TM28,New Timer
+%TM29,%TM29,New Timer
+%TM30,%TM30,New Timer
+%TM31,%TM31,New Timer
+%TM32,%TM32,New Timer
+%TM33,%TM33,New Timer
+%TM34,%TM34,New Timer
+%TM35,%TM35,New Timer
+%TM36,%TM36,New Timer
+%TM37,%TM37,New Timer
+%TM38,%TM38,New Timer
+%TM39,%TM39,New Timer
 _/FILE-symbols.csv
 _FILE-general.txt
 PERIODIC_REFRESH=50
@@ -233,12 +402,12 @@ SIZE_NBR_WORDS=20
 SIZE_NBR_TIMERS=10
 SIZE_NBR_MONOSTABLES=10
 SIZE_NBR_COUNTERS=10
-SIZE_NBR_TIMERS_IEC=10
-SIZE_NBR_PHYS_INPUTS=15
-SIZE_NBR_PHYS_OUTPUTS=15
+SIZE_NBR_TIMERS_IEC=40
+SIZE_NBR_PHYS_INPUTS=50
+SIZE_NBR_PHYS_OUTPUTS=50
 SIZE_NBR_ARITHM_EXPR=100
 SIZE_NBR_SECTIONS=10
-SIZE_NBR_SYMBOLS=160
+SIZE_NBR_SYMBOLS=260
 _/FILE-general.txt
 _FILE-rung_6.csv
 #VER=2.0
@@ -265,6 +434,19 @@ _FILE-counters.csv
 0
 0
 _/FILE-counters.csv
+_FILE-rung_9.csv
+#VER=2.0
+#LABEL=
+#COMMENT=
+#PREVRUNG=10
+#NEXTRUNG=8
+9-0-0/0 , 1-0-0/3 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 53-0-60/23
+9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 20-0-0/12 , 9-0-0/0 , 9-0-0/0 , 0-0-0/0 , 0-0-0/0
+9-0-0/0 , 9-0-50/0 , 9-0-0/0 , 99-0-0/8 , 99-0-0/0 , 20-0-0/8 , 9-0-0/0 , 1-0-50/25 , 9-1-0/0 , 50-0-0/3
+0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/10 , 0-0-0/0 , 0-0-0/0 , 0-0-0/11 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
+9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 20-0-0/9 , 9-0-0/9 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 50-0-60/22
+9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 20-0-0/11 , 9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 20-0-0/10 , 0-1-0/0 , 0-0-0/0
+_/FILE-rung_9.csv
 _FILE-rung_2.csv
 #VER=2.0
 #LABEL=
@@ -327,7 +509,7 @@ _FILE-sections.csv
 #NAME000=HomingLadder
 #NAME001=ToolPostLadder
 000,0,-1,2,0,0
-001,0,-1,4,4,0
+001,0,-1,4,7,0
 _/FILE-sections.csv
 _FILE-rung_3.csv
 #VER=2.0
@@ -355,4 +537,30 @@ _FILE-rung_1.csv
 9-0-0/0 , 1-0-50/4 , 2-0-50/5 , 9-0-0/0 , 1-0-50/6 , 99-0-0/0 , 13-0-0/3 , 99-0-0/0 , 13-0-0/6 , 50-0-60/1
 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 99-0-0/0 , 99-0-0/0 , 99-0-0/0 , 99-0-0/0 , 0-0-0/0
 _/FILE-rung_1.csv
+_FILE-rung_10.csv
+#VER=2.0
+#LABEL=
+#COMMENT=
+#PREVRUNG=11
+#NEXTRUNG=9
+1-0-60/24 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 2-0-60/21 , 9-0-0/0 , 50-0-60/20
+9-0-60/0 , 1-0-60/26 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 9-0-60/21 , 9-0-0/0 , 53-0-60/23
+1-0-60/20 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 13-0-0/8 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 52-0-60/23
+0-0-60/20 , 0-0-0/0 , 0-0-0/0 , 0-0-0/8 , 99-0-0/0 , 99-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-60/23
+4-0-60/23 , 9-0-0/0 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 13-0-0/9 , 9-0-0/0 , 2-0-60/25 , 9-0-0/0 , 50-0-60/21
+0-0-60/23 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 99-0-0/0 , 99-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-60/21
+_/FILE-rung_10.csv
+_FILE-rung_8.csv
+#VER=2.0
+#LABEL=
+#COMMENT=
+#PREVRUNG=9
+#NEXTRUNG=7
+0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
+1-0-50/20 , 9-0-0/0 , 1-0-50/22 , 9-0-0/0 , 1-0-50/25 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 60-0-0/4
+1-0-50/20 , 9-0-0/0 , 1-0-50/23 , 9-0-0/0 , 1-0-50/25 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 60-0-0/5
+1-0-50/22 , 9-0-0/0 , 1-0-50/23 , 9-0-0/0 , 1-0-50/25 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 60-0-0/6
+1-0-50/21 , 9-0-0/0 , 1-0-50/22 , 9-0-0/0 , 1-0-50/25 , 9-0-0/0 , 9-0-0/0 , 99-0-0/0 , 99-0-0/0 , 60-0-0/7
+0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0 , 0-0-0/0
+_/FILE-rung_8.csv
 _/FILES_CLASSICLADDER
diff --git a/maurice.hal b/maurice.hal
index c641b3c..6e8002c 100644
--- a/maurice.hal
+++ b/maurice.hal
@@ -11,8 +11,8 @@
 
 addf motion-command-handler servo-thread
 addf motion-controller servo-thread
-loadusr halui -ini maurice.ini
-loadusr io
+#loadusr halui -ini maurice.ini
+#loadusr io
 
 #==========================================
 # Global machine logic
diff --git a/mb2hal.hal b/mb2hal.hal
index df32d57..9ea4734 100644
--- a/mb2hal.hal
+++ b/mb2hal.hal
@@ -2,37 +2,37 @@
 loadusr -Wn mb2hal ./mb2halv2/mb2halv2 config=mb2hal.ini
 
 #mb2hal.STBIn.PowerOnSwitch
-#mb2hal.STBIn.SpindleNormal
-#mb2hal.STBIn.SpindleOff
-#mb2hal.STBIn.SpindleReverse 
+net SpindleNormal	mb2hal.STBIn.SpindleNormal
+net SpindleOff		mb2hal.STBIn.SpindleOff
+net SpindleReverse	mb2hal.STBIn.SpindleReverse
 #mb2hal.STBIn.TurretShift 
-#mb2hal.STBIn.CoolantReqOn 
-#mb2hal.STBIn.CoolantReqOff 
-#mb2hal.STBIn.CycleStart 
-#mb2hal.STBIn.FeedHoldbtn 
+net CoolantBtnOn	mb2hal.STBIn.CoolantReqOn
+net CoolantBtnOff	mb2hal.STBIn.CoolantReqOff
+net CycleStartBtn	mb2hal.STBIn.CycleStart
+net FeedHoldBtn		mb2hal.STBIn.FeedHoldbtn
 #mb2hal.STBIn.EStop 
-#mb2hal.STBIn.XaxisMPG0
-#mb2hal.STBIn.YaxisMPG1
-#mb2hal.STBIn.XplusJOG2
-#mb2hal.STBIn.XminusJog
-#mb2hal.STBIn.ZplusJOG
-#mb2hal.STBIn.ZminusJOG
-#
-#mb2hal.STBIn.ModeSelect-1
-#mb2hal.STBIn.ModeSelect-2
-#mb2hal.STBIn.ModeSelect-3
-#mb2hal.STBIn.ModeSelect-4
-#mb2hal.STBIn.TurretN-1   
-#mb2hal.STBIn.TurretN-2   
-#mb2hal.STBIn.TurretN-3   
-#mb2hal.STBIn.TurretN-4   
-#mb2hal.STBIn.FeedOv-1    
-#mb2hal.STBIn.FeedOv-2    
-#mb2hal.STBIn.FeedOv-3    
-#mb2hal.STBIn.FeedOv-4    
-#mb2hal.STBIn.RapidOv-1   
-#mb2hal.STBIn.RapidOv-2   
-#mb2hal.STBIn.MachineLock 
+net XSelect		mb2hal.STBIn.XaxisMPG
+net ZSelect		mb2hal.STBIn.ZaxisMPG
+net XJogPlus		mb2hal.STBIn.XplusJOG
+net XJogMinus		mb2hal.STBIn.XminusJog
+net ZJogPlus		mb2hal.STBIn.ZplusJOG
+net ZJogMinus		mb2hal.STBIn.ZminusJOG
+
+net ModeSelect1		mb2hal.STBIn.ModeSelect-1
+net ModeSelect2		mb2hal.STBIn.ModeSelect-2
+net ModeSelect3		mb2hal.STBIn.ModeSelect-3
+net ModeSelect4		mb2hal.STBIn.ModeSelect-4
+net PanelTurret1	mb2hal.STBIn.TurretN-1
+net PanelTurret2	mb2hal.STBIn.TurretN-2
+net PanelTurret3	mb2hal.STBIn.TurretN-3
+net PanelTurret4	mb2hal.STBIn.TurretN-4
+net FeedOv1		mb2hal.STBIn.FeedOv-1
+net FeedOv2		mb2hal.STBIn.FeedOv-2
+net FeedOv3		mb2hal.STBIn.FeedOv-3
+net FeedOv4		mb2hal.STBIn.FeedOv-4
+net RapidOv1		mb2hal.STBIn.RapidOv-1
+net RapidOv2		mb2hal.STBIn.RapidOv-2
+#mb2hal.STBIn.MachineLock
 #mb2hal.STBIn.DryRun
 #
 #mb2hal.STBIn.OptStop    
diff --git a/mb2hal.ini b/mb2hal.ini
index 5dce295..04bfee2 100644
--- a/mb2hal.ini
+++ b/mb2hal.ini
@@ -15,7 +15,7 @@
 # 2 = OK confirmation messages.
 # 3 = debugging messages.
 
-INIT_DEBUG=3
+INIT_DEBUG=1
 
 #OPTIONAL: HAL module (component) name. Defaults to "mb2hal".
 
@@ -91,7 +91,7 @@ HAL_MAP_PIN=CycleStart, 5391, bit, 7
 HAL_MAP_PIN=FeedHoldbtn, 5391, bit, 8 
 HAL_MAP_PIN=EStop, 5391, bit, 9 
 HAL_MAP_PIN=XaxisMPG, 5391, bit, 10
-HAL_MAP_PIN=YaxisMPG, 5391, bit, 11
+HAL_MAP_PIN=ZaxisMPG, 5391, bit, 11
 HAL_MAP_PIN=XplusJOG, 5391, bit, 12
 HAL_MAP_PIN=XminusJog, 5391, bit, 13
 HAL_MAP_PIN=ZplusJOG, 5391, bit, 14
-- 
GitLab