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.

Sign up for GitHub

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

Sync develop with elise #75

Merged
merged 14 commits into from
Nov 2, 2021
Merged

Sync develop with elise #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
21f47c9
Port scripts to Python 3
mjeronimo May 25, 2021
2cc32ba
Merge pull request #59 from mjeronimo/feature/ros-noetic-port
msmcconnell Jun 15, 2021
12afc9c
Update to C++14 (#60)
mjeronimo Jun 25, 2021
e33b11f
checkout tags (#62)
pmusau17 Jun 29, 2021
0bfff13
Fix/updated develop tags (#65)
msmcconnell Jul 15, 2021
46c76ca
Merge branch 'master' into feature/sync_noetic_with_3.7.0
Aug 10, 2021
2b7f075
Merge pull request #67 from usdot-fhwa-stol/feature/sync_noetic_with_…
msmcconnell Aug 10, 2021
fd30783
Fix build error where kinetic was sourced instead of noetic
Aug 20, 2021
10c09b4
merge develop into noetic/develop after 3.8.0 release
Oct 1, 2021
461d7b2
Merge pull request #73 from usdot-fhwa-stol/sync_noetic_with_develop
msmcconnell Oct 1, 2021
ae8fd6b
updated docker tag to point candidate
SaikrishnaBairamoni Oct 12, 2021
9abbe33
Update sdk version
Oct 14, 2021
9339672
Merge pull request #74 from usdot-fhwa-stol/fix/update_vimba_sdk
kjrush Oct 15, 2021
7879948
Sync develop with release/elise
Nov 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ include_directories(
include
)

# C++11 support
# C++14 support
include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if(COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
if(COMPILER_SUPPORTS_CXX14)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
elseif(COMPILER_SUPPORTS_CXX0X)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
else()
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++14 support. Please use a different C++ compiler.")
endif()
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
Expand Down
Binary file modified Vimba_installation_under_Linux.pdf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file renamed Vimba_v3.1_Linux.tgz → Vimba_v5.0_Linux.tgz
100644 → 100755
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion cfg/AvtVimbaCamera.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python3

PACKAGE='avt_vimba_camera'
NODE='avt_vimba_camera'
Expand Down
2 changes: 1 addition & 1 deletion cfg/AvtVimbaCameraStereo.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python3

PACKAGE='avt_vimba_camera'
NODE='avt_vimba_camera'
Expand Down
4 changes: 2 additions & 2 deletions docker/checkout.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ while [[ $# -gt 0 ]]; do
done

if [[ "$BRANCH" = "develop" ]]; then
git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch develop --depth 1
git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch develop --depth 1
git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch $BRANCH --depth 1
git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch $BRANCH --depth 1
else
git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch develop --depth 1
git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch develop --depth 1
Expand Down
2 changes: 1 addition & 1 deletion docker/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
# License for the specific language governing permissions and limitations under
# the License.

source /opt/ros/kinetic/setup.bash
source /opt/ros/noetic/setup.bash
cd ~/
colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release