Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
86f03ac
SDF creation and joystick integration with sim
Rishav-N Nov 17, 2025
13c9280
Fixed simulation bugs to enable rover control in gazebo
mdurrani808 Nov 10, 2025
6cacced
SDF creation and joystick integration with sim
Rishav-N Nov 17, 2025
60f5524
Merge pull request #1 from Rishav-N/ManualDrive
Rishav-N Nov 17, 2025
f5212e9
deleted stray file
Rishav-N Nov 18, 2025
3be6a2c
Merge pull request #2 from Rishav-N/ManualDrive
Rishav-N Nov 18, 2025
2792807
Deleted twist_stamper and added spherical coords to sdf
Rishav-N Nov 18, 2025
38ce7c9
SDF creation and joystick integration with sim
Rishav-N Nov 17, 2025
de82642
Deleted twist_stamper and added spherical coords to sdf
Rishav-N Nov 18, 2025
3ff494e
Merge pull request #3 from Rishav-N/ManualDrive
Rishav-N Nov 18, 2025
c075cd0
deleted stray files
Rishav-N Nov 18, 2025
915a1aa
Merge pull request #4 from Rishav-N/ManualDrive
Rishav-N Nov 18, 2025
dd23833
deleted stray text
Rishav-N Nov 18, 2025
9ed38c2
Merge pull request #5 from Rishav-N/ManualDrive
Rishav-N Nov 18, 2025
017b6e8
Merge branch 'main' into main
mdurrani808 Nov 18, 2025
e8991ff
Merge remote-tracking branch 'upstream/main'
Rishav-N Nov 23, 2025
4b94a5f
Autonav initial iteration (wonky path planning fix in progress)
Rishav-N Dec 28, 2025
7771480
Merge pull request #6 from Rishav-N/AutoNavV1
Rishav-N Dec 28, 2025
c1087ce
Deleted outdated files and minor changes
Rishav-N Dec 28, 2025
669d3f8
Merge pull request #7 from Rishav-N/AutoNavV1
Rishav-N Dec 28, 2025
1cad421
Merge branch 'main' into main
Rishav-N Dec 28, 2025
e2786ec
params changes
Rishav-N Dec 28, 2025
8e59049
Merge pull request #8 from Rishav-N/AutoNavV1
Rishav-N Dec 28, 2025
aff8dda
params changes
Rishav-N Dec 28, 2025
e3bcffa
params changes
Rishav-N Dec 28, 2025
dd3bf03
params changes
Rishav-N Dec 28, 2025
65f0c38
Merge pull request #9 from Rishav-N/AutoNavV1
Rishav-N Dec 28, 2025
d69fb1b
Merge pull request #10 from Rishav-N/AutoNavV1
Rishav-N Dec 28, 2025
5f88026
deleted old files
Rishav-N Dec 28, 2025
2c7c27a
Merge pull request #11 from Rishav-N/AutoNavV1
Rishav-N Dec 28, 2025
2f51b45
Track .tif files with LFS
Rishav-N Dec 28, 2025
3842c7d
Track .tif and .dae with Git LFS
Rishav-N Dec 28, 2025
341f15a
Merge pull request #12 from Rishav-N/AutoNavV1
Rishav-N Dec 29, 2025
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.tif filter=lfs diff=lfs merge=lfs -text
*.dae filter=lfs diff=lfs merge=lfs -text
7 changes: 7 additions & 0 deletions src/description/config/athena_drive_sim_controllers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ ackermann_steering_controller:
front_wheels_radius: 0.254
rear_wheels_radius: 0.254
use_stamped_vel: true
publish_rate: 50.0

odom_frame_id: "odom"
base_frame_id: "base_link"
publish_odom: true
publish_odom_tf: true
reference_timeout: 0.2


rear_steer_position_controller:
Expand Down
123 changes: 3 additions & 120 deletions src/description/models/terrain_world/meshes/terrain.dae

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@
<parameters>${simulation_controllers}</parameters>
</xacro:if>
<controller_manager_node_name>${prefix}controller_manager</controller_manager_node_name>
<ros>
<remapping>ackermann_steering_controller/tf_odometry:=/tf</remapping>
</ros>
</plugin>
</gazebo>
</xacro:if>
Expand Down
45 changes: 43 additions & 2 deletions src/simulation/launch/bringup.launch.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from ament_index_python.packages import get_package_share_directory
from launch import LaunchDescription
from launch.actions import DeclareLaunchArgument, IncludeLaunchDescription
from launch.actions import DeclareLaunchArgument, IncludeLaunchDescription, ExecuteProcess, TimerAction
from launch.launch_description_sources import PythonLaunchDescriptionSource
from launch.substitutions import LaunchConfiguration, PathJoinSubstitution

