diff --git a/launch/rviz_config/nao.rviz b/launch/rviz_config/nao.rviz index 9033604..d140f43 100644 --- a/launch/rviz_config/nao.rviz +++ b/launch/rviz_config/nao.rviz @@ -56,6 +56,10 @@ Visualization Manager: Frame Timeout: 15 Frames: All Enabled: true + Aruco_0_frame: + Value: true + Aruco_1_frame: + Value: true Aruco_2_frame: Value: true CameraBottom_frame: @@ -298,6 +302,10 @@ Visualization Manager: {} CameraTop_frame: CameraTop_optical_frame: + Aruco_0_frame: + {} + Aruco_1_frame: + {} Aruco_2_frame: {} HeadTouchFront_frame: @@ -412,10 +420,10 @@ Visualization Manager: Window Geometry: Displays: collapsed: false - Height: 550 + Height: 459 Hide Left Dock: false Hide Right Dock: false - QMainWindow State: 000000ff00000000fd00000004000000000000016a000002c4fc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000006400fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c0061007900730000000028000002c4000000dd00fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261000000010000010f000002c4fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a005600690065007700730000000028000002c4000000b000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000002f60000003efc0100000002fb0000000800540069006d00650000000000000002f6000002f600fffffffb0000000800540069006d00650100000000000004500000000000000000000001c10000020800000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730000000000ffffffff0000000000000000 + QMainWindow State: 000000ff00000000fd00000004000000000000016a000002c4fc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000006400fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c0061007900730000000028000002c4000000dd00fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261000000010000010f000002c4fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a005600690065007700730000000028000002c4000000b000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000002f60000003efc0100000002fb0000000800540069006d00650000000000000002f6000002f600fffffffb0000000800540069006d006501000000000000045000000000000000000000019b000001ad00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730000000000ffffffff0000000000000000 Selection: collapsed: false Time: @@ -424,6 +432,6 @@ Window Geometry: collapsed: false Views: collapsed: false - Width: 449 + Width: 411 X: 55 Y: 14 diff --git a/launch/rviz_config/nao_right.rviz b/launch/rviz_config/nao_right.rviz new file mode 100644 index 0000000..5e3463b --- /dev/null +++ b/launch/rviz_config/nao_right.rviz @@ -0,0 +1,437 @@ +Panels: + - Class: rviz/Displays + Help Height: 78 + Name: Displays + Property Tree Widget: + Expanded: + - /Global Options1 + - /Status1 + - /Grid1 + - /Grid1/Offset1 + - /TF1 + Splitter Ratio: 0.5 + Tree Height: 359 + - Class: rviz/Selection + Name: Selection + - Class: rviz/Tool Properties + Expanded: + - /2D Pose Estimate1 + - /2D Nav Goal1 + - /Publish Point1 + Name: Tool Properties + Splitter Ratio: 0.588679 + - Class: rviz/Views + Expanded: + - /Current View1 + Name: Views + Splitter Ratio: 0.5 + - Class: rviz/Time + Experimental: false + Name: Time + SyncMode: 0 + SyncSource: "" +Visualization Manager: + Class: "" + Displays: + - Alpha: 0.5 + Cell Size: 1 + Class: rviz/Grid + Color: 160; 160; 164 + Enabled: true + Line Style: + Line Width: 0.03 + Value: Lines + Name: Grid + Normal Cell Count: 0 + Offset: + X: 0 + Y: 0 + Z: 0 + Plane: XY + Plane Cell Count: 10 + Reference Frame: + Value: true + - Class: rviz/TF + Enabled: true + Frame Timeout: 15 + Frames: + All Enabled: true + Aruco_0_frame: + Value: true + Aruco_1_frame: + Value: true + Aruco_2_frame: + Value: true + CameraBottom_frame: + Value: true + CameraBottom_optical_frame: + Value: true + CameraTop_frame: + Value: true + CameraTop_optical_frame: + Value: true + ChestButton_frame: + Value: true + Head: + Value: true + HeadTouchFront_frame: + Value: true + HeadTouchMiddle_frame: + Value: true + HeadTouchRear_frame: + Value: true + ImuTorsoAccelerometer_frame: + Value: true + ImuTorsoGyrometer_frame: + Value: true + LAnklePitch: + Value: true + LBicep: + Value: true + LElbow: + Value: true + LFinger11_link: + Value: true + LFinger12_link: + Value: true + LFinger13_link: + Value: true + LFinger21_link: + Value: true + LFinger22_link: + Value: true + LFinger23_link: + Value: true + LFootBumperLeft_frame: + Value: true + LFootBumperRight_frame: + Value: true + LForeArm: + Value: true + LFsrFL_frame: + Value: true + LFsrFR_frame: + Value: true + LFsrRL_frame: + Value: true + LFsrRR_frame: + Value: true + LHandTouchBack_frame: + Value: true + LHandTouchLeft_frame: + Value: true + LHandTouchRight_frame: + Value: true + LHip: + Value: true + LInfraRed_frame: + Value: true + LPelvis: + Value: true + LShoulder: + Value: true + LSonar_frame: + Value: true + LThigh: + Value: true + LThumb1_link: + Value: true + LThumb2_link: + Value: true + LTibia: + Value: true + MicroFrontCenter_frame: + Value: true + MicroRearCenter_frame: + Value: true + MicroSurroundLeft_frame: + Value: true + MicroSurroundRight_frame: + Value: true + Neck: + Value: true + RAnklePitch: + Value: true + RBicep: + Value: true + RElbow: + Value: true + RFinger11_link: + Value: true + RFinger12_link: + Value: true + RFinger13_link: + Value: true + RFinger21_link: + Value: true + RFinger22_link: + Value: true + RFinger23_link: + Value: true + RFootBumperLeft_frame: + Value: true + RFootBumperRight_frame: + Value: true + RForeArm: + Value: true + RFsrFL_frame: + Value: true + RFsrFR_frame: + Value: true + RFsrRL_frame: + Value: true + RFsrRR_frame: + Value: true + RHandTouchBack_frame: + Value: true + RHandTouchLeft_frame: + Value: true + RHandTouchRight_frame: + Value: true + RHip: + Value: true + RInfraRed_frame: + Value: true + RPelvis: + Value: true + RShoulder: + Value: true + RSonar_frame: + Value: true + RThigh: + Value: true + RThumb1_link: + Value: true + RThumb2_link: + Value: true + RTibia: + Value: true + base_footprint: + Value: true + base_link: + Value: true + gaze: + Value: true + l_ankle: + Value: true + l_gripper: + Value: true + l_sole: + Value: true + l_wrist: + Value: true + odom: + Value: true + r_ankle: + Value: true + r_gripper: + Value: true + r_sole: + Value: true + r_wrist: + Value: true + torso: + Value: true + Marker Scale: 0.1 + Name: TF + Show Arrows: true + Show Axes: false + Show Names: false + Tree: + odom: + base_link: + base_footprint: + {} + torso: + ChestButton_frame: + {} + ImuTorsoAccelerometer_frame: + {} + ImuTorsoGyrometer_frame: + {} + LPelvis: + LHip: + LThigh: + LTibia: + LAnklePitch: + l_ankle: + LFootBumperLeft_frame: + {} + LFootBumperRight_frame: + {} + LFsrFL_frame: + {} + LFsrFR_frame: + {} + LFsrRL_frame: + {} + LFsrRR_frame: + {} + l_sole: + {} + LShoulder: + LBicep: + LElbow: + LForeArm: + l_wrist: + LFinger11_link: + LFinger12_link: + LFinger13_link: + {} + LFinger21_link: + LFinger22_link: + LFinger23_link: + {} + LHandTouchBack_frame: + {} + LHandTouchLeft_frame: + {} + LHandTouchRight_frame: + {} + LThumb1_link: + LThumb2_link: + {} + l_gripper: + {} + LSonar_frame: + {} + Neck: + Head: + CameraBottom_frame: + CameraBottom_optical_frame: + {} + CameraTop_frame: + CameraTop_optical_frame: + Aruco_0_frame: + {} + Aruco_1_frame: + {} + Aruco_2_frame: + {} + HeadTouchFront_frame: + {} + HeadTouchMiddle_frame: + {} + HeadTouchRear_frame: + {} + LInfraRed_frame: + {} + MicroFrontCenter_frame: + {} + MicroRearCenter_frame: + {} + MicroSurroundLeft_frame: + {} + MicroSurroundRight_frame: + {} + RInfraRed_frame: + {} + gaze: + {} + RPelvis: + RHip: + RThigh: + RTibia: + RAnklePitch: + r_ankle: + RFootBumperLeft_frame: + {} + RFootBumperRight_frame: + {} + RFsrFL_frame: + {} + RFsrFR_frame: + {} + RFsrRL_frame: + {} + RFsrRR_frame: + {} + r_sole: + {} + RShoulder: + RBicep: + RElbow: + RForeArm: + r_wrist: + RFinger11_link: + RFinger12_link: + RFinger13_link: + {} + RFinger21_link: + RFinger22_link: + RFinger23_link: + {} + RHandTouchBack_frame: + {} + RHandTouchLeft_frame: + {} + RHandTouchRight_frame: + {} + RThumb1_link: + RThumb2_link: + {} + r_gripper: + {} + RSonar_frame: + {} + Update Interval: 0 + Value: true + Enabled: true + Global Options: + Background Color: 48; 48; 48 + Fixed Frame: torso + Frame Rate: 30 + Name: root + Tools: + - Class: rviz/Interact + Hide Inactive Objects: true + - Class: rviz/MoveCamera + - Class: rviz/Select + - Class: rviz/FocusCamera + - Class: rviz/Measure + - Class: rviz/SetInitialPose + Topic: /initialpose + - Class: rviz/SetGoal + Topic: /move_base_simple/goal + - Class: rviz/PublishPoint + Single click: true + Topic: /clicked_point + Value: true + Views: + Current: + Class: rviz/Orbit + Distance: 1.11097 + Enable Stereo Rendering: + Stereo Eye Separation: 0.06 + Stereo Focal Distance: 1 + Swap Stereo Eyes: false + Value: false + Focal Point: + X: 0 + Y: 0 + Z: 0 + Name: Current View + Near Clip Distance: 0.01 + Pitch: 0.000398204 + Target Frame: + Value: Orbit (rviz) + Yaw: 4.70541 + Saved: ~ +Window Geometry: + Displays: + collapsed: false + Height: 458 + Hide Left Dock: false + Hide Right Dock: false + QMainWindow State: 000000ff00000000fd00000004000000000000016a000002c4fc0200000008fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000006400fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c0061007900730000000028000002c4000000dd00fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261000000010000010f000002c4fc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a005600690065007700730000000028000002c4000000b000fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000002f60000003efc0100000002fb0000000800540069006d00650000000000000002f6000002f600fffffffb0000000800540069006d006501000000000000045000000000000000000000014b000001ac00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730000000000ffffffff0000000000000000 + Selection: + collapsed: false + Time: + collapsed: false + Tool Properties: + collapsed: false + Views: + collapsed: false + Width: 331 + X: 467 + Y: 14 diff --git a/launch/teleoperation.launch b/launch/teleoperation.launch index 632be5e..77f9b65 100644 --- a/launch/teleoperation.launch +++ b/launch/teleoperation.launch @@ -1,32 +1,30 @@ - - + - - - + - + ?> - + + ?> - + - + + + + + diff --git a/scripts/teleoperation.sh b/scripts/teleoperation.sh index 25eb998..83616a2 100755 --- a/scripts/teleoperation.sh +++ b/scripts/teleoperation.sh @@ -8,11 +8,11 @@ commands=( # Start roscore 'cd ~/catkin_ws;source devel/setup.bash ;roscore' # Bringup Nao - 'sleep 1;cd ~/catkin_ws;source devel/setup.bash ;roslaunch nao_bringup nao_full.launch ' + 'sleep 1;cd ~/catkin_ws;source devel/setup.bash ;roslaunch nao_bringup nao_full.launch' # Start speech recognition server 'sleep 4;cd ~/catkin_ws;source devel/setup.bash ;roslaunch nao_apps speech.launch' # Launch nodes in teleoperation package - 'sleep 4;cd ~/catkin_ws;source devel/setup.bash ;roslaunch teleoperation teleoperation.launch gui:=false' + 'sleep 4;cd ~/catkin_ws;source devel/setup.bash ;roslaunch teleoperation teleoperation.launch' ) # Build final command with all the tabs to launch