Skip to content
Snippets Groups Projects
Commit 1ab5d719 authored by Randy Mackay's avatar Randy Mackay
Browse files

GPS: init primary_instance to zero

parent a8a6368f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
libraries/AP_GPS/AP_GPS.cpp
+ 1
− 2
View file @ 1ab5d719
...@@ -72,8 +72,8 @@ void AP_GPS::init(DataFlash_Class *dataflash) ...@@ -72,8 +72,8 @@ void AP_GPS::init(DataFlash_Class *dataflash)
{ {
_DataFlash = dataflash; _DataFlash = dataflash;
hal.uartB->begin(38400UL, 256, 16); hal.uartB->begin(38400UL, 256, 16);
#if GPS_MAX_INSTANCES > 1
primary_instance = 0; primary_instance = 0;
#if GPS_MAX_INSTANCES > 1
if (hal.uartE != NULL) { if (hal.uartE != NULL) {
hal.uartE->begin(38400UL, 256, 16); hal.uartE->begin(38400UL, 256, 16);
} }
...@@ -363,7 +363,6 @@ AP_GPS::update(void) ...@@ -363,7 +363,6 @@ AP_GPS::update(void)
} }
} }
#else #else
primary_instance=0;
num_instances = 1; num_instances = 1;
#endif // GPS_MAX_INSTANCES #endif // GPS_MAX_INSTANCES
// update notify with gps status. We always base this on the primary_instance // update notify with gps status. We always base this on the primary_instance
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment