Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1

3 files changed, 44 insertions, 5 deletions

diff --git a/src/systemcmds/preflight_check/preflight_check.c b/src/systemcmds/preflight_check/preflight_check.c
index f5bd01ce8..e9c5f1a2c 100644
--- a/src/systemcmds/preflight_check/preflight_check.c
+++ b/src/systemcmds/preflight_check/preflight_check.c
@@ -163,7 +163,7 @@ system_eval:
 		warnx("PREFLIGHT CHECK ERROR! TRIGGERING ALARM");
 		fflush(stderr);
 
-		int buzzer = open("/dev/tone_alarm", O_WRONLY);
+		int buzzer = open(TONEALARM_DEVICE_PATH, O_WRONLY);
 		int leds = open(LED_DEVICE_PATH, 0);
 
 		if (leds < 0) {
diff --git a/src/systemcmds/tests/test_hrt.c b/src/systemcmds/tests/test_hrt.c
index ba6b86adb..5690997a9 100644
--- a/src/systemcmds/tests/test_hrt.c
+++ b/src/systemcmds/tests/test_hrt.c
@@ -124,10 +124,10 @@ int test_tone(int argc, char *argv[])
 	int fd, result;
 	unsigned long tone;
 
-	fd = open("/dev/tone_alarm", O_WRONLY);
+	fd = open(TONEALARM_DEVICE_PATH, O_WRONLY);
 
 	if (fd < 0) {
-		printf("failed opening /dev/tone_alarm\n");
+		printf("failed opening " TONEALARM_DEVICE_PATH "\n");
 		goto out;
 	}
 
diff --git a/src/systemcmds/tests/tests_file.c b/src/systemcmds/tests/tests_file.c
index 47f480758..588d648bd 100644
--- a/src/systemcmds/tests/tests_file.c
+++ b/src/systemcmds/tests/tests_file.c
@@ -52,6 +52,44 @@
 int
 test_file(int argc, char *argv[])
 {
+	const iterations = 10;
+
+	/* check if microSD card is mounted */
+	struct stat buffer;
+	if (stat("/fs/microsd/", &buffer)) {
+		warnx("no microSD card mounted, aborting file test");
+		return 1;
+	}
+
+	uint8_t buf[512];
+	hrt_abstime start, end;
+	perf_counter_t wperf = perf_alloc(PC_ELAPSED, "SD writes");
+
+	int fd = open("/fs/microsd/testfile", O_TRUNC | O_WRONLY | O_CREAT);
+	memset(buf, 0, sizeof(buf));
+
+	start = hrt_absolute_time();
+	for (unsigned i = 0; i < iterations; i++) {
+		perf_begin(wperf);
+		write(fd, buf, sizeof(buf));
+		perf_end(wperf);
+	}
+	end = hrt_absolute_time();
+
+	close(fd);
+
+	warnx("%dKiB in %llu microseconds", iterations / 2, end - start);
+	perf_print_counter(wperf);
+	perf_free(wperf);
+
+	return 0;
+}
+#if 0
+int
+test_file(int argc, char *argv[])
+{
+	const iterations = 1024;
+
 	/* check if microSD card is mounted */
 	struct stat buffer;
 	if (stat("/fs/microsd/", &buffer)) {
@@ -67,7 +105,7 @@ test_file(int argc, char *argv[])
 	memset(buf, 0, sizeof(buf));
 
 	start = hrt_absolute_time();
-	for (unsigned i = 0; i < 1024; i++) {
+	for (unsigned i = 0; i < iterations; i++) {
 		perf_begin(wperf);
 		write(fd, buf, sizeof(buf));
 		perf_end(wperf);
@@ -78,7 +116,7 @@ test_file(int argc, char *argv[])
 
 	unlink("/fs/microsd/testfile");
 
-	warnx("512KiB in %llu microseconds", end - start);
+	warnx("%dKiB in %llu microseconds", iterations / 2, end - start);
 	perf_print_counter(wperf);
 	perf_free(wperf);
 
@@ -112,3 +150,4 @@ test_file(int argc, char *argv[])
 
 	return 0;
 }
+#endif