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

Fixing subtree issues with blackboard shared resources (3640) (backport #3911) #3916

Merged
merged 2 commits into from
Oct 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 28, 2023

This is an automatic backport of pull request #3911 done by Mergify.
Cherry-pick of 4b4465d has failed:

On branch mergify/bp/humble/pr-3911
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 4b4465df.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* fixing subtree issues

* Update bt_action_server_impl.hpp

(cherry picked from commit 4b4465d)

# Conflicts:
#	nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp
@mergify mergify bot added the conflicts label Oct 28, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Oct 28, 2023

@mergify[bot], all pull requests must be targeted towards the main development branch.
Once merged into main, it is possible to backport to @humble, but it must be in main
to have these changes reflected into new distributions.

@SteveMacenski SteveMacenski merged commit 95b2322 into humble Oct 30, 2023
1 of 3 checks passed
@SteveMacenski SteveMacenski deleted the mergify/bp/humble/pr-3911 branch October 30, 2023 20:56
RBT22 pushed a commit to EnjoyRobotics/navigation2 that referenced this pull request Nov 16, 2023
ros-navigation#3911) (ros-navigation#3916)

* Fixing subtree issues with blackboard shared resources (3640) (ros-navigation#3911)

* fixing subtree issues

* Update bt_action_server_impl.hpp

(cherry picked from commit 4b4465d)

# Conflicts:
#	nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp

* Update bt_action_server_impl.hpp

---------

Co-authored-by: Steve Macenski <[email protected]>
RBT22 pushed a commit to EnjoyRobotics/navigation2 that referenced this pull request Nov 16, 2023
ros-navigation#3911) (ros-navigation#3916)

* Fixing subtree issues with blackboard shared resources (3640) (ros-navigation#3911)

* fixing subtree issues

* Update bt_action_server_impl.hpp

(cherry picked from commit 4b4465d)

# Conflicts:
#	nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp

* Update bt_action_server_impl.hpp

---------

Co-authored-by: Steve Macenski <[email protected]>
redvinaa pushed a commit to EnjoyRobotics/navigation2 that referenced this pull request Nov 20, 2023
ros-navigation#3911) (ros-navigation#3916)

* Fixing subtree issues with blackboard shared resources (3640) (ros-navigation#3911)

* fixing subtree issues

* Update bt_action_server_impl.hpp

(cherry picked from commit 4b4465d)

# Conflicts:
#	nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp

* Update bt_action_server_impl.hpp

---------

Co-authored-by: Steve Macenski <[email protected]>
kakarrot-anderson pushed a commit to floatic-unicorn/navigation2 that referenced this pull request Jan 24, 2024
* Humble sync 6 June 9: 1.1.7 (ros-navigation#3616)

* Option allowing to use simple lookupTransform API (ros-navigation#3412)

* Option allowing to use simple lookupTransform API
ignoring time shifts between source and base frame during the movement

* Refine comments

* Fix wrong warning message format (ros-navigation#3416)

* Fix wrong warning message format (Closes ros-navigation#3415)

* fix code formatting

* nav2_dwb_controller: add forward_prune_distance parameter (ros-navigation#3374)

Until now, the prune_distance was used as distance threshold to shorten
the upcoming path when shorten_transformed_plan was enabled. However,
the prune and shortening mechanisms are de-correlated mechanisms. One
could wish to use a different shortening distance for upcoming points,
than the prune distance used for passed points. For this reason, a new
parameter "forward_prune_distance" was added.

* Fix service_name for server_name in cancel assisted teleop node

* Fix mask coordinates calculation in worldToMask (ros-navigation#3418)

* Remove goal checker default from follow path node

* Correct CostmapFilters copyrights (ros-navigation#3423)

* Correct the parameter description for AMCL (ros-navigation#3451)

Signed-off-by: Trung Kien <[email protected]>

* Add default service name to BTServiceNode (ros-navigation#3448)

* Add default service name to BtServiceNode

* docstring

* fix initialization-list order

* Update nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp

Co-authored-by: Steve Macenski <[email protected]>

---------

Co-authored-by: Steve Macenski <[email protected]>

* Fix Typos (ros-navigation#3452)

* removing galactic from table as EOL (ros-navigation#3460)

* Support for Dev Containers and Codespaces (ros-navigation#3457)

* Alias image tag over current branch name

* Duplicate build and push steps for dev tag

* Alias image tag over current branch name

* Modify build and push steps for dev tag

* Build and push dev tag first
to not cache from stale stages
as otherwise caching from multple regestry images seems error prone

* Revert "Build and push dev tag first"
as otherwise the build failer durring the dev tag
could then still block build of the main tag

This reverts commit 12dd5b1.

* Cache from multple reference images
while giving layers from the main tag priority
this assumes that cache-from prioritizes firstly listed references

https://github.com/moby/buildkit/blob/0ad8d61575be009ce6478edf1d85716849c8ff1a/solver/llbsolver/bridge.go#L92

* Cache tests in dev image as well
colcon cache can then skip tests for uneffected packages

* Add devcontainer.json

* Ignore doc for image builds

* Add more extensions

* Change workspaceFolder to root src path
to avoid auto generating .vscode folder in repo
created by ms-iot.vscode-ros extension
upon configuring ros packages with c_cpp_properties.json

* Enable features
for github-cli

* Add docs about codespaces
and have it opened when starting codespaces

* Update update_ci_image.yaml

to fix duplicate step ids
and add workflow file to push paths

* Patch CI actions and Dockerfiles (ros-navigation#3468)

* Unset default value for FAIL_ON_TEST_FAILURE
as unsetting it via --build-arg seems unreliable
docker/compose#3608

* Use build arg default for failing on test failers

* Update from deprecated set-output commands
https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/

* Use Codespaces prebuilds (ros-navigation#3470)

* Add commands to devcontainer

* Set builtin bash to be safe
https://gist.github.com/mohanpedala/1e2ff5661761d3abd0385e8223e16425
https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/

* Setup workspace on create

* Revert use of set -u for bash
don't raise error due to variables
otherwise colcon setup.sh chokes from using an unbounded path variable

* Add safe.directory for git config
otherwise colcon cache errors out because of issues with git
due to complex user mapping magic that vscode does with devcontainers

https://stackoverflow.com/questions/72978485/git-submodule-update-failed-with-fatal-detected-dubious-ownership-in-repositor

also used by Moveit2:
moveit/moveit2#1994

https://github.blog/2022-04-12-git-security-vulnerability-announced/

* Set env using remoteEnv
instead of inlining them in scripts

* Revert to using the main tag
now that the tester stage has been replicated
with the new devcontainer script commands instead

* formating

* Scrap `-dev` image tag
and use codspaces prebuilds instead

* Build incrementally from update content command
by copying the build workspace steps from circleci config

* Adapt the build workspace steps for bash

* Fix for different ceres isinf() API (ros-navigation#3471)

* Fixing name of security launch file

* Clean up pending service client request on interrupt/timeout (ros-navigation#3479)

Signed-off-by: Øystein Sture <[email protected]>

* Added str cast to parse int (ros-navigation#3486)

Co-authored-by: antoniomarangi <[email protected]>

* Add flag to not send request in BTServiceNode (ros-navigation#3431)

* Add flag to not send request in BTServiceNode

* rename goal to request

* Fail if should not send goal

* Update nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp

Co-authored-by: Steve Macenski <[email protected]>

* Update nav2_behavior_tree/include/nav2_behavior_tree/bt_service_node.hpp

Co-authored-by: Steve Macenski <[email protected]>

* .

* fix linter

* fix CI

---------

Co-authored-by: Steve Macenski <[email protected]>

* Prepare test results to only use junit/xunit schema (ros-navigation#3441)

* Set ctest arg to output junit

To try and help CircleCI to parse the output files
https://stackoverflow.com/a/70774733/2577586

* Replace the original Test.xml

by outputting the junit to the same filename
Context:
https://github.com/colcon/colcon-cmake/blob/8f1b92a190b2ad4289ecf837c3200d540c13fdd9/colcon_cmake/task/cmake/test.py#L133

* Fix default formatting to a list

WARNING:colcon.colcon_defaults.argument_parser.defaults:Default value 'ctest-args' for parser 'test' should be a list, not:  --output-junit Test.xml

* Revert junit file name
https://circleci.com/docs/collect-test-data/#ctest-for-c-cxx-tests

* Fine and rename ctest summary Test.xml

* Fix find path

* Simplify extention renaming

* Copy ctest junit file into test_results
so that they can be stored by CI

* Revert ctest config modifications

* Prepare Test Results by removing Test.xml
generated by ctest
to simplify fix for circleci

* Reorder storage of test result artifacts
before Test.xml files are removed
so that they can still be archived and viewed for later

* Use find command

* Container retention via version tagging (ros-navigation#3491)

* Use github action expression syntax
to alias over github repository name

* Tag by version instead of by timestamp

* Avoid pushing untagged image to GHCR
by setting provenance to false
now that provenance is enabled by default
as of v4 of docker/build-push-action

- docker/build-push-action#781
- docker/build-push-action#778

* Use checkout action to set version output (ros-navigation#3492)

Otherwise there is no source code to use to set the version output.
Fixes: ros-navigation#3491

* Change directory to inside checked out repo (ros-navigation#3493)

or relative path under $GITHUB_WORKSPACE
that actions/checkout places the repository

* Write and read from correct output mapping (ros-navigation#3494)

* Revert "Change directory to inside checked out repo (ros-navigation#3493)"

This reverts commit 332c1fb.

* Add `version` to outputs for check step
and use output from `check` id

* Use output from check_ci_files job

* updating world in simple commander for TB3 package change (ros-navigation#3495)

* Ensure version output is always set (ros-navigation#3503)

even when github.event_name != 'push'
by moving run step to same job as build-push action.

Also set context path provided by checkout action
to avoid future nonintuitive behavoir using default Git context,
even when the checkout action appears to be being used.

- https://github.com/docker/build-push-action#git-context
- https://github.com/docker/build-push-action#path-context

* Add labels to pushed image versions (ros-navigation#3505)

using Pre-Defined Annotation Keys
as defined by The OpenContainers Annotations Spec

- https://specs.opencontainers.org/image-spec/annotations/#pre-defined-annotation-keys
- https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows
- https://docs.github.com/en/rest/repos/repos?apiVersion=2022-11-28#get-a-repository

* Typo README.md (ros-navigation#3506)

* [Velocity smoother] Set zeros command if timeout (ros-navigation#3512)

* Set zeros command if timeout

* Fix lint

* Fix gtest 

increase time to allow deceleration

* Always update last_cmd_

* Revert test modif

* remove test logs

* Fix paste error

* Update velocity_smoother.cpp

* Update velocity_smoother.cpp

* Improve Dev Container ergonomics (ros-navigation#3482)

* Install and enable bash autocompletion
by using apt durring on create command
and by copying skelton .bashrc file that sources it by default

* Edit apt for autocomplete
by disabling docker-clean from containerized ubuntu

* Add ROS2 Ament Task Provider extension
Provides tasks and problem matchers for ROS2 projects using ament

https://marketplace.visualstudio.com/items?itemName=althack.ament-task-provider

* Source underlay for extentions
to allow them to find the path to ros binaries
such as ament_cpplint needed for althack.ament-task-provider

* Target new dever stage in Dockerfile

* Reduce need for internet after image build
by installing developer dependencies earlier

* Edit apt caching before apt updating

* Source underlay systemwide
this is a hacky workarround
to ensure VS Code can run ShellExecution tasks
with the ros envorment included in PATH

otherwise, postponing this to the on-create-command
results in vscode extentions not finding system installed ros commands

this also works for all user shells
regardless of how devontainers could change the user

* Postpone bashrc setup to postCreateCommand
once the dev container has been assigned to a user for the first time

* Cleanup onCreateCommand
as we don't use ros_entrypoint.sh for development
and so it doesn't really need to be updated

* Quite down the logs when building devcontainer

* Formatting

* Add refrence ccp properties config file
generated from the vscode ROS extention
but with the hardcoded paths in includePath deleted

* Update version of cppStandard for ROS Rolling

* Update workspaceFolder to use new .vscode folder

* Mount ccache directory to volume
to speed up rebuilding devcontainer
whenever onCreateCommand is triggered
because of modifications to .devcontainer/ files

* Avoid use of containerEnv to express ccache direcotry
as doing so is not possable, for more info:
- https://stackoverflow.com/a/75759647/2577586
- microsoft/vscode-remote-release#7147 (comment)

Just target a path in the temp direcotry instead

* Stage auto generated includePath

* Remove workspace install from include path
except for autogenerated headers from message packages

* Avoid hardcoded path to sorce folder

* Avoid hardcoded path to install folder
but this is still rather fragile
as the reletive path
between workspaceFolder and the colcon workspace isn't fixed

* Sort list of paths

* Remove cpp properties configuration
as it seems it's existance prevents autoupdating the includePaths property
unless user manually runs the vscode command `>ROS:Update C++ Properties`

https://github.com/ms-iot/vscode-ros/blob/47d8f14f4ec0498cd9e8381e6fcc5f47abb340f2/src/extension.ts#L71

and even when this command is invoked
it blows aways any customizated properties anyhow

issue about wrong cppStandard tracked here:
ms-iot/vscode-ros#818

* Fix typo
to move docker-clean from loaded config path

* fix data race: addFilter() and resizeMap() can be executed concurrently (ros-navigation#3518)

Co-authored-by: Dirk Braunschweiger <[email protected]>

* fix data race: prohibit resizeMap() during plugin/filter initialization (ros-navigation#3522)

Co-authored-by: Dirk Braunschweiger <[email protected]>

* Mount overlay workspace into Dev Container via volume (ros-navigation#3524)

* Add volume for overlay
to avoid rebuilding it from scratch
whenever the dev container is rebuilt
this saves startup time locally when fiddling with the configs

* Append devcontainerId to volume name
to avoid conflicts with other devcontainers
note that devcontainerId is stable across rebuilds
- https://containers.dev/implementors/json_reference/#variables-in-devcontainerjson

* Call updateContentCommand from onCreateCommand
to deduplicate scripts and keep setup DRY
given the addition of a mounted overlay volume
which could include a prebuilt colcon workspace
well before the dev container is created/rebuilt

* Comment out colcon clean from setup
to avoid unintentional removal of built packages
from the persistent overlay workspace volume.
Users can uncomment the line locally
or simply remove the overlay workspace volume
if they want to rebuild packages from scratch.

* Format json

* Add headless and use_rviz LaunchConfigurations to demo launch files (ros-navigation#3527)

* Add headless and use_rviz LaunchConfigurations
in nav2_simple_commander demo launch files
for whether to start rviz or gzclient
to simplify their use in headless environments

* Fix headless logic to match tb3_simulation_launch.py
for launch arg consistency

* Fix State-Lattice planner crashes due to FP precision loss (ros-navigation#3531)

* Fix State-Lattice planner crashes due to FP precision loss

* Move testcase comment

* Add PoseProgressChecker (ros-navigation#3530)

* add rotation progress checker

* clean include

* add stopped goal checker reset test

* add rotation progress checker tests

* uncrustify

* better name: PoseProgressChecker instead of RotationProgressChecker

* camelCase

* uncrustify

* rename in tests

* more rename

* simplify parentheses

* faster and better tests

---------

Co-authored-by: Guillaume Doisy <[email protected]>

* [velocity_smoother] Fix accel and deccel inverted for negative speeds (ros-navigation#3529)

* fix inverted accel / deccel

* handle speed through 0.0

* add applyConstraints tests

* fold logic

* same logic in findEtaConstraint

* lint

* Update nav2_velocity_smoother/src/velocity_smoother.cpp

* Update nav2_velocity_smoother/src/velocity_smoother.cpp

* findEtaConstraint tests

* space

* lint

* typos

* comment typos

---------

Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>

* Enable Visualizations for Dev Container (ros-navigation#3523)

* Add visualizer stage
to install demo dependencies

* Install foxglove

* Install gzweb

* Add hack for resolvable mesh URIs
located by the aws SDL model files
- aws-robotics/aws-robomaker-small-warehouse-world#24

* Revert hack and use fork
that fixes issues with deploy.sh
- osrf/gzweb#248

* Update target stage to visualizer

* Comment out gzclient and rviz for debugging

* Add hack for resolvable mesh URIs
as migrating the python3 scripts still hasn't resolved the issue

* Reorder stages for readability
by keeping sequential builder and tester stages adjacent
while keeping tester stage the default exported target

* fix typo

* Install gdb for launching ros launch files
using the ROS VS Code extension
- ms-iot/vscode-ros#588

* Add vscode tasks file

* Add Start Gzweb task

* Add Start Foxglove tasks
for bridge and studio

* Add Start Foxglove compound task
using dependsOn

* Set default problemMatcher to empty
to avoid nagging the user to select one
as currently none really support our use case

* Source overlay before running foxglove_bridge
to ensure nav2 message types are defined
by inlining all args into command
and sourcing workspace setup

* Formatting

* Generalize and simplify hack

* Generalize gazebo model discovery

* Patch gzserver to run headless using xvfb
to avoid host/platform specific x11 quirks
exposed by vscode automatic x11 forwarding

This is needed to provide gazebo a virtual frame buffer
as it still need one after all these years.
This also avoids the need modifying launch files to call xvfb-run

- microsoft/vscode-remote-release#8031
- gazebosim/gazebo-classic#1602

* Set isBackground for start tasks

* Add stop tasks

* Add restart foxglove task

* Switch to shell for commanding pkill
to gracefully return 0 when process is not running
allowing sequence of dependsOn tasks to run
such as for the restart tasks

* Add icons to tasks
for readability

* Add restart gzweb task

* Add global start, stop, and restart tasks
for all background visualization tasks

* Formatting

* Hide tasks users need not run manually
to avoid cluttering up the run task quick pick

* Shorten label for background tasks
so they succinctly show from the running task list

* Show global start and stop visualizations tasks
as they may be too helpful to hide

* Revert "Comment out gzclient and rviz for debugging"

This reverts commit 0addae2.

* Add --ipc=host to runArgs
to enable shared memory transport
- https://community.rti.com/kb/communicate-between-two-docker-containers-using-rti-connext-dds-and-shared-memory

* Add --pid=host to runArgs
to simplify discovery
- https://community.rti.com/kb/communicate-between-two-docker-containers-using-rti-connext-dds-and-shared-memory

* Add to runArgs
to simplify debugging
- https://code.visualstudio.com/docs/devcontainers/create-dev-container#_use-docker-compose

* Add comments

* Comment out runArgs unintended side effects
or cross talk between containers by default
also avoids interfering with vscode's X11 forwarding

* [nav2_planner] Fix costmap thread reset on cleanup (ros-navigation#3548)

* remove costmap thread reset on cleanup

* Init costmap thread in on_configure method

* Move costmap_thread init in on_configure method

* Add IsBatteryChargingCondition (ros-navigation#3553)

* Add IsBatteryChargingCondition

* Minor fixes in battery charging and add testing

* Fix format

* Added isBatteryChargingCondition BT node to params

* Impl noise filtering layer in the costmap_2d (ros-navigation#2567)

Signed-off-by: ryzhikovas <[email protected]>

* Improve Dev Container Web App Visualization (ros-navigation#3551)

* Add Caddyfile to reverse proxy websockets
in an attempt to avoid authentication tokens in headers
when forwarding ports from codespaces via web interface

- https://docs.github.com/en/codespaces/developing-in-codespaces/forwarding-ports-in-your-codespace#using-command-line-tools-and-rest-clients-to-access-ports
- https://caddyserver.com/docs/quick-starts/reverse-proxy
- https://caddy.community/t/caddy-v2-how-to-proxy-websoket-v2ray-websocket-tls/7040/13

* Update caddy related tasks

* Rename Gzweb task to Gzweb Bridge
to make room for more gzweb tasks

* Add Gzweb Client Task

* Add Caddyfile to reverse proxy websockets
now for Gzweb

* Specify config file to avoid crosstalk
between caddy stop commands

* Fix reverse proxy for websockets
by correcting matcher using headers
as websocket request header value is lowercase for gzweb and foxglove

* Comment out log output files for debugging

* Simplify tasks by removing client tasks

* Stop tasks by using terminate
via the workbench.action.tasks.terminate command

* Move Caddyfile

* Add Web Server tasks

* Move Caddyfile

* Update log output file path

* Update root path

* Update reverse_proxy for both gzweb and foxglove
by using the path argument for respective matchers

- https://caddyserver.com/docs/caddyfile/matchers#path-matchers

* Use snippets
to keep Caddyfile DRY
- https://caddyserver.com/docs/caddyfile/concepts#snippets

* Use rewrite to catch trailing slash
as file_server defaults do not correct reverse_proxy.
This make typing the websocket URL more forgiving

- https://caddyserver.com/docs/caddyfile/patterns#trailing-slashes

* Improve websocket snippet
to keep Caddyfile DRY

* Use header_regexp for case-insensitive matching
given web port forwarding from Codespaces is odd
and rewrites the value of this header field to lowercases
even when local browser request is sent as `Upgrade`

* Add helper index page to web server
to link to web apps for reverse proxy

* Limit templates to fix gzweb
by adding matcher for only root index
otherwise gzweb's own index.html gets overwritten

* Add comments to Cadyfile
to document tricky configuration

* Stage working redirect

* Simplify index.html

* Add helper redirect to simplify foxglove
to set the respective queries values to automate websocket setup,
and ensure the websocket schema matches the https request

* Avoid hardcoding port number

* Clean up comments

* Use header to compute redirect
to take into account requesting forwarding
or more codespace port forwarding shenanigans

* Use shorthand placeholders
- https://caddyserver.com/docs/caddyfile/concepts#placeholders

* Formatting

* Keep trailing slash
to stay consistent with caddy file_server directive
that serves a 308 Permanent Redirect
for both foxglove and gzweb paths anyway

* Refactor matcher logic
to account for requests either from
host ports from local dev containers
or forwarded requests from codespace web port forwarding

* Split snippet into globals
for composability

* Update comments

* Add Placeholders
for debugging

* Use tables to center

* Use github markdown
- https://github.com/sindresorhus/github-markdown-css

* Simplify vars

* Rename vars

* Revert "Rename vars"
as dotted var names do not work in Caddyfile

This reverts commit 3e2d1b3.

* Add System Monitor
to debug CPU load and memory issues

* Update headings

* Update layout

* Update layout

* Add Foxglove layout for Nav2

* Symlink assets folder for web server

* Fetch Foxglove layout using layoutUrl
a new parameter to load layout json data from URL
- https://github.com/orgs/foxglove/discussions/217

* Cleanup

* Use fork to fetch Foxglove layout using layoutUrl
until this PR is merged:
- https://github.com/foxglove/studio/pull/5987

* Update Caddyfile to handle relative root
by using local srv folder

* Inject mobile view html tags
using the caddy replace module
- https://caddyserver.com/docs/modules/http.handlers.replace_response
- https://github.com/caddyserver/replace-response

* Simplify Caddyfile

* Use snippet for apps

* Simplify Caddyfile

* Simplify Caddyfile

* Build caddy using custom modules

* Remove unused symlinks

* Add comments

* Use environment and defined variables for config
to avoid hard coded paths

* Add FoxgloveUrl to vars
for reuse in templates

* Fix trailing slash for DataSourceUrl

* Use exec to run gzserver with xvfb
to prevent ros launch from orphaning process
and ensure gzserver receives SIGTERM signal
given gzserver often hangs after only SIGINT
- https://unix.stackexchange.com/a/196053/213124

* Update redirect for foxglove
to redirect from path /foxglove/autolayout

* Add redirect for foxglove
to redirect from path /foxglove/autoconnect
but does not use LayoutUrl
as to not change from cached layout

* Use web app manifest
to set display as standalone
- https://web.dev/add-manifest/
- https://developer.mozilla.org/en-US/docs/Web/Manifest

* Template manifest files
to embed host info into app name

* Add manifests for other web apps

* Add shortcuts for Foxglove
- https://developer.mozilla.org/en-US/docs/Web/Manifest/shortcuts
- https://web.dev/app-shortcuts/

* Format

* Update comments

* Revert use of fork

* Remove debug directive

* Improve usability of PWAs in Dev Containers (ros-navigation#3576)

* Add WIP icons

* Add WIP icons for gzweb

* Add WIP icons for glances

* Set cross origin to use credentials
ensuring auth cookie is included in request header
when requesting for web app manifest file
thus avoiding CORS policy violations in browser
when accessing forwarded codespaces ports from the web

> The request for the manifest is made without credentials (even if it's on the same domain), thus if the manifest requires credentials, you must include `crossorigin="use-credentials"` in the manifest tag.

- https://web.dev/add-manifest/
- https://stackoverflow.com/a/57184506/2577586

* Use ReqHost variable in templates
to account for X-Forwarded-Host value in header

* Delete duplicate manifest

* Set id property in app manifests
so we can address them independently from their start_url
- https://developer.chrome.com/blog/pwa-manifest-id/

* Ensure apps are uniquely identifies
by adding trailing slash to id
and thus different URI directories

* Refactor root landing page into nav2 app
by moving page file into nav2 sub folder
adding root redirect pointing to /nav2/
and updating html, markdown, manifest files respectively

* Fix https detection for Caddy reverse proxies
by also checking X-Forwarded-Proto in request header

* Remove unnecessary files

* Prune smaller images

* Prune duplicate icon

* Clean up html tags

* Update manifest icons

* Rename icons

* Revert "Prune duplicate icon"

This reverts commit 5710401.

* Add back favicon for shortcut

* Add self index for completeness and bookmarking

* Simplify icon linking

* Delete binary files

* Fix hyperlink path

* Include image files using gitattributes
to track these binary files via git LFS

* Add icons using git lfs

* Standardized all icon paths

* Use external links for icons
to avoid the need for using git LFS
although this is a bit of a hack

* Stage any and maskable icons

* Use any and masked icons

* Set colors to match maskable icon colors

* Update icon

* Use lossless compression
without removing background
- https://shortpixel.com/online-image-compression

* Use WebP instead of PNG
for smaller file sizes
- https://en.wikipedia.org/wiki/WebP

* Move icons into icons folder

* Use _SRV environment variables for service paths

* Download media files from github
during docker image build
to avoid adding always online dependencies
when creating or starting dev containers

* Delete media icons from git repo
now that we download media from anonymized URLs on github
- https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/attaching-files

* Add comments

* Enable file browsing for non app paths
for remote debugging of media and asset files

* Consolidate assets into single folder

* Add links for file browser paths
to Server Diagnostics

* Delete unused symlink

* Update landing page to match manifest
by including same shortcuts and start url

* Patch gzweb to disable modelList
avoiding 404s for thumbnails
as they are hardcoded into js

* Update comments

* Simplify Caddyfile by reverting to symlinking
but add ROOT_SRV env for custom overriding

* Loop over nav2 srv folders when symlinking
to generalize over folder names

* Add matcher for file browsing root directory
while still redirecting to nav2 app by default

* Use placeholders for root variable
to consolidate env default fallback settings
e.g `:/srv`

* Promote file browser in Nav2 app shortcuts

* Fix and update SRV envs

* Postpone symlinking for Nav2 web app
to when post-create-command script then runs
given full repo is not copied into builder stage in Dockerfile.
While this could be postponed to update-content-command
leaving it here avoids blowing user changes
after the container has been created or modified.

* Add guard to check if srv folder exists

* Add refresh rate shortcuts to glances

* Add file browser shortcut to nav2

* Set scope for nav2 PWA to root
to allow for opening child apps inside nav2 app

* Display child apps in fullscreen mode by default
as users can still open them in standalone via nav2 app
given the nav2 app's scope is the parent root path

* Update shortcuts and landing page

* Document PWA scope and installation order
when using Nav2 PWA scoped as root

* Revert setting scope for nav2 PWA to root path
as adding file browser shortcut to nav2 PWA is not worth the trouble
of having to explain installation order caveats and URL launch behavior.
File browser shortcut is still accessible from inside nav2 pwa launcher
but merely displays in browser preview
given root / is out of scope for /nav2/

* Update server diagnostics for troubleshooting

* Verify checksum of archive before extraction
incase anonymized URL changes expected archive

* Fix the condition in ackerman motion model constraints (ros-navigation#3581)

* Fix the condition in ackerman motion model constraints

* Fix ackerman motion model tests

* Fix another ackerman motion model test

* Fix broken symlink for gzweb (ros-navigation#3585)

to load world models

* Fix broken link to contributing guidelines (ros-navigation#3587)

The original URL (https://navigation.ros.org/contribute/index.html) seems not to exist, returning an HTTP 404. Hence, I've replaced the link with a page that seems most relevant.

* Adding Our Sponsors - May 2023 (ros-navigation#3593)

* adding our sponsors - may 2023

* adding blurb

* adding links

* adding links

* adding links

* adding Open Nav

* Add CostmapFilterInfoServer as a component (ros-navigation#3596)

* Resolve ros-navigation#3532: reset i (ros-navigation#3597)

* [MPPI] empty path_follow_critic proper fix (ros-navigation#3599)

* [MPPI] empty path_follow_critic proper fix

* fix linting issue

---------

Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>

* bumping humble to 1.1.7 for release

---------

Signed-off-by: Trung Kien <[email protected]>
Signed-off-by: Øystein Sture <[email protected]>
Signed-off-by: ryzhikovas <[email protected]>
Co-authored-by: Alexey Merzlyakov <[email protected]>
Co-authored-by: Jose Luis Blanco-Claraco <[email protected]>
Co-authored-by: DylanDeCoeyer-Quimesis <[email protected]>
Co-authored-by: Trung Kien <[email protected]>
Co-authored-by: HovorunB <[email protected]>
Co-authored-by: Tony Najjar <[email protected]>
Co-authored-by: Ruffin <[email protected]>
Co-authored-by: Øystein Sture <[email protected]>
Co-authored-by: mrmara <[email protected]>
Co-authored-by: antoniomarangi <[email protected]>
Co-authored-by: Tony Najjar <[email protected]>
Co-authored-by: Griswald Brooks <[email protected]>
Co-authored-by: BriceRenaudeau <[email protected]>
Co-authored-by: Dirk Braunschweiger <[email protected]>
Co-authored-by: Dirk Braunschweiger <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Alberto Tudela <[email protected]>
Co-authored-by: ryzhikovas <[email protected]>
Co-authored-by: Alexandr Buyval <[email protected]>
Co-authored-by: Hyung-Taik Choi <[email protected]>
Co-authored-by: Filipe Cerveira <[email protected]>

* Fix merge conflict error (ros-navigation#3619)

* fixing a second merge conflict resolution error (ros-navigation#3621)

* fixing merge conflicts for release on humble sync 6 (ros-navigation#3623)

* Fixing 3629 (ros-navigation#3630)

* Fixing 3629

* Update planner_server.cpp

* bumping humble to 1.1.8 for release sync 6 + bug patch

* Fixing build warning (ros-navigation#3667) (ros-navigation#3673)

(cherry picked from commit 7d4b199)

Co-authored-by: Steve Macenski <[email protected]>

* Fix the velocity smoother being stuck when the deadband is too high (ros-navigation#3690) (ros-navigation#3715)

* Move last_cmd update before deadband

* fix lint

(cherry picked from commit cb34d0c)

Co-authored-by: BriceRenaudeau <[email protected]>

* Humble sync 7 August 4 1.1.9 (ros-navigation#3739)

* Fix map not showing on rviz when navigation is launched with namespace (ros-navigation#3620)

* updating mppi's path angle critic for optional bidirectionality (ros-navigation#3624)

* updating mppi's path angle critic for optional bidirectionality

* Update README.md

* fixing path angle critic's non-directional bias (ros-navigation#3632)

* fixing path angle critic's non-directional bias

* adding reformat

* adapting goal critic for speed to goal (ros-navigation#3641)

* adapting goal critic for speed to goal

* retuning goal critic

* add readme entries

* Update critics_tests.cpp

* Fix uninitialized value (ros-navigation#3651)

* In NAV2, this warning is treated as an error

Signed-off-by: Ryan Friedman <[email protected]>

* Fix rviz panel node arguments (ros-navigation#3655)

Signed-off-by: Nick Lamprianidis <[email protected]>

* Reduce out-of-range log to DEBUG (ros-navigation#3656)

* Adding nan twist rejection for velocity smoother and collision monitor (ros-navigation#3658)

* adding nan twist rejection for velocity smoother and collision monitor

* deref

* MPPI: Support Exact Path Following For Feasible Plans (ros-navigation#3659)

* alternative to path align critic for inversion control

* fix default behavior (enforce_path_inversion: false) (ros-navigation#3643)

Co-authored-by: Guillaume Doisy <[email protected]>

* adding dyaw option for path alignment to incentivize following the path's intent where necessary

* add docs for use path orientations

* fix typo

---------

Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>

* Fix smoother server tests (ros-navigation#3663)

* Fix smoother server tests

* Update test_smoother_server.cpp

* nav2_bt_navigator: log current location on navigate_to_pose action initialization (ros-navigation#3720)

It is very useful to know the current location considered by the
bt_navigator for debug purposes.

* nav2_behaviors: export all available plugins (ros-navigation#3716)

It allows external packages to include those headers and create child
classes through inheritance.

* changing costmap layers private to protected (ros-navigation#3722)

* adding error warnings around incorrect inflation layer setups in MPPI and Smac which impact performance substantially (ros-navigation#3728)

* adding error warnings around incorrect inflation layer setups in MPPI and Smac which impact performance substantially

* fix test failures

* Update RewrittenYaml to support list rewrites (ros-navigation#3727)

* allowing leaf key rewrites that aren't dcits (ros-navigation#3730)

* adding checks on config and dynamic parameters for proper velocity and acceleration limits (ros-navigation#3731)

* Fix Goal updater QoS (ros-navigation#3719)

* Fix GoalUpdater QoS

* Fixes

* bumping Humble to 1.1.9 for release

* fix merge conflict resolution in collision monitor node

---------

Signed-off-by: Ryan Friedman <[email protected]>
Signed-off-by: Nick Lamprianidis <[email protected]>
Co-authored-by: Filipe Cerveira <[email protected]>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Nick Lamprianidis <[email protected]>
Co-authored-by: BriceRenaudeau <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: DylanDeCoeyer-Quimesis <[email protected]>
Co-authored-by: gyaanantia <[email protected]>
Co-authored-by: Tony Najjar <[email protected]>

* Fixing 3768: planner server lifecycle transition down (ros-navigation#3786)

* Use ParameterFile (allow_substs) (ros-navigation#3706) (ros-navigation#3806)

Signed-off-by: ymd-stella <[email protected]>
Co-authored-by: ymd-stella <[email protected]>

* Added missing destructor to MPPI critic manager (ros-navigation#3812)

* Added missing virtual destructor

* Updated CriticManger Destructor to be same as other branches

* mppi: return NO_INFORMATION when the checked point is outside the costmap (ros-navigation#3816) (ros-navigation#3818)

otherwise the controller crashes at ObstaclesCritic::costAtPose
because x_i and y_i isn't initialized.

(cherry picked from commit 6b250a7)

Co-authored-by: Chuanhong Guo <[email protected]>

* [Humble] Sync 8 - Sept 25  (ros-navigation#3836)

* Same orientation of coordinate frames in rviz ang gazebo (ros-navigation#3751)

* rviz view straight in default xy orientation

Signed-off-by: Christian Henkel <[email protected]>

* gazebo orientation to match rviz

Signed-off-by: Christian Henkel <[email protected]>

* rotating in direction of view

---------

Signed-off-by: Christian Henkel <[email protected]>

* Fix flaky costmap filters tests: (ros-navigation#3754)

1. Set forward_prune_distance to 1.0 to robot not getting lost
2. Correct map name for costmap filter tests

* Fix missing mutex in PlannerServer::isPathValid (ros-navigation#3756)

Signed-off-by: ymd-stella <[email protected]>

* Rewrite the scan topic costmap plugins for multi-robot(namespace) before launch navigation. (ros-navigation#3572)

* Make it possible to launch namspaced robot which rewrites `<robot_namespace>` to namespace.
- It allows to apply namespace automatically on specific target topic path in costmap plugins.

Add new nav2 params file for multi-robot(rewriting `<robot_namespace>`) as an example.
- nav2_multirobot_params_all.yaml

Modify nav2_common.ReplaceString
- add condition argument

* Update nav2_bringup/launch/bringup_launch.py

Co-authored-by: Steve Macenski <[email protected]>

* Add new luanch script for multi-robot bringup

Rename luanch script for multi-robot simulation bringup

Add new nav2_common script
- Parse argument
- Parse multirobot pose

Update README.md

* Update README.md

Apply suggestions from code review

Fix pep257 erors

Co-authored-by: Steve Macenski <[email protected]>

---------

Co-authored-by: Steve Macenski <[email protected]>

* use ros clock for wait (ros-navigation#3782)

* use ROS clock for wait

* fix backport issue

---------

Co-authored-by: Guillaume Doisy <[email protected]>

* fixing external users of the BT action node template (ros-navigation#3792)

* fixing external users of the BT action node template

* Update nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp

Co-authored-by: Guillaume Doisy <[email protected]>

---------

Co-authored-by: Guillaume Doisy <[email protected]>

* Using Simple Commander API for multi robot systems (ros-navigation#3803)

* support multirobot namespaces

* add docs

* adding copy all params primitive for BT navigator (to ingest into rclcpp) (ros-navigation#3804)

* adding copy all params primitive

* fix linting

* lint

* I swear to god, this better be the last linting issue

* allowing params to be declared from yaml

* Update bt_navigator.cpp

* some minor optimizations (ros-navigation#3821)

* fix broken behaviortree doc link (ros-navigation#3822)

Signed-off-by: Anton Kesy <[email protected]>

* [MPPI] complete minor optimaization with floating point calculations (ros-navigation#3827)

* floating point calculations

* Update optimizer_unit_tests.cpp

* Update critics_tests.cpp

* Update critics_tests.cpp

* 25% speed up of goal critic; 1% speed up from vy striding when not in use

* bumping 1.1.9 to 1.1.10 for Humble release

---------

Signed-off-by: Christian Henkel <[email protected]>
Signed-off-by: ymd-stella <[email protected]>
Signed-off-by: Anton Kesy <[email protected]>
Co-authored-by: Christian Henkel <[email protected]>
Co-authored-by: Alexey Merzlyakov <[email protected]>
Co-authored-by: ymd-stella <[email protected]>
Co-authored-by: Hyunseok <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Anton Kesy <[email protected]>

* Update CMakeLists.txt (ros-navigation#3843) (ros-navigation#3845)

(cherry picked from commit 2d6e9a9)

Co-authored-by: Steve Macenski <[email protected]>

* bump to 1.1.11 for release for AVX512 fixes

* add option for sse4 and avs512 (ros-navigation#3853) (ros-navigation#3855)

(cherry picked from commit 7274811)

Co-authored-by: Steve Macenski <[email protected]>

* Bumping to 1.1.12 for binary release of AVX512 patches

* [MPPI Optimization] adding regenerate noise param + adding docs (ros-navigation#3868) (ros-navigation#3870)

* adding regenerate noise param + adding docs

* fix tests

* remove unnecessary normalization

* Update optimizer.cpp

(cherry picked from commit 924f167)

# Conflicts:
#	nav2_mppi_controller/README.md

Co-authored-by: Steve Macenski <[email protected]>

* Updating default map path

* [MPPI] Reworked Path Align Critic; 70% faster + Tracks Paths Better! Edit: strike that, now 80% (ros-navigation#3872) (ros-navigation#3882)

* adding regenerate noise param + adding docs

* fix tests

* remove unnecessary normalization

* Update optimizer.cpp

* adding refactored path alignment critic

* fix visualization bug

* speed up another 30%

* remove a little jitter

* a few more small optimizaitons

* fixing unit tests

* retain legacy critic

* adding tests for legacy

(cherry picked from commit 7009ffb)

Co-authored-by: Steve Macenski <[email protected]>

* Fix incorrect auto merge conflict issue

* Use mutex to protect costmap reads. (backport ros-navigation#3877) (ros-navigation#3897)

* Use mutex to protect costmap reads. (ros-navigation#3877)

* Use mutex to protect costmap reads.
Otherwise costmap can be read during a map update and return 0.

* Revert "Use mutex to protect costmap reads."

This reverts commit e16a44c.

* Lock costmap before running MPPI controller.

* Fix typo.

* Protect against costmap updates in MPP and RotationShim controllers.

---------

Co-authored-by: Leif Terry <[email protected]>
(cherry picked from commit a1c9fd5)

# Conflicts:
#	nav2_mppi_controller/src/controller.cpp

* fix merge conflict

---------

Co-authored-by: LeifHookedWireless <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>

* Adjust the Variable types in Nav2_costmap_2d pkg in [nav2_humble]  ros-navigation#3891 (ros-navigation#3900) (ros-navigation#3902)

* image.hpp ros-navigation#3891

* Update image.hpp

(cherry picked from commit 7a7c6da)

Co-authored-by: GoesM <[email protected]>

* Log if BT rate is exceeded (ros-navigation#3909) (ros-navigation#3913)

(cherry picked from commit a11cdd8)

Co-authored-by: Steve Macenski <[email protected]>

* Update theta_star_planner.cpp (ros-navigation#3918) (ros-navigation#3922)

(cherry picked from commit 0629ff3)

Co-authored-by: Steve Macenski <[email protected]>

* Fixing subtree issues with blackboard shared resources (3640) (backport ros-navigation#3911) (ros-navigation#3916)

* Fixing subtree issues with blackboard shared resources (3640) (ros-navigation#3911)

* fixing subtree issues

* Update bt_action_server_impl.hpp

(cherry picked from commit 4b4465d)

# Conflicts:
#	nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp

* Update bt_action_server_impl.hpp

---------

Co-authored-by: Steve Macenski <[email protected]>

* fix build

Signed-off-by: kevin <[email protected]>

* test

Signed-off-by: kevin <[email protected]>

* test

Signed-off-by: kevin <[email protected]>

* disdt

Signed-off-by: kevin <[email protected]>

* test

Signed-off-by: kevin <[email protected]>

* test

Signed-off-by: kevin <[email protected]>

* remove unused

Signed-off-by: kevin <[email protected]>

* test

Signed-off-by: kevin <[email protected]>

* test

Signed-off-by: kevin <[email protected]>

* fix spin

Signed-off-by: ladianchad <[email protected]>

* remove looprate log

Signed-off-by: ladianchad <[email protected]>

* removed loop rate waring

Signed-off-by: ladianchad <[email protected]>

---------

Signed-off-by: Trung Kien <[email protected]>
Signed-off-by: Øystein Sture <[email protected]>
Signed-off-by: ryzhikovas <[email protected]>
Signed-off-by: Ryan Friedman <[email protected]>
Signed-off-by: Nick Lamprianidis <[email protected]>
Signed-off-by: ymd-stella <[email protected]>
Signed-off-by: Christian Henkel <[email protected]>
Signed-off-by: Anton Kesy <[email protected]>
Signed-off-by: kevin <[email protected]>
Signed-off-by: ladianchad <[email protected]>
Co-authored-by: Steve Macenski <[email protected]>
Co-authored-by: Alexey Merzlyakov <[email protected]>
Co-authored-by: Jose Luis Blanco-Claraco <[email protected]>
Co-authored-by: DylanDeCoeyer-Quimesis <[email protected]>
Co-authored-by: Trung Kien <[email protected]>
Co-authored-by: HovorunB <[email protected]>
Co-authored-by: Tony Najjar <[email protected]>
Co-authored-by: Ruffin <[email protected]>
Co-authored-by: Øystein Sture <[email protected]>
Co-authored-by: mrmara <[email protected]>
Co-authored-by: antoniomarangi <[email protected]>
Co-authored-by: Tony Najjar <[email protected]>
Co-authored-by: Griswald Brooks <[email protected]>
Co-authored-by: BriceRenaudeau <[email protected]>
Co-authored-by: Dirk Braunschweiger <[email protected]>
Co-authored-by: Dirk Braunschweiger <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Guillaume Doisy <[email protected]>
Co-authored-by: Alberto Tudela <[email protected]>
Co-authored-by: ryzhikovas <[email protected]>
Co-authored-by: Alexandr Buyval <[email protected]>
Co-authored-by: Hyung-Taik Choi <[email protected]>
Co-authored-by: Filipe Cerveira <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Ryan <[email protected]>
Co-authored-by: Nick Lamprianidis <[email protected]>
Co-authored-by: gyaanantia <[email protected]>
Co-authored-by: ymd-stella <[email protected]>
Co-authored-by: Vineet <[email protected]>
Co-authored-by: Chuanhong Guo <[email protected]>
Co-authored-by: Christian Henkel <[email protected]>
Co-authored-by: Hyunseok <[email protected]>
Co-authored-by: Anton Kesy <[email protected]>
Co-authored-by: LeifHookedWireless <[email protected]>
Co-authored-by: GoesM <[email protected]>
Co-authored-by: kevin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant