Merge remote-tracking branch 'upstream/master' into dev_ros

Conflicts:
	.gitignore
	src/lib/uavcan

1 files changed, 0 insertions, 28 deletions

diff --git a/Tools/tests-host/autodeclination_test.cpp b/Tools/tests-host/autodeclination_test.cpp
deleted file mode 100644
index 93bc340bb..000000000
--- a/Tools/tests-host/autodeclination_test.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h> 
-#include <unistd.h>
-#include <string.h>
-#include <systemlib/mixer/mixer.h>
-#include <systemlib/err.h>
-#include <drivers/drv_hrt.h>
-#include <px4iofirmware/px4io.h>
-#include "../../src/systemcmds/tests/tests.h"
-#include <geo/geo.h>
-
-int main(int argc, char *argv[]) {
-	warnx("autodeclination test started");
-
-	if (argc < 3)
-		errx(1, "Need lat/lon!");
-
-	char* p_end;
-
-	float lat = strtod(argv[1], &p_end);
-	float lon = strtod(argv[2], &p_end);
-
-	float declination = get_mag_declination(lat, lon);
-
-	printf("lat: %f lon: %f, dec: %f\n", lat, lon, declination);
-
-}