mirror of https://github.com/ArduPilot/ardupilot
Plane: moved to new GPS init syntax
This commit is contained in:
parent
18db7b2efd
commit
73f70cc596
|
@ -70,6 +70,7 @@
|
|||
|
||||
#include <AP_HAL_AVR.h>
|
||||
#include <AP_HAL_AVR_SITL.h>
|
||||
#include <AP_HAL_Empty.h>
|
||||
|
||||
AP_HAL::BetterStream* cliSerial;
|
||||
|
||||
|
@ -165,25 +166,25 @@ static AP_Compass_HMC5843 compass;
|
|||
|
||||
// real GPS selection
|
||||
#if GPS_PROTOCOL == GPS_PROTOCOL_AUTO
|
||||
AP_GPS_Auto g_gps_driver(hal.uartB, &g_gps);
|
||||
AP_GPS_Auto g_gps_driver(&g_gps);
|
||||
|
||||
#elif GPS_PROTOCOL == GPS_PROTOCOL_NMEA
|
||||
AP_GPS_NMEA g_gps_driver(hal.uartB);
|
||||
AP_GPS_NMEA g_gps_driver();
|
||||
|
||||
#elif GPS_PROTOCOL == GPS_PROTOCOL_SIRF
|
||||
AP_GPS_SIRF g_gps_driver(hal.uartB);
|
||||
AP_GPS_SIRF g_gps_driver();
|
||||
|
||||
#elif GPS_PROTOCOL == GPS_PROTOCOL_UBLOX
|
||||
AP_GPS_UBLOX g_gps_driver(hal.uartB);
|
||||
AP_GPS_UBLOX g_gps_driver();
|
||||
|
||||
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK
|
||||
AP_GPS_MTK g_gps_driver(hal.uartB);
|
||||
AP_GPS_MTK g_gps_driver();
|
||||
|
||||
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK16
|
||||
AP_GPS_MTK16 g_gps_driver(hal.uartB);
|
||||
AP_GPS_MTK16 g_gps_driver();
|
||||
|
||||
#elif GPS_PROTOCOL == GPS_PROTOCOL_NONE
|
||||
AP_GPS_None g_gps_driver(NULL);
|
||||
AP_GPS_None g_gps_driver();
|
||||
|
||||
#else
|
||||
#error Unrecognised GPS_PROTOCOL setting.
|
||||
|
|
Loading…
Reference in New Issue