commit 14fd0fb63e7fb562e509e663c604af29a2d81a89
author Brian Silverman <brians> Tue Jan 14 21:42:01 2014 -0800
committer Brian Silverman <brians> Tue Jan 14 21:42:01 2014 -0800
tree 62bc118b4ca6987a165b5a73b9187226c298e52c
parent e51ad631794472dd151125d751e593147a34faa2

switched from fitpc/atom to prime/linux

Also removed a few old things that had nothing reasonable to be changed
to.

frc971/output/CameraServer.cc

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"
 

frc971/output/motor_writer.cc

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"

frc971/output/output.gyp

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',