switched from fitpc/atom to prime/linux
Also removed a few old things that had nothing reasonable to be changed
to.
diff --git a/frc971/atom_code/build.sh b/frc971/atom_code/build.sh
deleted file mode 100755
index 42229b2..0000000
--- a/frc971/atom_code/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd $(dirname $0)
-
-../../aos/build/build.sh atom atom_code.gyp no atom "$@"
diff --git a/frc971/autonomous/auto_main.cc b/frc971/autonomous/auto_main.cc
index 8ce82f8..e8914c6 100644
--- a/frc971/autonomous/auto_main.cc
+++ b/frc971/autonomous/auto_main.cc
@@ -2,7 +2,7 @@
#include "aos/common/control_loop/Timing.h"
#include "aos/common/time.h"
-#include "aos/atom_code/init.h"
+#include "aos/linux_code/init.h"
#include "aos/common/logging/logging.h"
#include "frc971/autonomous/auto.q.h"
#include "frc971/autonomous/auto.h"
diff --git a/frc971/autonomous/autonomous.gyp b/frc971/autonomous/autonomous.gyp
index 526904c..c581198 100644
--- a/frc971/autonomous/autonomous.gyp
+++ b/frc971/autonomous/autonomous.gyp
@@ -46,7 +46,7 @@
'auto_main.cc',
],
'dependencies': [
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/linux_code/linux_code.gyp:init',
'auto_queue',
'auto_lib',
],
diff --git a/frc971/control_loops/angle_adjust/angle_adjust.gyp b/frc971/control_loops/angle_adjust/angle_adjust.gyp
index 323cb56..afdabb2 100644
--- a/frc971/control_loops/angle_adjust/angle_adjust.gyp
+++ b/frc971/control_loops/angle_adjust/angle_adjust.gyp
@@ -58,7 +58,7 @@
'<(AOS)/common/common.gyp:time',
'<(AOS)/common/common.gyp:timing',
'angle_adjust_loop',
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/linux_code/linux_code.gyp:init',
'<(AOS)/common/common.gyp:queues',
],
},
@@ -71,7 +71,7 @@
'dependencies': [
'angle_adjust_lib',
'angle_adjust_loop',
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/linux_code/linux_code.gyp:init',
],
},
],
diff --git a/frc971/control_loops/angle_adjust/angle_adjust_csv.cc b/frc971/control_loops/angle_adjust/angle_adjust_csv.cc
index 109af56..5da6ca9 100644
--- a/frc971/control_loops/angle_adjust/angle_adjust_csv.cc
+++ b/frc971/control_loops/angle_adjust/angle_adjust_csv.cc
@@ -2,7 +2,7 @@
#include "aos/common/control_loop/Timing.h"
#include "aos/common/time.h"
-#include "aos/atom_code/init.h"
+#include "aos/linux_code/init.h"
#include "frc971/control_loops/angle_adjust/angle_adjust_motor.q.h"
using ::frc971::control_loops::angle_adjust;
diff --git a/frc971/control_loops/angle_adjust/angle_adjust_main.cc b/frc971/control_loops/angle_adjust/angle_adjust_main.cc
index c7f725b..1a90749 100644
--- a/frc971/control_loops/angle_adjust/angle_adjust_main.cc
+++ b/frc971/control_loops/angle_adjust/angle_adjust_main.cc
@@ -1,6 +1,6 @@
#include "frc971/control_loops/angle_adjust/angle_adjust.h"
-#include "aos/atom_code/init.h"
+#include "aos/linux_code/init.h"
int main() {
::aos::Init();
diff --git a/frc971/control_loops/drivetrain/drivetrain.gyp b/frc971/control_loops/drivetrain/drivetrain.gyp
index 53bb16c..7821c39 100644
--- a/frc971/control_loops/drivetrain/drivetrain.gyp
+++ b/frc971/control_loops/drivetrain/drivetrain.gyp
@@ -77,7 +77,7 @@
'drivetrain_main.cc',
],
'dependencies': [
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/linux_code/linux_code.gyp:init',
'drivetrain_lib',
'drivetrain_loop',
],
diff --git a/frc971/control_loops/drivetrain/drivetrain_main.cc b/frc971/control_loops/drivetrain/drivetrain_main.cc
index e3fc306..f3f0ddd 100644
--- a/frc971/control_loops/drivetrain/drivetrain_main.cc
+++ b/frc971/control_loops/drivetrain/drivetrain_main.cc
@@ -1,6 +1,6 @@
#include "frc971/control_loops/drivetrain/drivetrain.h"
-#include "aos/atom_code/init.h"
+#include "aos/linux_code/init.h"
int main() {
::aos::Init();
diff --git a/frc971/control_loops/index/index.gyp b/frc971/control_loops/index/index.gyp
index 014f266..dc1c06d 100644
--- a/frc971/control_loops/index/index.gyp
+++ b/frc971/control_loops/index/index.gyp
@@ -60,7 +60,7 @@
'index_main.cc',
],
'dependencies': [
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/linux_code/linux_code.gyp:init',
'index_lib',
'index_loop',
],
diff --git a/frc971/control_loops/index/index_main.cc b/frc971/control_loops/index/index_main.cc
index c542268..321d74c 100644
--- a/frc971/control_loops/index/index_main.cc
+++ b/frc971/control_loops/index/index_main.cc
@@ -1,6 +1,6 @@
#include "frc971/control_loops/index/index.h"
-#include "aos/atom_code/init.h"
+#include "aos/linux_code/init.h"
int main() {
::aos::Init();
diff --git a/frc971/control_loops/matlab/drivetrain_controller.m b/frc971/control_loops/matlab/drivetrain_controller.m
index b51af99..f9ee4be 100644
--- a/frc971/control_loops/matlab/drivetrain_controller.m
+++ b/frc971/control_loops/matlab/drivetrain_controller.m
@@ -46,7 +46,7 @@
% Plot what we computed
-fd = fopen('/home/aschuh/frc971/2012/trunk/src/atom_code/control_loops/Drivetrain.mat', 'w');
+fd = fopen('/home/aschuh/frc971/2012/trunk/src/prime/control_loops/Drivetrain.mat', 'w');
n = 1;
sm = [];
writeMatHeader(fd, size(dm.a, 1), size(dm.b, 2));
diff --git a/frc971/control_loops/shooter/shooter.gyp b/frc971/control_loops/shooter/shooter.gyp
index 64e3a20..70f635f 100644
--- a/frc971/control_loops/shooter/shooter.gyp
+++ b/frc971/control_loops/shooter/shooter.gyp
@@ -70,7 +70,7 @@
'shooter_main.cc',
],
'dependencies': [
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/linux_code/linux_code.gyp:init',
'shooter_lib',
'shooter_loop',
],
diff --git a/frc971/control_loops/shooter/shooter_main.cc b/frc971/control_loops/shooter/shooter_main.cc
index c52db73..e4e25ad 100644
--- a/frc971/control_loops/shooter/shooter_main.cc
+++ b/frc971/control_loops/shooter/shooter_main.cc
@@ -1,6 +1,6 @@
#include "frc971/control_loops/shooter/shooter.h"
-#include "aos/atom_code/init.h"
+#include "aos/linux_code/init.h"
int main() {
::aos::Init();
diff --git a/frc971/control_loops/wrist/wrist.gyp b/frc971/control_loops/wrist/wrist.gyp
index d66bf6c..60895ca 100644
--- a/frc971/control_loops/wrist/wrist.gyp
+++ b/frc971/control_loops/wrist/wrist.gyp
@@ -58,7 +58,7 @@
'wrist_main.cc',
],
'dependencies': [
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/linux_code/linux_code.gyp:init',
'wrist_lib',
'wrist_loop',
],
diff --git a/frc971/control_loops/wrist/wrist_main.cc b/frc971/control_loops/wrist/wrist_main.cc
index 0aeec42..3da6d62 100644
--- a/frc971/control_loops/wrist/wrist_main.cc
+++ b/frc971/control_loops/wrist/wrist_main.cc
@@ -1,6 +1,6 @@
#include "frc971/control_loops/wrist/wrist.h"
-#include "aos/atom_code/init.h"
+#include "aos/linux_code/init.h"
int main() {
::aos::Init();
diff --git a/frc971/crio/dumb_main.cc b/frc971/crio/dumb_main.cc
index 8cf0eb4..08c653e 100644
--- a/frc971/crio/dumb_main.cc
+++ b/frc971/crio/dumb_main.cc
@@ -14,10 +14,10 @@
public:
MyRobot() : NetworkRobot(static_cast<uint16_t>(::aos::NetworkPort::kMotors),
::MakeIPAddress(::GetOwnIPAddress(),
- ::aos::NetworkAddress::kAtom),
+ ::aos::NetworkAddress::kPrime),
static_cast<uint16_t>(::aos::NetworkPort::kDS),
::MakeIPAddress(::GetOwnIPAddress(),
- ::aos::NetworkAddress::kAtom)) {}
+ ::aos::NetworkAddress::kPrime)) {}
};
} // namespace frc971
diff --git a/frc971/input/JoystickReader.cc b/frc971/input/JoystickReader.cc
index b29e17d..8f65cdd 100644
--- a/frc971/input/JoystickReader.cc
+++ b/frc971/input/JoystickReader.cc
@@ -3,8 +3,8 @@
#include <unistd.h>
#include <math.h>
-#include "aos/atom_code/init.h"
-#include "aos/atom_code/input/joystick_input.h"
+#include "aos/linux_code/init.h"
+#include "aos/prime/input/joystick_input.h"
#include "aos/common/logging/logging.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
diff --git a/frc971/input/input.gyp b/frc971/input/input.gyp
index d26f851..33bf3c4 100644
--- a/frc971/input/input.gyp
+++ b/frc971/input/input.gyp
@@ -7,8 +7,8 @@
'JoystickReader.cc',
],
'dependencies': [
- '<(AOS)/atom_code/input/input.gyp:joystick_input',
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/prime/input/input.gyp:joystick_input',
+ '<(AOS)/linux_code/linux_code.gyp:init',
'<(AOS)/build/aos.gyp:logging',
'<(DEPTH)/frc971/control_loops/drivetrain/drivetrain.gyp:drivetrain_loop',
@@ -34,7 +34,7 @@
'<(DEPTH)/frc971/control_loops/wrist/wrist.gyp:wrist_loop',
'<(DEPTH)/frc971/control_loops/index/index.gyp:index_loop',
'<(DEPTH)/frc971/control_loops/shooter/shooter.gyp:shooter_loop',
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/linux_code/linux_code.gyp:init',
'<(AOS)/build/aos.gyp:logging',
'<(AOS)/common/util/util.gyp:wrapping_counter',
'<(DEPTH)/frc971/frc971.gyp:constants',
diff --git a/frc971/input/sensor_receiver.cc b/frc971/input/sensor_receiver.cc
index 6fdd2e6..2f5c450 100644
--- a/frc971/input/sensor_receiver.cc
+++ b/frc971/input/sensor_receiver.cc
@@ -1,6 +1,6 @@
#include <inttypes.h>
-#include "aos/atom_code/init.h"
+#include "aos/linux_code/init.h"
#include "aos/common/logging/logging.h"
#include "aos/common/util/wrapping_counter.h"
#include "aos/common/time.h"
diff --git a/frc971/output/CameraServer.cc b/frc971/output/CameraServer.cc
index 93a83c7..35b16b4 100644
--- a/frc971/output/CameraServer.cc
+++ b/frc971/output/CameraServer.cc
@@ -1,12 +1,12 @@
#include <string.h>
-#include "aos/atom_code/output/HTTPServer.h"
-#include "aos/atom_code/output/evhttp_ctemplate_emitter.h"
-#include "aos/atom_code/output/ctemplate_cache.h"
+#include "aos/linux_code/output/HTTPServer.h"
+#include "aos/linux_code/output/evhttp_ctemplate_emitter.h"
+#include "aos/linux_code/output/ctemplate_cache.h"
#include "ctemplate/template.h"
-#include "aos/atom_code/init.h"
+#include "aos/linux_code/init.h"
#include "aos/common/logging/logging.h"
-#include "aos/atom_code/configuration.h"
+#include "aos/linux_code/configuration.h"
#include "frc971/constants.h"
diff --git a/frc971/output/AtomMotorWriter.cc b/frc971/output/motor_writer.cc
similarity index 97%
rename from frc971/output/AtomMotorWriter.cc
rename to frc971/output/motor_writer.cc
index 3ba3593..b9f5e6f 100644
--- a/frc971/output/AtomMotorWriter.cc
+++ b/frc971/output/motor_writer.cc
@@ -2,9 +2,9 @@
#include <string.h>
#include <unistd.h>
-#include "aos/atom_code/output/motor_output.h"
+#include "aos/prime/output/motor_output.h"
#include "aos/common/logging/logging.h"
-#include "aos/atom_code/init.h"
+#include "aos/linux_code/init.h"
#include "frc971/queues/Piston.q.h"
#include "frc971/control_loops/drivetrain/drivetrain.q.h"
diff --git a/frc971/output/output.gyp b/frc971/output/output.gyp
index 1a8b1c9..3474f33 100644
--- a/frc971/output/output.gyp
+++ b/frc971/output/output.gyp
@@ -7,11 +7,11 @@
'CameraServer.cc',
],
'dependencies': [
- '<(AOS)/atom_code/output/output.gyp:http_server',
+ '<(AOS)/linux_code/output/output.gyp:http_server',
'../frc971.gyp:constants',
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/linux_code/linux_code.gyp:init',
'<(AOS)/build/aos.gyp:logging',
- '<(AOS)/atom_code/atom_code.gyp:configuration',
+ '<(AOS)/linux_code/linux_code.gyp:configuration',
],
'copies': [
{
@@ -26,11 +26,11 @@
'target_name': 'MotorWriter',
'type': '<(aos_target)',
'sources': [
- 'AtomMotorWriter.cc'
+ 'motor_writer.cc'
],
'dependencies': [
- '<(AOS)/atom_code/output/output.gyp:motor_output',
- '<(AOS)/atom_code/atom_code.gyp:init',
+ '<(AOS)/prime/output/output.gyp:motor_output',
+ '<(AOS)/linux_code/linux_code.gyp:init',
'<(AOS)/build/aos.gyp:logging',
'<(DEPTH)/frc971/control_loops/angle_adjust/angle_adjust.gyp:angle_adjust_loop',
'<(DEPTH)/frc971/control_loops/wrist/wrist.gyp:wrist_loop',
diff --git a/frc971/atom_code/.gitignore b/frc971/prime/.gitignore
similarity index 100%
rename from frc971/atom_code/.gitignore
rename to frc971/prime/.gitignore
diff --git a/frc971/prime/build.sh b/frc971/prime/build.sh
new file mode 100755
index 0000000..81ae16a
--- /dev/null
+++ b/frc971/prime/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd $(dirname $0)
+
+../../aos/build/build.sh linux prime.gyp no prime "$@"
diff --git a/frc971/atom_code/camera/camera.gyp b/frc971/prime/camera/camera.gyp
similarity index 84%
rename from frc971/atom_code/camera/camera.gyp
rename to frc971/prime/camera/camera.gyp
index 6dc9530..6a6b13c 100644
--- a/frc971/atom_code/camera/camera.gyp
+++ b/frc971/prime/camera/camera.gyp
@@ -7,11 +7,11 @@
'manifest': 'frc971_camera.mf',
},
'dependencies': [
- '<(AOS)/atom_code/camera/camera.gyp:aos_camera',
+ '<(AOS)/linux_code/camera/camera.gyp:aos_camera',
'<(DEPTH)/frc971/queues/queues.gyp:frc971_queues_so',
],
'export_dependent_settings': [
- '<(AOS)/atom_code/camera/camera.gyp:aos_camera',
+ '<(AOS)/linux_code/camera/camera.gyp:aos_camera',
'<(DEPTH)/frc971/queues/queues.gyp:frc971_queues_so',
],
'includes': ['../../../aos/build/java.gypi'],
diff --git a/frc971/atom_code/camera/frc971_camera.mf b/frc971/prime/camera/frc971_camera.mf
similarity index 100%
rename from frc971/atom_code/camera/frc971_camera.mf
rename to frc971/prime/camera/frc971_camera.mf
diff --git a/frc971/atom_code/camera/org/spartanrobotics/camera/QueueReader.java b/frc971/prime/camera/org/spartanrobotics/camera/QueueReader.java
similarity index 100%
rename from frc971/atom_code/camera/org/spartanrobotics/camera/QueueReader.java
rename to frc971/prime/camera/org/spartanrobotics/camera/QueueReader.java
diff --git a/frc971/atom_code/camera/org/spartanrobotics/camera/QueueTest.java b/frc971/prime/camera/org/spartanrobotics/camera/QueueTest.java
similarity index 100%
rename from frc971/atom_code/camera/org/spartanrobotics/camera/QueueTest.java
rename to frc971/prime/camera/org/spartanrobotics/camera/QueueTest.java
diff --git a/frc971/atom_code/camera/org/spartanrobotics/camera/Test.java b/frc971/prime/camera/org/spartanrobotics/camera/Test.java
similarity index 100%
rename from frc971/atom_code/camera/org/spartanrobotics/camera/Test.java
rename to frc971/prime/camera/org/spartanrobotics/camera/Test.java
diff --git a/frc971/atom_code/atom_code.gyp b/frc971/prime/prime.gyp
similarity index 96%
rename from frc971/atom_code/atom_code.gyp
rename to frc971/prime/prime.gyp
index d60b26b..b1af09e 100644
--- a/frc971/atom_code/atom_code.gyp
+++ b/frc971/prime/prime.gyp
@@ -4,7 +4,7 @@
'target_name': 'All',
'type': 'none',
'dependencies': [
- '<(AOS)/build/aos_all.gyp:Atom',
+ '<(AOS)/build/aos_all.gyp:Prime',
'../control_loops/drivetrain/drivetrain.gyp:drivetrain',
'../control_loops/drivetrain/drivetrain.gyp:drivetrain_lib_test',
'../control_loops/wrist/wrist.gyp:wrist',
diff --git a/frc971/atom_code/scripts/start_list.txt b/frc971/prime/scripts/start_list.txt
similarity index 100%
rename from frc971/atom_code/scripts/start_list.txt
rename to frc971/prime/scripts/start_list.txt