Skip to content

Commit 1f24ea9

Browse files
Shorten nStandardMsgType to fit 15-character limit
1 parent 6089826 commit 1f24ea9

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

staubli_val3_driver/val3/ros_server/decodeMsgBody.pgx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
l_bFlag=false
2828
2929
switch rosGenericMsg.header.nMsgType
30-
case nStandardMsgType["JOINT_TRAJ_PT"]
30+
case nStdMsgType["JOINT_TRAJ_PT"]
3131
call decTrajPt(l_bFlag)
3232
break
33-
case nStandardMsgType["JOINT_TRAJ_PT_FULL"]
33+
case nStdMsgType["JOINT_TRAJ_PT_FULL"]
3434
call decTrajPtFull(l_bFlag)
3535
break
3636
default
@@ -44,10 +44,10 @@
4444
// error whilst decoding msg body...
4545
if (rosGenericMsg.header.nCommType==2)
4646
switch rosGenericMsg.header.nMsgType
47-
case nStandardMsgType["JOINT_TRAJ_PT"]
47+
case nStdMsgType["JOINT_TRAJ_PT"]
4848
rosTrajPtAck.header.nReplyCode=2
4949
break
50-
case nStandardMsgType["JOINT_TRAJ_PT_FULL"]
50+
case nStdMsgType["JOINT_TRAJ_PT_FULL"]
5151
rosTrajPtFAck.header.nReplyCode=2
5252
break
5353
default

staubli_val3_driver/val3/ros_server/encodeAck.pgx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
2020
2121
switch rosGenericMsg.header.nMsgType
22-
case nStandardMsgType["JOINT_TRAJ_PT"]
22+
case nStdMsgType["JOINT_TRAJ_PT"]
2323
call encTrajPtAck()
2424
break
25-
case nStandardMsgType["JOINT_TRAJ_PT_FULL"]
25+
case nStdMsgType["JOINT_TRAJ_PT_FULL"]
2626
call encTrajPtFAck()
2727
break
2828
default

staubli_val3_driver/val3/ros_server/pushMotion.pgx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
2929
3030
switch rosGenericMsg.header.nMsgType
31-
case nStandardMsgType["JOINT_TRAJ_PT"]
31+
case nStdMsgType["JOINT_TRAJ_PT"]
3232
l_mTrajPt.nSequence=rosTrajPtMsg.jointTrajPt.nSeq
3333
3434
// ROS joint position values are in rad, but VAL3 uses degrees
@@ -43,7 +43,7 @@
4343
l_mTrajPt.nDuration=rosTrajPtMsg.jointTrajPt.nDuration
4444
4545
break
46-
case nStandardMsgType["JOINT_TRAJ_PT_FULL"]
46+
case nStdMsgType["JOINT_TRAJ_PT_FULL"]
4747
l_mTrajPt.nSequence=rosTrajPtFMsg.jointTrajPtFull.nSeq
4848
l_mTrajPt.nDuration=rosTrajPtFMsg.jointTrajPtFull.nTime
4949
@@ -91,10 +91,10 @@
9191
// thus ACK should flag FAILURE, but only if comm type is request
9292
if(rosGenericMsg.header.nCommType==nCommType["SERVICE_REQUEST"])
9393
switch rosGenericMsg.header.nMsgType
94-
case nStandardMsgType["JOINT_TRAJ_PT"]
94+
case nStdMsgType["JOINT_TRAJ_PT"]
9595
rosTrajPtAck.header.nReplyCode=2
9696
break
97-
case nStandardMsgType["JOINT_TRAJ_PT_FULL"]
97+
case nStdMsgType["JOINT_TRAJ_PT_FULL"]
9898
rosTrajPtFAck.header.nReplyCode=2
9999
break
100100
default

staubli_val3_driver/val3/ros_server/recvMsgBody.pgx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
l_bFlag=false
2828
2929
switch rosGenericMsg.header.nMsgType
30-
case nStandardMsgType["JOINT_TRAJ_PT"]
30+
case nStdMsgType["JOINT_TRAJ_PT"]
3131
call recvTrajPt(l_bFlag)
3232
break
33-
case nStandardMsgType["JOINT_TRAJ_PT_FULL"]
33+
case nStdMsgType["JOINT_TRAJ_PT_FULL"]
3434
call recvTrajPtFull(l_bFlag)
3535
break
3636
default

staubli_val3_driver/val3/ros_server/ros_server.dtx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
</Value>
457457
</Data>
458458
<Data name="nVel" access="private" xsi:type="array" type="num" size="2" />
459-
<Data name="nStandardMsgType" access="private" xsi:type="collection" type="num">
459+
<Data name="nStdMsgType" access="private" xsi:type="collection" type="num">
460460
<Value key="JOINT_TRAJ_PT" value="11" />
461461
<Value key="JOINT_TRAJ_PT_FULL" value="14" />
462462
</Data>

staubli_val3_driver/val3/ros_server/sendAck.pgx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
2323
2424
switch rosGenericMsg.header.nMsgType
25-
case nStandardMsgType["JOINT_TRAJ_PT"]
25+
case nStdMsgType["JOINT_TRAJ_PT"]
2626
call sendRosMsg(siTcpIpMotion, rosTrajPtAck.prefix, rosTrajPtAck.header, rosTrajPtAck.body, nInConnFlag)
2727
break
28-
case nStandardMsgType["JOINT_TRAJ_PT_FULL"]
28+
case nStdMsgType["JOINT_TRAJ_PT_FULL"]
2929
call sendRosMsg(siTcpIpMotion, rosTrajPtFAck.prefix, rosTrajPtFAck.header, rosTrajPtFAck.body, nInConnFlag)
3030
break
3131
default

0 commit comments

Comments
 (0)