switched from fitpc/atom to prime/linux
Also removed a few old things that had nothing reasonable to be changed
to.
diff --git a/aos/common/common.gyp b/aos/common/common.gyp
index d8c10e0..4c2b684 100644
--- a/aos/common/common.gyp
+++ b/aos/common/common.gyp
@@ -24,10 +24,10 @@
'<(AOS)/build/aos.gyp:logging',
'once',
'<(EXTERNALS):gtest',
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:shared_mem',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:shared_mem',
],
'export_dependent_settings': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:shared_mem',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:shared_mem',
],
},
{
@@ -57,10 +57,10 @@
},
{
'dependencies': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:queue',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
],
'export_dependent_settings': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:queue',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
],
}]
],
@@ -224,18 +224,18 @@
'target_name': 'condition',
'type': 'static_library',
'sources': [
- '<(AOS)/atom_code/ipc_lib/condition.cc',
+ '<(AOS)/linux_code/ipc_lib/condition.cc',
],
'dependencies': [
'mutex',
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:aos_sync',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
# TODO(aschuh): Fix this dependency loop by
# providing a logging interface.
# '<(AOS)/build/aos.gyp:logging',
],
'export_dependent_settings': [
'mutex',
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:aos_sync',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
],
},
{
@@ -248,13 +248,13 @@
],
}, {
'sources': [
- '<(AOS)/atom_code/ipc_lib/mutex.cpp',
+ '<(AOS)/linux_code/ipc_lib/mutex.cpp',
],
'dependencies': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:aos_sync',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
],
'export_dependent_settings': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:aos_sync',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:aos_sync',
],
}],
],
@@ -290,7 +290,7 @@
'mutex',
'<(AOS)/build/aos.gyp:logging',
'queue_testutils',
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:core_lib',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:core_lib',
],
},
{
diff --git a/aos/common/condition.h b/aos/common/condition.h
index c407070..c913b47 100644
--- a/aos/common/condition.h
+++ b/aos/common/condition.h
@@ -2,7 +2,7 @@
#define AOS_COMMON_CONDITION_H_
#include "aos/common/mutex.h"
-#include "aos/atom_code/ipc_lib/aos_sync.h"
+#include "aos/linux_code/ipc_lib/aos_sync.h"
namespace aos {
diff --git a/aos/common/condition_test.cc b/aos/common/condition_test.cc
index fca2820..a10275b 100644
--- a/aos/common/condition_test.cc
+++ b/aos/common/condition_test.cc
@@ -10,7 +10,7 @@
#include "aos/common/mutex.h"
#include "aos/common/queue_testutils.h"
#include "aos/common/type_traits.h"
-#include "aos/atom_code/ipc_lib/core_lib.h"
+#include "aos/linux_code/ipc_lib/core_lib.h"
#include "aos/common/logging/logging.h"
#include "aos/common/macros.h"
diff --git a/aos/common/debugging-tips.txt b/aos/common/debugging-tips.txt
index 5d52af2..af2d37c 100644
--- a/aos/common/debugging-tips.txt
+++ b/aos/common/debugging-tips.txt
@@ -6,8 +6,8 @@
just run `LogStreamer` if you want to do simple testing without writing logs
to a file. See `LogDisplayer --help` for options.
All of the binaries get put in the same place. That is
- src/out_atom/Default/outputs on the build machine and
- /home/driver/robot_code/bin on the fitpc.
+ src/outputs/prime/outputs on the build machine and
+ /home/driver/robot_code/bin on linux.
[Startup]
Low level startup errors often end up in /aos_fatal_error.* on the cRIO and
diff --git a/aos/common/messages/QueueHolder.h b/aos/common/messages/QueueHolder.h
index 8d8ba51..c40a630 100644
--- a/aos/common/messages/QueueHolder.h
+++ b/aos/common/messages/QueueHolder.h
@@ -12,7 +12,7 @@
#include "aos/common/type_traits.h"
#include "aos/common/logging/logging.h"
#ifndef __VXWORKS__
-#include "aos/atom_code/ipc_lib/queue.h"
+#include "aos/linux_code/ipc_lib/queue.h"
#endif
namespace aos {
diff --git a/aos/common/messages/messages.gyp b/aos/common/messages/messages.gyp
index b76dbba..e134a95 100644
--- a/aos/common/messages/messages.gyp
+++ b/aos/common/messages/messages.gyp
@@ -19,10 +19,10 @@
'conditions': [
['OS!="crio"', {
'dependencies': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:queue',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
],
'export_dependent_settings': [
- '<(AOS)/atom_code/ipc_lib/ipc_lib.gyp:queue',
+ '<(AOS)/linux_code/ipc_lib/ipc_lib.gyp:queue',
],
}],
],
diff --git a/aos/common/mutex.h b/aos/common/mutex.h
index b6b277c..a22df4e 100644
--- a/aos/common/mutex.h
+++ b/aos/common/mutex.h
@@ -7,14 +7,14 @@
#include "aos/common/macros.h"
#include "aos/common/type_traits.h"
-#include "aos/atom_code/ipc_lib/aos_sync.h"
+#include "aos/linux_code/ipc_lib/aos_sync.h"
namespace aos {
class Condition;
-// An abstraction of a mutex that has implementations both for the
-// atom and for the cRIO.
+// An abstraction of a mutex that has implementations both for
+// linux and for the cRIO.
// If there are multiple tasks or processes contending for the mutex,
// higher priority ones will succeed in locking first,
// and tasks of equal priorities have the same chance of getting the lock.
diff --git a/aos/common/mutex_test.cpp b/aos/common/mutex_test.cpp
index 652cd9e..29e1956 100644
--- a/aos/common/mutex_test.cpp
+++ b/aos/common/mutex_test.cpp
@@ -9,7 +9,7 @@
#include "gtest/gtest.h"
-#include "aos/atom_code/ipc_lib/aos_sync.h"
+#include "aos/linux_code/ipc_lib/aos_sync.h"
namespace aos {
namespace testing {
diff --git a/aos/common/network/SendSocket.h b/aos/common/network/SendSocket.h
index 9323da8..06529d0 100644
--- a/aos/common/network/SendSocket.h
+++ b/aos/common/network/SendSocket.h
@@ -3,7 +3,7 @@
#include "Socket.h"
-#include "aos/atom_code/configuration.h"
+#include "aos/linux_code/configuration.h"
#include "aos/common/network_port.h"
#include "aos/common/util.h"
diff --git a/aos/common/network/network.gyp b/aos/common/network/network.gyp
index 60b37aa..4d5aff3 100644
--- a/aos/common/network/network.gyp
+++ b/aos/common/network/network.gyp
@@ -7,7 +7,7 @@
'team_number.cc',
],
'dependencies': [
- '<(AOS)/atom_code/atom_code.gyp:configuration',
+ '<(AOS)/linux_code/linux_code.gyp:configuration',
'<(AOS)/common/common.gyp:once',
'<(AOS)/build/aos.gyp:logging',
],
@@ -53,7 +53,7 @@
'<(AOS)/build/aos.gyp:logging',
'<(AOS)/common/common.gyp:time',
'<(AOS)/common/common.gyp:util',
- '<(AOS)/atom_code/atom_code.gyp:configuration',
+ '<(AOS)/linux_code/linux_code.gyp:configuration',
],
'export_dependent_settings': [
'<(AOS)/build/aos.gyp:logging',
diff --git a/aos/common/network/team_number.cc b/aos/common/network/team_number.cc
index 367f991..3e9aeb6 100644
--- a/aos/common/network/team_number.cc
+++ b/aos/common/network/team_number.cc
@@ -4,7 +4,7 @@
#include <inttypes.h>
#include "aos/common/once.h"
-#include "aos/atom_code/configuration.h"
+#include "aos/linux_code/configuration.h"
#include "aos/common/logging/logging.h"
namespace aos {
diff --git a/aos/common/network_port.h b/aos/common/network_port.h
index a8f2d1d..c19c2ce 100644
--- a/aos/common/network_port.h
+++ b/aos/common/network_port.h
@@ -8,15 +8,12 @@
// Constants representing the various ports used for communications and some
// documentation about what each is used for.
enum class NetworkPort : uint16_t {
- // UDP socket sending motor values from the atom to the crio.
+ // UDP socket sending motor values from the prime to the crio.
kMotors = 9710,
- // UDP socket forwarding drivers station packets from the crio to the atom.
+ // UDP socket forwarding drivers station packets from the crio to the prime.
kDS = 9711,
- // UDP socket sending sensor values from the crio to the atom.
+ // UDP socket sending sensor values from the crio to the prime.
kSensors = 9712,
- // TCP socket(s) (automatically reconnects) sending logs from the crio to the
- // atom.
- kLogs = 9713,
// HTTP server that sends out camera feeds in mjpg format.
// Should not be changed because this number shows up elsewhere too.
kCameraStreamer = 9714,
@@ -26,7 +23,7 @@
// last segment of their IP addresses.
enum class NetworkAddress : uint8_t {
// The computer that the cRIO talks to.
- kAtom = 179,
+ kPrime = 179,
kCRIO = 2,
};
diff --git a/aos/common/once-tmpl.h b/aos/common/once-tmpl.h
index 9b9c8c5..9e3ebfe 100644
--- a/aos/common/once-tmpl.h
+++ b/aos/common/once-tmpl.h
@@ -9,7 +9,7 @@
// It doesn't use pthread_once, because Brian looked at the pthreads
// implementation for vxworks and noticed that it is completely and entirely
// broken for doing just about anything (including its pthread_once). It has the
-// same implementation on the atom for simplicity.
+// same implementation under linux for simplicity.
namespace aos {
diff --git a/aos/common/queue.h b/aos/common/queue.h
index 68cb338..d37fe59 100644
--- a/aos/common/queue.h
+++ b/aos/common/queue.h
@@ -12,7 +12,7 @@
#include "aos/common/time.h"
#include "aos/common/macros.h"
#ifndef USE_UNSAFE
-#include "aos/atom_code/ipc_lib/queue.h"
+#include "aos/linux_code/ipc_lib/queue.h"
#endif // USE_UNSAFE
#include "aos/common/time.h"
@@ -310,7 +310,7 @@
#ifdef USE_UNSAFE
#include "aos/crio/queue-tmpl.h"
#else
-#include "aos/atom_code/queue-tmpl.h"
+#include "aos/linux_code/queue-tmpl.h"
#endif
#undef USE_UNSAFE
diff --git a/aos/common/queue_testutils.h b/aos/common/queue_testutils.h
index 2d26262..3c7a0a4 100644
--- a/aos/common/queue_testutils.h
+++ b/aos/common/queue_testutils.h
@@ -1,7 +1,7 @@
#ifndef AOS_COMMON_QUEUE_TESTUTILS_H_
#define AOS_COMMON_QUEUE_TESTUTILS_H_
-#include "aos/atom_code/ipc_lib/shared_mem.h"
+#include "aos/linux_code/ipc_lib/shared_mem.h"
// This file has some general helper functions for dealing with testing things
// that use shared memory etc.
diff --git a/aos/common/time.h b/aos/common/time.h
index bc2dc3e..c646661 100644
--- a/aos/common/time.h
+++ b/aos/common/time.h
@@ -71,7 +71,7 @@
}
#endif // SWIG
- // CLOCK_MONOTONIC on the fitpc and CLOCK_REALTIME on the cRIO because the
+ // CLOCK_MONOTONIC on linux and CLOCK_REALTIME on the cRIO because the
// cRIO doesn't have any others.
// CLOCK_REALTIME is the default realtime clock and CLOCK_MONOTONIC doesn't
// change when somebody changes the wall clock (like the ntp deamon or