From bb35f75bbfb59f027e06eda860f456bd6a605474 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 6 Jan 2018 10:42:53 -0500
Subject: [PATCH] delete mavlink v1.0 submodule
---
.gitmodules | 4 ----
mavlink/include/mavlink/v1.0 | 1 -
src/drivers/pwm_out_rc_in/CMakeLists.txt | 4 ----
src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp | 6 +++---
src/drivers/snapdragon_rc_pwm/CMakeLists.txt | 4 ----
src/drivers/snapdragon_rc_pwm/snapdragon_rc_pwm.cpp | 4 ++--
src/modules/simulator/CMakeLists.txt | 4 +---
7 files changed, 6 insertions(+), 21 deletions(-)
delete mode 160000 mavlink/include/mavlink/v1.0
diff --git a/.gitmodules b/.gitmodules
index 8741337b63..74e658d905 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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"]
path = mavlink/include/mavlink/v2.0
url = https://github.com/mavlink/c_library_v2.git
diff --git a/mavlink/include/mavlink/v1.0 b/mavlink/include/mavlink/v1.0
deleted file mode 160000
index 191029c482..0000000000
--- a/mavlink/include/mavlink/v1.0
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 191029c48227f7a5b0900493c54ee831080183f5
diff --git a/src/drivers/pwm_out_rc_in/CMakeLists.txt b/src/drivers/pwm_out_rc_in/CMakeLists.txt
index 97d66d4397..0c5f55550c 100644
--- a/src/drivers/pwm_out_rc_in/CMakeLists.txt
+++ b/src/drivers/pwm_out_rc_in/CMakeLists.txt
@@ -31,8 +31,6 @@
#
############################################################################
-px4_add_git_submodule(TARGET git_mavlink_v1 PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v1.0")
-
px4_add_module(
MODULE drivers__pwm_out_rc_in
MAIN pwm_out_rc_in
@@ -43,7 +41,5 @@ px4_add_module(
SRCS
pwm_out_rc_in.cpp
DEPENDS
- git_mavlink_v1
platforms__common
)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
diff --git a/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp b/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp
index b9efc7a0d0..25343f4773 100644
--- a/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp
+++ b/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp
@@ -51,9 +51,9 @@
#include <systemlib/param/param.h>
#include <systemlib/pwm_limit/pwm_limit.h>
#include <dev_fs_lib_serial.h>
-#include <v1.0/checksum.h>
-#include <v1.0/mavlink_types.h>
-#include <v1.0/common/mavlink.h>
+#include <v2.0/checksum.h>
+#include <v2.0/mavlink_types.h>
+#include <v2.0/common/mavlink.h>
/*
* This driver is supposed to run on Snapdragon. It sends actuator_controls (PWM)
diff --git a/src/drivers/snapdragon_rc_pwm/CMakeLists.txt b/src/drivers/snapdragon_rc_pwm/CMakeLists.txt
index d2c66a5509..1fb8f59121 100644
--- a/src/drivers/snapdragon_rc_pwm/CMakeLists.txt
+++ b/src/drivers/snapdragon_rc_pwm/CMakeLists.txt
@@ -31,8 +31,6 @@
#
############################################################################
-px4_add_git_submodule(TARGET git_mavlink_v1 PATH "${PX4_SOURCE_DIR}/mavlink/include/mavlink/v1.0")
-
px4_add_module(
MODULE drivers__snapdragon_rc_pwm
MAIN snapdragon_rc_pwm
@@ -43,7 +41,5 @@ px4_add_module(
SRCS
snapdragon_rc_pwm.cpp
DEPENDS
- git_mavlink_v1
platforms__common
)
-# vim: set noet ft=cmake fenc=utf-8 ff=unix :
diff --git a/src/drivers/snapdragon_rc_pwm/snapdragon_rc_pwm.cpp b/src/drivers/snapdragon_rc_pwm/snapdragon_rc_pwm.cpp
index f676c46206..1a950cac10 100644
--- a/src/drivers/snapdragon_rc_pwm/snapdragon_rc_pwm.cpp
+++ b/src/drivers/snapdragon_rc_pwm/snapdragon_rc_pwm.cpp
@@ -53,8 +53,8 @@
#include <uORB/topics/input_rc.h>
#include <uORB/topics/actuator_controls.h>
-#include <v1.0/mavlink_types.h>
-#include <v1.0/common/mavlink.h>
+#include <v2.0/mavlink_types.h>
+#include <v2.0/common/mavlink.h>
#include "drivers/drv_pwm_output.h"
#include <drivers/drv_hrt.h>
diff --git a/src/modules/simulator/CMakeLists.txt b/src/modules/simulator/CMakeLists.txt
index 96695b4611..1a9dc06334 100644
--- a/src/modules/simulator/CMakeLists.txt
+++ b/src/modules/simulator/CMakeLists.txt
@@ -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)
if(ENABLE_UART_RC_INPUT)
@@ -64,6 +62,6 @@ px4_add_module(
SRCS
${SIMULATOR_SRCS}
DEPENDS
- git_mavlink_v1
+ git_mavlink_v2
platforms__common
)
--
GitLab