Skip to content

Commit c62a0d8

Browse files
committed
Bump cmake requirements, declare ament index python and launcha dn have docker mount data for testing
1 parent efbcf6e commit c62a0d8

7 files changed

Lines changed: 12 additions & 4 deletions

File tree

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
log/
22
build/
33
install/
4+
data/*
5+
!data/.gitkeep
6+
!data/flights/
7+
!data/flights/.gitkeep
48
*.log
59

610
# Prerequisites

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ services:
1616

1717
volumes:
1818
- ./:/workspace:rw
19+
- ./data:/data:rw
1920
- /tmp/.X11-unix:/tmp/.X11-unix:rw
2021

2122
network_mode: "host"

src/cubesat_bringup/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8)
1+
cmake_minimum_required(VERSION 3.16)
22
project(cubesat_bringup)
33

44
find_package(ament_cmake REQUIRED)

src/cubesat_bringup/launch/sensors_only.launch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def generate_launch_description():
4242
return LaunchDescription(
4343
[
4444
flight_dir_arg,
45-
pi_io,
46-
stm_bridge,
45+
# pi_io,
46+
# stm_bridge,
4747
]
4848
)

src/cubesat_bringup/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<exec_depend>cubesat_control</exec_depend>
1616
<exec_depend>cubesat_radio</exec_depend>
1717
<exec_depend>cubesat_vision</exec_depend>
18+
<exec_depend>ament_index_python</exec_depend>
19+
<exec_depend>launch</exec_depend>
1820
<exec_depend>launch_ros</exec_depend>
1921

2022
<export>

src/cubesat_bringup/scripts/start_flight.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ def main():
5454

5555
if __name__ == "__main__":
5656
main()
57+

src/cubesat_msgs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8)
1+
cmake_minimum_required(VERSION 3.16)
22
project(cubesat_msgs)
33

44
find_package(ament_cmake REQUIRED)

0 commit comments

Comments
 (0)