Skip to content

Commit

Permalink
latest
Browse files Browse the repository at this point in the history
  • Loading branch information
MishkaMN committed Jan 15, 2025
1 parent 86e5732 commit 8351b89
Show file tree
Hide file tree
Showing 19 changed files with 195,245 additions and 107 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
# /////////////////////////////////////////////////////////////////////////////
ARG DOCKER_ORG="usdotfhwastoldev"
ARG DOCKER_TAG="develop"
FROM ${DOCKER_ORG}/autoware.ai:${DOCKER_TAG} as base-image
FROM 3ab965d5e097 as base-image

FROM base-image AS source-code
FROM 3ab965d5e097 AS source-code

RUN mkdir ~/src
COPY --chown=carma . /home/carma/src/carma-platform/
Expand All @@ -49,7 +49,7 @@ RUN ~/src/carma-platform/docker/checkout.bash -b ${GIT_BRANCH}
# /////////////////////////////////////////////////////////////////////////////


FROM base-image AS install
FROM 3ab965d5e097 AS install
ARG ROS1_PACKAGES=""
ENV ROS1_PACKAGES=${ROS1_PACKAGES}
ARG ROS2_PACKAGES=""
Expand All @@ -66,7 +66,7 @@ RUN ~/carma_ws/src/carma-platform/docker/install.sh
# /////////////////////////////////////////////////////////////////////////////


FROM base-image
FROM 3ab965d5e097

ARG BUILD_DATE="NULL"
ARG VCS_REF="NULL"
Expand Down
1 change: 1 addition & 0 deletions autoware.auto
Submodule autoware.auto added at daf857
8 changes: 1 addition & 7 deletions carma/config/rosbag2_qos_overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,21 @@
history: keep_last
reliability: reliable
durability: transient_local
depth: 1

/environment/semantic_map:
history: keep_last
reliability: reliable
durability: transient_local
depth: 1

/localization/map_param_loader/georeference:
history: keep_last
reliability: reliable
durability: transient_local
depth: 1

/localization/points_map:
history: keep_last
reliability: reliable
durability: transient_local
depth: 1

/message/incoming_geofence_control:
history: keep_all
Expand All @@ -50,10 +46,8 @@
history: keep_last
reliability: reliable
durability: transient_local
depth: 1

