GCS_MAVLink: mavlink_comm_x become UARTDrivers

10 years ago · 1157c13eb6
2 changed files with 6 additions and 7 deletions
--- a/libraries/GCS_MAVLink/GCS_MAVLink.cpp
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
@ -31,11 +31,10 @@ This provides some support code and variables for MAVLink enabled sketches
				@@ -31,11 +31,10 @@ This provides some support code and variables for MAVLink enabled sketches
 #include "include/mavlink/v1.0/mavlink_helpers.h"
 #endif

-
-AP_HAL::BetterStream	*mavlink_comm_0_port;
-AP_HAL::BetterStream	*mavlink_comm_1_port;
+AP_HAL::UARTDriver	*mavlink_comm_0_port;
+AP_HAL::UARTDriver	*mavlink_comm_1_port;
 #if MAVLINK_COMM_NUM_BUFFERS > 2
-AP_HAL::BetterStream	*mavlink_comm_2_port;
+AP_HAL::UARTDriver	*mavlink_comm_2_port;
 #endif

 mavlink_system_t mavlink_system = {7,1};
--- a/libraries/GCS_MAVLink/GCS_MAVLink.h
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.h
@ -51,14 +51,14 @@
				@@ -51,14 +51,14 @@
 #include "include/mavlink/v1.0/mavlink_types.h"

 /// MAVLink stream used for uartA
-extern AP_HAL::BetterStream	*mavlink_comm_0_port;
+extern AP_HAL::UARTDriver	*mavlink_comm_0_port;

 /// MAVLink stream used for uartC
-extern AP_HAL::BetterStream	*mavlink_comm_1_port;
+extern AP_HAL::UARTDriver	*mavlink_comm_1_port;

 #if MAVLINK_COMM_NUM_BUFFERS > 2
 /// MAVLink stream used for uartD
-extern AP_HAL::BetterStream	*mavlink_comm_2_port;
+extern AP_HAL::UARTDriver	*mavlink_comm_2_port;
 #endif

 /// MAVLink system definition