Rename y2023_bot4 to y2024_swerve
Signed-off-by: Nikolai Sohmers <nikolai@sohmers.com>
Change-Id: I5ba424d229862bbf571de74cbb516260909d1d70
diff --git a/y2023_bot4/BUILD b/y2024_swerve/BUILD
similarity index 96%
rename from y2023_bot4/BUILD
rename to y2024_swerve/BUILD
index 095731a..53f98b8 100644
--- a/y2023_bot4/BUILD
+++ b/y2024_swerve/BUILD
@@ -5,7 +5,7 @@
config_validator_test(
name = "config_validator_test",
- config = "//y2023_bot4:aos_config",
+ config = "//y2024_swerve:aos_config",
)
robot_downloader(
@@ -64,7 +64,7 @@
srcs = [
"swerve_drivetrain_output.json",
],
- visibility = ["//y2023_bot4:__subpackages__"],
+ visibility = ["//y2024_swerve:__subpackages__"],
)
cc_library(
@@ -151,7 +151,7 @@
aos_config(
name = "aos_config",
- src = "y2023_bot4.json",
+ src = "y2024_swerve.json",
flatbuffers = [
"//aos/network:message_bridge_client_fbs",
"//aos/network:message_bridge_server_fbs",
@@ -169,7 +169,7 @@
aos_config(
name = "config_roborio",
- src = "y2023_bot4_roborio.json",
+ src = "y2024_swerve_roborio.json",
flatbuffers = [
":drivetrain_position_fbs",
":drivetrain_can_position_fbs",
@@ -195,7 +195,7 @@
aos_config(
name = "config_imu",
- src = "y2023_bot4_imu.json",
+ src = "y2024_swerve_imu.json",
flatbuffers = [
"//aos/network:message_bridge_client_fbs",
"//aos/network:message_bridge_server_fbs",
@@ -213,7 +213,7 @@
aos_config(
name = "config_logger",
- src = "y2023_bot4_logger.json",
+ src = "y2024_swerve_logger.json",
flatbuffers = [
"//aos/network:message_bridge_client_fbs",
"//aos/network:message_bridge_server_fbs",
diff --git a/y2023_bot4/constants.cc b/y2024_swerve/constants.cc
similarity index 94%
rename from y2023_bot4/constants.cc
rename to y2024_swerve/constants.cc
index 701308d..4f938a3 100644
--- a/y2023_bot4/constants.cc
+++ b/y2024_swerve/constants.cc
@@ -1,4 +1,4 @@
-#include "y2023_bot4/constants.h"
+#include "y2024_swerve/constants.h"
#include <cstdint>
@@ -6,7 +6,7 @@
#include "aos/network/team_number.h"
-namespace y2023_bot4::constants {
+namespace y2024_swerve::constants {
Values MakeValues(uint16_t team) {
LOG(INFO) << "creating a Constants for team: " << team;
Values r;
@@ -47,4 +47,4 @@
}
Values MakeValues() { return MakeValues(aos::network::GetTeamNumber()); }
-} // namespace y2023_bot4::constants
+} // namespace y2024_swerve::constants
diff --git a/y2023_bot4/constants.h b/y2024_swerve/constants.h
similarity index 89%
rename from y2023_bot4/constants.h
rename to y2024_swerve/constants.h
index fbbc5f2..cf6c183 100644
--- a/y2023_bot4/constants.h
+++ b/y2024_swerve/constants.h
@@ -1,5 +1,5 @@
-#ifndef Y2023_BOT4_CONSTANTS_H
-#define Y2023_BOT4_CONSTANTS_H
+#ifndef Y2024_SWERVE_CONSTANTS_H
+#define Y2024_SWERVE_CONSTANTS_H
#ifndef M_PI
#define M_PI 3.14159265358979323846
@@ -9,7 +9,7 @@
#include "frc971/constants.h"
-namespace y2023_bot4::constants {
+namespace y2024_swerve::constants {
struct Values {
static const int kZeroingSampleSize = 200;
@@ -48,6 +48,6 @@
// Calls MakeValues with aos::network::GetTeamNumber()
Values MakeValues();
-} // namespace y2023_bot4::constants
+} // namespace y2024_swerve::constants
-#endif // Y2023_BOT4_CONSTANTS_H
+#endif // Y2024_SWERVE_CONSTANTS_H
diff --git a/y2023_bot4/drivetrain_can_position.fbs b/y2024_swerve/drivetrain_can_position.fbs
similarity index 95%
rename from y2023_bot4/drivetrain_can_position.fbs
rename to y2024_swerve/drivetrain_can_position.fbs
index ef8edf7..f0d41a8 100644
--- a/y2023_bot4/drivetrain_can_position.fbs
+++ b/y2024_swerve/drivetrain_can_position.fbs
@@ -1,5 +1,5 @@
include "frc971/control_loops/can_talonfx.fbs";
-namespace y2023_bot4;
+namespace y2024_swerve;
table SwerveModuleCANPosition {
rotation: frc971.control_loops.CANTalonFX (id: 0);
diff --git a/y2023_bot4/drivetrain_position.fbs b/y2024_swerve/drivetrain_position.fbs
similarity index 95%
rename from y2023_bot4/drivetrain_position.fbs
rename to y2024_swerve/drivetrain_position.fbs
index e5d0fc3..902cfee 100644
--- a/y2023_bot4/drivetrain_position.fbs
+++ b/y2024_swerve/drivetrain_position.fbs
@@ -1,5 +1,5 @@
include "frc971/control_loops/control_loops.fbs";
-namespace y2023_bot4;
+namespace y2024_swerve;
table AbsoluteDrivetrainPosition {
// Position of the follower wheels from the encoders
diff --git a/y2023_bot4/swerve_drivetrain_output.json b/y2024_swerve/swerve_drivetrain_output.json
similarity index 100%
rename from y2023_bot4/swerve_drivetrain_output.json
rename to y2024_swerve/swerve_drivetrain_output.json
diff --git a/y2023_bot4/swerve_publisher_lib.cc b/y2024_swerve/swerve_publisher_lib.cc
similarity index 84%
rename from y2023_bot4/swerve_publisher_lib.cc
rename to y2024_swerve/swerve_publisher_lib.cc
index 78a778e..771d770 100644
--- a/y2023_bot4/swerve_publisher_lib.cc
+++ b/y2024_swerve/swerve_publisher_lib.cc
@@ -1,9 +1,9 @@
-#include "y2023_bot4/swerve_publisher_lib.h"
+#include "y2024_swerve/swerve_publisher_lib.h"
-y2023_bot4::SwervePublisher::SwervePublisher(aos::EventLoop *event_loop,
- aos::ExitHandle *exit_handle,
- const std::string &filename,
- double duration)
+y2024_swerve::SwervePublisher::SwervePublisher(aos::EventLoop *event_loop,
+ aos::ExitHandle *exit_handle,
+ const std::string &filename,
+ double duration)
: drivetrain_output_sender_(
event_loop->MakeSender<drivetrain::swerve::Output>("/drivetrain")) {
event_loop
diff --git a/y2023_bot4/swerve_publisher_lib.h b/y2024_swerve/swerve_publisher_lib.h
similarity index 77%
rename from y2023_bot4/swerve_publisher_lib.h
rename to y2024_swerve/swerve_publisher_lib.h
index 5969b7b..9206eab 100644
--- a/y2023_bot4/swerve_publisher_lib.h
+++ b/y2024_swerve/swerve_publisher_lib.h
@@ -1,5 +1,5 @@
-#ifndef Y2023_BOT4_SWERVE_PUBLISHER_H_
-#define Y2023_BOT4_SWERVE_PUBLISHER_H_
+#ifndef Y2024_SWERVE_SWERVE_PUBLISHER_H_
+#define Y2024_SWERVE_SWERVE_PUBLISHER_H_
#include "gflags/gflags.h"
#include "glog/logging.h"
@@ -10,7 +10,7 @@
#include "aos/json_to_flatbuffer.h"
#include "frc971/control_loops/drivetrain/swerve/swerve_drivetrain_output_generated.h"
-namespace y2023_bot4 {
+namespace y2024_swerve {
namespace drivetrain = frc971::control_loops::drivetrain;
@@ -24,6 +24,6 @@
drivetrain_output_sender_;
};
-} // namespace y2023_bot4
+} // namespace y2024_swerve
-#endif // Y2023_BOT4_SWERVE_PUBLISHER_H_
+#endif // Y2024_SWERVE_SWERVE_PUBLISHER_H_
diff --git a/y2023_bot4/swerve_publisher_lib_test.cc b/y2024_swerve/swerve_publisher_lib_test.cc
similarity index 80%
rename from y2023_bot4/swerve_publisher_lib_test.cc
rename to y2024_swerve/swerve_publisher_lib_test.cc
index e834659..95892cc 100644
--- a/y2023_bot4/swerve_publisher_lib_test.cc
+++ b/y2024_swerve/swerve_publisher_lib_test.cc
@@ -1,14 +1,14 @@
-#include "y2023_bot4/swerve_publisher_lib.h"
+#include "y2024_swerve/swerve_publisher_lib.h"
#include "gtest/gtest.h"
#include "aos/events/simulated_event_loop.h"
-namespace y2023_bot4::testing {
+namespace y2024_swerve::testing {
class SwervePublisherTest : public ::testing::Test {
public:
SwervePublisherTest()
- : config_(aos::configuration::ReadConfig("y2023_bot4/aos_config.json")),
+ : config_(aos::configuration::ReadConfig("y2024_swerve/aos_config.json")),
event_loop_factory_(&config_.message()),
roborio_(aos::configuration::GetNode(
event_loop_factory_.configuration(), "roborio")),
@@ -20,7 +20,7 @@
frc971::control_loops::drivetrain::swerve::Output>(
"/drivetrain")),
swerve_publisher_(event_loop_.get(), exit_handle_.get(),
- "y2023_bot4/swerve_drivetrain_output.json", 100) {}
+ "y2024_swerve/swerve_drivetrain_output.json", 100) {}
void SendOutput() { event_loop_factory_.Run(); }
@@ -42,11 +42,11 @@
aos::Fetcher<frc971::control_loops::drivetrain::swerve::Output>
drivetrain_swerve_output_fetcher_;
- y2023_bot4::SwervePublisher swerve_publisher_;
+ y2024_swerve::SwervePublisher swerve_publisher_;
};
TEST_F(SwervePublisherTest, CheckSentFb) {
SendOutput();
CheckOutput();
}
-} // namespace y2023_bot4::testing
+} // namespace y2024_swerve::testing
diff --git a/y2023_bot4/swerve_publisher_main.cc b/y2024_swerve/swerve_publisher_main.cc
similarity index 72%
rename from y2023_bot4/swerve_publisher_main.cc
rename to y2024_swerve/swerve_publisher_main.cc
index 87470d7..5409da3 100644
--- a/y2023_bot4/swerve_publisher_main.cc
+++ b/y2024_swerve/swerve_publisher_main.cc
@@ -1,5 +1,5 @@
#include "aos/events/shm_event_loop.h"
-#include "y2023_bot4/swerve_publisher_lib.h"
+#include "y2024_swerve/swerve_publisher_lib.h"
DEFINE_double(duration, 100.0, "Length of time in Ms to apply current for");
DEFINE_string(drivetrain_position, "swerve_drivetrain_output.json",
@@ -16,9 +16,9 @@
std::unique_ptr<aos::ExitHandle> exit_handle = event_loop.MakeExitHandle();
- y2023_bot4::SwervePublisher publisher(&event_loop, exit_handle.get(),
- FLAGS_drivetrain_position,
- FLAGS_duration);
+ y2024_swerve::SwervePublisher publisher(&event_loop, exit_handle.get(),
+ FLAGS_drivetrain_position,
+ FLAGS_duration);
event_loop.Run();
}
diff --git a/y2023_bot4/wpilib_interface.cc b/y2024_swerve/wpilib_interface.cc
similarity index 97%
rename from y2023_bot4/wpilib_interface.cc
rename to y2024_swerve/wpilib_interface.cc
index e5b5a6f..65741a4 100644
--- a/y2023_bot4/wpilib_interface.cc
+++ b/y2024_swerve/wpilib_interface.cc
@@ -9,9 +9,9 @@
#include "frc971/wpilib/swerve/swerve_drivetrain_writer.h"
#include "frc971/wpilib/talonfx.h"
#include "frc971/wpilib/wpilib_robot_base.h"
-#include "y2023_bot4/constants.h"
-#include "y2023_bot4/drivetrain_can_position_static.h"
-#include "y2023_bot4/drivetrain_position_generated.h"
+#include "y2024_swerve/constants.h"
+#include "y2024_swerve/drivetrain_can_position_static.h"
+#include "y2024_swerve/drivetrain_position_generated.h"
DEFINE_bool(ctre_diag_server, false,
"If true, enable the diagnostics server for interacting with "
@@ -24,7 +24,7 @@
namespace drivetrain = frc971::control_loops::drivetrain;
-namespace y2023_bot4::wpilib {
+namespace y2024_swerve::wpilib {
namespace {
template <class T>
@@ -303,6 +303,6 @@
}
};
-} // namespace y2023_bot4::wpilib
+} // namespace y2024_swerve::wpilib
-AOS_ROBOT_CLASS(::y2023_bot4::wpilib::WPILibRobot)
+AOS_ROBOT_CLASS(::y2024_swerve::wpilib::WPILibRobot)
diff --git a/y2023_bot4/y2023_bot4.json b/y2024_swerve/y2024_swerve.json
similarity index 71%
rename from y2023_bot4/y2023_bot4.json
rename to y2024_swerve/y2024_swerve.json
index 49db6fc..85d1ed9 100644
--- a/y2023_bot4/y2023_bot4.json
+++ b/y2024_swerve/y2024_swerve.json
@@ -12,8 +12,8 @@
}
],
"imports": [
- "y2023_bot4_roborio.json",
- "y2023_bot4_imu.json",
- "y2023_bot4_logger.json"
+ "y2024_swerve_roborio.json",
+ "y2024_swerve_imu.json",
+ "y2024_swerve_logger.json"
]
}
diff --git a/y2023_bot4/y2023_bot4_imu.json b/y2024_swerve/y2024_swerve_imu.json
similarity index 100%
rename from y2023_bot4/y2023_bot4_imu.json
rename to y2024_swerve/y2024_swerve_imu.json
diff --git a/y2023_bot4/y2023_bot4_logger.json b/y2024_swerve/y2024_swerve_logger.json
similarity index 100%
rename from y2023_bot4/y2023_bot4_logger.json
rename to y2024_swerve/y2024_swerve_logger.json
diff --git a/y2023_bot4/y2023_bot4_roborio.json b/y2024_swerve/y2024_swerve_roborio.json
similarity index 98%
rename from y2023_bot4/y2023_bot4_roborio.json
rename to y2024_swerve/y2024_swerve_roborio.json
index 7ff175c..2746ade 100644
--- a/y2023_bot4/y2023_bot4_roborio.json
+++ b/y2024_swerve/y2024_swerve_roborio.json
@@ -98,7 +98,7 @@
},
{
"name": "/drivetrain",
- "type": "y2023_bot4.AbsoluteDrivetrainPosition",
+ "type": "y2024_swerve.AbsoluteDrivetrainPosition",
"source_node": "roborio",
"frequency": 250,
"num_senders": 1,
@@ -106,7 +106,7 @@
},
{
"name": "/drivetrain",
- "type": "y2023_bot4.AbsoluteCANPosition",
+ "type": "y2024_swerve.AbsoluteCANPosition",
"source_node": "roborio",
"frequency": 250,
"num_senders": 1,