more cleanup up of build files + indentation
diff --git a/frc971/input/SensorReader.cc b/frc971/input/SensorReader.cc
index fd14df4..aed0818 100644
--- a/frc971/input/SensorReader.cc
+++ b/frc971/input/SensorReader.cc
@@ -2,7 +2,6 @@
#include <arpa/inet.h>
-#include "aos/aos_core.h"
#include "aos/common/inttypes.h"
#include "aos/common/input/SensorInput.h"
diff --git a/frc971/input/input.gyp b/frc971/input/input.gyp
index 2abeac8..99bbb3e 100644
--- a/frc971/input/input.gyp
+++ b/frc971/input/input.gyp
@@ -8,7 +8,6 @@
'header_path': 'frc971/input',
},
'dependencies': [
- '<(AOS)/build/aos.gyp:libaos',
'<(AOS)/common/common.gyp:controls',
],
'includes': ['../../aos/build/queues.gypi'],
@@ -20,9 +19,7 @@
'JoystickReader.cc',
],
'dependencies': [
- '<(AOS)/build/aos.gyp:libaos',
'<(AOS)/atom_code/input/input.gyp:joystick',
- '<(AOS)/common/network/network.gyp:socket',
'actions',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
'<(DEPTH)/frc971/queues/queues.gyp:queues',
@@ -36,10 +33,10 @@
'SensorReader.cc',
],
'dependencies': [
- '<(AOS)/build/aos.gyp:libaos',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
'<(DEPTH)/frc971/queues/queues.gyp:queues',
- '<(AOS)/common/network/network.gyp:socket',
+ '<(AOS)/common/input/input.gyp:sensor_input',
+ '<(AOS)/build/aos.gyp:aos_core',
],
'conditions': [
['OS!="crio"', {
@@ -59,7 +56,6 @@
'<(AOS)/build/aos.gyp:libaos',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
'<(AOS)/crio/shared_libs/shared_libs.gyp:interrupt_notifier',
- '<(AOS)/crio/shared_libs/shared_libs.gyp:limit_encoder_reader',
],
},
{
diff --git a/frc971/output/SensorSender.cc b/frc971/output/SensorSender.cc
index e2d2e51..105088d 100644
--- a/frc971/output/SensorSender.cc
+++ b/frc971/output/SensorSender.cc
@@ -1,5 +1,6 @@
#include "aos/crio/motor_server/SensorSender.h"
+#include "aos/aos_core.h"
+
#include "frc971/queues/sensor_values.h"
AOS_RUN_FORK(aos::SensorSender<frc971::sensor_values>, "971SS", 100)
-
diff --git a/frc971/output/output.gyp b/frc971/output/output.gyp
index 780eadf..42bfe94 100644
--- a/frc971/output/output.gyp
+++ b/frc971/output/output.gyp
@@ -32,6 +32,7 @@
'<(AOS)/atom_code/output/output.gyp:motor_output',
'<(AOS)/atom_code/messages/messages.gyp:messages',
'<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/common/network/network.gyp:socket',
],
}, {
'sources': ['CRIOMotorWriter.cc'],
@@ -43,7 +44,6 @@
'<(AOS)/common/common.gyp:controls',
'<(DEPTH)/frc971/control_loops/control_loops.gyp:control_loops',
'<(DEPTH)/frc971/queues/queues.gyp:queues',
- '<(AOS)/common/network/network.gyp:socket',
],
},
{
@@ -54,7 +54,6 @@
],
'dependencies': [
'<(AOS)/build/aos.gyp:libaos',
- '<(AOS)/common/network/network.gyp:socket',
],
},
],
diff --git a/frc971/queues/queues.gyp b/frc971/queues/queues.gyp
index 6219db2..70ed873 100644
--- a/frc971/queues/queues.gyp
+++ b/frc971/queues/queues.gyp
@@ -3,7 +3,6 @@
'queue_files': [
'GyroAngle.q',
'Piston.q',
- 'Temp.q',
]
},
'targets': [