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

Integrates local planner with random walk. Still need to tune parameters, but it runs. #118

Merged
merged 95 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
765ebd7
changing global planning docs and cleaning up random walk planner
tharp789 Sep 17, 2024
8c680be
adding testing docs
tharp789 Sep 18, 2024
717b641
changing global planning docs and cleaning up random walk planner
tharp789 Sep 17, 2024
98f81d0
adding testing docs
tharp789 Sep 18, 2024
c3de1aa
Merge branch 'tharp/rand_walk_cleanup' of https://github.com/castacks…
tharp789 Sep 18, 2024
1f72df9
refactoring code for new interface
tharp789 Sep 18, 2024
7e3b32b
adding conversions for new message types
tharp789 Sep 18, 2024
2c63df8
fixing build issues for new interfaces
tharp789 Sep 18, 2024
91e4b8d
chaning logic to take the max voxzel size instead of assuming uniform
tharp789 Sep 18, 2024
8b84e5a
cleaning up distance calculations
tharp789 Sep 18, 2024
3947fdb
making build changes for curr_location
tharp789 Sep 18, 2024
31512b4
more build fixes
tharp789 Sep 18, 2024
85a36ce
more and more build fixes
tharp789 Sep 18, 2024
a52f822
more and more build fixes
tharp789 Sep 18, 2024
d2f5d97
asdf
tharp789 Sep 18, 2024
b9ac384
a;alala
tharp789 Sep 18, 2024
01bd1c0
asdfallsdlfkn
tharp789 Sep 18, 2024
57eaa10
fixed build
tharp789 Sep 18, 2024
aba33a5
Do proper docker containers now with variable number of robots (#40)
andrewjong Sep 18, 2024
458e7b1
Aj/update docs (#45)
andrewjong Sep 19, 2024
ace15f7
Add footer (#46)
andrewjong Sep 19, 2024
e1293c9
Add more docs
andrewjong Sep 19, 2024
0afc4df
welcome page, boilerplate (#47)
andrewjong Sep 19, 2024
0cadc73
changing global planning docs and cleaning up random walk planner
tharp789 Sep 17, 2024
543e761
adding some more documentation
tharp789 Sep 22, 2024
de82155
adding service call
tharp789 Sep 22, 2024
67ecb47
finishing clean up of old map callback
tharp789 Sep 23, 2024
e69a946
deleting irrelevant testing doc
tharp789 Sep 23, 2024
e8a3044
Merge remote-tracking branch 'origin/main' into tharp/rand_walk_cleanup
tharp789 Sep 23, 2024
b6d532f
Merge remote-tracking branch 'origin/main' into tharp/rand_walk_cleanup
tharp789 Sep 25, 2024
6f58a9a
Merge remote-tracking branch 'origin/main' into tharp/rand_walk_cleanup
tharp789 Oct 1, 2024
528dbad
removing trivial_planner package for random walk and add xml launch file
tharp789 Oct 1, 2024
4219588
Merge remote-tracking branch 'origin/main' into tharp/rand_walk_cleanup
tharp789 Oct 2, 2024
019d228
Merge remote-tracking branch 'origin/main' into tharp/rand_walk_cleanup
tharp789 Oct 2, 2024
44a8b1f
removing airstack_msgs dependency
tharp789 Oct 2, 2024
0790c38
adding plan reception mode to behaviro tree
tharp789 Oct 3, 2024
1bbb5ef
buildable chanes
tharp789 Oct 8, 2024
1b68714
merging from main
tharp789 Oct 8, 2024
83cbd17
working action based random walk
tharp789 Oct 8, 2024
58c2b9c
working global plan toggle
tharp789 Oct 9, 2024
5e05a7d
fixing read_parameter formatting
tharp789 Oct 9, 2024
81ba81b
adding ensemble planner
tharp789 Oct 9, 2024
0fac73e
first test of the new global planner format with random walk publishi…
tharp789 Oct 10, 2024
0720d8c
adding rad2deg and logging in random walk logic
tharp789 Oct 10, 2024
8d8dda0
Merge remote-tracking branch 'origin/main' into tharp/rand_walk_cleanup
tharp789 Oct 10, 2024
4167a2a
working random walk
tharp789 Oct 10, 2024
d718425
cleaning up junk
tharp789 Oct 10, 2024
ad41f04
Remove fluff from droan
andrewjong Oct 8, 2024
0f7c2a2
Connect disparity expansion to other core stack topics; works with gt…
andrewjong Oct 8, 2024
e708b8a
Remove tf_prefix
andrewjong Oct 8, 2024
e499cbf
Clean up launch, start migrating to use nav_msgs/Path for global plan
andrewjong Oct 8, 2024
521586c
Remove deprecated traj mode client
andrewjong Oct 10, 2024
b8cc13f
Progress
andrewjong Oct 15, 2024
03ac5c2
Enable permalinks for headers
andrewjong Oct 17, 2024
ac246e2
Update to use relative path
andrewjong Oct 17, 2024
3c6e325
Add xml extensions
andrewjong Oct 17, 2024
40c74f4
Update comments
andrewjong Oct 17, 2024
a63c8e2
Factor out parameters to config file; also clean up code
andrewjong Oct 17, 2024
0a13d14
Add expansion point cloud visualizer back
andrewjong Oct 17, 2024
b5d5085
Add missing marker publisher
andrewjong Oct 18, 2024
7b3b276
Fix bugs and topic connections
andrewjong Oct 18, 2024
72b2540
Fix bugs and code cleanup
andrewjong Oct 18, 2024
dede750
Fix typos add clarity
andrewjong Oct 18, 2024
c1d8055
Add rviz for debug droan
andrewjong Oct 18, 2024
31ad717
Update docs
andrewjong Oct 24, 2024
dd5a59e
Rename core.rviz to robot.rviz
andrewjong Oct 24, 2024
5d4b3a3
Enable SITL extension automatically in docker image
andrewjong Oct 24, 2024
1dd1f22
Remove node name override from launch files; instead let node names b…
andrewjong Oct 25, 2024
bcaf333
Pass node names
andrewjong Oct 28, 2024
3d50f5b
Refactor; nested nodes didn't work with subscribers, pass node ptr in…
andrewjong Oct 29, 2024
93a4f91
Publishes a local traj omg
andrewjong Oct 29, 2024
31f2652
Set mavros use_sim_time at launch instead of with separate pane
andrewjong Oct 29, 2024
3ebc504
Manually set trajectory marker namespace to prevent accumulating expl…
andrewjong Oct 29, 2024
4df2cfb
Add to global plan ICD sending feedback for ETA to waypoints
andrewjong Oct 29, 2024
ce4e8b4
Try make tmux extension auto refresh. didn't work
andrewjong Oct 29, 2024
579caca
Customize for debug
andrewjong Oct 29, 2024
60b4b97
Attempt fix and refactor trajectory collision checking
andrewjong Oct 30, 2024
ef437cb
Clean up and make debugging clearer
andrewjong Oct 31, 2024
3d2eeb0
Update cpp standard to cpp17, add docstring to recommended extensions
andrewjong Oct 31, 2024
f7ec94c
yay now the disparity graph collision markers are correct
andrewjong Oct 31, 2024
9d6c64f
No more segfault
andrewjong Oct 31, 2024
3b9d962
Update
andrewjong Oct 31, 2024
d5ce1e1
Comment out main rviz for now
andrewjong Oct 31, 2024
fce8547
Make lib shared
andrewjong Oct 31, 2024
ec2c1dc
idk what this does
andrewjong Oct 31, 2024
6aa09ef
Merge with Tyler's random walk planner branch
andrewjong Oct 31, 2024
8eeef5b
Remove dependency on missing global_planner_msgs
andrewjong Oct 31, 2024
73cc22c
Comment out 5 sec wait for mavros launch
andrewjong Nov 1, 2024
37907b9
Reorder buttons
andrewjong Nov 1, 2024
5f7755e
Publish frustum from disparity expansion for debugging
andrewjong Nov 1, 2024
d336296
Successfully integrate droan with tyler's random walk planner
andrewjong Nov 1, 2024
0189eb5
Rename SEGMENT to ADD_SEGMENT
andrewjong Nov 1, 2024
bed325b
Extract params to yaml
andrewjong Nov 1, 2024
00b1104
Clean code
andrewjong Nov 1, 2024
b94bd3d
Update rviz
andrewjong Nov 1, 2024
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
38 changes: 19 additions & 19 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@
"limitSymbolsToIncludedHeaders": false
},
"includePath": [
"/root/AirStack/ros_ws/install/vdb_mapping_interfaces/include/**",
"/root/AirStack/ros_ws/install/trajectory_library/include/**",
"/root/AirStack/ros_ws/install/mavros_interface/include/**",
"/root/AirStack/ros_ws/install/robot_interface/include/**",
"/root/AirStack/ros_ws/install/px4_msgs/include/**",
"/root/AirStack/ros_ws/install/mav_system_msgs/include/**",
"/root/AirStack/ros_ws/install/mav_state_machine_msgs/include/**",
"/root/AirStack/ros_ws/install/mav_planning_msgs/include/**",
"/root/AirStack/ros_ws/install/mav_msgs/include/**",
"/root/AirStack/ros_ws/install/disparity_map_representation/include/**",
"/root/AirStack/ros_ws/install/map_representation_interface/include/**",
"/root/AirStack/ros_ws/install/disparity_graph/include/**",
"/root/AirStack/ros_ws/install/behavior_tree/include/**",
"/root/AirStack/ros_ws/install/behavior_tree_msgs/include/**",
"/root/AirStack/ros_ws/install/airstack_common/include/**",
"/root/AirStack/ros_ws/install/airstack_msgs/include/**",
"${workspaceFolder}/ros_ws/install/vdb_mapping_interfaces/include/**",
"${workspaceFolder}/ros_ws/install/trajectory_library/include/**",
"${workspaceFolder}/ros_ws/install/mavros_interface/include/**",
"${workspaceFolder}/ros_ws/install/robot_interface/include/**",
"${workspaceFolder}/ros_ws/install/px4_msgs/include/**",
"${workspaceFolder}/ros_ws/install/mav_system_msgs/include/**",
"${workspaceFolder}/ros_ws/install/mav_state_machine_msgs/include/**",
"${workspaceFolder}/ros_ws/install/mav_planning_msgs/include/**",
"${workspaceFolder}/ros_ws/install/mav_msgs/include/**",
"${workspaceFolder}/ros_ws/install/disparity_map_representation/include/**",
"${workspaceFolder}/ros_ws/install/map_representation_interface/include/**",
"${workspaceFolder}/ros_ws/install/disparity_graph/include/**",
"${workspaceFolder}/ros_ws/install/behavior_tree/include/**",
"${workspaceFolder}/ros_ws/install/behavior_tree_msgs/include/**",
"${workspaceFolder}/ros_ws/install/airstack_common/include/**",
"${workspaceFolder}/ros_ws/install/airstack_msgs/include/**",
"${workspaceFolder}/ros_ws/src/**",
"/opt/ros/humble/include/**",
"/usr/include/**",
"/root/AirStack/ros_ws/src/**"
"/usr/include/**"
],
"name": "ROS",
"intelliSenseMode": "gcc-x64",
"compilerPath": "/usr/bin/gcc",
"cStandard": "gnu11",
"cppStandard": "c++14"
"cppStandard": "c++17"
}
],
"version": 4
Expand Down
6 changes: 5 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
"ms-iot.vscode-ros",
"ms-vscode-remote.remote-ssh",
"ms-python.python",
"ms-vscode-remote.remote-containers"
"ms-vscode-remote.remote-containers",
"redhat.vscode-xml",
"dotjoshjohnson.xml",
"ms-vscode.cmake-tools",
"cschlosser.doxdocgen"
]
}
3 changes: 2 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
"version": "0.2.0",
"configurations": [
{
"name": "ROS2: Launch robot.launch.py",
"name": "ROS2: Launch robot.launch.xml",
"type": "ros",
"request": "launch",
// "preLaunchTask": "build ros_ws debug",
"target": "${workspaceFolder}/ros_ws/install/robot_bringup/share/robot_bringup/launch/robot.launch.xml",
}
]
Expand Down
6 changes: 4 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"**/install": true,
"**/log": true
},
"C_Cpp.errorSquiggles": "enabled",
// ISAAC SIM
"python.analysis.extraPaths": [
"~/.local/share/ov/pkg/isaac-sim-4.0.0/exts/omni.exporter.urdf",
Expand Down Expand Up @@ -820,8 +821,9 @@
"stop_token": "cpp",
"cfenv": "cpp",
"typeindex": "cpp",
"valarray": "cpp"
"valarray": "cpp",
"*.ipp": "cpp"
},
"C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: Google, IndentWidth: 4, ColumnLimit: 100 }",
"editor.formatOnSave": true
}
}
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": "2.0.0",
"tasks": [
{
"label": "build ros_ws",
"label": "build ros_ws debug",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/ros_ws"
Expand Down
3 changes: 3 additions & 0 deletions docker/Dockerfile.isaac-ros
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ RUN cd /tmp/ && \
# copy over the AscentAeroSystemsSITLPackage
COPY docker/isaac-sim/AscentAeroSystemsSITLPackage /AscentAeroSystemsSITLPackage

# the user.config.json file specifies to auto load the SITL extensions
COPY docker/isaac-sim/user.config.json /root/.local/share/ov/data/Kit/Isaac-Sim/4.1/user.config.json

COPY ros_ws/fastdds.xml /isaac-sim/fastdds.xml

# Cleanup. Prevent people accidentally doing git commits as root in Docker
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
services:
# ==============================================================================
isaac-sim:
image: &isaac-sim-image airlab-storage.andrew.cmu.edu:5001/shared/isaac-sim_ros-humble:v1.0.1
image: &isaac-sim-image airlab-storage.andrew.cmu.edu:5001/shared/isaac-sim_ros-humble:v1.0.2
build:
context: ../
dockerfile: docker/Dockerfile.isaac-ros
Expand Down
23 changes: 17 additions & 6 deletions docker/extras/drag_and_drop/ascent_sitl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,21 @@ windows:
- echo $AUTONOMY_STACK_PORT
- mavproxy.py --streamrate=100 --master tcp:127.0.0.1:$BASE_PORT --out udp:127.0.0.1:$ASCENT_SITL_PORT --out udp:127.0.0.1:$ISAAC_SIM_PORT --out udp:127.0.0.1:$AUTONOMY_STACK_PORT
- shell_command:
- sleep 5
# - sleep 5
- export ROS_DOMAIN_ID=$DOMAIN_ID
- ros2 launch mavros apm.launch fcu_url:="udp://127.0.0.1:$AUTONOMY_STACK_PORT@$MAVROS_LAUNCH_PORT" namespace:=$NAMESPACE/interface/mavros
- shell_command:
- sleep 7
- export ROS_DOMAIN_ID=$DOMAIN_ID
- ros2 param set $NAMESPACE/interface/mavros/mavros use_sim_time true
# - ros2 launch mavros apm.launch fcu_url:="udp://127.0.0.1:$AUTONOMY_STACK_PORT@$MAVROS_LAUNCH_PORT" namespace:=$NAMESPACE/interface/mavros --ros-args -p use_sim_time:=true
- >
ros2 run mavros mavros_node
--ros-args
-r __ns:=/$NAMESPACE/interface/mavros
-p fcu_url:="udp://127.0.0.1:$AUTONOMY_STACK_PORT@$MAVROS_LAUNCH_PORT"
-p tgt_system:=1
-p tgt_component:=1
-p fcu_protocol:=v2.0
--params-file $(ros2 pkg prefix mavros)/share/mavros/launch/apm_pluginlists.yaml
--params-file $(ros2 pkg prefix mavros)/share/mavros/launch/apm_config.yaml
-p use_sim_time:=true
# - shell_command:
# - sleep 7
# - export ROS_DOMAIN_ID=$DOMAIN_ID
# - ros2 param set $NAMESPACE/interface/mavros/mavros use_sim_time true
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,16 @@ def on_startup(self, ext_id):
ui.Spacer(height=5)
self.sessions_stack = ui.VStack()
#'''

self.sessions_dict = {}

self.play_listener = self.timeline.get_timeline_event_stream().create_subscription_to_pop_by_type(
int(omni.timeline.TimelineEventType.PLAY), self.refresh_tmux_sessions)
self.pause_listener = self.timeline.get_timeline_event_stream().create_subscription_to_pop_by_type(
int(omni.timeline.TimelineEventType.PAUSE), self.refresh_tmux_sessions)
self.stop_listener = self.timeline.get_timeline_event_stream().create_subscription_to_pop_by_type(
int(omni.timeline.TimelineEventType.STOP), self.refresh_tmux_sessions)

self.refresh_tmux_sessions()

'''
with self.window.frame:
Expand Down Expand Up @@ -291,4 +299,5 @@ def kill():
del self.sessions_dict[k]

def on_shutdown(self):
self.refresh_tmux_sessions()
print("[airlab.tmux_manager] Extension shutdown")
Loading