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

ROS Kinetic/Melodic clean-up #4

Open
wants to merge 28 commits into
base: melodic
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3fc50ca
Removing ackermann_msgs to use binary version.
Dec 29, 2020
5ae5549
Removing joystick_drivers to use binary version.
Dec 29, 2020
a37c32d
Removing serial to use binary version.
Dec 29, 2020
984b839
Removing hokuyo_node to be replaced with urg_node.
Dec 29, 2020
3991b7c
Replacing hokuyo_node with urg_node.
Dec 29, 2020
30f4923
Removing vesc to use binary version.
Dec 29, 2020
0ec07ca
Updating README.
Dec 29, 2020
b8a7224
Moving ackermann_cmd_mux to top of workspace.
Dec 29, 2020
f3b1458
Updating ackermann_cmd_mux CMakeLists.txt and package.xml files.
Dec 29, 2020
24bd914
Adding framework for f1tenth_racecar to replace racecar.
Dec 29, 2020
147a887
Moving racecar files up a level.
Dec 29, 2020
1326486
Updating README.
Dec 29, 2020
5c6e972
Adding LICENSE file.
Dec 29, 2020
0afb516
Adding used YAML config files to f1tenth_racecar.
Dec 29, 2020
48654c0
Adding all example maps to f1tenth_racecar.
Dec 29, 2020
a26cb89
Adding all rviz configs to f1tenth_racecar.
Dec 29, 2020
de11890
Installing all subfolders of f1tenth_racecar.
Dec 29, 2020
d3a2b4f
Adding joy_teleop script and dependencies.
Dec 29, 2020
d4439d7
Adding missing dependency on vesc_ packges to f1tenth_racecar.
Dec 29, 2020
060d73c
Adding missing dependencies on amcl and map_server.
Dec 29, 2020
d26195c
Adding used launch files to f1tenth_racecar.
Dec 29, 2020
3754f9f
Removing racecar package.
Dec 29, 2020
6980949
[f1tenth_racecar] Fixing errors in package.xml.
Dec 29, 2020
57032e3
[f1tenth_racecar] Adding missing dependencies in CMakeLists.txt.
Dec 29, 2020
fb6f872
[f1tenth_system] Fixing param bug in sensors.launch.xml.
Dec 29, 2020
4ea308f
Adding argument to teleop.launch for Jetson NX joystick inputs.
Dec 30, 2020
021b750
Addressing feedback from review.
Jan 22, 2021
fe2502d
Update f1tenth_racecar/CMakeLists.txt
Jan 24, 2021
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
File renamed without changes.
29 changes: 5 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,9 @@
# driver_base
You'll also need the driver_base package, , you could get this package via:

```sudo apt-get install ros-<distro>-driver-base```

# f110_system
Code/Drivers onboard f110 race cars.

## ackermann_msgs
The ROS message definitions for ackermann steering.

## hokuyo_node
The driver for Hokuyo 10LX and Hokuyo 30LX.

## joystick_drivers
The driver for Linux compatible joysticks

## racecar
The package including launch files handling starting the car, and the parameters for Odometry tuning, motor/servo settings.

## serial
A cross-platform library for interfacing with rs-232 serial like ports written in C++.
Code/Drivers onboard f1/10 racecars.

## vesc
The package handling communication with the VESC 6 Plus.
## f1tenth_racecar
The package including launch files handling starting the car, and the parameters for Odometry tuning, and motor/servo settings.
This package is based heavily on the [MIT Racecar](https://mit-racecar.github.io) project.

## waypoint_logger
The node that records the car's current position in the world, requires particle_filter to work.
The node that records the car's current position in the world.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
cmake_minimum_required(VERSION 2.8.3)
project(ackermann_cmd_mux)

find_package(catkin REQUIRED COMPONENTS
roscpp
pluginlib
nodelet
dynamic_reconfigure
ackermann_msgs
std_msgs
rospy
ackermann_msgs
dynamic_reconfigure
nodelet
pluginlib
roscpp
rospy
std_msgs
)

# pkg-config support
Expand All @@ -22,10 +23,10 @@ endif()
generate_dynamic_reconfigure_options(cfg/reload.cfg)

catkin_package(
INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME}_nodelet
CATKIN_DEPENDS roscpp pluginlib nodelet dynamic_reconfigure ackermann_msgs rospy std_msgs
DEPENDS yaml-cpp
INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME}_nodelet
CATKIN_DEPENDS roscpp pluginlib nodelet dynamic_reconfigure ackermann_msgs rospy std_msgs
DEPENDS yaml-cpp
)

include_directories(include ${catkin_INCLUDE_DIRS} ${yaml-cpp_INCLUDE_DIRS})
Expand All @@ -38,17 +39,17 @@ add_dependencies(${PROJECT_NAME}_nodelet ${PROJECT_NAME}_gencfg)
target_link_libraries(${PROJECT_NAME}_nodelet ${catkin_LIBRARIES} ${yaml-cpp_LIBRARIES})

