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

Merge branch 'master' of https://code.google.com/p/ardupilot-mega

This commit is contained in:
Michael Oborne 2011-09-17 21:23:14 +08:00
parent 39640e8d94 c825e76a88
commit cae10dc8f6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduCopter/ArduCopter.pde
View File

@ -200,7 +200,7 @@ static AP_Int8 *flight_modes = &g.flight_mode1;
AP_DCM dcm(&imu, g_gps); AP_DCM dcm(&imu, g_gps);
#ifdef OPTFLOW_ENABLED #ifdef OPTFLOW_ENABLED
AP_OpticalFlow_ADNS3080 optflow(); AP_OpticalFlow_ADNS3080 optflow;
#endif #endif
#endif #endif

4
ArduCopter/Log.pde
View File

@ -503,8 +503,8 @@ static void Log_Write_Optflow()
DataFlash.WriteInt((int)optflow.dx); DataFlash.WriteInt((int)optflow.dx);
DataFlash.WriteInt((int)optflow.dy); DataFlash.WriteInt((int)optflow.dy);
DataFlash.WriteInt((int)optflow.surface_quality); DataFlash.WriteInt((int)optflow.surface_quality);
DataFlash.WriteLong(optflow.lat);//optflow_offset.lat + optflow.lat); DataFlash.WriteLong(optflow.vlat);//optflow_offset.lat + optflow.lat);
DataFlash.WriteLong(optflow.lon);//optflow_offset.lng + optflow.lng); DataFlash.WriteLong(optflow.vlon);//optflow_offset.lng + optflow.lng);
DataFlash.WriteByte(END_BYTE); DataFlash.WriteByte(END_BYTE);
} }
#endif #endif