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/y2020/BUILD b/y2020/BUILD
index 1e0e4d8..918ff79 100644
--- a/y2020/BUILD
+++ b/y2020/BUILD
@@ -9,7 +9,7 @@
"//aos/network:web_proxy_main",
],
data = [
- ":config",
+ ":aos_config",
"@ctre_phoenix_api_cpp_athena//:shared_libraries",
"@ctre_phoenix_cci_athena//:shared_libraries",
],
@@ -39,7 +39,7 @@
"//y2020/vision:viewer",
],
data = [
- ":config",
+ ":aos_config",
],
dirs = [
"//y2020/www:www_files",
@@ -152,7 +152,7 @@
)
aos_config(
- name = "config",
+ name = "aos_config",
src = "y2020.json",
flatbuffers = [
"//aos/network:message_bridge_client_fbs",
@@ -192,9 +192,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 [
@@ -221,9 +221,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",
],
)
@@ -247,11 +247,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",
],
)
@@ -266,7 +266,7 @@
name = "log_web_proxy",
srcs = ["log_web_proxy.sh"],
data = [
- ":config",
+ ":aos_config",
"//aos/network:log_web_proxy_main",
"//y2020/www:camera_main_bundle.min.js",
"//y2020/www:field_main_bundle.min.js",
@@ -279,7 +279,7 @@
name = "web_proxy",
srcs = ["web_proxy.sh"],
data = [
- ":config",
+ ":aos_config",
"//aos/network:web_proxy_main",
"//y2020/www:camera_main_bundle.min.js",
"//y2020/www:field_main_bundle.min.js",
diff --git a/y2020/actors/autonomous_actor_main.cc b/y2020/actors/autonomous_actor_main.cc
index 72384d5..f866064 100644
--- a/y2020/actors/autonomous_actor_main.cc
+++ b/y2020/actors/autonomous_actor_main.cc
@@ -9,7 +9,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());
::y2020::constants::InitValues();
diff --git a/y2020/actors/shooter_tuning_actor.cc b/y2020/actors/shooter_tuning_actor.cc
index d18c518..06e78b9 100644
--- a/y2020/actors/shooter_tuning_actor.cc
+++ b/y2020/actors/shooter_tuning_actor.cc
@@ -178,7 +178,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());
y2020::constants::InitValues();
diff --git a/y2020/control_loops/drivetrain/BUILD b/y2020/control_loops/drivetrain/BUILD
index 56ac3a9..f4915da 100644
--- a/y2020/control_loops/drivetrain/BUILD
+++ b/y2020/control_loops/drivetrain/BUILD
@@ -145,7 +145,7 @@
visibility = ["//visibility:public"],
deps = [
"//frc971/control_loops/drivetrain:simulation_channels",
- "//y2020:config",
+ "//y2020:aos_config",
],
)
@@ -172,7 +172,7 @@
name = "drivetrain_replay_test",
srcs = ["drivetrain_replay_test.cc"],
data = [
- "//y2020:config",
+ "//y2020:aos_config",
"@drivetrain_replay",
],
target_compatible_with = ["@platforms//os:linux"],
@@ -195,7 +195,7 @@
cc_binary(
name = "drivetrain_replay",
srcs = ["drivetrain_replay.cc"],
- data = ["//y2020:config"],
+ data = ["//y2020:aos_config"],
target_compatible_with = ["@platforms//os:linux"],
deps = [
":drivetrain_base",
diff --git a/y2020/control_loops/drivetrain/drivetrain_main.cc b/y2020/control_loops/drivetrain/drivetrain_main.cc
index 24c876f..cd8df4d 100644
--- a/y2020/control_loops/drivetrain/drivetrain_main.cc
+++ b/y2020/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<::y2020::control_loops::drivetrain::Localizer> localizer =
diff --git a/y2020/control_loops/drivetrain/drivetrain_replay.cc b/y2020/control_loops/drivetrain/drivetrain_replay.cc
index 40b50ed..d2f2880 100644
--- a/y2020/control_loops/drivetrain/drivetrain_replay.cc
+++ b/y2020/control_loops/drivetrain/drivetrain_replay.cc
@@ -19,7 +19,7 @@
#include "y2020/control_loops/drivetrain/localizer.h"
#include "y2020/control_loops/superstructure/superstructure.h"
-DEFINE_string(config, "y2020/config.json",
+DEFINE_string(config, "y2020/aos_config.json",
"Name of the config file to replay using.");
DEFINE_string(output_folder, "/tmp/replayed",
"Name of the folder to write replayed logs to.");
diff --git a/y2020/control_loops/drivetrain/drivetrain_replay_test.cc b/y2020/control_loops/drivetrain/drivetrain_replay_test.cc
index 297cf5b..08622cb 100644
--- a/y2020/control_loops/drivetrain/drivetrain_replay_test.cc
+++ b/y2020/control_loops/drivetrain/drivetrain_replay_test.cc
@@ -26,7 +26,7 @@
logfile,
"external/drivetrain_replay/",
"Name of the logfile to read from.");
-DEFINE_string(config, "y2020/config.json",
+DEFINE_string(config, "y2020/aos_config.json",
"Name of the config file to replay using.");
namespace y2020 {
diff --git a/y2020/control_loops/drivetrain/trajectory_generator_main.cc b/y2020/control_loops/drivetrain/trajectory_generator_main.cc
index adfa492..152822e 100644
--- a/y2020/control_loops/drivetrain/trajectory_generator_main.cc
+++ b/y2020/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/y2020/control_loops/superstructure/BUILD b/y2020/control_loops/superstructure/BUILD
index abf24fc..9fa5969 100644
--- a/y2020/control_loops/superstructure/BUILD
+++ b/y2020/control_loops/superstructure/BUILD
@@ -108,7 +108,7 @@
"superstructure_lib_test.cc",
],
data = [
- "//y2020:config",
+ "//y2020:aos_config",
"@superstructure_replay",
],
target_compatible_with = ["@platforms//os:linux"],
diff --git a/y2020/control_loops/superstructure/shooter/shooter_tuning_params_setter.cc b/y2020/control_loops/superstructure/shooter/shooter_tuning_params_setter.cc
index 68bb243..e919aae 100644
--- a/y2020/control_loops/superstructure/shooter/shooter_tuning_params_setter.cc
+++ b/y2020/control_loops/superstructure/shooter/shooter_tuning_params_setter.cc
@@ -34,7 +34,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());
diff --git a/y2020/control_loops/superstructure/superstructure_lib_test.cc b/y2020/control_loops/superstructure/superstructure_lib_test.cc
index e41c421..1bbf42b 100644
--- a/y2020/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2020/control_loops/superstructure/superstructure_lib_test.cc
@@ -23,7 +23,7 @@
"If set, logs all channels to the provided logfile.");
DEFINE_string(replay_logfile, "external/superstructure_replay/",
"Name of the logfile to read from and replay.");
-DEFINE_string(config, "y2020/config.json",
+DEFINE_string(config, "y2020/aos_config.json",
"Name of the config file to replay using.");
namespace y2020 {
@@ -445,7 +445,7 @@
protected:
SuperstructureTest()
: ::frc971::testing::ControlLoopTest(
- aos::configuration::ReadConfig("y2020/config.json"),
+ aos::configuration::ReadConfig("y2020/aos_config.json"),
chrono::microseconds(5050)),
roborio_(aos::configuration::GetNode(configuration(), "roborio")),
test_event_loop_(MakeEventLoop("test", roborio_)),
diff --git a/y2020/control_loops/superstructure/superstructure_main.cc b/y2020/control_loops/superstructure/superstructure_main.cc
index a10237d..88dddf1 100644
--- a/y2020/control_loops/superstructure/superstructure_main.cc
+++ b/y2020/control_loops/superstructure/superstructure_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());
::y2020::constants::InitValues();
diff --git a/y2020/joystick_reader.cc b/y2020/joystick_reader.cc
index b610b64..951c5a7 100644
--- a/y2020/joystick_reader.cc
+++ b/y2020/joystick_reader.cc
@@ -340,7 +340,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());
::y2020::input::joysticks::Reader reader(&event_loop);
diff --git a/y2020/setpoint_setter.cc b/y2020/setpoint_setter.cc
index e04fe41..0ca67e7 100644
--- a/y2020/setpoint_setter.cc
+++ b/y2020/setpoint_setter.cc
@@ -13,7 +13,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());
diff --git a/y2020/vision/BUILD b/y2020/vision/BUILD
index 75ef7aa..ae4e3f2 100644
--- a/y2020/vision/BUILD
+++ b/y2020/vision/BUILD
@@ -31,7 +31,7 @@
"camera_reader.h",
],
data = [
- "//y2020:config",
+ "//y2020:aos_config",
],
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//y2020:__subpackages__"] + ["//y2022:__subpackages__"],
@@ -55,7 +55,7 @@
"viewer.cc",
],
data = [
- "//y2020:config",
+ "//y2020:aos_config",
],
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//y2020:__subpackages__"],
@@ -103,7 +103,7 @@
"calibration.cc",
],
data = [
- "//y2020:config",
+ "//y2020:aos_config",
],
target_compatible_with = ["@platforms//os:linux"],
visibility = [
@@ -133,7 +133,7 @@
"viewer_replay.cc",
],
data = [
- "//y2020:config",
+ "//y2020:aos_config",
],
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//y2020:__subpackages__"],
@@ -154,7 +154,7 @@
"extrinsics_calibration.cc",
],
data = [
- "//y2020:config",
+ "//y2020:aos_config",
],
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//y2020:__subpackages__"],
diff --git a/y2020/vision/calibration.cc b/y2020/vision/calibration.cc
index 9293d50..0a12d70 100644
--- a/y2020/vision/calibration.cc
+++ b/y2020/vision/calibration.cc
@@ -16,7 +16,7 @@
DEFINE_string(calibration_folder, ".", "Folder to place calibration files.");
DEFINE_string(camera_id, "", "Camera ID in format YY-NN-- year and number.");
-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_bool(display_undistorted, false,
"If true, display the undistorted image.");
DEFINE_string(pi, "", "Pi name to calibrate.");
diff --git a/y2020/vision/camera_reader_main.cc b/y2020/vision/camera_reader_main.cc
index c7fec43..b54cf4e 100644
--- a/y2020/vision/camera_reader_main.cc
+++ b/y2020/vision/camera_reader_main.cc
@@ -3,9 +3,9 @@
#include "y2020/vision/camera_reader.h"
// config used to allow running camera_reader independently. E.g.,
-// bazel run //y2020/vision:camera_reader -- --config y2020/config.json
+// bazel run //y2020/vision:camera_reader -- --config y2020/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.");
namespace frc971 {
namespace vision {
namespace {
diff --git a/y2020/vision/extrinsics_calibration.cc b/y2020/vision/extrinsics_calibration.cc
index f2ac926..5f08527 100644
--- a/y2020/vision/extrinsics_calibration.cc
+++ b/y2020/vision/extrinsics_calibration.cc
@@ -20,7 +20,7 @@
#include "y2020/vision/sift/sift_training_generated.h"
#include "y2020/vision/tools/python_code/sift_training_data.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.");
DEFINE_string(pi, "pi-7971-2", "Pi name to calibrate.");
DEFINE_bool(plot, false, "Whether to plot the resulting data.");
diff --git a/y2020/vision/viewer.cc b/y2020/vision/viewer.cc
index 37ff4a3..d923407 100644
--- a/y2020/vision/viewer.cc
+++ b/y2020/vision/viewer.cc
@@ -12,7 +12,7 @@
#include "frc971/vision/vision_generated.h"
#include "y2020/vision/sift/sift_generated.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.");
DEFINE_bool(show_features, true, "Show the SIFT features that matched.");
DEFINE_string(channel, "/camera", "Channel name for the image.");
diff --git a/y2020/web_proxy.sh b/y2020/web_proxy.sh
index 8e1a570..16a292a 100755
--- a/y2020/web_proxy.sh
+++ b/y2020/web_proxy.sh
@@ -1 +1 @@
-./aos/network/web_proxy_main --config=y2020/config.json --data_dir=y2020/www
+./aos/network/web_proxy_main --config=y2020/aos_config.json --data_dir=y2020/www
diff --git a/y2020/wpilib_interface.cc b/y2020/wpilib_interface.cc
index f746970..5569550 100644
--- a/y2020/wpilib_interface.cc
+++ b/y2020/wpilib_interface.cc
@@ -556,7 +556,7 @@
void Run() override {
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());