From 2291a8994ee748351b74818d9538e3b8a1e13cfc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 29 Jun 2015 15:59:53 +1000 Subject: [PATCH] Replay: fixed build --- Tools/Replay/DataFlashFileReader.cpp | 2 +- Tools/Replay/LR_MsgHandler.cpp | 4 ++-- Tools/Replay/LR_MsgHandler.h | 2 +- Tools/Replay/LogReader.h | 6 +++--- Tools/Replay/MsgHandler.cpp | 2 +- Tools/Replay/MsgHandler.h | 2 +- Tools/Replay/Replay.cpp | 7 ++++--- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Tools/Replay/DataFlashFileReader.cpp b/Tools/Replay/DataFlashFileReader.cpp index 911ba2f946..74d3795329 100644 --- a/Tools/Replay/DataFlashFileReader.cpp +++ b/Tools/Replay/DataFlashFileReader.cpp @@ -1,4 +1,4 @@ -#include +#include "DataFlashFileReader.h" #include #include diff --git a/Tools/Replay/LR_MsgHandler.cpp b/Tools/Replay/LR_MsgHandler.cpp index 9d861d3e10..13dd6285f6 100644 --- a/Tools/Replay/LR_MsgHandler.cpp +++ b/Tools/Replay/LR_MsgHandler.cpp @@ -1,4 +1,4 @@ -#include +#include "LR_MsgHandler.h" extern const AP_HAL::HAL& hal; @@ -292,7 +292,7 @@ void LR_MsgHandler_MAG::process_message(uint8_t *msg) } #include -#include +#include "VehicleType.h" void LR_MsgHandler_MSG::process_message(uint8_t *msg) { diff --git a/Tools/Replay/LR_MsgHandler.h b/Tools/Replay/LR_MsgHandler.h index df26491b95..1b26afd25f 100644 --- a/Tools/Replay/LR_MsgHandler.h +++ b/Tools/Replay/LR_MsgHandler.h @@ -1,7 +1,7 @@ #ifndef AP_LR_MSGHANDLER_H #define AP_LR_MSGHANDLER_H -#include +#include "MsgHandler.h" class LR_MsgHandler : public MsgHandler { public: diff --git a/Tools/Replay/LogReader.h b/Tools/Replay/LogReader.h index c173452bbc..ade0844ebb 100644 --- a/Tools/Replay/LogReader.h +++ b/Tools/Replay/LogReader.h @@ -1,6 +1,6 @@ -#include -#include -#include +#include "VehicleType.h" +#include "DataFlashFileReader.h" +#include "LR_MsgHandler.h" class LogReader : public DataFlashFileReader { diff --git a/Tools/Replay/MsgHandler.cpp b/Tools/Replay/MsgHandler.cpp index 3942896cdd..aab8527106 100644 --- a/Tools/Replay/MsgHandler.cpp +++ b/Tools/Replay/MsgHandler.cpp @@ -1,4 +1,4 @@ -#include +#include "MsgHandler.h" void fatal(const char *msg) { ::printf("%s",msg); diff --git a/Tools/Replay/MsgHandler.h b/Tools/Replay/MsgHandler.h index bec367cae5..451e8b3592 100644 --- a/Tools/Replay/MsgHandler.h +++ b/Tools/Replay/MsgHandler.h @@ -2,7 +2,7 @@ #define AP_MSGHANDLER_H #include -#include +#include "VehicleType.h" #include diff --git a/Tools/Replay/Replay.cpp b/Tools/Replay/Replay.cpp index 7c32a3278b..1dd0e52ed4 100644 --- a/Tools/Replay/Replay.cpp +++ b/Tools/Replay/Replay.cpp @@ -48,16 +48,17 @@ #include #include #include -#include #include #include #include #include #include -#include #include // for optind only #include -#include + +#include "Parameters.h" +#include "VehicleType.h" +#include "MsgHandler.h" #ifndef INT16_MIN #define INT16_MIN -32768