cleaned up the build setup etc for robot_state
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index 0f904ea..8847d40 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -199,7 +199,7 @@
'control_loop/ControlLoop.cc',
],
'dependencies': [
- '<(AOS)/common/messages/messages.gyp:aos_queues',
+ '<(AOS)/common/messages/messages.gyp:robot_state',
'<(AOS)/build/aos.gyp:logging',
'timing',
'time',
@@ -209,7 +209,7 @@
'<(DEPTH)/bbb_cape/src/bbb/bbb.gyp:sensor_generation',
],
'export_dependent_settings': [
- '<(AOS)/common/messages/messages.gyp:aos_queues',
+ '<(AOS)/common/messages/messages.gyp:robot_state',
'<(AOS)/build/aos.gyp:logging',
'timing',
'time',
diff --git a/aos/common/control_loop/ControlLoop-tmpl.h b/aos/common/control_loop/ControlLoop-tmpl.h
index 4735051..6323df5 100644
--- a/aos/common/control_loop/ControlLoop-tmpl.h
+++ b/aos/common/control_loop/ControlLoop-tmpl.h
@@ -2,7 +2,7 @@
#include "aos/common/logging/logging.h"
#include "aos/common/control_loop/Timing.h"
-#include "aos/common/messages/RobotState.q.h"
+#include "aos/common/messages/robot_state.q.h"
#include "aos/common/logging/queue_logging.h"
#include "bbb/sensor_generation.q.h"
diff --git a/aos/common/messages/messages.gyp b/aos/common/messages/messages.gyp
index b9737d1..0b7805b 100644
--- a/aos/common/messages/messages.gyp
+++ b/aos/common/messages/messages.gyp
@@ -1,10 +1,10 @@
{
'targets': [
{
- 'target_name': 'aos_queues',
+ 'target_name': 'robot_state',
'type': 'static_library',
'sources': [
- 'RobotState.q',
+ 'robot_state.q',
],
'variables': {
'header_path': 'aos/common/messages',
diff --git a/aos/common/messages/RobotState.q b/aos/common/messages/robot_state.q
similarity index 100%
rename from aos/common/messages/RobotState.q
rename to aos/common/messages/robot_state.q
diff --git a/aos/prime/input/input.gyp b/aos/prime/input/input.gyp
index f7ab848..4779ddc 100644
--- a/aos/prime/input/input.gyp
+++ b/aos/prime/input/input.gyp
@@ -8,7 +8,7 @@
],
'dependencies': [
'<(AOS)/common/input/input.gyp:driver_station_data',
- '<(AOS)/common/messages/messages.gyp:aos_queues',
+ '<(AOS)/common/messages/messages.gyp:robot_state',
'<(AOS)/common/network/network.gyp:socket',
'<(EXTERNALS):WPILib-NetworkRobotValues',
'<(AOS)/build/aos.gyp:logging',
diff --git a/aos/prime/input/joystick_input.cc b/aos/prime/input/joystick_input.cc
index 1dc1fa9..a2ba21b 100644
--- a/aos/prime/input/joystick_input.cc
+++ b/aos/prime/input/joystick_input.cc
@@ -6,7 +6,7 @@
#include "aos/common/network_port.h"
#include "aos/common/network/ReceiveSocket.h"
-#include "aos/common/messages/RobotState.q.h"
+#include "aos/common/messages/robot_state.q.h"
#include "aos/common/logging/logging.h"
#include "aos/common/logging/queue_logging.h"
diff --git a/aos/prime/output/motor_output.cc b/aos/prime/output/motor_output.cc
index 4d4e45f..54add2d 100644
--- a/aos/prime/output/motor_output.cc
+++ b/aos/prime/output/motor_output.cc
@@ -5,7 +5,7 @@
#include "aos/common/control_loop/Timing.h"
#include "aos/common/logging/logging.h"
#include "aos/common/network_port.h"
-#include "aos/common/messages/RobotState.q.h"
+#include "aos/common/messages/robot_state.q.h"
namespace aos {
diff --git a/aos/prime/output/output.gyp b/aos/prime/output/output.gyp
index 47569ec..67ad7af 100644
--- a/aos/prime/output/output.gyp
+++ b/aos/prime/output/output.gyp
@@ -11,7 +11,7 @@
'<(AOS)/common/common.gyp:timing',
'<(EXTERNALS):WPILib-NetworkRobotValues',
'<(AOS)/build/aos.gyp:logging',
- '<(AOS)/common/messages/messages.gyp:aos_queues',
+ '<(AOS)/common/messages/messages.gyp:robot_state',
],
'export_dependent_settings': [
'<(AOS)/common/network/network.gyp:socket',