Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/axis simulation node #16

Open
wants to merge 2 commits into
base: ros-devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ catkin_install_python(PROGRAMS src/axis_camera/axis_stream_node.py
catkin_install_python(PROGRAMS src/axis_camera/axis_node.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

catkin_install_python(PROGRAMS src/axis_camera/axis_ptz_sim.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

catkin_install_python(PROGRAMS src/axis_camera/axis_ptz_sim_node.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

install(
DIRECTORY launch config data
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
Expand Down
20 changes: 0 additions & 20 deletions config/axis_gazebo_ptz_config.yaml

This file was deleted.

22 changes: 22 additions & 0 deletions config/axis_sim_ptz_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
desired_freq: 10

subscriber_rgb_comand_topic: front_ptz_camera_control/ptz_command
server_rgb_comand_service: front_ptz_camera_control/ptz_command
server_home_comand_service: front_ptz_camera_control/home_command

# Name of the camera joints Global namespace using '/'
pan_joint_controller_topic: /robot/front_ptz_camera_joint_pan_position_controller/command
tilt_joint_controller_topic: /robot/front_ptz_camera_joint_tilt_position_controller/command
zoom_joint_controller_topic: /robot/front_ptz_camera_joint_zoom_position_controller/command

# radians
max_pan_value: 3.14
min_pan_value: -3.14
max_tilt_value: 1.57
min_tilt_value: 0.0
max_zoom_value: 30
min_zoom_value: 0

# Flag to invert received/sent pan and tilt values
invert_pan: false
invert_tilt: false
57 changes: 0 additions & 57 deletions launch/axis_gazebo.launch

This file was deleted.

12 changes: 12 additions & 0 deletions launch/axis_ptz_sim.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0"?>
<launch>

<arg name="node_name" default="axis_camera"/>
<arg name="ptz_sim_config_file" default="$(find axis_camera)/config/axis_sim_ptz_config.yaml"/>

<node pkg="axis_camera" type="axis_ptz_sim_node.py" name="$(arg node_name)_control" output="screen">
<rosparam file="$(arg ptz_sim_config_file)" command="load" subst_value="true"/>
</node>

</launch>

Loading