Skip to content
Browse files

Global change all references from

GPS_PROTOCOL_MTK16
to
GPS_PROTOCOL_MTK19
  • Loading branch information...
1 parent 6a24234 commit af8cab237c47289cae8854317862ab845eb43fff Craig@3DR committed with tridge Dec 21, 2012
View
2 APMrover2/APM_Config.h.reference
@@ -67,7 +67,7 @@
// GPS_PROTOCOL_NONE No GPS attached
// GPS_PROTOCOL_IMU X-Plane interface or ArduPilot IMU.
// 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_SIRF SiRF-based GPS in Binary mode. NOT TESTED
// GPS_PROTOCOL_NMEA Standard NMEA GPS. NOT SUPPORTED (yet?)
View
4 APMrover2/APMrover2.pde
@@ -207,8 +207,8 @@ AP_GPS_UBLOX g_gps_driver();
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK
AP_GPS_MTK g_gps_driver();
-#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK16
-AP_GPS_MTK16 g_gps_driver();
+#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK19
+AP_GPS_MTK19 g_gps_driver();
#elif GPS_PROTOCOL == GPS_PROTOCOL_NONE
AP_GPS_None g_gps_driver();
View
2 APMrover2/defines.h
@@ -48,7 +48,7 @@
#define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5
-#define GPS_PROTOCOL_MTK16 6
+#define GPS_PROTOCOL_MTK19 6
#define GPS_PROTOCOL_AUTO 7
#define CH_ROLL CH_1
View
4 ArduCopter/ArduCopter.pde
@@ -230,8 +230,8 @@ AP_GPS_UBLOX g_gps_driver();
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK
AP_GPS_MTK g_gps_driver();
- #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK16
-AP_GPS_MTK16 g_gps_driver();
+ #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK19
+AP_GPS_MTK19 g_gps_driver();
#elif GPS_PROTOCOL == GPS_PROTOCOL_NONE
AP_GPS_None g_gps_driver();
View
2 ArduCopter/defines.h
@@ -109,7 +109,7 @@
#define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5
-#define GPS_PROTOCOL_MTK16 6
+#define GPS_PROTOCOL_MTK19 6
#define GPS_PROTOCOL_AUTO 7
// HIL enumerations
View
2 ArduCopter/options.cmake
@@ -47,7 +47,7 @@ apm_option("GPS_PROTOCOL" TYPE STRING
"GPS_PROTOCOL_NONE"
"GPS_PROTOCOL_IMU"
"GPS_PROTOCOL_MTK"
- "GPS_PROTOCOL_MTK16"
+ "GPS_PROTOCOL_MTK19"
"GPS_PROTOCOL_UBLOX"
"GPS_PROTOCOL_SIRF"
"GPS_PROTOCOL_NMEA")
View
2 ArduPlane/APM_Config.h.reference
@@ -67,7 +67,7 @@
// GPS_PROTOCOL_NONE No GPS attached
// GPS_PROTOCOL_IMU X-Plane interface or ArduPilot IMU.
// 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_SIRF SiRF-based GPS in Binary mode. NOT TESTED
// GPS_PROTOCOL_NMEA Standard NMEA GPS. NOT SUPPORTED (yet?)
View
4 ArduPlane/ArduPlane.pde
@@ -171,8 +171,8 @@ AP_GPS_UBLOX g_gps_driver();
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK
AP_GPS_MTK g_gps_driver();
- #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK16
-AP_GPS_MTK16 g_gps_driver();
+ #elif GPS_PROTOCOL == GPS_PROTOCOL_MTK19
+AP_GPS_MTK19 g_gps_driver();
#elif GPS_PROTOCOL == GPS_PROTOCOL_NONE
AP_GPS_None g_gps_driver();
View
2 ArduPlane/defines.h
@@ -45,7 +45,7 @@
#define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5
-#define GPS_PROTOCOL_MTK16 6
+#define GPS_PROTOCOL_MTK19 6
#define GPS_PROTOCOL_AUTO 7
#define CH_ROLL CH_1
View
2 ArduPlane/options.cmake
@@ -47,7 +47,7 @@ apm_option("GPS_PROTOCOL" TYPE STRING
"GPS_PROTOCOL_NONE"
"GPS_PROTOCOL_IMU"
"GPS_PROTOCOL_MTK"
- "GPS_PROTOCOL_MTK16"
+ "GPS_PROTOCOL_MTK19"
"GPS_PROTOCOL_UBLOX"
"GPS_PROTOCOL_SIRF"
"GPS_PROTOCOL_NMEA")
View
4 Tools/ArduTracker/APM_Config.h.reference
@@ -65,10 +65,12 @@
//
// GPS_PROTOCOL_NONE No GPS attached
// 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_SIRF SiRF-based GPS in Binary mode. NOT TESTED
// GPS_PROTOCOL_NMEA Standard NMEA GPS. NOT SUPPORTED (yet?)
+// GPS_PROTOCOL_AUTO 7
//
//#define GPS_PROTOCOL GPS_PROTOCOL_UBLOX
//
View
2 Tools/ArduTracker/ArduTracker.pde
@@ -91,6 +91,8 @@ AP_GPS_SIRF gps(&Serial1);
AP_GPS_UBLOX gps(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK
AP_GPS_MTK gps(&Serial1);
+#elif GPS_PROTOCOL == GPS_PROTOCOL_MTK19
+AP_GPS_MTK19 gps(&Serial1);
#elif GPS_PROTOCOL == GPS_PROTOCOL_NONE
AP_GPS_NONE gps(NULL);
#else
View
2 Tools/ArduTracker/defines.h
@@ -29,6 +29,8 @@
#define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5
+#define GPS_PROTOCOL_MTK19 6
+#define GPS_PROTOCOL_AUTO 7
// Radio channels
// Note channels are from 0!
View
2 Tools/VARTest/defines.h
@@ -44,7 +44,7 @@
#define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5
-#define GPS_PROTOCOL_MTK16 6
+#define GPS_PROTOCOL_MTK19 6
#define GPS_PROTOCOL_AUTO 7
#define CH_ROLL CH_1
View
2 archive/WaypointWriterCopterMega/defines.h
@@ -46,7 +46,7 @@
#define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5
-#define GPS_PROTOCOL_MTK16 6
+#define GPS_PROTOCOL_MTK19 6
// Radio channels
// Note channels are from 0!
View
2 archive/WaypointWriterMega/defines.h
@@ -46,7 +46,7 @@
#define GPS_PROTOCOL_IMU 3
#define GPS_PROTOCOL_MTK 4
#define GPS_PROTOCOL_HIL 5
-#define GPS_PROTOCOL_MTK16 6
+#define GPS_PROTOCOL_MTK19 6
// Radio channels
// Note channels are from 0!

0 comments on commit af8cab2

Please sign in to comment.
Something went wrong with that request. Please try again.