yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete mavlink v1.0 submodule

Browse Source
This commit is contained in:
Daniel Agar
2018-01-06 10:42:53 -05:00
parent 4b4b181e7c
commit bb35f75bbf
7 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -1,7 +1,3 @@
[submodule "mavlink/include/mavlink/v1.0"]
path = mavlink/include/mavlink/v1.0
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

1
mavlink/include/mavlink/v1.0

Submodule mavlink/include/mavlink/v1.0 deleted from 191029c482

4
src/drivers/pwm_out_rc_in/CMakeLists.txt
View File

@@ -31,8 +31,6 @@
# #
############################################################################ ############################################################################
px4_add_git_submodule(TARGET git_mavlink_v1 PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v1.0")
px4_add_module( px4_add_module(
MODULE drivers__pwm_out_rc_in MODULE drivers__pwm_out_rc_in
MAIN pwm_out_rc_in MAIN pwm_out_rc_in
@@ -43,7 +41,5 @@ px4_add_module(
SRCS SRCS
pwm_out_rc_in.cpp pwm_out_rc_in.cpp
DEPENDS DEPENDS
git_mavlink_v1
platforms__common platforms__common
) )
# vim: set noet ft=cmake fenc=utf-8 ff=unix :

6
src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp
View File

@@ -51,9 +51,9 @@
#include <systemlib/param/param.h> #include <systemlib/param/param.h>
#include <systemlib/pwm_limit/pwm_limit.h> #include <systemlib/pwm_limit/pwm_limit.h>
#include <dev_fs_lib_serial.h> #include <dev_fs_lib_serial.h>
#include <v1.0/checksum.h> #include <v2.0/checksum.h>
#include <v1.0/mavlink_types.h> #include <v2.0/mavlink_types.h>
#include <v1.0/common/mavlink.h> #include <v2.0/common/mavlink.h>
/* /*
* This driver is supposed to run on Snapdragon. It sends actuator_controls (PWM) * This driver is supposed to run on Snapdragon. It sends actuator_controls (PWM)

4
src/drivers/snapdragon_rc_pwm/CMakeLists.txt
View File

@@ -31,8 +31,6 @@
# #
############################################################################ ############################################################################
px4_add_git_submodule(TARGET git_mavlink_v1 PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v1.0")
px4_add_module( px4_add_module(
MODULE drivers__snapdragon_rc_pwm MODULE drivers__snapdragon_rc_pwm
MAIN snapdragon_rc_pwm MAIN snapdragon_rc_pwm
@@ -43,7 +41,5 @@ px4_add_module(
SRCS SRCS
snapdragon_rc_pwm.cpp snapdragon_rc_pwm.cpp
DEPENDS DEPENDS
git_mavlink_v1
platforms__common platforms__common
) )
# vim: set noet ft=cmake fenc=utf-8 ff=unix :

4
src/drivers/snapdragon_rc_pwm/snapdragon_rc_pwm.cpp
View File

@@ -53,8 +53,8 @@
#include <uORB/topics/input_rc.h> #include <uORB/topics/input_rc.h>
#include <uORB/topics/actuator_controls.h> #include <uORB/topics/actuator_controls.h>
#include <v1.0/mavlink_types.h> #include <v2.0/mavlink_types.h>
#include <v1.0/common/mavlink.h> #include <v2.0/common/mavlink.h>
#include "drivers/drv_pwm_output.h" #include "drivers/drv_pwm_output.h"
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>

4
src/modules/simulator/CMakeLists.txt
View File

@@ -31,8 +31,6 @@
# #
############################################################################ ############################################################################
px4_add_git_submodule(TARGET git_mavlink_v1 PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v1.0")
option(ENABLE_UART_RC_INPUT "Enable RC Input from UART mavlink connection" OFF) option(ENABLE_UART_RC_INPUT "Enable RC Input from UART mavlink connection" OFF)
if(ENABLE_UART_RC_INPUT) if(ENABLE_UART_RC_INPUT)
@@ -64,6 +62,6 @@ px4_add_module(
SRCS SRCS
${SIMULATOR_SRCS} ${SIMULATOR_SRCS}
DEPENDS DEPENDS
git_mavlink_v1 git_mavlink_v2
platforms__common platforms__common
) )