Get rid of //aos/prime
It's not a useful distinction to make any more.
Change-Id: Ieacfe8af4502108b8a5949234a1a3b6a6dd7b7e9
diff --git a/aos/common/debugging-tips.txt b/aos/common/debugging-tips.txt
index b9a50f3..9bbe8d3 100644
--- a/aos/common/debugging-tips.txt
+++ b/aos/common/debugging-tips.txt
@@ -23,7 +23,7 @@
[Control Loop(s) Not Working]
Are robot_state messages going out? An aos::JoystickInput (often
joystick_reader) should be sending them.
- Also, kFakeJoysticks in aos/prime/input/joystick_reader.cc has to be set to
+ Also, kFakeJoysticks in aos/input/joystick_reader.cc has to be set to
false in order for anything to get output.
Is it being fed goal messages?
Is it getting position messages?
diff --git a/aos/prime/downloader/BUILD b/aos/downloader/BUILD
similarity index 100%
rename from aos/prime/downloader/BUILD
rename to aos/downloader/BUILD
diff --git a/aos/prime/downloader/downloader.bzl b/aos/downloader/downloader.bzl
similarity index 96%
rename from aos/prime/downloader/downloader.bzl
rename to aos/downloader/downloader.bzl
index 0bbae4b..dff198a 100644
--- a/aos/prime/downloader/downloader.bzl
+++ b/aos/downloader/downloader.bzl
@@ -41,7 +41,7 @@
'_downloader': attr.label(
executable = True,
cfg = HOST_CFG,
- default = Label('//aos/prime/downloader'),
+ default = Label('//aos/downloader'),
),
'start_srcs': attr.label_list(
mandatory = True,
diff --git a/aos/prime/downloader/downloader.py b/aos/downloader/downloader.py
similarity index 100%
rename from aos/prime/downloader/downloader.py
rename to aos/downloader/downloader.py
diff --git a/aos/prime/input/BUILD b/aos/input/BUILD
similarity index 100%
rename from aos/prime/input/BUILD
rename to aos/input/BUILD
diff --git a/aos/prime/input/joystick_input.cc b/aos/input/joystick_input.cc
similarity index 97%
rename from aos/prime/input/joystick_input.cc
rename to aos/input/joystick_input.cc
index cf9e7c0..a6ada96 100644
--- a/aos/prime/input/joystick_input.cc
+++ b/aos/input/joystick_input.cc
@@ -1,4 +1,4 @@
-#include "aos/prime/input/joystick_input.h"
+#include "aos/input/joystick_input.h"
#include <string.h>
diff --git a/aos/prime/input/joystick_input.h b/aos/input/joystick_input.h
similarity index 81%
rename from aos/prime/input/joystick_input.h
rename to aos/input/joystick_input.h
index ec97580..ec8b52a 100644
--- a/aos/prime/input/joystick_input.h
+++ b/aos/input/joystick_input.h
@@ -1,5 +1,5 @@
-#ifndef AOS_LINUX_CODE_INPUT_JOYSTICKS_INPUT_H_
-#define AOS_LINUX_CODE_INPUT_JOYSTICKS_INPUT_H_
+#ifndef AOS_INPUT_JOYSTICK_INPUT_H_
+#define AOS_INPUT_JOYSTICK_INPUT_H_
#include "aos/common/input/driver_station_data.h"
@@ -29,4 +29,4 @@
} // namespace input
} // namespace aos
-#endif // AOS_LINUX_CODE_INPUT_JOYSTICKS_INPUT_H_
+#endif // AOS_INPUT_JOYSTICK_INPUT_H_
diff --git a/aos/prime/README.txt b/aos/prime/README.txt
deleted file mode 100644
index 07c414b..0000000
--- a/aos/prime/README.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-see ../README.txt for stuff affecting crio and linux code
-
-This folder has code for the linux box that talks to the cRIO etc. It is called the prime. We have multiple explanations for that name:
- It is the primary controller.
- PRIME/Primary Robot Intelligent Management Entity
- Represents Optimus Prime, one of the good transformers who battle the bad ones that 254 names robots after.
- It is easy to type and doesn't conflict with anything else common for tab-completion.
- It's not hardware-specific.
-
-The code that would be useful on any linux box is in ../linux_code/.