Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Global change all references from 

GPS_PROTOCOL_MTK16
to
GPS_PROTOCOL_MTK19
This commit is contained in:
Craig@3DR 2012-12-21 11:19:32 -08:00
parent ac66d7cac2
commit e882a19bb7
17 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APMrover2/APM_Config.h.reference
View File

@ -67,7 +67,7 @@
// GPS_PROTOCOL_NONE No GPS attached // GPS_PROTOCOL_NONE No GPS attached
// GPS_PROTOCOL_IMU X-Plane interface or ArduPilot IMU. // GPS_PROTOCOL_IMU X-Plane interface or ArduPilot IMU.
// GPS_PROTOCOL_MTK MediaTek-based GPS running the DIYDrones firmware 1.4 // GPS_PROTOCOL_MTK MediaTek-based GPS running the DIYDrones firmware 1.4
// GPS_PROTOCOL_MTK16 MediaTek-based GPS running the DIYDrones firmware 1.6 // GPS_PROTOCOL_MTK19 MediaTek-based GPS running the DIYDrones firmware 1.6, 1.7, 1.8, 1.9
// GPS_PROTOCOL_UBLOX UBLOX GPS // GPS_PROTOCOL_UBLOX UBLOX GPS
// GPS_PROTOCOL_SIRF SiRF-based GPS in Binary mode. NOT TESTED // GPS_PROTOCOL_SIRF SiRF-based GPS in Binary mode. NOT TESTED
// GPS_PROTOCOL_NMEA Standard NMEA GPS. NOT SUPPORTED (yet?) // GPS_PROTOCOL_NMEA Standard NMEA GPS. NOT SUPPORTED (yet?)

4
APMrover2/APMrover2.pde
View File

