diff --git a/ArduCopter/Log.cpp b/ArduCopter/Log.cpp index 4e8ea3c615..d2b5cc04f3 100644 --- a/ArduCopter/Log.cpp +++ b/ArduCopter/Log.cpp @@ -923,7 +923,9 @@ void Copter::Log_Write_Vehicle_Startup_Messages() sprintf(frame_buf, "Frame: %s", get_frame_string()); DataFlash.Log_Write_Message(frame_buf); DataFlash.Log_Write_Mode(control_mode, control_mode_reason); +#if AC_RALLY DataFlash.Log_Write_Rally(rally); +#endif } diff --git a/ArduCopter/config.h b/ArduCopter/config.h index 4ff3e04c4a..92088ae62d 100644 --- a/ArduCopter/config.h +++ b/ArduCopter/config.h @@ -656,9 +656,10 @@ #ifndef AC_TERRAIN #define AC_TERRAIN ENABLED - #if !AC_RALLY - #error Terrain relies on Rally which is disabled - #endif +#endif + +#if AC_TERRAIN && !AC_RALLY + #error Terrain relies on Rally which is disabled #endif //////////////////////////////////////////////////////////////////////////////