From e6c16387ecdcf1f1dcab1ab6db82b7283ad7f5b9 Mon Sep 17 00:00:00 2001
From: GroundStation <foo@bar>
Date: Mon, 28 Nov 2016 14:38:33 -0600
Subject: [PATCH] Fixed height/long
---
groundStation/src/backend/backend.c | 8 ++++----
groundStation/src/frontend/frontend_tracker.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/groundStation/src/backend/backend.c b/groundStation/src/backend/backend.c
index 9bcaa7a19..8b523c274 100644
--- a/groundStation/src/backend/backend.c
+++ b/groundStation/src/backend/backend.c
@@ -638,7 +638,7 @@ static void client_recv(int fd) {
if (tracker == NULL) {
char * dummy = TD_MAGIC " 1.0 2.0 3.0 4.0 5.0 6.0\n";
write(fd, dummy, strlen(dummy));
- }else if (!ucart_vrpn_tracker_getData(tracker, &td)) {
+ }else if (ucart_vrpn_tracker_getData(tracker, &td)) {
write(fd, TD_MAGIC " ERROR\n", strlen(TD_MAGIC " ERROR\n"));
} else {
/* more than sufficient buffer */
@@ -648,9 +648,9 @@ static void client_recv(int fd) {
if (snprintf(buffer,
2048,
TD_MAGIC " %lf %lf %lf %lf %lf %lf\n",
- td.x,
- td.y,
td.z,
+ td.y,
+ td.x,
td.pitch,
td.roll,
td.yaw) >= 2048) {
@@ -659,7 +659,7 @@ static void client_recv(int fd) {
warnx("Increase format buffer size, output was too long!");
write(fd, TD_MAGIC " ERROR\n", strlen(TD_MAGIC " ERROR\n"));
}
-
+ write(fd, buffer, strlen(buffer));
}
}
diff --git a/groundStation/src/frontend/frontend_tracker.c b/groundStation/src/frontend/frontend_tracker.c
index b93cc6ce0..94597b63c 100644
--- a/groundStation/src/frontend/frontend_tracker.c
+++ b/groundStation/src/frontend/frontend_tracker.c
@@ -26,7 +26,7 @@ int frontend_track(
}
if (strncmp(line, MAGIC " ERROR", strlen(MAGIC " ERROR")) == 0) {
- warn("Backend returned an error");
+ warnx("Backend returned an error: %s", strstr(line, "ERROR"));
return 1;
}
--
GitLab