Skip to content

Commit

Permalink
Remove robot prefix, use YARP_PORT_PREFIX instead
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed Jan 23, 2020
1 parent 02b5042 commit 1454eaa
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion share/contexts/launchCanBus/locomotion-leftLeg.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ threaded true

[wrapper leftLegPort]
device "controlboardwrapper2"
name "/teo/leftLeg"
name "/leftLeg"
period 60
joints 6
networks ("leftLegBus")
Expand Down
4 changes: 2 additions & 2 deletions share/contexts/launchCanBus/locomotion-noTrunk.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ threaded true

[wrapper leftLegPort]
device "controlboardwrapper2"
name "/teo/leftLeg"
name "/leftLeg"
period 60
joints 6
networks ("locomotionBus")
Expand All @@ -18,7 +18,7 @@ calibrator "generic"

[wrapper rightLegPort]
device "controlboardwrapper2"
name "/teo/rightLeg"
name "/rightLeg"
period 60
joints 6
networks ("locomotionBus")
Expand Down
2 changes: 1 addition & 1 deletion share/contexts/launchCanBus/locomotion-rightLeg.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ threaded true

[wrapper rightLegPort]
device "controlboardwrapper2"
name "/teo/rightLeg"
name "/rightLeg"
period 60
joints 6
networks ("rightLegBus")
Expand Down
6 changes: 3 additions & 3 deletions share/contexts/launchCanBus/locomotion.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ threaded true

[wrapper leftLegPort]
device "controlboardwrapper2"
name "/teo/leftLeg"
name "/leftLeg"
period 60
joints 6
networks ("locomotionBus")
Expand All @@ -18,7 +18,7 @@ calibrator "generic"

[wrapper trunkPort]
device "controlboardwrapper2"
name "/teo/trunk"
name "/trunk"
period 60
joints 2
networks ("locomotionBus")
Expand All @@ -27,7 +27,7 @@ calibrator "generic"

[wrapper rightLegPort]
device "controlboardwrapper2"
name "/teo/rightLeg"
name "/rightLeg"
period 60
joints 6
networks ("locomotionBus")
Expand Down
10 changes: 5 additions & 5 deletions share/contexts/launchCanBus/manipulation-dextra.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ threaded true

[wrapper leftHandPort]
device "controlboardwrapper2"
name "/teo/leftHand"
name "/leftHand"
period 60
joints 6
networks ("manipulationBus")
manipulationBus (0 5 0 5)

[wrapper leftArmPort]
device "controlboardwrapper2"
name "/teo/leftArm"
name "/leftArm"
period 60
joints 6
networks ("manipulationBus")
Expand All @@ -26,7 +26,7 @@ calibrator "generic"

[wrapper headPort]
device "controlboardwrapper2"
name "/teo/head"
name "/head"
period 60
joints 2
networks ("manipulationBus")
Expand All @@ -35,7 +35,7 @@ calibrator "generic"

[wrapper rightArmPort]
device "controlboardwrapper2"
name "/teo/rightArm"
name "/rightArm"
period 60
joints 6
networks ("manipulationBus")
Expand All @@ -44,7 +44,7 @@ calibrator "generic"

[wrapper rightHandPort]
device "controlboardwrapper2"
name "/teo/rightHand"
name "/rightHand"
period 60
joints 6
networks ("manipulationBus")
Expand Down
10 changes: 5 additions & 5 deletions share/contexts/launchCanBus/manipulation-lacquey.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ threaded true

[wrapper leftHandPort]
device "controlboardwrapper2"
name "/teo/leftHand"
name "/leftHand"
period 60
joints 1
networks ("manipulationBus")
manipulationBus (0 0 0 0)

[wrapper leftArmPort]
device "controlboardwrapper2"
name "/teo/leftArm"
name "/leftArm"
period 60
joints 6
networks ("manipulationBus")
Expand All @@ -26,7 +26,7 @@ calibrator "generic"

[wrapper headPort]
device "controlboardwrapper2"
name "/teo/head"
name "/head"
period 60
joints 2
networks ("manipulationBus")
Expand All @@ -35,7 +35,7 @@ calibrator "generic"

[wrapper rightArmPort]
device "controlboardwrapper2"
name "/teo/rightArm"
name "/rightArm"
period 60
joints 6
networks ("manipulationBus")
Expand All @@ -44,7 +44,7 @@ calibrator "generic"

[wrapper rightHandPort]
device "controlboardwrapper2"
name "/teo/rightHand"
name "/rightHand"
period 60
joints 1
networks ("manipulationBus")
Expand Down
4 changes: 2 additions & 2 deletions share/contexts/launchCanBus/manipulation-leftArm-dextra.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ threaded true

[wrapper leftHandPort]
device "controlboardwrapper2"
name "/teo/leftHand"
name "/leftHand"
period 60
joints 6
networks ("leftArmBus")
rightArmBus (0 5 0 5)

[wrapper leftArmPort]
device "controlboardwrapper2"
name "/teo/leftArm"
name "/leftArm"
period 60
joints 6
networks ("leftArmBus")
Expand Down
4 changes: 2 additions & 2 deletions share/contexts/launchCanBus/manipulation-leftArm-lacquey.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ threaded true

