gitmodules add branch tracking

- update mavlink, cmake_hexagon, uavcan_board_ident to latest
This commit is contained in:
Daniel Agar 2017-11-21 19:52:02 -05:00
parent 7a5a497725
commit cea2c36000
3 changed files with 15 additions and 2 deletions

13
.gitmodules vendored
View File

@ -1,9 +1,11 @@
[submodule "mavlink/include/mavlink/v1.0"] [submodule "mavlink/include/mavlink/v1.0"]
path = mavlink/include/mavlink/v1.0 path = mavlink/include/mavlink/v1.0
url = https://github.com/mavlink/c_library_v1.git url = https://github.com/mavlink/c_library_v1.git
branch = master
[submodule "mavlink/include/mavlink/v2.0"] [submodule "mavlink/include/mavlink/v2.0"]
path = mavlink/include/mavlink/v2.0 path = mavlink/include/mavlink/v2.0
url = https://github.com/mavlink/c_library_v2.git url = https://github.com/mavlink/c_library_v2.git
branch = master
[submodule "src/modules/uavcan/libuavcan"] [submodule "src/modules/uavcan/libuavcan"]
path = src/modules/uavcan/libuavcan path = src/modules/uavcan/libuavcan
url = https://github.com/UAVCAN/libuavcan.git url = https://github.com/UAVCAN/libuavcan.git
@ -16,33 +18,44 @@
[submodule "Tools/jMAVSim"] [submodule "Tools/jMAVSim"]
path = Tools/jMAVSim path = Tools/jMAVSim
url = https://github.com/PX4/jMAVSim.git url = https://github.com/PX4/jMAVSim.git
branch = master
[submodule "Tools/sitl_gazebo"] [submodule "Tools/sitl_gazebo"]
path = Tools/sitl_gazebo path = Tools/sitl_gazebo
url = https://github.com/PX4/sitl_gazebo.git url = https://github.com/PX4/sitl_gazebo.git
branch = master
[submodule "src/lib/matrix"] [submodule "src/lib/matrix"]
path = src/lib/matrix path = src/lib/matrix
url = https://github.com/PX4/Matrix.git url = https://github.com/PX4/Matrix.git
branch = master
[submodule "src/lib/DriverFramework"] [submodule "src/lib/DriverFramework"]
path = src/lib/DriverFramework path = src/lib/DriverFramework
url = https://github.com/PX4/DriverFramework.git url = https://github.com/PX4/DriverFramework.git
branch = master
[submodule "src/lib/ecl"] [submodule "src/lib/ecl"]
path = src/lib/ecl path = src/lib/ecl
url = https://github.com/PX4/ecl.git url = https://github.com/PX4/ecl.git
branch = master
[submodule "cmake/cmake_hexagon"] [submodule "cmake/cmake_hexagon"]
path = cmake/cmake_hexagon path = cmake/cmake_hexagon
url = https://github.com/ATLFlight/cmake_hexagon url = https://github.com/ATLFlight/cmake_hexagon
branch = master
[submodule "src/drivers/gps/devices"] [submodule "src/drivers/gps/devices"]
path = src/drivers/gps/devices path = src/drivers/gps/devices
url = https://github.com/PX4/GpsDrivers.git url = https://github.com/PX4/GpsDrivers.git
branch = master
[submodule "src/lib/micro-CDR"] [submodule "src/lib/micro-CDR"]
path = src/modules/micrortps_bridge/micro-CDR path = src/modules/micrortps_bridge/micro-CDR
url = https://github.com/eProsima/micro-CDR.git url = https://github.com/eProsima/micro-CDR.git
branch = master
[submodule "platforms/nuttx/NuttX/nuttx"] [submodule "platforms/nuttx/NuttX/nuttx"]
path = platforms/nuttx/NuttX/nuttx path = platforms/nuttx/NuttX/nuttx
url = https://github.com/PX4-NuttX/nuttx.git url = https://github.com/PX4-NuttX/nuttx.git
branch = px4_firmware_nuttx-7.22+
[submodule "platforms/nuttx/NuttX/apps"] [submodule "platforms/nuttx/NuttX/apps"]
path = platforms/nuttx/NuttX/apps path = platforms/nuttx/NuttX/apps
url = https://github.com/PX4-NuttX/apps.git url = https://github.com/PX4-NuttX/apps.git
branch = px4_firmware_nuttx-7.22+
[submodule "cmake/configs/uavcan_board_ident"] [submodule "cmake/configs/uavcan_board_ident"]
path = cmake/configs/uavcan_board_ident path = cmake/configs/uavcan_board_ident
url = https://github.com/PX4/uavcan_board_ident.git url = https://github.com/PX4/uavcan_board_ident.git
branch = master

@ -1 +1 @@
Subproject commit 61a161e9d550df9d464f85ad47e3cf7b32d5bd94 Subproject commit 191029c48227f7a5b0900493c54ee831080183f5

@ -1 +1 @@
Subproject commit fe4d705c72c4ac90332904f9203ff52f70d45b8b Subproject commit 0667deeba1b156681a843ce40f77d1fd0d735513