removed the fitpc-side DriverStationDisplay
diff --git a/aos/atom_code/camera/camera.gyp b/aos/atom_code/camera/camera.gyp
index 270fb4f..9931806 100644
--- a/aos/atom_code/camera/camera.gyp
+++ b/aos/atom_code/camera/camera.gyp
@@ -9,14 +9,12 @@
'dependencies': [
'<(AOS)/common/network/network.gyp:socket_so',
'<(AOS)/common/common.gyp:timing_so',
- '<(AOS)/atom_code/messages/messages.gyp:messages_so',
'private_aos_camera_jar',
'<(EXTERNALS):libjpeg',
],
'export_dependent_settings': [
'<(AOS)/common/network/network.gyp:socket_so',
'<(AOS)/common/common.gyp:timing_so',
- '<(AOS)/atom_code/messages/messages.gyp:messages_so',
'private_aos_camera_jar',
],
},
diff --git a/aos/atom_code/messages/DriverStationDisplay.cpp b/aos/atom_code/messages/DriverStationDisplay.cpp
deleted file mode 100644
index 076ba3f..0000000
--- a/aos/atom_code/messages/DriverStationDisplay.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "DriverStationDisplay.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "aos/common/logging/logging.h"
-
-using namespace aos;
-
-static const aos_type_sig signature = {sizeof(DriverStationDisplay), 1234, 10};
-aos_queue *DriverStationDisplay::queue = NULL;
-void DriverStationDisplay::GetQueue() {
- if (queue == NULL) {
- queue = aos_fetch_queue("DriverStationDisplay", &signature);
- }
-}
-
-void DriverStationDisplay::Send(int line, const char *fmt, ...) {
- GetQueue();
- DriverStationDisplay *msg = static_cast<DriverStationDisplay *>(
- aos_queue_get_msg(queue));
- if (msg == NULL) {
- LOG(WARNING, "could not get message to send '%s' to the DS queue\n", fmt);
- return;
- }
- msg->line = static_cast<uint8_t>(line);
-
- va_list ap;
- va_start(ap, fmt);
- int ret = vsnprintf(msg->data, sizeof(msg->data), fmt, ap);
- va_end(ap);
- if (ret < 0) {
- LOG(WARNING, "could not format '%s' with arguments\n", fmt);
- aos_queue_free_msg(queue, msg);
- return;
- } else if (static_cast<uintmax_t>(ret) >=
- static_cast<uintmax_t>(sizeof(msg->data))) {
- LOG(WARNING, "format '%s' ended up longer than the max size (%zd)\n",
- fmt, sizeof(msg->data));
- }
-
- if (aos_queue_write_msg(queue, msg, NON_BLOCK) < 0) {
- LOG(ERROR, "writing '%s' (line %hhd) failed\n", msg->data, msg->line);
- aos_queue_free_msg(queue, msg);
- }
-}
-
-const DriverStationDisplay *DriverStationDisplay::GetNext() {
- GetQueue();
- return static_cast<const DriverStationDisplay *>(aos_queue_read_msg(queue, NON_BLOCK));
-}
-void DriverStationDisplay::Free(const DriverStationDisplay *msg) {
- GetQueue();
- aos_queue_free_msg(queue, msg);
-}
-
diff --git a/aos/atom_code/messages/DriverStationDisplay.h b/aos/atom_code/messages/DriverStationDisplay.h
deleted file mode 100644
index 5feffb8..0000000
--- a/aos/atom_code/messages/DriverStationDisplay.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef AOS_ATOM_CODE_MESSAGES_DRIVER_STATION_DISPLAY_H_
-#define AOS_ATOM_CODE_MESSAGES_DRIVER_STATION_DISPLAY_H_
-
-#include <stdint.h>
-#include <string.h>
-
-#include "aos/common/type_traits.h"
-#include "aos/atom_code/ipc_lib/queue.h"
-
-namespace aos {
-const size_t kLineLength = 21;
-
-struct DriverStationDisplay {
- static void Send(int line, const char *fmt, ...)
- __attribute__((format(printf, 2, 3)));
- static const DriverStationDisplay *GetNext(); // returns NULL if there are no more
- static void Free(const DriverStationDisplay *msg);
-
- uint8_t line;
- char data[kLineLength + 1];
-
- private:
- static void GetQueue();
- static aos_queue *queue;
-};
-static_assert(shm_ok<DriverStationDisplay>::value,
- "DriverStationDisplay will go through shared memory");
-} // namespace aos
-
-#endif
-
diff --git a/aos/atom_code/messages/messages.gyp b/aos/atom_code/messages/messages.gyp
deleted file mode 100644
index 05dec59..0000000
--- a/aos/atom_code/messages/messages.gyp
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- 'targets': [
- {
- 'target_name': 'messages_so',
- 'type': 'shared_library',
- 'variables': {'no_rsync': 1},
- 'sources': [
- 'DriverStationDisplay.cpp',
- ],
- 'dependencies': [
- '<(AOS)/build/aos.gyp:logging',
- ],
- 'export_dependent_settings': [
- ],
- 'direct_dependent_settings': {
- 'variables': {
- 'jni_libs': [
- 'messages_so',
- ],
- },
- },
- },
- {
- 'target_name': 'messages',
- 'type': 'static_library',
- 'sources': [
- 'DriverStationDisplay.cpp',
- ],
- 'dependencies': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:ipc_lib',
- ],
- 'export_dependent_settings': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:ipc_lib',
- ],
- },
- ],
-}
diff --git a/aos/build/aos_all.gyp b/aos/build/aos_all.gyp
index 85a4021..e766b59 100644
--- a/aos/build/aos_all.gyp
+++ b/aos/build/aos_all.gyp
@@ -18,7 +18,6 @@
'../atom_code/starter/starter.gyp:starter_exe',
'../atom_code/starter/starter.gyp:netconsole',
'../common/common.gyp:queue_test',
- #'../common/messages/messages.gyp:*', # TODO(brians) did this test ever exist?
'../common/common.gyp:die_test',
'../common/util/util.gyp:trapezoid_profile_test',
'../common/sensors/sensors.gyp:sensor_receiver_test',