install(TARGETS ${PROJECT_NAME}_nodelet
DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
)
install(DIRECTORY plugins
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(DIRECTORY launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(DIRECTORY param
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<package>
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>ackermann_cmd_mux</name>
<version>0.7.0</version>
<description>
Expand All @@ -8,33 +10,24 @@
together with their priority and timeout are configured through a YAML file, that can be reload at
runtime. Blatantly derived / copied from yujin_ocs/yocs_cmd_vel_mux.
</description>
<author>Jorge Santos Simon</author>
<author>Michael Boulet</author>
<maintainer email="[email protected]">Michael Boulet</maintainer>
<license>BSD</license>
<url type="website">http://ros.org/wiki/ackermann_cmd_mux</url>
<url type="repository">https://github.mit.edu/racecar/racecar</url>
<url type="bugtracker">https://github.mit.edu/racecar/racecar/issues</url>
<author>Jorge Santos Simon</author>
<author>Michael Boulet</author>

<buildtool_depend>catkin</buildtool_depend>

<build_depend>roscpp</build_depend>
<build_depend>nodelet</build_depend>
<build_depend>dynamic_reconfigure</build_depend>
<build_depend>pluginlib</build_depend>
<build_depend>ackermann_msgs</build_depend>
<build_depend>yaml-cpp</build_depend>
<build_depend>rospy</build_depend>
<build_depend>std_msgs</build_depend>

<run_depend>roscpp</run_depend>
<run_depend>ackermann_msgs</run_depend>
<run_depend>pluginlib</run_depend>
<run_depend>nodelet</run_depend>
<run_depend>dynamic_reconfigure</run_depend>
<run_depend>yaml-cpp</run_depend>
<run_depend>rospy</run_depend>
<run_depend>std_msgs</run_depend>
<depend>ackermann_msgs</depend>
<depend>dynamic_reconfigure</depend>
<depend>nodelet</depend>
<depend>pluginlib</depend>
<depend>roscpp</depend>
<depend>rospy</depend>
<depend>std_msgs</depend>
<depend>yaml-cpp</depend>

<export>
<nodelet plugin="${prefix}/plugins/nodelets.xml" />
Expand Down
12 changes: 0 additions & 12 deletions ackermann_msgs/.gitignore

This file was deleted.

28 changes: 0 additions & 28 deletions ackermann_msgs/CHANGELOG.rst

This file was deleted.

16 changes: 0 additions & 16 deletions ackermann_msgs/CMakeLists.txt

This file was deleted.

10 changes: 0 additions & 10 deletions ackermann_msgs/README.rst

This file was deleted.

9 changes: 0 additions & 9 deletions ackermann_msgs/mainpage.dox

This file was deleted.

38 changes: 0 additions & 38 deletions ackermann_msgs/msg/AckermannDrive.msg

This file was deleted.

5 changes: 0 additions & 5 deletions ackermann_msgs/msg/AckermannDriveStamped.msg

This file was deleted.

26 changes: 0 additions & 26 deletions ackermann_msgs/package.xml

This file was deleted.

43 changes: 43 additions & 0 deletions f1tenth_racecar/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
cmake_minimum_required(VERSION 3.0.2)
project(f1tenth_racecar)

find_package(catkin REQUIRED
actionlib
rospy
rosservice
rostopic
sensor_msgs
)

catkin_package(
CATKIN_DEPENDS
ackermann_cmd_mux
joy
rosbag
rostopic
rviz
tf2_ros
tf
urg_node
)

install(PROGRAMS
scripts/joy_teleop.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

install(DIRECTORY config
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

install(DIRECTORY launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

install(DIRECTORY maps
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

install(DIRECTORY rviz
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
51 changes: 51 additions & 0 deletions f1tenth_racecar/config/joy_teleop_nx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
joy_node:
hzheng40 marked this conversation as resolved.
Show resolved Hide resolved
dev: /dev/input/joypad-f710
deadzone: 0.01
autorepeat_rate: 20
coalesce_interval: 0.01

teleop:
# Default mode - Stop for safety
default:
type: topic
is_default: true
message_type: ackermann_msgs/AckermannDriveStamped
topic_name: low_level/ackermann_cmd_mux/input/teleop
message_value:
-
target: drive.speed
value: 0.0
-
target: drive.steering_angle
value: 0.0

# Enable Human control by holding Left Bumper
human_control:
type: topic
message_type: ackermann_msgs/AckermannDriveStamped
topic_name: low_level/ackermann_cmd_mux/input/teleop
deadman_buttons: [4]
axis_mappings:
-
axis: 1
target: drive.speed
scale: 5.0 # joystick will command plus or minus 2 meters / second
offset: 0.0
-
axis: 0
target: drive.steering_angle
scale: 0.34 # joystick will command plus or minus ~20 degrees steering angle
offset: 0.0

# Enable autonomous control by pressing right bumper
# This switch causes the joy_teleop to stop sending messages to input/teleop
# And send messages to /dev/null (an unused ROS topic)
autonomous_control:
type: topic
message_type: std_msgs/Int8
topic_name: /dev/null
deadman_buttons: [5]
message_value:
-
target: data
value: 0
Loading