cleaned up a bunch of build + formatting
diff --git a/aos/crio/motor_server/CRIOControlLoopRunner.cpp b/aos/crio/motor_server/CRIOControlLoopRunner.cc
similarity index 96%
rename from aos/crio/motor_server/CRIOControlLoopRunner.cpp
rename to aos/crio/motor_server/CRIOControlLoopRunner.cc
index 1971dc1..a4cf3ce 100644
--- a/aos/crio/motor_server/CRIOControlLoopRunner.cpp
+++ b/aos/crio/motor_server/CRIOControlLoopRunner.cc
@@ -1,6 +1,6 @@
#include "CRIOControlLoopRunner.h"
-#include "aos/aos_core.h"
+#include "aos/common/logging/logging.h"
#include "aos/crio/shared_libs/interrupt_bridge.h"
#include "aos/crio/motor_server/MotorOutput.h"
#include "aos/crio/motor_server/MotorServer.h"
diff --git a/aos/crio/motor_server/MotorControllerOutput.cpp b/aos/crio/motor_server/MotorControllerOutput.cc
similarity index 98%
rename from aos/crio/motor_server/MotorControllerOutput.cpp
rename to aos/crio/motor_server/MotorControllerOutput.cc
index a0897b4..7b24892 100644
--- a/aos/crio/motor_server/MotorControllerOutput.cpp
+++ b/aos/crio/motor_server/MotorControllerOutput.cc
@@ -1,6 +1,5 @@
#include "aos/crio/motor_server/MotorControllerOutput.h"
-#include "aos/aos_core.h"
#include "aos/common/byteorder.h"
#include "aos/common/commonmath.h"
diff --git a/aos/crio/motor_server/MotorOutput.cpp b/aos/crio/motor_server/MotorOutput.cc
similarity index 100%
rename from aos/crio/motor_server/MotorOutput.cpp
rename to aos/crio/motor_server/MotorOutput.cc
diff --git a/aos/crio/motor_server/MotorServer.cpp b/aos/crio/motor_server/MotorServer.cc
similarity index 99%
rename from aos/crio/motor_server/MotorServer.cpp
rename to aos/crio/motor_server/MotorServer.cc
index 77a0579..ebb69fd 100644
--- a/aos/crio/motor_server/MotorServer.cpp
+++ b/aos/crio/motor_server/MotorServer.cc
@@ -3,12 +3,11 @@
#include <stdio.h>
#include <stdlib.h>
#include "usrLib.h"
-#include "aos/common/inttypes.h"
#include "WPILib/Timer.h"
#include "WPILib/Task.h"
-#include "aos/aos_core.h"
+#include "aos/common/inttypes.h"
#include "aos/crio/motor_server/MotorControllerOutput.h"
#include "aos/crio/motor_server/SolenoidOutput.h"
#include "aos/common/Configuration.h"
diff --git a/aos/crio/motor_server/OutputDevice.h b/aos/crio/motor_server/OutputDevice.h
index 0789a68..7cd4983 100644
--- a/aos/crio/motor_server/OutputDevice.h
+++ b/aos/crio/motor_server/OutputDevice.h
@@ -1,5 +1,5 @@
-#ifndef __CRIO_MOTOR_SERVER_OUTPUT_DEVICE_H_
-#define __CRIO_MOTOR_SERVER_OUTPUT_DEVICE_H_
+#ifndef AOS_CRIO_MOTOR_SERVER_OUTPUT_DEVICE_H_
+#define AOS_CRIO_MOTOR_SERVER_OUTPUT_DEVICE_H_
#include <stdint.h>
#include "aos/crio/shared_libs/ByteBuffer.h"
@@ -20,7 +20,6 @@
virtual void NoValue() = 0;
};
-} // namespace aos
+} // namespace aos
-#endif
-
+#endif // AOS_CRIO_MOTOR_SERVER_OUTPUT_DEVICE_H_
diff --git a/aos/crio/motor_server/SensorOutput.cpp b/aos/crio/motor_server/SensorOutput.cc
similarity index 100%
rename from aos/crio/motor_server/SensorOutput.cpp
rename to aos/crio/motor_server/SensorOutput.cc
diff --git a/aos/crio/motor_server/SensorSender-tmpl.h b/aos/crio/motor_server/SensorSender-tmpl.h
index 93fe73d..0ec303c 100644
--- a/aos/crio/motor_server/SensorSender-tmpl.h
+++ b/aos/crio/motor_server/SensorSender-tmpl.h
@@ -1,5 +1,6 @@
#include "WPILib/Task.h"
#include "WPILib/Timer.h"
+
#include "aos/crio/motor_server/SensorOutput.h"
#include "aos/common/network/SendSocket.h"
#include "aos/common/Configuration.h"
diff --git a/aos/crio/motor_server/SensorSender.h b/aos/crio/motor_server/SensorSender.h
index 135e1fa..c42fbfb 100644
--- a/aos/crio/motor_server/SensorSender.h
+++ b/aos/crio/motor_server/SensorSender.h
@@ -1,5 +1,5 @@
-#ifndef __CRIO_SENSOR_SENDER_H_
-#define __CRIO_SENSOR_SENDER_H_
+#ifndef AOS_CRIO_MOTOR_SERVER_SENSOR_SENDER_H_
+#define AOS_CRIO_MOTOR_SERVER_SENSOR_SENDER_H_
namespace aos {
@@ -15,9 +15,8 @@
void Run();
};
-} // namespace aos
+} // namespace aos
#include "SensorSender-tmpl.h"
-#endif
-
+#endif // AOS_CRIO_MOTOR_SERVER_SENSOR_SENDER_H_
diff --git a/aos/crio/motor_server/motor_server.gyp b/aos/crio/motor_server/motor_server.gyp
new file mode 100644
index 0000000..01f5353
--- /dev/null
+++ b/aos/crio/motor_server/motor_server.gyp
@@ -0,0 +1,73 @@
+{
+ 'targets': [
+ {
+ 'target_name': 'CRIOControlLoopRunner',
+ 'type': 'static_library',
+ 'sources': [
+ # 'ControlLoopGoals.h'
+ 'CRIOControlLoopRunner.cc',
+ ],
+ 'dependencies': [
+ '<(EXTERNALS):WPILib',
+ '<(AOS)/common/common.gyp:mutex',
+ '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/crio/shared_libs/shared_libs.gyp:interrupt_notifier',
+ 'output',
+ '<(AOS)/build/aos.gyp:logging',
+ ],
+ 'export_dependent_settings': [
+ '<(EXTERNALS):WPILib',
+ '<(AOS)/common/common.gyp:mutex',
+ '<(AOS)/common/common.gyp:controls',
+ ],
+ },
+ {
+ 'target_name': 'output',
+ 'type': 'static_library',
+ 'sources': [
+ # 'OutputDevice.h',
+ # 'SensorSender-tmpl.h',
+ 'SensorOutput.cc',
+ # 'SolenoidOutput.h'
+ 'MotorControllerOutput.cc',
+ 'MotorOutput.cc',
+ ],
+ 'dependencies': [
+ '<(EXTERNALS):WPILib',
+ '<(AOS)/common/network/network.gyp:socket',
+ '<(AOS)/common/common.gyp:common',
+ ],
+ 'export_dependent_settings': [
+ '<(EXTERNALS):WPILib',
+ '<(AOS)/common/network/network.gyp:socket',
+ '<(AOS)/common/common.gyp:common',
+ ],
+ },
+ {
+ 'target_name': 'MotorServer',
+ 'type': 'static_library',
+ 'sources': [
+ 'MotorServer.cc',
+ ],
+ 'dependencies': [
+ '<(EXTERNALS):WPILib',
+ '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/common.gyp:mutex',
+ '<(AOS)/common/messages/messages.gyp:QueueHolder',
+ '<(AOS)/common/network/network.gyp:socket',
+ 'CRIOControlLoopRunner',
+ '<(AOS)/crio/shared_libs/shared_libs.gyp:ByteBuffer',
+ 'output',
+ ],
+ 'export_dependent_settings': [
+ '<(EXTERNALS):WPILib',
+ '<(AOS)/common/common.gyp:controls',
+ '<(AOS)/common/common.gyp:mutex',
+ '<(AOS)/common/messages/messages.gyp:QueueHolder',
+ '<(AOS)/common/network/network.gyp:socket',
+ 'CRIOControlLoopRunner',
+ '<(AOS)/crio/shared_libs/shared_libs.gyp:ByteBuffer',
+ ],
+ },
+ ],
+}