From 27054ecdd1ce1231972da20a12c3b6afd89de045 Mon Sep 17 00:00:00 2001 From: "Takagi, Isamu" <43976882+isamu-takagi@users.noreply.github.com> Date: Thu, 3 Oct 2024 14:11:45 +0900 Subject: [PATCH 01/18] feat: remove ROS_DOMAIN_ID (#123) Signed-off-by: Takagi, Isamu --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b8ab1752..2f0e10eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,6 @@ RUN apt-get -y install ros-humble-rqt-graph ENV XDG_RUNTIME_DIR=/tmp/xdg ENV ROS_LOCALHOST_ONLY=0 ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp -ENV ROS_DOMAIN_ID=71 ENV CYCLONEDDS_URI=file:///opt/autoware/cyclonedds.xml COPY cyclonedds.xml /opt/autoware/cyclonedds.xml From 1dd34741f480e9c772c23e22cc7bc58b21b4cda4 Mon Sep 17 00:00:00 2001 From: taikitanaka3 <65527974+taikitanaka3@users.noreply.github.com> Date: Thu, 3 Oct 2024 14:23:22 +0900 Subject: [PATCH 02/18] chore: add script (#122) * chore: add script * use option and remove default arg Signed-off-by: Takagi, Isamu --------- Signed-off-by: Takagi, Isamu Co-authored-by: Takagi, Isamu --- aichallenge/run_autoware.bash | 22 ++++++++++++++++++- .../run_aichallenge_launch_replay_rosbag.sh | 5 ----- .../run_aichallenge_launch_run_vehicle.sh | 5 ----- .../run_aichallenge_launch_simulation.sh | 5 ----- .../launch/reference.launch.xml | 4 ++-- .../launch/aichallenge_system.launch.xml | 6 ++--- 6 files changed, 26 insertions(+), 21 deletions(-) delete mode 100644 aichallenge/workspace/run_aichallenge_launch_replay_rosbag.sh delete mode 100644 aichallenge/workspace/run_aichallenge_launch_run_vehicle.sh delete mode 100644 aichallenge/workspace/run_aichallenge_launch_simulation.sh diff --git a/aichallenge/run_autoware.bash b/aichallenge/run_autoware.bash index fa41976b..ec6325da 100755 --- a/aichallenge/run_autoware.bash +++ b/aichallenge/run_autoware.bash @@ -1,6 +1,26 @@ #!/bin/bash +mode=${1} + +case "${mode}" in +"awsim") + opts="simulation:=true use_sim_time:=true run_rviz:=true" + ;; +"vehicle") + opts="simulation:=false use_sim_time:=false run_rviz:=false" + ;; +"rosbag") + opts="simulation:=false use_sim_time:=true run_rviz:=true" + ;; +*) + echo "invalid argument (use 'awsim' or 'vehicle' or 'rosbag')" + exit 1 + ;; +esac + # shellcheck disable=SC1091 source /aichallenge/workspace/install/setup.bash sudo ip link set multicast on lo -ros2 launch aichallenge_system_launch aichallenge_system.launch.xml + +# shellcheck disable=SC2086 +ros2 launch aichallenge_system_launch aichallenge_system.launch.xml ${opts} diff --git a/aichallenge/workspace/run_aichallenge_launch_replay_rosbag.sh b/aichallenge/workspace/run_aichallenge_launch_replay_rosbag.sh deleted file mode 100644 index d7e86d0e..00000000 --- a/aichallenge/workspace/run_aichallenge_launch_replay_rosbag.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/bash - -source install/setup.bash - -ros2 launch aichallenge_system_launch aichallenge_system.launch.xml simulation:=false use_sim_time:=true run_rviz:=true diff --git a/aichallenge/workspace/run_aichallenge_launch_run_vehicle.sh b/aichallenge/workspace/run_aichallenge_launch_run_vehicle.sh deleted file mode 100644 index 2497e9e9..00000000 --- a/aichallenge/workspace/run_aichallenge_launch_run_vehicle.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/bash - -source install/setup.bash - -ros2 launch aichallenge_system_launch aichallenge_system.launch.xml simulation:=false use_sim_time:=false run_rviz:=false diff --git a/aichallenge/workspace/run_aichallenge_launch_simulation.sh b/aichallenge/workspace/run_aichallenge_launch_simulation.sh deleted file mode 100644 index 406f621a..00000000 --- a/aichallenge/workspace/run_aichallenge_launch_simulation.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/bash - -source install/setup.bash - -ros2 launch aichallenge_system_launch aichallenge_system.launch.xml simulation:=true use_sim_time:=true run_rviz:=true diff --git a/aichallenge/workspace/src/aichallenge_submit/aichallenge_submit_launch/launch/reference.launch.xml b/aichallenge/workspace/src/aichallenge_submit/aichallenge_submit_launch/launch/reference.launch.xml index d671b0bb..51878e63 100644 --- a/aichallenge/workspace/src/aichallenge_submit/aichallenge_submit_launch/launch/reference.launch.xml +++ b/aichallenge/workspace/src/aichallenge_submit/aichallenge_submit_launch/launch/reference.launch.xml @@ -2,11 +2,11 @@ - + + - diff --git a/aichallenge/workspace/src/aichallenge_system/aichallenge_system_launch/launch/aichallenge_system.launch.xml b/aichallenge/workspace/src/aichallenge_system/aichallenge_system_launch/launch/aichallenge_system.launch.xml index 03c8124a..8cb04494 100644 --- a/aichallenge/workspace/src/aichallenge_system/aichallenge_system_launch/launch/aichallenge_system.launch.xml +++ b/aichallenge/workspace/src/aichallenge_system/aichallenge_system_launch/launch/aichallenge_system.launch.xml @@ -1,9 +1,9 @@ - - - + + + From a594331f703a54b9c790bb67244acc1b3e9af8fc Mon Sep 17 00:00:00 2001 From: "Takagi, Isamu" <43976882+isamu-takagi@users.noreply.github.com> Date: Thu, 3 Oct 2024 14:51:46 +0900 Subject: [PATCH 03/18] chore: add no-cache option for docker dev build (#124) Signed-off-by: Takagi, Isamu --- docker_build.sh | 2 +- docker_run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_build.sh b/docker_build.sh index 2fc35bda..6fea2dba 100755 --- a/docker_build.sh +++ b/docker_build.sh @@ -7,7 +7,7 @@ case "${target}" in opts="--no-cache" ;; "dev") - opts="" + opts="--no-cache" ;; *) echo "invalid argument (use 'dev' or 'eval')" diff --git a/docker_run.sh b/docker_run.sh index 3362083e..7a7fd098 100755 --- a/docker_run.sh +++ b/docker_run.sh @@ -32,4 +32,4 @@ esac mkdir -p output # shellcheck disable=SC2086 -rocker ${opts} --x11 --device /dev/dri --user --net host --privileged --volume ${volume} -- "aichallenge-2024-${target}" +rocker ${opts} --x11 --devices /dev/dri --user --net host --privileged --volume ${volume} -- "aichallenge-2024-${target}" From 27f19f7fee572b810dc35cfaf6e338f6fe227011 Mon Sep 17 00:00:00 2001 From: "Takagi, Isamu" <43976882+isamu-takagi@users.noreply.github.com> Date: Thu, 3 Oct 2024 18:41:36 +0900 Subject: [PATCH 04/18] feat: vehicle driver script (#125) Signed-off-by: Takagi, Isamu --- launch_vehicle_driver.bash | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 launch_vehicle_driver.bash diff --git a/launch_vehicle_driver.bash b/launch_vehicle_driver.bash new file mode 100755 index 00000000..5dd2a105 --- /dev/null +++ b/launch_vehicle_driver.bash @@ -0,0 +1,2 @@ +#!/bin/bash +rocker --x11 --devices /dev/dri --volume /dev/vcu --user --user-preserve-groups dialout --net host --privileged ghcr.io/automotiveaichallenge/racing_kart_interface From 4f9963410a840e9de8485a8d81d873561fc911e2 Mon Sep 17 00:00:00 2001 From: Masahiro Kubota <42679530+masahiro-kubota@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:55:42 +0900 Subject: [PATCH 05/18] fix: add arguments to launch command (#126) Signed-off-by: Masahiro Kubota --- aichallenge/run_evaluation.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aichallenge/run_evaluation.bash b/aichallenge/run_evaluation.bash index 68095751..20f388f3 100755 --- a/aichallenge/run_evaluation.bash +++ b/aichallenge/run_evaluation.bash @@ -21,7 +21,7 @@ sleep 20 # Start Autoware echo "Start Autoware" -ros2 launch aichallenge_system_launch aichallenge_system.launch.xml >autoware.log 2>&1 & +ros2 launch aichallenge_system_launch aichallenge_system.launch.xml simulation:=true use_sim_time:=true run_rviz:=true >autoware.log 2>&1 & PID_AUTOWARE=$! sleep 10 From 04406d89308be73587eba61c8c3f357de2052b57 Mon Sep 17 00:00:00 2001 From: "Takagi, Isamu" <43976882+isamu-takagi@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:29:05 +0900 Subject: [PATCH 06/18] feat: reset vcu script (#129) * feat: vehicle driver script Signed-off-by: Takagi, Isamu * feat: reset vcu script Signed-off-by: Takagi, Isamu * set container name Signed-off-by: Takagi, Isamu * remove moved file Signed-off-by: Takagi, Isamu --------- Signed-off-by: Takagi, Isamu --- launch_vehicle_driver.bash | 2 -- vehicle/launch_driver.bash | 2 ++ vehicle/reset_vcu.py | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) delete mode 100755 launch_vehicle_driver.bash create mode 100755 vehicle/launch_driver.bash create mode 100755 vehicle/reset_vcu.py diff --git a/launch_vehicle_driver.bash b/launch_vehicle_driver.bash deleted file mode 100755 index 5dd2a105..00000000 --- a/launch_vehicle_driver.bash +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -rocker --x11 --devices /dev/dri --volume /dev/vcu --user --user-preserve-groups dialout --net host --privileged ghcr.io/automotiveaichallenge/racing_kart_interface diff --git a/vehicle/launch_driver.bash b/vehicle/launch_driver.bash new file mode 100755 index 00000000..2eddf676 --- /dev/null +++ b/vehicle/launch_driver.bash @@ -0,0 +1,2 @@ +#!/bin/bash +rocker --x11 --devices /dev/dri --volume /dev/vcu --user --user-preserve-groups dialout --net host --privileged --name racing_kart_interface ghcr.io/automotiveaichallenge/racing_kart_interface diff --git a/vehicle/reset_vcu.py b/vehicle/reset_vcu.py new file mode 100755 index 00000000..63d6feb5 --- /dev/null +++ b/vehicle/reset_vcu.py @@ -0,0 +1,17 @@ +#!/usr/bin/env python3 +# This script send Ctrl + C several times, then send Ctrl + D. + +import argparse +import serial +import time + +parser = argparse.ArgumentParser() +parser.add_argument("--device", default="/dev/vcu/usb") +args = parser.parse_args() + +device = serial.Serial(args.device, 115200, timeout=None) +for _ in range(10): + device.write(b"\x03") + time.sleep(0.1) +device.write(b"\x04") +device.close() From daab8bd66e5ca44cad9dc83e7c97b65241d75aac Mon Sep 17 00:00:00 2001 From: Masahiro Kubota <42679530+masahiro-kubota@users.noreply.github.com> Date: Sat, 5 Oct 2024 00:11:06 +0900 Subject: [PATCH 07/18] feat: add container name (#130) * feat: add container name Signed-off-by: Masahiro Kubota * fix typo Signed-off-by: Masahiro Kubota --------- Signed-off-by: Masahiro Kubota --- docker_run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_run.sh b/docker_run.sh index 7a7fd098..85db1c3d 100755 --- a/docker_run.sh +++ b/docker_run.sh @@ -32,4 +32,4 @@ esac mkdir -p output # shellcheck disable=SC2086 -rocker ${opts} --x11 --devices /dev/dri --user --net host --privileged --volume ${volume} -- "aichallenge-2024-${target}" +rocker ${opts} --x11 --devices /dev/dri --user --net host --privileged --name aichallenge-2024 --volume ${volume} -- "aichallenge-2024-${target}" From 80528fce7cd061f1120cb3d8be8b4d4eed5cb329 Mon Sep 17 00:00:00 2001 From: Masahiro Kubota <42679530+masahiro-kubota@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:44:26 +0900 Subject: [PATCH 08/18] feat: add the docker run script (#127) * feat: add zenoh_kart_run.sh Signed-off-by: Masahiro Kubota * feat: add cyclonedds setting Signed-off-by: Masahiro Kubota * feat: add the docker run script for zenoh Signed-off-by: Masahiro Kubota * delete the zenoh script for remote pc Signed-off-by: Masahiro Kubota --------- Signed-off-by: Masahiro Kubota --- vehicle/zenoh.json5 | 256 ++++++++++++++++++++++++++++++++++++++ vehicle/zenoh_kart_run.sh | 11 ++ 2 files changed, 267 insertions(+) create mode 100644 vehicle/zenoh.json5 create mode 100755 vehicle/zenoh_kart_run.sh diff --git a/vehicle/zenoh.json5 b/vehicle/zenoh.json5 new file mode 100644 index 00000000..7ce97667 --- /dev/null +++ b/vehicle/zenoh.json5 @@ -0,0 +1,256 @@ +//// +//// This file presents the default configuration used by both the `zenoh-plugin-ros2dds` plugin and the `zenoh-bridge-ros2dds` standalone executable. +//// The "ros2" JSON5 object below can be used as such in the "plugins" part of a config file for the zenoh router (zenohd). +//// +{ + plugins: { + //// + //// ROS2 related configuration + //// All settings are optional and are unset by default - uncomment the ones you want to set + //// + ros2dds: { + //// + //// nodename: A ROS node name to be used by this bridge. + //// Default: "zenoh_bridge_ros2dds" + //// + // nodename: "zenoh_bridge_ros2dds", + + //// + //// namespace: A ROS namespace which: + //// - is used for the "zenoh_bridge_ros2dds" node itself + //// - is added to all discovered interfaces when routed to Zenoh + //// (i.e. a "cmd_vel" topic in the robot will be seen as "namespace/cmd_vel" outside the robot) + //// Note that this also applies to topics with absolute path such as "/rosout", "/tf" and "/tf_static". + //// Default: "/" + //// + // namespace: "/", + + //// + //// domain: The DDS Domain ID. By default set to 0, or to "$ROS_DOMAIN_ID" is this environment variable is defined. + //// + // domain: 0, + + //// + //// ros_localhost_only: If set to true, the DDS discovery and traffic will occur only on the localhost interface (127.0.0.1). + //// By default set to false, unless the "ROS_LOCALHOST_ONLY=1" environment variable is defined. + //// + // ros_localhost_only: true, + + //// + //// shm_enabled: If set to true, the DDS implementation will use Iceoryx shared memory. + //// Requires the bridge to be built with the 'dds_shm' feature for this option to valid. + //// By default set to false. + //// + // shm_enabled: false, + + //// + //// allow / deny: Specify the lists of ROS 2 interfaces that are allowed or denied to be routed over Zenoh. + //// Each element of the lists is a regular expression that must match the full interface name. + //// You cannot set both 'allow' and 'deny' in the same configuration. + //// If neither 'allow' nor 'deny' are set, all interfaces are allowed. + //// Use 'allow' to allow only the specified interfaces. If an interface type is set to an empty list + //// or is not specified at all, it means that NO such interface is allowed. + //// Use 'deny' to allow all except the specified interfaces. If an interface type is set to an empty list + //// or is not specified at all, it means that ALL such interface are allowed. + allow: { + publishers: [ + "/joy", + "/vehicle/status/control_mode", + "/racing_kart/debug/delay", + "/racing_kart/debug/status", + "/racing_kart/gnss", + "/tf", + "/tf_static", + "/control/debug/lookahead_point", + "/map/vector_map_marker", + "/planning/scenario_planning/lane_driving/behavior_planning/path", + "/localization/kinematic_state", + ], + subscribers: [ + "/joy", + "/vehicle/status/control_mode", + "/racing_kart/debug/delay", + "/racing_kart/debug/status", + "/racing_kart/gnss", + "/tf", + "/tf_static", + "/control/debug/lookahead_point", + "/map/vector_map_marker", + "/planning/scenario_planning/lane_driving/behavior_planning/path", + "/localization/kinematic_state", + ], + service_servers: [], + service_clients: [], + action_servers: [], + action_clients: [], + }, + // deny: { + // publishers: ["/rosout", "/parameter_events"], + // subscribers: ["/rosout"], + // service_servers: [".*/set_parameters"], + // service_clients: [".*/set_parameters"], + // action_servers: [], + // action_clients: [], + // }, + + //// + //// pub_max_frequencies: Specify a list of maximum frequency of publications routing over zenoh for a set of Publishers. + //// The strings must have the format "=": + //// - "regex" is a regular expression matching a Publisher interface name + //// - "float" is the maximum frequency in Hertz; + //// if publication rate is higher, downsampling will occur when routing. + // pub_max_frequencies: [".*/laser_scan=5", "/tf=10"], + + //// + //// pub_priorities: Specify a list of priorities of publications routing over zenoh for a set of Publishers. + //// In case of high traffic, the publications with higher priorities will overtake + //// the publications with lower priorities in Zenoh publication queues. + //// The strings must have the format "=[:express]": + //// - "regex" is a regular expression matching a Publisher topic name + //// - "integer" is a priority value in the range [1-7]. Highest priority is 1, lowest is 7 and default is 5. + //// (see Zenoh Priority definition here: https://docs.rs/zenoh/latest/zenoh/publication/enum.Priority.html) + //// - ":express" is an option to indicate that the Zenoh express policy must be used for those publications. + //// The express policy makes Zenoh to to send the message immediatly, not waiting for possible further messages + //// to create a bigger batch of messages. This usually has a positive impact on latency for the topic + //// but a negative impact on the general throughput, as more overhead is used for those topics. + pub_priorities: ["/joy=1:express"], + + //// + //// reliable_routes_blocking: When true, the publications from a RELIABLE DDS Writer will be + //// routed to zenoh using the CongestionControl::Block option. + //// Meaning the routing will be blocked in case of network congestion, + //// blocking the DDS Reader and the RELIABLE DDS Writer in return. + //// When false (or for BERST_EFFORT DDS Writers), CongestionControl::Drop + //// is used, meaning the route might drop some data in case of congestion. + //// + // reliable_routes_blocking: true, + + //// + //// queries_timeout: Timeouts configuration for various Zenoh queries. + //// Each field is optional. If not set, the 'default' timeout (5.0 seconds by default) applies to all queries. + //// Each value can be either a float in seconds that will apply as a timeout to all queries, + //// either a list of strings with format "=" where: + //// - "regex" is a regular expression matching an interface name + //// - "float" is the timeout in seconds + queries_timeout: { + // //// default timeout that will apply to all query, except the ones specified below + // //// in 'transient_local_subscribers', 'services' and 'actions' + default: 2.0, + // //// timeouts for TRANSIENT_LOCAL subscriber when querying publishers for historical publications + // transient_local_subscribers: 1.0, + // //// timeouts for Service clients calling a Service server + // services: ["add_two_ints=0.5", ".*=1.0"], + // //// timeouts for Action clients calling an Action server (send_goal, cancel_goal and get_result services) + // actions: { + // send_goal: 1.0, + // cancel_goal: 1.0, + // get_result: [".*long_mission=3600", ".*short_action=10.0"], + // } + }, + + //// + //// This plugin uses Tokio (https://tokio.rs/) for asynchronous programming. + //// When running as a plugin within a Zenoh router, the plugin creates its own Runtime managing 2 pools of threads: + //// - worker threads for non-blocking tasks. Those threads are spawn at Runtime creation. + //// - blocking threads for blocking tasks (e.g. I/O). Those threads are spawn when needed. + //// For more details see https://github.com/tokio-rs/tokio/discussions/3858#discussioncomment-869878 + //// When running as a standalone bridge the Zenoh Session's Runtime is used and can be configured via the + //// `ZENOH_RUNTIME` environment variable. See https://docs.rs/zenoh-runtime/latest/zenoh_runtime/enum.ZRuntime.html + //// + + //// work_thread_num: The number of worker thread in the asynchronous runtime will use. (default: 2) + //// Only for a plugin, no effect on a bridge. + // work_thread_num: 2, + + //// max_block_thread_num: The number of blocking thread in the asynchronous runtime will use. (default: 50) + //// Only for a plugin, no effect on a bridge. + // max_block_thread_num: 50, + }, + + //// + //// REST API configuration (active only if this part is defined) + //// + // rest: { + // //// + // //// The HTTP port number (for all network interfaces). + // //// You can bind on a specific interface setting a ":" string. + // //// + // http_port: 8000, + // }, + }, + + //// + //// Zenoh related configuration. + //// Only the most relevant sections are displayed here. + //// For a complete view of configuration possibilities, see https://github.com/eclipse-zenoh/zenoh/blob/main/DEFAULT_CONFIG.json5 + //// + + /// The identifier (as unsigned 128bit integer in hexadecimal lowercase - leading zeros are not accepted) + /// that zenoh runtime will use. + /// If not set, a random unsigned 128bit integer will be used. + /// WARNING: this id must be unique in your zenoh network. + // id: "1234567890abcdef", + + //// + //// mode: The bridge's mode (router, peer or client) + //// + //mode: "router", + + //// + //// Which endpoints to connect to. E.g. tcp/localhost:7447. + //// By configuring the endpoints, it is possible to tell zenoh which remote router or other zenoh-bridge-ros2dds to connect to at startup. + //// + connect: { + endpoints: [ + // "/:" + ], + }, + + //// + //// Which endpoints to listen on. + //// By configuring the endpoints, it is possible to tell zenoh which are the endpoints that other routers, + //// peers, or client can use to establish a zenoh session. + //// In 'router' mode (default) the zenoh-bridge-ros2dds is listening by default on `tcp/0.0.0.0:7447` (`0.0.0.0` meaning all the available network interfaces) + //// + // listen: { + // endpoints: [ + // // "/:" + // ] + //}, + + //// + //// Configure the scouting mechanisms and their behaviours + //// + //scouting: { + // /// The UDP multicast scouting configuration. + // multicast: { + // /// Whether multicast scouting is enabled or not + // enabled: true, + // /// The socket which should be used for multicast scouting + // address: "224.0.0.224:7446", + // /// The network interface which should be used for multicast scouting + // interface: "auto", // If not set or set to "auto" the interface if picked automatically + // /// Which type of Zenoh instances to automatically establish sessions with upon discovery on UDP multicast. + // /// Accepts a single value or different values for router, peer and client. + // /// Each value is bit-or-like combinations of "peer", "router" and "client". + // autoconnect: { router: "", peer: "router|peer" }, + // /// Whether or not to listen for scout messages on UDP multicast and reply to them. + // listen: true, + // }, + // /// The gossip scouting configuration. + // gossip: { + // /// Whether gossip scouting is enabled or not + // enabled: true, + // /// When true, gossip scouting information is propagated multiple hops to all nodes in the local network. + // /// When false, gossip scouting information is only propagated to the next hop. + // /// Activating multihop gossip implies more scouting traffic and a lower scalability. + // /// It mostly makes sense when using "linkstate" routing mode where all nodes in the subsystem don't have + // /// direct connectivity with each other. + // multihop: false, + // /// Which type of Zenoh instances to automatically establish sessions with upon discovery on gossip. + // /// Accepts a single value or different values for router, peer and client. + // /// Each value is bit-or-like combinations of "peer", "router" and "client". + // autoconnect: { router: "", peer: "router|peer" }, + // }, + //}, +} diff --git a/vehicle/zenoh_kart_run.sh b/vehicle/zenoh_kart_run.sh new file mode 100755 index 00000000..97e61944 --- /dev/null +++ b/vehicle/zenoh_kart_run.sh @@ -0,0 +1,11 @@ +#!/bin/bash +docker run --rm \ + --net=host \ + -e ROS_DISTRO=humble \ + -e RMW_IMPLEMENTATION=rmw_cyclonedds_cpp \ + -e CYCLONEDDS_URI=file:///cyclonedds.xml \ + --name zenoh \ + -v ~/aichallenge-2024/vehicle/zenoh.json5:/zenoh.json5 \ + -v ~/aichallenge-2024/cyclonedds.xml:/cyclonedds.xml \ + eclipse/zenoh-bridge-ros2dds:latest \ + -c /zenoh.json5 \ No newline at end of file From 7f82ad9f752eafc941035c756e3d61e70ff85bc2 Mon Sep 17 00:00:00 2001 From: "Takagi, Isamu" <43976882+isamu-takagi@users.noreply.github.com> Date: Sat, 5 Oct 2024 18:12:41 +0900 Subject: [PATCH 09/18] feat: update vehicle scripts (#133) Signed-off-by: Takagi, Isamu --- vehicle/{launch_driver.bash => run_driver.bash} | 2 +- vehicle/{zenoh_kart_run.sh => run_zenoh.bash} | 0 vehicle/{reset_vcu.py => try_vcu_reset.py} | 0 vehicle/zenoh.json5 | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename vehicle/{launch_driver.bash => run_driver.bash} (97%) rename vehicle/{zenoh_kart_run.sh => run_zenoh.bash} (100%) rename vehicle/{reset_vcu.py => try_vcu_reset.py} (100%) diff --git a/vehicle/launch_driver.bash b/vehicle/run_driver.bash similarity index 97% rename from vehicle/launch_driver.bash rename to vehicle/run_driver.bash index 2eddf676..efc7d987 100755 --- a/vehicle/launch_driver.bash +++ b/vehicle/run_driver.bash @@ -1,2 +1,2 @@ #!/bin/bash -rocker --x11 --devices /dev/dri --volume /dev/vcu --user --user-preserve-groups dialout --net host --privileged --name racing_kart_interface ghcr.io/automotiveaichallenge/racing_kart_interface +rocker --x11 --devices /dev/dri --volume /dev/vcu --user --user-preserve-groups dialout --net host --privileged --name racing_kart_interface ghcr.io/automotiveaichallenge/racing_kart_interface "$@" diff --git a/vehicle/zenoh_kart_run.sh b/vehicle/run_zenoh.bash similarity index 100% rename from vehicle/zenoh_kart_run.sh rename to vehicle/run_zenoh.bash diff --git a/vehicle/reset_vcu.py b/vehicle/try_vcu_reset.py similarity index 100% rename from vehicle/reset_vcu.py rename to vehicle/try_vcu_reset.py diff --git a/vehicle/zenoh.json5 b/vehicle/zenoh.json5 index 7ce97667..4f16f4d8 100644 --- a/vehicle/zenoh.json5 +++ b/vehicle/zenoh.json5 @@ -54,8 +54,8 @@ //// or is not specified at all, it means that ALL such interface are allowed. allow: { publishers: [ - "/joy", "/vehicle/status/control_mode", + "/racing_kart/joy", "/racing_kart/debug/delay", "/racing_kart/debug/status", "/racing_kart/gnss", @@ -67,8 +67,8 @@ "/localization/kinematic_state", ], subscribers: [ - "/joy", "/vehicle/status/control_mode", + "/racing_kart/joy", "/racing_kart/debug/delay", "/racing_kart/debug/status", "/racing_kart/gnss", From 1a165023d6b0fe70c9967b556f574d3965512ce3 Mon Sep 17 00:00:00 2001 From: "Takagi, Isamu" <43976882+isamu-takagi@users.noreply.github.com> Date: Sun, 6 Oct 2024 17:37:54 +0900 Subject: [PATCH 10/18] fix: awsim brake map (#136) Signed-off-by: Takagi, Isamu --- .../launch/aichallenge_awsim_adapter.launch.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aichallenge/workspace/src/aichallenge_system/aichallenge_awsim_adapter/launch/aichallenge_awsim_adapter.launch.xml b/aichallenge/workspace/src/aichallenge_system/aichallenge_awsim_adapter/launch/aichallenge_awsim_adapter.launch.xml index 090a0514..dc0b8ab6 100644 --- a/aichallenge/workspace/src/aichallenge_system/aichallenge_awsim_adapter/launch/aichallenge_awsim_adapter.launch.xml +++ b/aichallenge/workspace/src/aichallenge_system/aichallenge_awsim_adapter/launch/aichallenge_awsim_adapter.launch.xml @@ -5,7 +5,7 @@ - + From ad45310f42b6bd3b7068fb5bf7ce27e293e470cf Mon Sep 17 00:00:00 2001 From: taikitanaka3 <65527974+taikitanaka3@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:34:46 +0900 Subject: [PATCH 11/18] feat: add tmux launch script and date time to name (#135) * feat: add date time to name * feat: update run script to add zenoh docker * style: pre-commit * chore: add stop vehicle tmux * chore: update --- docker_run.sh | 2 +- run_script.tmux | 70 ++++++++++++++++++++++++++++++++++++++++++ run_veihcle_tmux.sh | 4 +++ stop_vehicle_tmux.sh | 6 ++++ vehicle/run_zenoh.bash | 18 +++++------ vehicle/zenoh.json5 | 2 ++ 6 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 run_script.tmux create mode 100644 run_veihcle_tmux.sh create mode 100644 stop_vehicle_tmux.sh diff --git a/docker_run.sh b/docker_run.sh index 85db1c3d..8e39b81e 100755 --- a/docker_run.sh +++ b/docker_run.sh @@ -32,4 +32,4 @@ esac mkdir -p output # shellcheck disable=SC2086 -rocker ${opts} --x11 --devices /dev/dri --user --net host --privileged --name aichallenge-2024 --volume ${volume} -- "aichallenge-2024-${target}" +rocker ${opts} --x11 --devices /dev/dri --user --net host --privileged --name aichallenge-2024-$(date "+%Y-%m-%d-%H-%M-%S") --volume ${volume} -- "aichallenge-2024-${target}" diff --git a/run_script.tmux b/run_script.tmux new file mode 100644 index 00000000..907043f3 --- /dev/null +++ b/run_script.tmux @@ -0,0 +1,70 @@ +#!/bin/bash + +# docker setup +AIC_DIR="/home/$USER/aichallenge-2024" +VEHICLE_DIR="/home/$USER/aichallenge-2024/vehicle" + +AIC_CD="cd $AIC_DIR" +VEHICLE_CD="cd $VEHICLE_DIR" + +AIC_DOCKER_RUN_CMD="bash docker_run.sh dev cpu" +KART_DOCKER_RUN_CMD="bash run_driver.bash" +ZENOH_DOCKER_RUN_CMD="bash run_zenoh.bash" + +AIC_WORKSPACE_CD_CMD="cd /aichallenge" +SOURCE_CMD="source install/setup.bash" + +# mouse setup +set-option -g mouse on +bind-key -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'select-pane -t=; copy-mode -e; send-keys -M'" +bind-key -n WheelDownPane select-pane -t= \; send-keys -M + +set-window-option -g mode-keys vi +bind-key -T copy-mode-vi v send -X begin-selection +bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel "xclip -sel clip -i" + + +# split-vertical +# 1. 初期のペインで左右に分割 +select-pane -t 0 # 最初のペイン (0) を選択 +split-window -h -p 50 # 左右に 50% 分割して、右にペイン 1 を作成 + +# 2. 右側のペインを選択して上下に 3 回分割 +select-pane -t 1 # 右側のペイン (1) を選択 +split-window -v -p 67 # ペイン 1 を 67% 下で分割し、ペイン 2 を作成 +split-window -v -p 50 # ペイン 2 を 50% 下で分割し、ペイン 3 を作成 +split-window -v -p 50 # ペイン 3 を 50% 下で分割し、ペイン 4 を作成 +# pane 0 is used for aic +select-pane -t 0 +send-keys "set -x" C-m +send-keys "$AIC_CD" C-m +send-keys "echo $AIC_WORKSPACE_CD_CMD" C-m +send-keys "echo $SOURCE_CMD" C-m +send-keys "echo run_autoware.bash vehicle" C-m +send-keys "$AIC_DOCKER_RUN_CMD" C-m + +# pane 1 is used for aic rosbag record +select-pane -t 1 +send-keys "set -x" C-m +send-keys "$AIC_CD" C-m +send-keys "sleep 2" C-m +send-keys "echo $AIC_WORKSPACE_CD_CMD" C-m +send-keys "echo $SOURCE_CMD" C-m +send-keys "$AIC_DOCKER_RUN_CMD" C-m + +# pane 2 is used for racing kart docker +select-pane -t 2 +send-keys "set -x" C-m +send-keys "$VEHICLE_CD" C-m +send-keys "$KART_DOCKER_RUN_CMD" C-m + +# pane 3 is used for zenoh docker +select-pane -t 3 +send-keys "set -x" C-m +send-keys "$VEHICLE_CD" C-m +send-keys "sleep 10" C-m +send-keys "$ZENOH_DOCKER_RUN_CMD " C-m + +# pane 4 is used for anything +select-pane -t 4 +send-keys "set -x" C-m diff --git a/run_veihcle_tmux.sh b/run_veihcle_tmux.sh new file mode 100644 index 00000000..ee5d98d3 --- /dev/null +++ b/run_veihcle_tmux.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +bash stop_vehicle_tmux.sh +gnome-terminal --maximize --zoom 0.7 -- tmux new-session \; source-file run_script.tmux diff --git a/stop_vehicle_tmux.sh b/stop_vehicle_tmux.sh new file mode 100644 index 00000000..9066df0d --- /dev/null +++ b/stop_vehicle_tmux.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# kill tmux server +tmux kill-server +# kill all docker +docker rm -f "$(docker ps -a -q)" diff --git a/vehicle/run_zenoh.bash b/vehicle/run_zenoh.bash index 97e61944..a3eeb804 100755 --- a/vehicle/run_zenoh.bash +++ b/vehicle/run_zenoh.bash @@ -1,11 +1,11 @@ #!/bin/bash docker run --rm \ - --net=host \ - -e ROS_DISTRO=humble \ - -e RMW_IMPLEMENTATION=rmw_cyclonedds_cpp \ - -e CYCLONEDDS_URI=file:///cyclonedds.xml \ - --name zenoh \ - -v ~/aichallenge-2024/vehicle/zenoh.json5:/zenoh.json5 \ - -v ~/aichallenge-2024/cyclonedds.xml:/cyclonedds.xml \ - eclipse/zenoh-bridge-ros2dds:latest \ - -c /zenoh.json5 \ No newline at end of file + --net=host \ + -e ROS_DISTRO=humble \ + -e RMW_IMPLEMENTATION=rmw_cyclonedds_cpp \ + -e CYCLONEDDS_URI=file:///cyclonedds.xml \ + --name zenoh \ + -v ~/aichallenge-2024/vehicle/zenoh.json5:/zenoh.json5 \ + -v ~/aichallenge-2024/cyclonedds.xml:/cyclonedds.xml \ + eclipse/zenoh-bridge-ros2dds:latest \ + -c /zenoh.json5 diff --git a/vehicle/zenoh.json5 b/vehicle/zenoh.json5 index 4f16f4d8..65a5bb88 100644 --- a/vehicle/zenoh.json5 +++ b/vehicle/zenoh.json5 @@ -65,6 +65,7 @@ "/map/vector_map_marker", "/planning/scenario_planning/lane_driving/behavior_planning/path", "/localization/kinematic_state", + "/initialpose", ], subscribers: [ "/vehicle/status/control_mode", @@ -78,6 +79,7 @@ "/map/vector_map_marker", "/planning/scenario_planning/lane_driving/behavior_planning/path", "/localization/kinematic_state", + "/initialpose", ], service_servers: [], service_clients: [], From d7355657c1b5dc14e128046513df82d952b00651 Mon Sep 17 00:00:00 2001 From: taikitanaka3 <65527974+taikitanaka3@users.noreply.github.com> Date: Tue, 8 Oct 2024 17:07:56 +0900 Subject: [PATCH 12/18] chore: update ll2 (#139) --- .../map/lanelet2_map.osm | 2453 +++++++++-------- 1 file changed, 1330 insertions(+), 1123 deletions(-) diff --git a/aichallenge/workspace/src/aichallenge_submit/aichallenge_submit_launch/map/lanelet2_map.osm b/aichallenge/workspace/src/aichallenge_submit/aichallenge_submit_launch/map/lanelet2_map.osm index 49147919..0501b7a0 100644 --- a/aichallenge/workspace/src/aichallenge_submit/aichallenge_submit_launch/map/lanelet2_map.osm +++ b/aichallenge/workspace/src/aichallenge_submit/aichallenge_submit_launch/map/lanelet2_map.osm @@ -1,6 +1,6 @@ - + @@ -1561,39 +1561,39 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -1746,29 +1746,29 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -2336,929 +2336,914 @@ - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + @@ -3281,57 +3266,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3343,13 +3277,6 @@ - - - - - - - @@ -3365,6 +3292,11 @@ + + + + + @@ -3376,41 +3308,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -3484,20 +3385,6 @@ - - - - - - - - - - - - - - @@ -3525,197 +3412,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3780,83 +3480,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3926,115 +3549,699 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + \ No newline at end of file From 3d26946f050671d378f0b0b84f07915c83f52dbd Mon Sep 17 00:00:00 2001 From: Masahiro Kubota <42679530+masahiro-kubota@users.noreply.github.com> Date: Tue, 8 Oct 2024 17:11:08 +0900 Subject: [PATCH 13/18] =?UTF-8?q?fix:=20Change=20the=20path=20of=20cyclone?= =?UTF-8?q?dds.xml=20to=20to=20clarify=20the=20files=20for=20op=E2=80=A6?= =?UTF-8?q?=20(#134)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Change the path of cyclonedds.xml to to clarify the files for operator Signed-off-by: Masahiro Kubota * change file name Signed-off-by: Masahiro Kubota * delete file Signed-off-by: Masahiro Kubota --------- Signed-off-by: Masahiro Kubota --- Dockerfile | 2 +- cyclonedds.xml => vehicle/cyclonedds.xml | 0 vehicle/run_zenoh.bash | 9 ++++----- 3 files changed, 5 insertions(+), 6 deletions(-) rename cyclonedds.xml => vehicle/cyclonedds.xml (100%) diff --git a/Dockerfile b/Dockerfile index 2f0e10eb..ccd789a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ENV ROS_LOCALHOST_ONLY=0 ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp ENV CYCLONEDDS_URI=file:///opt/autoware/cyclonedds.xml -COPY cyclonedds.xml /opt/autoware/cyclonedds.xml +COPY vehicle/cyclonedds.xml /opt/autoware/cyclonedds.xml FROM common AS dev diff --git a/cyclonedds.xml b/vehicle/cyclonedds.xml similarity index 100% rename from cyclonedds.xml rename to vehicle/cyclonedds.xml diff --git a/vehicle/run_zenoh.bash b/vehicle/run_zenoh.bash index a3eeb804..a1e13a21 100755 --- a/vehicle/run_zenoh.bash +++ b/vehicle/run_zenoh.bash @@ -1,11 +1,10 @@ #!/bin/bash +SCRIPT_DIR=$(readlink -f "$(dirname "$0")") docker run --rm \ --net=host \ -e ROS_DISTRO=humble \ -e RMW_IMPLEMENTATION=rmw_cyclonedds_cpp \ - -e CYCLONEDDS_URI=file:///cyclonedds.xml \ + -e CYCLONEDDS_URI=file:///vehicle/cyclonedds.xml \ + -v "${SCRIPT_DIR}:/vehicle" \ --name zenoh \ - -v ~/aichallenge-2024/vehicle/zenoh.json5:/zenoh.json5 \ - -v ~/aichallenge-2024/cyclonedds.xml:/cyclonedds.xml \ - eclipse/zenoh-bridge-ros2dds:latest \ - -c /zenoh.json5 + eclipse/zenoh-bridge-ros2dds:latest -c /vehicle/zenoh.json5 From 7fa43d8b1942a151aca2c0b46187febb1639483e Mon Sep 17 00:00:00 2001 From: "Takagi, Isamu" <43976882+isamu-takagi@users.noreply.github.com> Date: Tue, 8 Oct 2024 17:14:10 +0900 Subject: [PATCH 14/18] feat: create docker image for each user (#138) Signed-off-by: Takagi, Isamu --- docker_build.sh | 2 +- docker_run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_build.sh b/docker_build.sh index 6fea2dba..39e6cba5 100755 --- a/docker_build.sh +++ b/docker_build.sh @@ -16,4 +16,4 @@ case "${target}" in esac # shellcheck disable=SC2086 -docker build ${opts} --target "${target}" -t "aichallenge-2024-${target}" . +docker build ${opts} --target "${target}" -t "aichallenge-2024-${target}-${USER}" . diff --git a/docker_run.sh b/docker_run.sh index 8e39b81e..10c21996 100755 --- a/docker_run.sh +++ b/docker_run.sh @@ -32,4 +32,4 @@ esac mkdir -p output # shellcheck disable=SC2086 -rocker ${opts} --x11 --devices /dev/dri --user --net host --privileged --name aichallenge-2024-$(date "+%Y-%m-%d-%H-%M-%S") --volume ${volume} -- "aichallenge-2024-${target}" +rocker ${opts} --x11 --devices /dev/dri --user --net host --privileged --name aichallenge-2024-$(date "+%Y-%m-%d-%H-%M-%S") --volume ${volume} -- "aichallenge-2024-${target}-${USER}" From 5dc27bc48435e3d7b83283dd17cae6b7c15b8a9d Mon Sep 17 00:00:00 2001 From: "Takagi, Isamu" <43976882+isamu-takagi@users.noreply.github.com> Date: Tue, 8 Oct 2024 21:25:32 +0900 Subject: [PATCH 15/18] feat: remove zenoh filter (#140) Signed-off-by: Takagi, Isamu --- vehicle/zenoh.json5 | 42 ++++++++---------------------------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/vehicle/zenoh.json5 b/vehicle/zenoh.json5 index 65a5bb88..6e8a7ffc 100644 --- a/vehicle/zenoh.json5 +++ b/vehicle/zenoh.json5 @@ -52,40 +52,14 @@ //// or is not specified at all, it means that NO such interface is allowed. //// Use 'deny' to allow all except the specified interfaces. If an interface type is set to an empty list //// or is not specified at all, it means that ALL such interface are allowed. - allow: { - publishers: [ - "/vehicle/status/control_mode", - "/racing_kart/joy", - "/racing_kart/debug/delay", - "/racing_kart/debug/status", - "/racing_kart/gnss", - "/tf", - "/tf_static", - "/control/debug/lookahead_point", - "/map/vector_map_marker", - "/planning/scenario_planning/lane_driving/behavior_planning/path", - "/localization/kinematic_state", - "/initialpose", - ], - subscribers: [ - "/vehicle/status/control_mode", - "/racing_kart/joy", - "/racing_kart/debug/delay", - "/racing_kart/debug/status", - "/racing_kart/gnss", - "/tf", - "/tf_static", - "/control/debug/lookahead_point", - "/map/vector_map_marker", - "/planning/scenario_planning/lane_driving/behavior_planning/path", - "/localization/kinematic_state", - "/initialpose", - ], - service_servers: [], - service_clients: [], - action_servers: [], - action_clients: [], - }, + //allow: { + // publishers: [], + // subscribers: [], + // service_servers: [], + // service_clients: [], + // action_servers: [], + // action_clients: [], + //}, // deny: { // publishers: ["/rosout", "/parameter_events"], // subscribers: ["/rosout"], From 0552064663e74da398993bb6587873d58fee42a5 Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Wed, 9 Oct 2024 19:33:28 +0900 Subject: [PATCH 16/18] update lanelet2_map.osm in booars_launch with aichallenge_submit_launch's one Signed-off-by: Autumn60 --- .../booars_launch/map/lanelet2_map.osm | 2453 +++++++++-------- 1 file changed, 1330 insertions(+), 1123 deletions(-) diff --git a/aichallenge/workspace/src/aichallenge_submit/booars_launch/map/lanelet2_map.osm b/aichallenge/workspace/src/aichallenge_submit/booars_launch/map/lanelet2_map.osm index 49147919..0501b7a0 100644 --- a/aichallenge/workspace/src/aichallenge_submit/booars_launch/map/lanelet2_map.osm +++ b/aichallenge/workspace/src/aichallenge_submit/booars_launch/map/lanelet2_map.osm @@ -1,6 +1,6 @@ - + @@ -1561,39 +1561,39 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -1746,29 +1746,29 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -2336,929 +2336,914 @@ - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + @@ -3281,57 +3266,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3343,13 +3277,6 @@ - - - - - - - @@ -3365,6 +3292,11 @@ + + + + + @@ -3376,41 +3308,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -3484,20 +3385,6 @@ - - - - - - - - - - - - - - @@ -3525,197 +3412,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3780,83 +3480,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3926,115 +3549,699 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + \ No newline at end of file From abc641270b80f7754c4c39789f303c271065274b Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Wed, 9 Oct 2024 19:40:31 +0900 Subject: [PATCH 17/18] fix spelling in zenoh.json5 Signed-off-by: Autumn60 --- vehicle/zenoh.json5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vehicle/zenoh.json5 b/vehicle/zenoh.json5 index 6e8a7ffc..2209157f 100644 --- a/vehicle/zenoh.json5 +++ b/vehicle/zenoh.json5 @@ -86,7 +86,7 @@ //// - "integer" is a priority value in the range [1-7]. Highest priority is 1, lowest is 7 and default is 5. //// (see Zenoh Priority definition here: https://docs.rs/zenoh/latest/zenoh/publication/enum.Priority.html) //// - ":express" is an option to indicate that the Zenoh express policy must be used for those publications. - //// The express policy makes Zenoh to to send the message immediatly, not waiting for possible further messages + //// The express policy makes Zenoh to to send the message immediately, not waiting for possible further messages //// to create a bigger batch of messages. This usually has a positive impact on latency for the topic //// but a negative impact on the general throughput, as more overhead is used for those topics. pub_priorities: ["/joy=1:express"], @@ -96,7 +96,7 @@ //// routed to zenoh using the CongestionControl::Block option. //// Meaning the routing will be blocked in case of network congestion, //// blocking the DDS Reader and the RELIABLE DDS Writer in return. - //// When false (or for BERST_EFFORT DDS Writers), CongestionControl::Drop + //// When false (or for BEST_EFFORT DDS Writers), CongestionControl::Drop //// is used, meaning the route might drop some data in case of congestion. //// // reliable_routes_blocking: true, @@ -195,7 +195,7 @@ //}, //// - //// Configure the scouting mechanisms and their behaviours + //// Configure the scouting mechanisms and their behaviors //// //scouting: { // /// The UDP multicast scouting configuration. From d9e75df93a027dd9603f8e0887acec91055af926 Mon Sep 17 00:00:00 2001 From: Autumn60 Date: Wed, 9 Oct 2024 19:40:50 +0900 Subject: [PATCH 18/18] add words to .cspell.json for zenoh settings Signed-off-by: Autumn60 --- .cspell.json | 58 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/.cspell.json b/.cspell.json index df7e9be3..a42af469 100644 --- a/.cspell.json +++ b/.cspell.json @@ -54,8 +54,10 @@ "ackermann", "adapi", "aichallenge", + "argmin", "astar", "autocompute", + "autoconnect", "autodetermine", "automotiveaichallenge", "autoware", @@ -63,6 +65,8 @@ "booars", "brakemap", "buildtool", + "cind", + "coeffs", "colcon", "costmap", "cuda", @@ -70,13 +74,21 @@ "dallara", "dcmake", "decel", + "dind", "distro", "downsample", + "downsampling", + "dtheta", + "eguchi", "freespace", "gnss", "gnucxx", + "Golay", "gtest", + "Iceoryx", "initialpose", + "ints", + "Kohei", "lanechange", "lanefollowing", "lanelet", @@ -86,58 +98,58 @@ "linalg", "linestring", "linestrings", + "linkstate", "lowpass", "mapfile", "mathcal", "mgrs", + "michikuni", + "mppi", + "MPPI", + "mpss", + "multihop", + "ncourse", + "nodename", "odometry", "osrf", + "pinv", "pitstop", "pointcloud", + "Qdin", "rclcpp", "rclpy", "rcutils", + "reparameting", "rgba", "rois", + "rosbag", "rosdep", "rosdistro", + "rosout", "rrtstar", + "rsample", "rviz", + "satitzky", + "Savitzky", "schematypens", "sideshift", + "softplus", "srvs", "stddev", + "tempature", "traj", "urdf", + "vander", + "Vandermonde", "velodyne", "wextra", "wmctrl", "wpedantic", "xacro", + "xclip", "xyzrpy", "zcvf", - "mppi", - "Qdin", - "Kohei", - "MPPI", - "Savitzky", - "satitzky", - "Golay", - "Vandermonde", - "michikuni", - "eguchi", - "vander", - "pinv", - "dtheta", - "cind", - "dind", - "ncourse", - "argmin", - "reparameting", - "tempature", - "rsample", - "coeffs", - "softplus", - "mpss" + "zenoh", + "zenohd" ] }