Rename config.json to aos_config.json
Plenty of other things are called config.json, so let's pick a more
unique name.
Change-Id: I6510a172ec62674dd1b11bd71cef9aac2480c612
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
diff --git a/y2022/BUILD b/y2022/BUILD
index af57a74..1aa4fa1 100644
--- a/y2022/BUILD
+++ b/y2022/BUILD
@@ -7,7 +7,7 @@
"//aos/network:web_proxy_main",
],
data = [
- ":config",
+ ":aos_config",
"@ctre_phoenix_api_cpp_athena//:shared_libraries",
"@ctre_phoenix_cci_athena//:shared_libraries",
],
@@ -38,7 +38,7 @@
"//y2022/control_loops/localizer:localizer_main",
],
data = [
- ":config",
+ ":aos_config",
],
start_binaries = [
"//aos/events/logging:logger_main",
@@ -52,7 +52,7 @@
)
aos_config(
- name = "config",
+ name = "aos_config",
src = "y2022.json",
flatbuffers = [
"//aos/network:message_bridge_client_fbs",
@@ -91,9 +91,9 @@
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//visibility:public"],
deps = [
- "//aos/events:config",
- "//frc971/control_loops/drivetrain:config",
- "//frc971/input:config",
+ "//aos/events:aos_config",
+ "//frc971/control_loops/drivetrain:aos_config",
+ "//frc971/input:aos_config",
],
)
for pi in [
@@ -118,8 +118,8 @@
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//visibility:public"],
deps = [
- "//aos/events:config",
- "//frc971/control_loops/drivetrain:config",
+ "//aos/events:aos_config",
+ "//frc971/control_loops/drivetrain:aos_config",
],
)
@@ -137,9 +137,9 @@
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//visibility:public"],
deps = [
- "//aos/events:config",
- "//frc971/control_loops/drivetrain:config",
- "//frc971/input:config",
+ "//aos/events:aos_config",
+ "//frc971/control_loops/drivetrain:aos_config",
+ "//frc971/input:aos_config",
],
)
@@ -159,11 +159,11 @@
],
target_compatible_with = ["@platforms//os:linux"],
deps = [
- "//aos/events:config",
- "//frc971/autonomous:config",
- "//frc971/control_loops/drivetrain:config",
- "//frc971/input:config",
- "//frc971/wpilib:config",
+ "//aos/events:aos_config",
+ "//frc971/autonomous:aos_config",
+ "//frc971/control_loops/drivetrain:aos_config",
+ "//frc971/input:aos_config",
+ "//frc971/wpilib:aos_config",
],
)
diff --git a/y2022/actors/autonomous_actor_main.cc b/y2022/actors/autonomous_actor_main.cc
index bf4a782..ae45ee8 100644
--- a/y2022/actors/autonomous_actor_main.cc
+++ b/y2022/actors/autonomous_actor_main.cc
@@ -8,7 +8,7 @@
::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
- aos::configuration::ReadConfig("config.json");
+ aos::configuration::ReadConfig("aos_config.json");
::aos::ShmEventLoop event_loop(&config.message());
::y2022::actors::AutonomousActor autonomous(&event_loop);
diff --git a/y2022/control_loops/drivetrain/BUILD b/y2022/control_loops/drivetrain/BUILD
index 661aee9..5381254 100644
--- a/y2022/control_loops/drivetrain/BUILD
+++ b/y2022/control_loops/drivetrain/BUILD
@@ -107,7 +107,7 @@
visibility = ["//visibility:public"],
deps = [
"//frc971/control_loops/drivetrain:simulation_channels",
- "//y2022:config",
+ "//y2022:aos_config",
],
)
diff --git a/y2022/control_loops/drivetrain/drivetrain_main.cc b/y2022/control_loops/drivetrain/drivetrain_main.cc
index fc448eb..a422eaa 100644
--- a/y2022/control_loops/drivetrain/drivetrain_main.cc
+++ b/y2022/control_loops/drivetrain/drivetrain_main.cc
@@ -12,7 +12,7 @@
aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
- aos::configuration::ReadConfig("config.json");
+ aos::configuration::ReadConfig("aos_config.json");
aos::ShmEventLoop event_loop(&config.message());
std::unique_ptr<::y2022::control_loops::drivetrain::Localizer> localizer =
diff --git a/y2022/control_loops/drivetrain/trajectory_generator_main.cc b/y2022/control_loops/drivetrain/trajectory_generator_main.cc
index c2837dd..9a59811 100644
--- a/y2022/control_loops/drivetrain/trajectory_generator_main.cc
+++ b/y2022/control_loops/drivetrain/trajectory_generator_main.cc
@@ -15,7 +15,7 @@
::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
- aos::configuration::ReadConfig("config.json");
+ aos::configuration::ReadConfig("aos_config.json");
::aos::ShmEventLoop event_loop(&config.message());
TrajectoryGenerator generator(
diff --git a/y2022/control_loops/localizer/BUILD b/y2022/control_loops/localizer/BUILD
index 034c779..8e7ec95 100644
--- a/y2022/control_loops/localizer/BUILD
+++ b/y2022/control_loops/localizer/BUILD
@@ -87,7 +87,7 @@
name = "localizer_test",
srcs = ["localizer_test.cc"],
data = [
- "//y2022:config",
+ "//y2022:aos_config",
],
shard_count = 10,
deps = [
@@ -102,7 +102,7 @@
name = "localizer_replay",
srcs = ["localizer_replay.cc"],
data = [
- "//y2020:config",
+ "//y2020:aos_config",
],
target_compatible_with = ["@platforms//os:linux"],
deps = [
diff --git a/y2022/control_loops/localizer/localizer_main.cc b/y2022/control_loops/localizer/localizer_main.cc
index 0cc53bb..187a441 100644
--- a/y2022/control_loops/localizer/localizer_main.cc
+++ b/y2022/control_loops/localizer/localizer_main.cc
@@ -3,7 +3,7 @@
#include "y2022/control_loops/localizer/localizer.h"
#include "y2022/control_loops/drivetrain/drivetrain_base.h"
-DEFINE_string(config, "config.json", "Path to the config file to use.");
+DEFINE_string(config, "aos_config.json", "Path to the config file to use.");
int main(int argc, char *argv[]) {
aos::InitGoogle(&argc, &argv);
diff --git a/y2022/control_loops/localizer/localizer_replay.cc b/y2022/control_loops/localizer/localizer_replay.cc
index 67fb35a..c438e53 100644
--- a/y2022/control_loops/localizer/localizer_replay.cc
+++ b/y2022/control_loops/localizer/localizer_replay.cc
@@ -11,7 +11,7 @@
#include "gflags/gflags.h"
#include "y2020/control_loops/drivetrain/drivetrain_base.h"
-DEFINE_string(config, "y2020/config.json",
+DEFINE_string(config, "y2020/aos_config.json",
"Name of the config file to replay using.");
DEFINE_int32(team, 7971, "Team number to use for logfile replay.");
DEFINE_string(output_folder, "/tmp/replayed",
diff --git a/y2022/control_loops/localizer/localizer_test.cc b/y2022/control_loops/localizer/localizer_test.cc
index 5857bda..79a69b5 100644
--- a/y2022/control_loops/localizer/localizer_test.cc
+++ b/y2022/control_loops/localizer/localizer_test.cc
@@ -284,7 +284,7 @@
class EventLoopLocalizerTest : public ::testing::Test {
protected:
EventLoopLocalizerTest()
- : configuration_(aos::configuration::ReadConfig("y2022/config.json")),
+ : configuration_(aos::configuration::ReadConfig("y2022/aos_config.json")),
event_loop_factory_(&configuration_.message()),
roborio_node_(
aos::configuration::GetNode(&configuration_.message(), "roborio")),
diff --git a/y2022/control_loops/superstructure/BUILD b/y2022/control_loops/superstructure/BUILD
index 644b53b..e5992ef 100644
--- a/y2022/control_loops/superstructure/BUILD
+++ b/y2022/control_loops/superstructure/BUILD
@@ -97,7 +97,7 @@
"superstructure_lib_test.cc",
],
data = [
- "//y2022:config",
+ "//y2022:aos_config",
],
deps = [
":superstructure_goal_fbs",
diff --git a/y2022/control_loops/superstructure/superstructure_lib_test.cc b/y2022/control_loops/superstructure/superstructure_lib_test.cc
index 493fe95..2ddbc3e 100644
--- a/y2022/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2022/control_loops/superstructure/superstructure_lib_test.cc
@@ -252,7 +252,7 @@
public:
SuperstructureTest()
: ::frc971::testing::ControlLoopTest(
- aos::configuration::ReadConfig("y2022/config.json"),
+ aos::configuration::ReadConfig("y2022/aos_config.json"),
std::chrono::microseconds(5050)),
values_(std::make_shared<constants::Values>(constants::MakeValues(
frc971::control_loops::testing::kTeamNumber))),
diff --git a/y2022/control_loops/superstructure/superstructure_main.cc b/y2022/control_loops/superstructure/superstructure_main.cc
index c6c12b7..3aa9517 100644
--- a/y2022/control_loops/superstructure/superstructure_main.cc
+++ b/y2022/control_loops/superstructure/superstructure_main.cc
@@ -6,7 +6,7 @@
::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
- aos::configuration::ReadConfig("config.json");
+ aos::configuration::ReadConfig("aos_config.json");
::aos::ShmEventLoop event_loop(&config.message());
std::shared_ptr<const y2022::constants::Values> values =
diff --git a/y2022/joystick_reader.cc b/y2022/joystick_reader.cc
index e5b09ac..80747a8 100644
--- a/y2022/joystick_reader.cc
+++ b/y2022/joystick_reader.cc
@@ -67,7 +67,7 @@
::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
- aos::configuration::ReadConfig("config.json");
+ aos::configuration::ReadConfig("aos_config.json");
::aos::ShmEventLoop event_loop(&config.message());
::y2022::input::joysticks::Reader reader(&event_loop);
diff --git a/y2022/localizer/imu_main.cc b/y2022/localizer/imu_main.cc
index bba2dd7..5bdab41 100644
--- a/y2022/localizer/imu_main.cc
+++ b/y2022/localizer/imu_main.cc
@@ -2,7 +2,7 @@
#include "aos/init.h"
#include "y2022/localizer/imu.h"
-DEFINE_string(config, "config.json", "Path to the config file to use.");
+DEFINE_string(config, "aos_config.json", "Path to the config file to use.");
int main(int argc, char *argv[]) {
aos::InitGoogle(&argc, &argv);
diff --git a/y2022/vision/BUILD b/y2022/vision/BUILD
index 965cc67..284dd66 100644
--- a/y2022/vision/BUILD
+++ b/y2022/vision/BUILD
@@ -89,7 +89,7 @@
"gpio.h",
],
data = [
- "//y2022:config",
+ "//y2022:aos_config",
],
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//y2022:__subpackages__"],
@@ -170,7 +170,7 @@
"viewer.cc",
],
data = [
- "//y2022:config",
+ "//y2022:aos_config",
],
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//y2022:__subpackages__"],
diff --git a/y2022/vision/camera_reader_main.cc b/y2022/vision/camera_reader_main.cc
index a82d2ac..d5ba448 100644
--- a/y2022/vision/camera_reader_main.cc
+++ b/y2022/vision/camera_reader_main.cc
@@ -3,9 +3,9 @@
#include "y2022/vision/camera_reader.h"
// config used to allow running camera_reader independently. E.g.,
-// bazel run //y2022/vision:camera_reader -- --config y2022/config.json
+// bazel run //y2022/vision:camera_reader -- --config y2022/aos_config.json
// --override_hostname pi-7971-1 --ignore_timestamps true
-DEFINE_string(config, "config.json", "Path to the config file to use.");
+DEFINE_string(config, "aos_config.json", "Path to the config file to use.");
DEFINE_double(duty_cycle, 0.5, "Duty cycle of the LEDs");
DEFINE_uint32(exposure, 5,
"Exposure time, in 100us increments; 0 implies auto exposure");
diff --git a/y2022/vision/viewer.cc b/y2022/vision/viewer.cc
index 2a6f0a6..f655f91 100644
--- a/y2022/vision/viewer.cc
+++ b/y2022/vision/viewer.cc
@@ -15,7 +15,7 @@
DEFINE_string(capture, "",
"If set, capture a single image and save it to this filename.");
DEFINE_string(channel, "/camera", "Channel name for the image.");
-DEFINE_string(config, "config.json", "Path to the config file to use.");
+DEFINE_string(config, "aos_config.json", "Path to the config file to use.");
DEFINE_string(png_dir, "", "Path to a set of images to display.");
DEFINE_bool(show_features, true, "Show the blobs.");
diff --git a/y2022/wpilib_interface.cc b/y2022/wpilib_interface.cc
index bd884a8..2fc5f6b 100644
--- a/y2022/wpilib_interface.cc
+++ b/y2022/wpilib_interface.cc
@@ -448,7 +448,7 @@
std::make_shared<const Values>(constants::MakeValues());
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
- aos::configuration::ReadConfig("config.json");
+ aos::configuration::ReadConfig("aos_config.json");
// Thread 1.
::aos::ShmEventLoop joystick_sender_event_loop(&config.message());