@ -237,8 +237,8 @@ AP_GPS_UBLOX g_gps_driver(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK
AP_GPS_MTK g_gps_driver(&Serial1); AP_GPS_MTK g_gps_driver(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK16 #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK19
AP_GPS_MTK16 g_gps_driver(&Serial1); AP_GPS_MTK19 g_gps_driver(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_NONE #elif GPS_PROTOCOL == GPS_PROTOCOL_NONE
AP_GPS_None g_gps_driver(NULL); AP_GPS_None g_gps_driver(NULL);

2
APMrover2/defines.h
View File

@ -48,7 +48,7 @@
#define GPS_PROTOCOL_IMU 3 #define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4 #define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5 #define GPS_PROTOCOL_HIL 5
#define GPS_PROTOCOL_MTK16 6 #define GPS_PROTOCOL_MTK19 6
#define GPS_PROTOCOL_AUTO 7 #define GPS_PROTOCOL_AUTO 7
#define CH_ROLL CH_1 #define CH_ROLL CH_1

4
ArduCopter/ArduCopter.pde
View File

@ -266,8 +266,8 @@ AP_GPS_UBLOX g_gps_driver(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK
AP_GPS_MTK g_gps_driver(&Serial1); AP_GPS_MTK g_gps_driver(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK16 #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK19
AP_GPS_MTK16 g_gps_driver(&Serial1); AP_GPS_MTK19 g_gps_driver(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_NONE #elif GPS_PROTOCOL == GPS_PROTOCOL_NONE
AP_GPS_None g_gps_driver(NULL); AP_GPS_None g_gps_driver(NULL);

2
ArduCopter/defines.h
View File

@ -107,7 +107,7 @@
#define GPS_PROTOCOL_IMU 3 #define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4 #define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5 #define GPS_PROTOCOL_HIL 5
#define GPS_PROTOCOL_MTK16 6 #define GPS_PROTOCOL_MTK19 6
#define GPS_PROTOCOL_AUTO 7 #define GPS_PROTOCOL_AUTO 7
// HIL enumerations // HIL enumerations

2
ArduCopter/options.cmake
View File

@ -47,7 +47,7 @@ apm_option("GPS_PROTOCOL" TYPE STRING
"GPS_PROTOCOL_NONE" "GPS_PROTOCOL_NONE"
"GPS_PROTOCOL_IMU" "GPS_PROTOCOL_IMU"
"GPS_PROTOCOL_MTK" "GPS_PROTOCOL_MTK"
"GPS_PROTOCOL_MTK16" "GPS_PROTOCOL_MTK19"
"GPS_PROTOCOL_UBLOX" "GPS_PROTOCOL_UBLOX"
"GPS_PROTOCOL_SIRF" "GPS_PROTOCOL_SIRF"
"GPS_PROTOCOL_NMEA") "GPS_PROTOCOL_NMEA")

2
ArduPlane/APM_Config.h.reference
View File

@ -67,7 +67,7 @@
// GPS_PROTOCOL_NONE No GPS attached // GPS_PROTOCOL_NONE No GPS attached
// GPS_PROTOCOL_IMU X-Plane interface or ArduPilot IMU. // GPS_PROTOCOL_IMU X-Plane interface or ArduPilot IMU.
// GPS_PROTOCOL_MTK MediaTek-based GPS running the DIYDrones firmware 1.4 // GPS_PROTOCOL_MTK MediaTek-based GPS running the DIYDrones firmware 1.4
// GPS_PROTOCOL_MTK16 MediaTek-based GPS running the DIYDrones firmware 1.6 // GPS_PROTOCOL_MTK19 MediaTek-based GPS running the DIYDrones firmware 1.6, 1.7, 1.8, 1.9
// GPS_PROTOCOL_UBLOX UBLOX GPS // GPS_PROTOCOL_UBLOX UBLOX GPS
// GPS_PROTOCOL_SIRF SiRF-based GPS in Binary mode. NOT TESTED // GPS_PROTOCOL_SIRF SiRF-based GPS in Binary mode. NOT TESTED
// GPS_PROTOCOL_NMEA Standard NMEA GPS. NOT SUPPORTED (yet?) // GPS_PROTOCOL_NMEA Standard NMEA GPS. NOT SUPPORTED (yet?)

4
ArduPlane/ArduPlane.pde
View File

@ -213,8 +213,8 @@ AP_GPS_UBLOX g_gps_driver(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK
AP_GPS_MTK g_gps_driver(&Serial1); AP_GPS_MTK g_gps_driver(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK16 #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK19
AP_GPS_MTK16 g_gps_driver(&Serial1); AP_GPS_MTK19 g_gps_driver(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_NONE #elif GPS_PROTOCOL == GPS_PROTOCOL_NONE
AP_GPS_None g_gps_driver(NULL); AP_GPS_None g_gps_driver(NULL);

2
ArduPlane/Makefile
View File

@ -31,7 +31,7 @@ mtk:
make -f Makefile EXTRAFLAGS="-DGPS_PROTOCOL=GPS_PROTOCOL_MTK" make -f Makefile EXTRAFLAGS="-DGPS_PROTOCOL=GPS_PROTOCOL_MTK"
mtk16: mtk16:
make -f Makefile EXTRAFLAGS="-DGPS_PROTOCOL=GPS_PROTOCOL_MTK16" make -f Makefile EXTRAFLAGS="-DGPS_PROTOCOL=GPS_PROTOCOL_MTK19"
heli: heli:
make -f Makefile EXTRAFLAGS="-DFRAME_CONFIG=HELI_FRAME" make -f Makefile EXTRAFLAGS="-DFRAME_CONFIG=HELI_FRAME"

2
ArduPlane/defines.h
View File

@ -45,7 +45,7 @@
#define GPS_PROTOCOL_IMU 3 #define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4 #define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5 #define GPS_PROTOCOL_HIL 5
#define GPS_PROTOCOL_MTK16 6 #define GPS_PROTOCOL_MTK19 6
#define GPS_PROTOCOL_AUTO 7 #define GPS_PROTOCOL_AUTO 7
#define CH_ROLL CH_1 #define CH_ROLL CH_1

2
ArduPlane/options.cmake
View File

@ -47,7 +47,7 @@ apm_option("GPS_PROTOCOL" TYPE STRING
"GPS_PROTOCOL_NONE" "GPS_PROTOCOL_NONE"
"GPS_PROTOCOL_IMU" "GPS_PROTOCOL_IMU"
"GPS_PROTOCOL_MTK" "GPS_PROTOCOL_MTK"
"GPS_PROTOCOL_MTK16" "GPS_PROTOCOL_MTK19"
"GPS_PROTOCOL_UBLOX" "GPS_PROTOCOL_UBLOX"
"GPS_PROTOCOL_SIRF" "GPS_PROTOCOL_SIRF"
"GPS_PROTOCOL_NMEA") "GPS_PROTOCOL_NMEA")

4
Tools/ArduTracker/APM_Config.h.reference
View File

@ -65,10 +65,12 @@
// //
// GPS_PROTOCOL_NONE No GPS attached // GPS_PROTOCOL_NONE No GPS attached
// GPS_PROTOCOL_IMU X-Plane interface or ArduPilot IMU. // GPS_PROTOCOL_IMU X-Plane interface or ArduPilot IMU.
// GPS_PROTOCOL_MTK MediaTek-based GPS. // GPS_PROTOCOL_MTK MediaTek-based GPS for Mediatek 1.4
// GPS_PROTOCOL_MTK19 MediaTek-based GPS for firmware 1.6, 1.7, 1.8, 1.9
// GPS_PROTOCOL_UBLOX UBLOX GPS // GPS_PROTOCOL_UBLOX UBLOX GPS
// GPS_PROTOCOL_SIRF SiRF-based GPS in Binary mode. NOT TESTED // GPS_PROTOCOL_SIRF SiRF-based GPS in Binary mode. NOT TESTED
// GPS_PROTOCOL_NMEA Standard NMEA GPS. NOT SUPPORTED (yet?) // GPS_PROTOCOL_NMEA Standard NMEA GPS. NOT SUPPORTED (yet?)
// GPS_PROTOCOL_AUTO 7
// //
//#define GPS_PROTOCOL GPS_PROTOCOL_UBLOX //#define GPS_PROTOCOL GPS_PROTOCOL_UBLOX
// //

2
Tools/ArduTracker/ArduTracker.pde
View File

@ -91,6 +91,8 @@ AP_GPS_SIRF gps(&Serial1);
AP_GPS_UBLOX gps(&Serial1); AP_GPS_UBLOX gps(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK
AP_GPS_MTK gps(&Serial1); AP_GPS_MTK gps(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK19
AP_GPS_MTK19 gps(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_NONE #elif GPS_PROTOCOL == GPS_PROTOCOL_NONE
AP_GPS_NONE gps(NULL); AP_GPS_NONE gps(NULL);
#else #else

2
Tools/ArduTracker/defines.h
View File

@ -29,6 +29,8 @@
#define GPS_PROTOCOL_IMU 3 #define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4 #define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5 #define GPS_PROTOCOL_HIL 5
#define GPS_PROTOCOL_MTK19 6
#define GPS_PROTOCOL_AUTO 7
// Radio channels // Radio channels
// Note channels are from 0! // Note channels are from 0!

2
Tools/VARTest/defines.h
View File

@ -44,7 +44,7 @@
#define GPS_PROTOCOL_IMU 3 #define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4 #define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5 #define GPS_PROTOCOL_HIL 5
#define GPS_PROTOCOL_MTK16 6 #define GPS_PROTOCOL_MTK19 6
#define GPS_PROTOCOL_AUTO 7 #define GPS_PROTOCOL_AUTO 7
#define CH_ROLL CH_1 #define CH_ROLL CH_1

2
archive/WaypointWriterCopterMega/defines.h
View File

@ -46,7 +46,7 @@
#define GPS_PROTOCOL_IMU 3 #define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4 #define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5 #define GPS_PROTOCOL_HIL 5
#define GPS_PROTOCOL_MTK16 6 #define GPS_PROTOCOL_MTK19 6
// Radio channels // Radio channels
// Note channels are from 0! // Note channels are from 0!

2
archive/WaypointWriterMega/defines.h
View File

@ -46,7 +46,7 @@
#define GPS_PROTOCOL_IMU 3 #define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4 #define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5 #define GPS_PROTOCOL_HIL 5
#define GPS_PROTOCOL_MTK16 6 #define GPS_PROTOCOL_MTK19 6
// Radio channels // Radio channels
// Note channels are from 0! // Note channels are from 0!