From 6efa63b8bdc74cc524befab31b07cdbe3efe1283 Mon Sep 17 00:00:00 2001
From: Dominic Clifton <me@dominicclifton.name>
Date: Sat, 1 Nov 2014 11:04:39 +0000
Subject: [PATCH] Update telemetry_hott_unittest.

---
 src/test/Makefile                        |  6 ++--
 src/test/unit/telemetry_hott_unittest.cc | 44 +++++++++++++-----------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/test/Makefile b/src/test/Makefile
index d63f785d97..a3711f4ab3 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -121,7 +121,7 @@ flight_imu_unittest : $(OBJECT_DIR)/flight/imu.o $(OBJECT_DIR)/flight_imu_unitte
 
 $(OBJECT_DIR)/flight/gps_conversion.o : $(USER_DIR)/flight/gps_conversion.c $(USER_DIR)/flight/gps_conversion.h $(GTEST_HEADERS)
 	@mkdir -p $(dir $@)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/flight/gps_conversion.c -o $@
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/flight/gps_conversion.c -o $@
 
 $(OBJECT_DIR)/gps_conversion_unittest.o : $(TEST_DIR)/gps_conversion_unittest.cc \
                      $(USER_DIR)/flight/gps_conversion.h $(GTEST_HEADERS)
@@ -135,12 +135,12 @@ gps_conversion_unittest : $(OBJECT_DIR)/flight/gps_conversion.o $(OBJECT_DIR)/gp
 
 $(OBJECT_DIR)/telemetry/hott.o : $(USER_DIR)/telemetry/hott.c $(USER_DIR)/telemetry/hott.h $(GTEST_HEADERS)
 	@mkdir -p $(dir $@)
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/telemetry/hott.c -o $@
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/telemetry/hott.c -o $@
 
 $(OBJECT_DIR)/telemetry_hott_unittest.o : $(TEST_DIR)/telemetry_hott_unittest.cc \
                      $(USER_DIR)/telemetry/hott.h $(GTEST_HEADERS)
 	@mkdir -p $(dir $@)
-	$(CC) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(TEST_DIR)/telemetry_hott_unittest.cc -o $@
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(TEST_DIR)/telemetry_hott_unittest.cc -o $@
 
 telemetry_hott_unittest :$(OBJECT_DIR)/telemetry/hott.o $(OBJECT_DIR)/telemetry_hott_unittest.o $(OBJECT_DIR)/flight/gps_conversion.o $(OBJECT_DIR)/gtest_main.a
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $(OBJECT_DIR)/$@
diff --git a/src/test/unit/telemetry_hott_unittest.cc b/src/test/unit/telemetry_hott_unittest.cc
index 2dc9784ebb..ad277ba007 100644
--- a/src/test/unit/telemetry_hott_unittest.cc
+++ b/src/test/unit/telemetry_hott_unittest.cc
@@ -21,34 +21,36 @@
 
 #include <limits.h>
 
-#include "platform.h"
+extern "C" {
+    #include "platform.h"
 
-#include "common/axis.h"
+    #include "common/axis.h"
 
-#include "drivers/system.h"
+    #include "drivers/system.h"
 
-#include "drivers/serial.h"
-#include "io/serial.h"
+    #include "drivers/serial.h"
+    #include "io/serial.h"
 
-#include "config/runtime_config.h"
+    #include "config/runtime_config.h"
 
-#include "sensors/sensors.h"
+    #include "sensors/sensors.h"
 
-#include "flight/flight.h"
-#include "io/gps.h"
-#include "sensors/battery.h"
+    #include "flight/flight.h"
+    #include "io/gps.h"
+    #include "sensors/battery.h"
 
-#include "telemetry/telemetry.h"
-#include "telemetry/hott.h"
-
-#include "flight/gps_conversion.h"
+    #include "telemetry/telemetry.h"
+    #include "telemetry/hott.h"
 
+    #include "flight/gps_conversion.h"
+}
 
 #include "unittest_macros.h"
 #include "gtest/gtest.h"
 
-void addGPSCoordinates(HOTT_GPS_MSG_t *hottGPSMessage, int32_t latitude, int32_t longitude);
-
+extern "C" {
+    void addGPSCoordinates(HOTT_GPS_MSG_t *hottGPSMessage, int32_t latitude, int32_t longitude);
+}
 // See http://en.wikipedia.org/wiki/Geographic_coordinate_conversion
 
 HOTT_GPS_MSG_t hottGPSMessage;
@@ -145,6 +147,8 @@ TEST(TelemetryHottTest, PrepareGPSMessage_Altitude1m)
 
 // STUBS
 
+extern "C" {
+
 int16_t debug[4];
 
 uint8_t stateFlags;
@@ -158,6 +162,9 @@ uint16_t GPS_altitude;              // altitude in 0.1m
 uint8_t vbat;
 int16_t GPS_directionToHome;        // direction to home or hol point in degrees
 
+int32_t amperage;
+int32_t mAhDrawn;
+
 uint32_t micros(void) { return 0; }
 
 uint8_t serialTotalBytesWaiting(serialPort_t *instance) {
@@ -215,8 +222,5 @@ bool sensors(uint32_t mask) {
     return false;
 }
 
-
-
-
-
+}