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

Plansys2 on Astrobee Noetic #107

Merged
merged 33 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f9d1aa4
Add `survey_manager` subdirectory without layout for survey nodes
Bckempa Mar 15, 2023
d69c396
Improve linking to survey manager docs
Bckempa Mar 15, 2023
fe13ff0
Add files via upload
Abster101 Mar 20, 2023
303a939
added files to the correct directory
Abster101 Mar 20, 2023
6333681
adding soft constraints problem files
Abster101 Apr 4, 2023
f095687
Attempt at a complete MVP domain model
trey0 Oct 25, 2023
369591a
Oops, remove redundant effect
trey0 Oct 25, 2023
31a9477
Simplified collision checking predicate
trey0 Oct 25, 2023
e7a8785
In a working state
trey0 Oct 27, 2023
fa9c324
Add sample_output_plan.txt
trey0 Oct 27, 2023
e1d1c6c
Oops, remove obsolete commented-out code
trey0 Oct 27, 2023
191b0c4
Fixed stereo survey part of the model based on analysis of old stereo…
trey0 Nov 9, 2023
5d4d797
Update sample_output_plan.txt to reflect latest domain/problem
trey0 Nov 9, 2023
5513601
Now generate PDDL problem from higher-level problem specification
trey0 Nov 9, 2023
4761d7a
Tune panorama estimated duration
trey0 Nov 9, 2023
d64a8ef
Add plan_interpreter.py. Minor cleanup in problem_generator.py
trey0 Nov 9, 2023
c73d55d
Simplify dynamic config just a bit
trey0 Nov 9, 2023
2b2f5d9
Merge pull request #1 from trey0/planner_model
Bckempa Nov 15, 2023
9da4f5d
Add `survey_manager` subdirectory without layout for survey nodes
Bckempa Mar 15, 2023
86ad3b2
Improve linking to survey manager docs
Bckempa Mar 15, 2023
f87f569
Remove `survey_bridge` capability will be added to `astrobee`
Bckempa Nov 7, 2023
3239e38
Add traclabs plansys2 backport via submodule, thanks @ana-GT
Bckempa Nov 15, 2023
bc69c22
Move sub-modules to `survey_manager` path
Bckempa Nov 21, 2023
0e73b41
Upgrade behaviortree to V4
Bckempa Nov 21, 2023
500a443
Cleanup unused, misplaced sub-modules, again.
Bckempa Nov 21, 2023
1487f6b
Merge branch 'survey_manager' into survey_planner
Bckempa Nov 28, 2023
f5d60dd
Remove `survey_manager` package and organize `survey_planner`
Bckempa Nov 28, 2023
799de4b
Deprecate Ubuntu-16.04 (xenial) builds of Isaac to support Plansys2
Bckempa Dec 7, 2023
d7780f3
Fix python formatting
Bckempa Dec 7, 2023
1faed30
Update to forks of traclabs backports
Bckempa Dec 7, 2023
ba10b12
Add readline development files to setup for plansys2 terminal interface
Bckempa Dec 7, 2023
892bc39
Removed outdated PDDL files per @trey0
Bckempa Dec 12, 2023
78b0f40
Revert CI upgrades for APK builds
Bckempa Dec 12, 2023
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
8 changes: 8 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
[submodule "isaac_msgs"]
path = communications/isaac_msgs
url = https://github.com/nasa/isaac_msgs.git
[submodule "astrobee/survey_manager/survey_planner/src/ros2_planning_system"]
path = astrobee/survey_manager/survey_planner/src/ros2_planning_system
url = https://github.com/traclabs/ros2_planning_system
branch = noetic-devel
[submodule "astrobee/survey_manager/survey_planner/src/ros1_lifecycle"]
path = astrobee/survey_manager/survey_planner/src/ros1_lifecycle
url = https://github.com/traclabs/ros1_lifecycle
branch = noetic-devel
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ the [Astrobee robot](https://github.com/nasa/astrobee). This repository includes
- [Dense mapping](https://nasa.github.io/isaac/html/geometric_streaming_mapper.html) to create a textured 3D map
- [Volumetric mapping](https://nasa.github.io/isaac/html/volumetric_mapper.html) to map volumetric signals, such as WiFi.
- [Image analysis](https://nasa.github.io/isaac/html/ano.html) module to train a neural network to detect anomalies
- [Survey Manager](https://nasa.github.io/isaac/html/survey.html) semi-autonomous planning and execution of imaging tasks.

You may also be interested in the separate repository for the [ISAAC User Interface](https://github.com/nasa/isaac_user_interface),
which enables monitoring of multiple robots through a web browser.
Expand Down
4 changes: 3 additions & 1 deletion astrobee/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ The Astrobeemodule contains the ISAAC additions to the Astrobee FSW

\subpage sim : Gazebo plugins for simulation including acoustic and heat camera, RFID reader and emmiter, as well as WiFi reader and emmiters.

\subpage gs_action_helper : Guest science action helper used to communicate with the ground through DDS messages
\subpage gs_action_helper : Guest science action helper used to communicate with the ground through DDS messages

\subpage survey : Semi-autonomous survey tasking of Astrobees.
7 changes: 7 additions & 0 deletions astrobee/survey_manager/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
\page survey Survey Manager

The ISAAC Survey Manager provides semi-autonomous planning and execution of panorama and stereophotography tasks to reduce operator loading and improve activity utilization.

\subpage survey_manager : Control node for survey work crew participants, includes operator interface.

\subpage survey_planner : Planning and scheduling of queued survey actions.
14 changes: 14 additions & 0 deletions astrobee/survey_manager/survey_manager/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
\page survey_manager Survey Manager

Control node for survey work crew participants, includes operator interface.

Task Life Cycle
---------
``
Bckempa marked this conversation as resolved.
Show resolved Hide resolved
Unassigned Queue --(planning)--> Robot queue --(execution)–-> Verify Queue --(verified good)--> Complete
/\ | |
| | (verified bad)
| (exception) |
| | |
{New Task} <--(retry)-- Failed Queue <-----<-------------<-
``
5 changes: 5 additions & 0 deletions astrobee/survey_manager/survey_planner/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
\page survey_planner Survey Planner

Planning and scheduling of queued survey actions using Playsys2 for PDPL solutions and behavior trees for execution.
Bckempa marked this conversation as resolved.
Show resolved Hide resolved

Based on [preliminary work](https://github.com/traclabs/astrobee_task_planning_ws) by [Ana](https://github.com/ana-GT) at [Traclabs](https://traclabs.com).
1 change: 1 addition & 0 deletions astrobee/survey_manager/survey_planner/src/ros1_lifecycle
Submodule ros1_lifecycle added at 15a503
2 changes: 2 additions & 0 deletions isaac/Subsystems.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ The ISAAC Repo contains the following Modules:

\subpage astrobee : High-level actions that support complex maneuvers.

\subpage survey : Semi-autonomous survey tasking of Astrobees.

\subpage shared : Shared tools common to the entire ISAAC repo.
1 change: 1 addition & 0 deletions scripts/setup/packages_focal.lst
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ python3-osrf-pycommon
python3-rosdep
ros-noetic-eigen-conversions
ros-noetic-pcl-ros
ros-noetic-behaviortree-cpp
libmnl-dev
libproj-dev