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/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 =