From 47926dc6ead315df00794a1b0edf777f8b182639 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 13 May 2014 19:10:24 +1000
Subject: [PATCH] Replay: fixed for changes to AP_Compass HIL API
---
Tools/Replay/LogReader.cpp | 6 +++---
Tools/Replay/Replay.pde | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Tools/Replay/LogReader.cpp b/Tools/Replay/LogReader.cpp
index 2f8b62abf..77bce4c56 100644
--- a/Tools/Replay/LogReader.cpp
+++ b/Tools/Replay/LogReader.cpp
@@ -143,7 +143,7 @@ void LogReader::process_plane(uint8_t type, uint8_t *data, uint16_t length)
}
memcpy(&msg, data, sizeof(msg));
wait_timestamp(msg.time_ms);
- compass.setHIL(Vector3i(msg.mag_x - msg.offset_x, msg.mag_y - msg.offset_y, msg.mag_z - msg.offset_z));
+ compass.setHIL(Vector3f(msg.mag_x - msg.offset_x, msg.mag_y - msg.offset_y, msg.mag_z - msg.offset_z));
compass.set_offsets(msg.offset_x, msg.offset_y, msg.offset_z);
break;
}
@@ -185,7 +185,7 @@ void LogReader::process_rover(uint8_t type, uint8_t *data, uint16_t length)
}
memcpy(&msg, data, sizeof(msg));
wait_timestamp(msg.time_ms);
- compass.setHIL(Vector3i(msg.mag_x - msg.offset_x, msg.mag_y - msg.offset_y, msg.mag_z - msg.offset_z));
+ compass.setHIL(Vector3f(msg.mag_x - msg.offset_x, msg.mag_y - msg.offset_y, msg.mag_z - msg.offset_z));
compass.set_offsets(msg.offset_x, msg.offset_y, msg.offset_z);
break;
}
@@ -215,7 +215,7 @@ void LogReader::process_copter(uint8_t type, uint8_t *data, uint16_t length)
}
memcpy(&msg, data, sizeof(msg));
wait_timestamp(msg.time_ms);
- compass.setHIL(Vector3i(msg.mag_x - msg.offset_x, msg.mag_y - msg.offset_y, msg.mag_z - msg.offset_z));
+ compass.setHIL(Vector3f(msg.mag_x - msg.offset_x, msg.mag_y - msg.offset_y, msg.mag_z - msg.offset_z));
compass.set_offsets(msg.offset_x, msg.offset_y, msg.offset_z);
break;
}
diff --git a/Tools/Replay/Replay.pde b/Tools/Replay/Replay.pde
index 62b7e16ff..d95dd20e7 100644
--- a/Tools/Replay/Replay.pde
+++ b/Tools/Replay/Replay.pde
@@ -49,8 +49,10 @@
#include <errno.h>
#include <fenv.h>
+#ifndef INT16_MIN
#define INT16_MIN -32768
#define INT16_MAX 32767
+#endif
#include "LogReader.h"
--
GitLab