/environment/map_update_debug:
history: keep_last
reliability: reliable
durability: transient_local
depth: 1
durability: transient_local
6 changes: 3 additions & 3 deletions carma/launch/carma_src.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,14 +352,14 @@ def generate_launch_description():
declare_arealist_path,
declare_vector_map_file,
declare_is_ros2_tracing_enabled,
ros2_rosbag_launch,
OpaqueFunction(function=create_ros2_tracing_action),
drivers_group,
transform_group,
environment_group,
localization_group,
v2x_group,
guidance_group,
ros2_rosbag_launch,
ui_group,
system_controller,
OpaqueFunction(function=create_ros2_tracing_action)
system_controller
])
1 change: 1 addition & 0 deletions carma/launch/ros2_rosbag.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def record_ros2_rosbag(context: LaunchContext, vehicle_config_param_file, rosbag

overriding_qos_profiles = context.perform_substitution(rosbag2_qos_override_param_file)

print(f"=====Location found: {overriding_qos_profiles}")
# Open vehicle config params file to process various rosbag settings
with open(vehicle_config_param_file_string, 'r') as f:

Expand Down
172 changes: 86 additions & 86 deletions docker/checkout.bash
Original file line number Diff line number Diff line change
@@ -1,101 +1,101 @@
#!/bin/bash
# #!/bin/bash

# Copyright (C) 2018-2023 LEIDOS.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
# # Copyright (C) 2018-2023 LEIDOS.
# #
# # Licensed under the Apache License, Version 2.0 (the "License"); you may not
# # use this file except in compliance with the License. You may obtain a copy of
# # the License at
# #
# # http://www.apache.org/licenses/LICENSE-2.0
# #
# # Unless required by applicable law or agreed to in writing, software
# # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# # License for the specific language governing permissions and limitations under
# # the License.

# CARMA packages checkout script
# Optional argument to set the root checkout directory with no ending '/' default is '~'
# # CARMA packages checkout script
# # Optional argument to set the root checkout directory with no ending '/' default is '~'

set -exo pipefail
# set -exo pipefail

dir=~
BRANCH=develop # The script will use this unless the -b flag updates it
while [[ $# -gt 0 ]]; do
arg="$1"
case $arg in
-b|--branch)
BRANCH=$2
shift
shift
;;
-r|--root)
dir=$2
shift
shift
;;
esac
done
# dir=~
# BRANCH=develop # The script will use this unless the -b flag updates it
# while [[ $# -gt 0 ]]; do
# arg="$1"
# case $arg in
# -b|--branch)
# BRANCH=$2
# shift
# shift
# ;;
# -r|--root)
# dir=$2
# shift
# shift
# ;;
# esac
# done

cd "${dir}"/src
# cd "${dir}"/src

git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-msgs.git --branch "${BRANCH}"
git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch "${BRANCH}"
git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-messenger.git --branch "${BRANCH}"
# Get humble branch of message filters which supports template Node arguments (foxy version supports rclcpp::Node only)
git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-message-filters.git --branch "${BRANCH}"
git clone --depth=1 https://github.com/usdot-fhwa-stol/multiple_object_tracking --branch "${BRANCH}"
# The feature/integrate-carma branch of rosbag2 includes improvements that were not possible to backport into the foxy branch
# of rosbag2. These rosbag2 packages will replace the originally built foxy rosbag2 packages.
# NOTE: Additional information regarding the rosbag2 improvements on this branch are included in the forked repository's README.
if [[ "${BRANCH}" == "master" ]] || [[ "${BRANCH}" == "develop" ]]; then
git clone --depth=1 https://github.com/usdot-fhwa-stol/rosbag2 --branch carma-"${BRANCH}"
else
git clone --depth=1 https://github.com/usdot-fhwa-stol/rosbag2 --branch "${BRANCH}"
fi
# git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-msgs.git --branch "${BRANCH}"
# git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-utils.git --branch "${BRANCH}"
# git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-messenger.git --branch "${BRANCH}"
# # Get humble branch of message filters which supports template Node arguments (foxy version supports rclcpp::Node only)
# git clone --depth=1 https://github.com/usdot-fhwa-stol/carma-message-filters.git --branch "${BRANCH}"
# git clone --depth=1 https://github.com/usdot-fhwa-stol/multiple_object_tracking --branch "${BRANCH}"
# # The feature/integrate-carma branch of rosbag2 includes improvements that were not possible to backport into the foxy branch
# # of rosbag2. These rosbag2 packages will replace the originally built foxy rosbag2 packages.
# # NOTE: Additional information regarding the rosbag2 improvements on this branch are included in the forked repository's README.
# if [[ "${BRANCH}" == "master" ]] || [[ "${BRANCH}" == "develop" ]]; then
# git clone --depth=1 https://github.com/usdot-fhwa-stol/rosbag2 --branch carma-"${BRANCH}"
# else
# git clone --depth=1 https://github.com/usdot-fhwa-stol/rosbag2 --branch "${BRANCH}"
# fi

# add astuff messages
# NOTE: The ibeo_msgs package is ignored because on build the cmake files in that package run a sed command
# which can make them incompatible with a new ros version after a source switch
git clone https://github.com/astuff/astuff_sensor_msgs
# # add astuff messages
# # NOTE: The ibeo_msgs package is ignored because on build the cmake files in that package run a sed command
# # which can make them incompatible with a new ros version after a source switch
# git clone https://github.com/astuff/astuff_sensor_msgs

cd astuff_sensor_msgs
git checkout 41d5ef0c33fb27eb3c9ba808b51332bcce186a83
# cd astuff_sensor_msgs
# git checkout 41d5ef0c33fb27eb3c9ba808b51332bcce186a83

# Disable ibeo_msgs
cd ibeo_msgs
echo "" > COLCON_IGNORE
cd ../astuff_sensor_msgs
echo "" > COLCON_IGNORE
# # Disable ibeo_msgs
# cd ibeo_msgs
# echo "" > COLCON_IGNORE
# cd ../astuff_sensor_msgs
# echo "" > COLCON_IGNORE

cd ../
# cd ../

# Clone the foxy branch of ros2_tracing in order to enable certain analyses of CARMA Platform
# made possible through collected trace data, such as analyzing ROS 2 callback durations.
git clone -b foxy https://github.com/ros2/ros2_tracing
# # Clone the foxy branch of ros2_tracing in order to enable certain analyses of CARMA Platform
# # made possible through collected trace data, such as analyzing ROS 2 callback durations.
# git clone -b foxy https://github.com/ros2/ros2_tracing

#rosbridge_suite is a ROS meta-package including all the rosbridge packages.
# NOTE: clone -b flag is used instead of --branch to avoid hook rewriting it
git clone -b ros2 https://github.com/usdot-fhwa-stol/rosbridge_suite
# #rosbridge_suite is a ROS meta-package including all the rosbridge packages.
# # NOTE: clone -b flag is used instead of --branch to avoid hook rewriting it
# git clone -b ros2 https://github.com/usdot-fhwa-stol/rosbridge_suite


# Novatel OEM7 Driver
# NOTE: This is required since otherwise this image will not contain the novatel_oem7_msgs package, and a missing ROS 2 message package
# can cause ROS 2 rosbag logging to fail in Foxy.
# Related GitHub discussion for fix that was not backported to Foxy: https://github.com/ros2/rosbag2/pull/858
git clone https://github.com/novatel/novatel_oem7_driver.git "${dir}"/src/novatel_oem7_driver -b ros2-dev
# Checkout verified commit
cd "${dir}"/src/novatel_oem7_driver
git checkout 3055e220bb9715b59c3ef53ab0aba05a495d9d5
# Ignore novatel_oem7_driver package; only novatel_oem7_msgs is required
cd "${dir}"/src/novatel_oem7_driver/src/novatel_oem7_driver
echo "" > COLCON_IGNORE
cd "${dir}"/src
# TODO: Remove V2X-Hub Depedency (CAR-6029)
git clone -b master --depth 1 https://github.com/etherealjoy/qhttpengine.git
# # Novatel OEM7 Driver
# # NOTE: This is required since otherwise this image will not contain the novatel_oem7_msgs package, and a missing ROS 2 message package
# # can cause ROS 2 rosbag logging to fail in Foxy.
# # Related GitHub discussion for fix that was not backported to Foxy: https://github.com/ros2/rosbag2/pull/858
# git clone https://github.com/novatel/novatel_oem7_driver.git "${dir}"/src/novatel_oem7_driver -b ros2-dev
# # Checkout verified commit
# cd "${dir}"/src/novatel_oem7_driver
# git checkout 3055e220bb9715b59c3ef53ab0aba05a495d9d5
# # Ignore novatel_oem7_driver package; only novatel_oem7_msgs is required
# cd "${dir}"/src/novatel_oem7_driver/src/novatel_oem7_driver
# echo "" > COLCON_IGNORE
# cd "${dir}"/src
# # TODO: Remove V2X-Hub Depedency (CAR-6029)
# git clone -b master --depth 1 https://github.com/etherealjoy/qhttpengine.git

git clone -b 7.6.0 --depth 1 https://github.com/usdot-fhwa-OPS/V2X-Hub.git
cd V2X-Hub
git config core.sparsecheckout true
git sparse-checkout init
git sparse-checkout set ext/ccserver
# git clone -b 7.6.0 --depth 1 https://github.com/usdot-fhwa-OPS/V2X-Hub.git
# cd V2X-Hub
# git config core.sparsecheckout true
# git sparse-checkout init
# git sparse-checkout set ext/ccserver
4 changes: 2 additions & 2 deletions docker/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ fi

cd ~/carma_ws

echo "Installing multiple object tracking dependencies"
sudo ./src/multiple_object_tracking/scripts/install_dependencies.sh
# echo "Installing multiple object tracking dependencies"
# sudo ./src/multiple_object_tracking/scripts/install_dependencies.sh

sudo mkdir -p /opt/carma # Create install directory
sudo chown carma /opt/carma # Set owner to expose permissions for build
Expand Down
Loading

0 comments on commit 8351b89

Please sign in to comment.