[wrapper leftHandPort]
device "controlboardwrapper2"
name "/teo/leftHand"
name "/leftHand"
period 60
joints 1
networks ("leftArmBus")
rightArmBus (0 0 0 0)

[wrapper leftArmPort]
device "controlboardwrapper2"
name "/teo/leftArm"
name "/leftArm"
period 60
joints 6
networks ("leftArmBus")
Expand Down
2 changes: 1 addition & 1 deletion share/contexts/launchCanBus/manipulation-leftArm.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ threaded true

[wrapper leftArmPort]
device "controlboardwrapper2"
name "/teo/leftArm"
name "/leftArm"
period 60
joints 6
networks ("leftArmBus")
Expand Down
4 changes: 2 additions & 2 deletions share/contexts/launchCanBus/manipulation-noHead.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ threaded true

[wrapper leftArmPort]
device "controlboardwrapper2"
name "/teo/leftArm"
name "/leftArm"
period 60
joints 6
networks ("manipulationBus")
Expand All @@ -18,7 +18,7 @@ calibrator "generic"

[wrapper rightArmPort]
device "controlboardwrapper2"
name "/teo/rightArm"
name "/rightArm"
period 60
joints 6
networks ("manipulationBus")
Expand Down
4 changes: 2 additions & 2 deletions share/contexts/launchCanBus/manipulation-rightArm-dextra.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ threaded true

[wrapper rightArmPort]
device "controlboardwrapper2"
name "/teo/rightArm"
name "/rightArm"
period 60
joints 6
networks ("rightArmBus")
Expand All @@ -17,7 +17,7 @@ calibrator "generic"

[wrapper rightHandPort]
device "controlboardwrapper2"
name "/teo/rightHand"
name "/rightHand"
period 60
joints 6
networks ("rightArmBus")
Expand Down
4 changes: 2 additions & 2 deletions share/contexts/launchCanBus/manipulation-rightArm-lacquey.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ threaded true

[wrapper rightArmPort]
device "controlboardwrapper2"
name "/teo/rightArm"
name "/rightArm"
period 60
joints 6
networks ("rightArmBus")
Expand All @@ -17,7 +17,7 @@ calibrator "generic"

[wrapper rightHandPort]
device "controlboardwrapper2"
name "/teo/rightHand"
name "/rightHand"
period 60
joints 1
networks ("rightArmBus")
Expand Down
2 changes: 1 addition & 1 deletion share/contexts/launchCanBus/manipulation-rightArm.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ threaded true

[wrapper rightArmPort]
device "controlboardwrapper2"
name "/teo/rightArm"
name "/rightArm"
period 60
joints 6
networks ("rightArmBus")
Expand Down
6 changes: 3 additions & 3 deletions share/contexts/launchCanBus/manipulation.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ threaded true

[wrapper leftArmPort]
device "controlboardwrapper2"
name "/teo/leftArm"
name "/leftArm"
period 60
joints 6
networks ("manipulationBus")
Expand All @@ -18,7 +18,7 @@ calibrator "generic"

[wrapper headPort]
device "controlboardwrapper2"
name "/teo/head"
name "/head"
period 60
joints 2
networks ("manipulationBus")
Expand All @@ -27,7 +27,7 @@ calibrator "generic"

[wrapper rightArmPort]
device "controlboardwrapper2"
name "/teo/rightArm"
name "/rightArm"
period 60
joints 6
networks ("manipulationBus")
Expand Down
2 changes: 1 addition & 1 deletion share/robots/teo/buses/pcan-leftArm.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[pcan-leftArm]
device "CanBusPeak"
description "PeakCAN bus on TEO's left arm"
name "/teo/can/leftArm"
name "/can/leftArm"
port "/dev/pcan3"
bitrate 1000000
rxBufferSize 500
Expand Down
2 changes: 1 addition & 1 deletion share/robots/teo/buses/pcan-leftLeg.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[pcan-leftLeg]
device "CanBusPeak"
description "PeakCAN bus on TEO's left leg"
name "/teo/can/leftLeg"
name "/can/leftLeg"
port "/dev/pcan1"
bitrate 1000000
rxBufferSize 500
Expand Down
2 changes: 1 addition & 1 deletion share/robots/teo/buses/pcan-rightArm.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[pcan-rightArm]
device "CanBusPeak"
description "PeakCAN bus on TEO's right arm"
name "/teo/can/rightArm"
name "/can/rightArm"
port "/dev/pcan2"
bitrate 1000000
rxBufferSize 500
Expand Down
2 changes: 1 addition & 1 deletion share/robots/teo/buses/pcan-rightLeg.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[pcan-rightLeg]
device "CanBusPeak"
description "PeakCAN bus on TEO's right leg"
name "/teo/can/rightLeg"
name "/can/rightLeg"
port "/dev/pcan0"
bitrate 1000000
rxBufferSize 500
Expand Down

0 comments on commit 1454eaa

Please sign in to comment.