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

Conflicts:
	.gitignore
	src/lib/uavcan

1 files changed, 0 insertions, 65 deletions

diff --git a/Tools/tests-host/sf0x_test.cpp b/Tools/tests-host/sf0x_test.cpp
deleted file mode 100644
index 82d19fcbe..000000000
--- a/Tools/tests-host/sf0x_test.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <systemlib/err.h>
-#include <drivers/drv_hrt.h>
-
-#include <drivers/sf0x/sf0x_parser.h>
-
-int main(int argc, char *argv[])
-{
-	warnx("SF0X test started");
-
-	int ret = 0;
-
-	const char LINE_MAX = 20;
-	char _linebuf[LINE_MAX];
-	_linebuf[0] = '\0';
-
-	const char *lines[] = {"0.01\r\n",
-			       "0.02\r\n",
-			       "0.03\r\n",
-			       "0.04\r\n",
-			       "0",
-			       ".",
-			       "0",
-			       "5",
-			       "\r",
-			       "\n",
-			       "0",
-			       "3\r",
-			       "\n"
-			       "\r\n",
-			       "0.06",
-			       "\r\n"
-			      };
-
-	enum SF0X_PARSE_STATE state = SF0X_PARSE_STATE0_UNSYNC;
-	float dist_m;
-	char _parserbuf[LINE_MAX];
-	unsigned _parsebuf_index = 0;
-
-	for (unsigned l = 0; l < sizeof(lines) / sizeof(lines[0]); l++) {
-
-		printf("\n%s", _linebuf);
-
-		int parse_ret;
-
-		for (int i = 0; i < strlen(lines[l]); i++) {
-			parse_ret = sf0x_parser(lines[l][i], _parserbuf, &_parsebuf_index, &state, &dist_m);
-
-			if (parse_ret == 0) {
-				printf("\nparsed: %f %s\n", dist_m, (parse_ret == 0) ? "OK" : "");
-			}
-		}
-
-		printf("%s", lines[l]);
-
-	}
-
-	warnx("test finished");
-
-	return ret;
-}