GPS: init primary_instance to zero

This commit is contained in:
Randy Mackay 2014-10-29 12:02:59 +09:00
parent a8a6368f05
commit 1ab5d71927

View File

@ -72,8 +72,8 @@ void AP_GPS::init(DataFlash_Class *dataflash)
{
_DataFlash = dataflash;
hal.uartB->begin(38400UL, 256, 16);
#if GPS_MAX_INSTANCES > 1
primary_instance = 0;
#if GPS_MAX_INSTANCES > 1
if (hal.uartE != NULL) {
hal.uartE->begin(38400UL, 256, 16);
}
@ -363,7 +363,6 @@ AP_GPS::update(void)
}
}
#else
primary_instance=0;
num_instances = 1;
#endif // GPS_MAX_INSTANCES
// update notify with gps status. We always base this on the primary_instance