Skip to content

Commit

Permalink
Merge pull request #143 from usdot-fhwa-stol/hotfix/3.8.2
Browse files Browse the repository at this point in the history 
Merge hotfix/3.8.2 to master
  • Loading branch information
@msmcconnell
msmcconnell authored Oct 22, 2021
2 parents 9493955 + 0491162 commit 062fd84
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion carla_integration/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.8.1
image: usdotfhwastol/carma-platform:carma-system-3.8.2
network_mode: host
container_name: platform
volumes_from:
Expand Down
2 changes: 1 addition & 1 deletion chrysler_pacifica_ehybrid_s_2019/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.8.1
image: usdotfhwastol/carma-platform:carma-system-3.8.2
network_mode: host
container_name: platform
runtime: nvidia
Expand Down
2 changes: 1 addition & 1 deletion development/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.8.1
image: usdotfhwastol/carma-platform:carma-system-3.8.2
network_mode: host
container_name: platform
volumes_from:
Expand Down
2 changes: 1 addition & 1 deletion ford_fusion_sehybrid_2019/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.8.1
image: usdotfhwastol/carma-platform:carma-system-3.8.2
network_mode: host
container_name: platform
volumes_from:
Expand Down
2 changes: 1 addition & 1 deletion freightliner_cascadia_2012_dot_10002/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.8.1
image: usdotfhwastol/carma-platform:carma-system-3.8.2
network_mode: host
container_name: platform
runtime: nvidia
Expand Down
2 changes: 1 addition & 1 deletion freightliner_cascadia_2012_dot_10003/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.8.1
image: usdotfhwastol/carma-platform:carma-system-3.8.2
network_mode: host
container_name: platform
runtime: nvidia
Expand Down
2 changes: 1 addition & 1 deletion freightliner_cascadia_2012_dot_10004/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.8.1
image: usdotfhwastol/carma-platform:carma-system-3.8.2
network_mode: host
container_name: platform
runtime: nvidia
Expand Down
4 changes: 2 additions & 2 deletions freightliner_cascadia_2012_dot_10004/drivers.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ If not using simulated drivers they are activated if the respective mock argumen
<remap from="camera/camera_info" to="dummy_camera_info"/>
<include if="$(arg avt_vimba_camera)" file="$(find avt_vimba_camera)/launch/mono_camera.launch">
<arg name="guid" default=""/>
<arg name="ip" default="192.168.30.10"/>
<arg name="ip" default="192.168.10.1"/>
<arg name="camera_info_url" value="file://$(arg vehicle_calibration_dir)/avt_vimba_camera/camera_fl_intrinsics.yaml"/>
<arg name="frame_id" default="left_optical"/>
<arg name="trig_timestamp_topic" default=""/>
Expand All @@ -130,7 +130,7 @@ If not using simulated drivers they are activated if the respective mock argumen
<!-- AVT Vimba Camera Right Driver Node
<include if="$(arg avt_vimba_camera)" ns="camera_right" file="$(find avt_vimba_camera)/launch/mono_camera.launch">
<arg name="guid" default=""/>
<arg name="ip" default="192.168.40.10"/>
<arg name="ip" default="192.168.20.1"/>
<arg name="camera_info_url" default="file://$(find vehicle_calibration_dir)/avt_vimba_camera/calibration_50-0536911040.yaml"/>
<arg name="frame_id" default="right_optical"/>
<arg name="trig_timestamp_topic" default=""/>
Expand Down
2 changes: 1 addition & 1 deletion freightliner_cascadia_2012_dot_80550/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.8.1
image: usdotfhwastol/carma-platform:carma-system-3.8.2
network_mode: host
container_name: platform
runtime: nvidia
Expand Down
4 changes: 2 additions & 2 deletions freightliner_cascadia_2012_dot_80550/drivers.launch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ If not using simulated drivers they are activated if the respective mock argumen
<remap from="camera/camera_info" to="dummy_camera_info"/>
<include if="$(arg avt_vimba_camera)" file="$(find avt_vimba_camera)/launch/mono_camera.launch">
<arg name="guid" default=""/>
<arg name="ip" default="192.168.30.10"/>
<arg name="ip" default="192.168.10.1"/>
<arg name="camera_info_url" value="file://$(arg vehicle_calibration_dir)/avt_vimba_camera/camera_fl_intrinsics.yaml"/>
<arg name="frame_id" default="left_optical"/>
<arg name="trig_timestamp_topic" default=""/>
Expand All @@ -130,7 +130,7 @@ If not using simulated drivers they are activated if the respective mock argumen
<!-- AVT Vimba Camera Right Driver Node
<include if="$(arg avt_vimba_camera)" ns="camera_right" file="$(find avt_vimba_camera)/launch/mono_camera.launch">
<arg name="guid" default=""/>
<arg name="ip" default="192.168.40.10"/>
<arg name="ip" default="192.168.20.1"/>
<arg name="camera_info_url" default="file://$(find vehicle_calibration_dir)/avt_vimba_camera/calibration_50-0536911040.yaml"/>
<arg name="frame_id" default="right_optical"/>
<arg name="trig_timestamp_topic" default=""/>
Expand Down
2 changes: 1 addition & 1 deletion lexus_rx_450h_2019/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
command: roscore

platform:
image: usdotfhwastol/carma-platform:carma-system-3.8.1
image: usdotfhwastol/carma-platform:carma-system-3.8.2
network_mode: host
container_name: platform
volumes_from:
Expand Down

0 comments on commit 062fd84

Please sign in to comment.