aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rover: updates for GPS changes

Browse Source
This commit is contained in:
Andrew Tridgell 2014-03-24 12:04:58 +11:00
parent 11e5b95878
commit d1a650a527
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APMrover2/Log.pde
View File

@ -515,7 +515,7 @@ static const struct LogStructure log_structure[] PROGMEM = {
{ LOG_CAMERA_MSG, sizeof(log_Camera),
"CAM", "IIHLLeccC", "TimeMS,GPSTime,GPSWeek,Lat,Lng,Alt,Roll,Pitch,Yaw" },
{ LOG_STARTUP_MSG, sizeof(log_Startup),
"STRT", "IBB", "TimeMS,SType,CTot" },
"STRT", "IBH", "TimeMS,SType,CTot" },
{ LOG_CTUN_MSG, sizeof(log_Control_Tuning),
"CTUN", "Ihcchf", "TimeMS,Steer,Roll,Pitch,ThrOut,AccY" },
{ LOG_NTUN_MSG, sizeof(log_Nav_Tuning),

4
APMrover2/system.pde
View File

@ -189,12 +189,12 @@ static void init_ardupilot()
// Do GPS init
g_gps = &g_gps_driver;
// GPS initialisation
g_gps->init(hal.uartB, GPS::GPS_ENGINE_AIRBORNE_4G);
g_gps->init(hal.uartB, GPS::GPS_ENGINE_AIRBORNE_4G, &DataFlash);
#if GPS2_ENABLE
if (hal.uartE != NULL) {
g_gps2 = &g_gps2_driver;
g_gps2->init(hal.uartE, GPS::GPS_ENGINE_AIRBORNE_4G);
g_gps2->init(hal.uartE, GPS::GPS_ENGINE_AIRBORNE_4G, &DataFlash);
g_gps2->set_secondary();
}
#endif