Expand Down Expand Up @@ -50,7 +50,7 @@ def generate_launch_description():
PythonLaunchDescriptionSource([gazebo_launch]),
launch_arguments=[
('use_sim_time', LaunchConfiguration('use_sim_time')),
('world', LaunchConfiguration('world'))
('world', LaunchConfiguration('world')),
]
)

Expand All @@ -72,9 +72,50 @@ def generate_launch_description():
PythonLaunchDescriptionSource([control_launch])
)

model_name = "rover" # <-- change to your actual model name

follow_cmd = ExecuteProcess(
cmd=[
'bash', '-c',
f'ign service -s /gui/follow '
f'--reqtype ignition.msgs.StringMsg '
f'--reptype ignition.msgs.Boolean '
f'--timeout 2000 '
f'--req \'data: "{model_name}"\''
],
output='screen'
)

offset_cmd = ExecuteProcess(
cmd=[
'bash', '-c',
'ign service -s /gui/follow/offset '
'--reqtype ignition.msgs.Vector3d '
'--reptype ignition.msgs.Boolean '
'--timeout 2000 '
'--req \'x: 2.0 y: 0.0 z: 0.5\''
],
output='screen'
)

# Run the follow+offset commands a few seconds after Gazebo starts
# (so the GUI + world + model are definitely available)
follow_after_delay = TimerAction(
period=5.0,
actions=[follow_cmd]
)

offset_after_delay = TimerAction(
period=10.0,
actions=[offset_cmd]
)


ld = LaunchDescription(ARGUMENTS)
ld.add_action(gazebo)
ld.add_action(robot_spawn)
ld.add_action(bridge)
ld.add_action(control)
ld.add_action(follow_after_delay)
ld.add_action(offset_after_delay)
return ld
5 changes: 4 additions & 1 deletion src/simulation/launch/control.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ def generate_launch_description():
package='controller_manager',
executable='spawner',
arguments=['ackermann_steering_controller'],
output='screen'
output='screen',
remappings=[
("/ackermann_steering_controller/tf_odometry", "/tf"),
]
)

delayed_ackermann_controller_spawner = RegisterEventHandler(
Expand Down
61 changes: 61 additions & 0 deletions src/subsystems/navigation/athena_map/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
cmake_minimum_required(VERSION 3.8)
project(athena_map)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

# find dependencies
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(sensor_msgs REQUIRED)
find_package(nav_msgs REQUIRED)
find_package(cv_bridge REQUIRED)
find_package(OpenCV REQUIRED)

set(dependencies
rclcpp
nav_msgs
sensor_msgs
cv_bridge
OpenCV
)

add_executable(map_node src/map_node.cpp)
target_include_directories(map_node PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
${OpenCV_INCLUDE_DIRS})

target_compile_features(map_node PUBLIC c_std_99 cxx_std_17) # Require C99 and C++17
ament_target_dependencies(
map_node SYSTEM
${dependencies}
)

target_link_libraries(map_node ${OpenCV_LIBRARIES})

install(TARGETS map_node
DESTINATION lib/${PROJECT_NAME})

# Install maps directory
install(DIRECTORY maps/
DESTINATION share/${PROJECT_NAME}/maps)

# Install launch directory
install(DIRECTORY launch/
DESTINATION share/${PROJECT_NAME}/launch)

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
# the following line skips the linter which checks for copyrights
# comment the line when a copyright and license is added to all source files
set(ament_cmake_copyright_FOUND TRUE)
# the following line skips cpplint (only works in a git repo)
# comment the line when this package is in a git repo and when
# a copyright and license is added to all source files
set(ament_cmake_cpplint_FOUND TRUE)
ament_lint_auto_find_test_dependencies()
endif()

ament_package()
202 changes: 202 additions & 0 deletions src/subsystems/navigation/athena_map/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
8 changes: 8 additions & 0 deletions src/subsystems/navigation/athena_map/config/dem_costmap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
dem_costmap_converter:
ros__parameters:
dem_file_path: "maps/north_site800m.tif" # override via launch-arg if you like
map_resolution: 1.0
max_passable_slope_degrees: 15.0
output_frame: map
origin_x: 518370.0
origin_y: 4253272.0
Loading