Merge "Use PopulateSwerveModuleRotation Function in Swerve Control Loops"
diff --git a/y2024_swerve/BUILD b/y2024_swerve/BUILD
index b24c469..0a91e3a 100644
--- a/y2024_swerve/BUILD
+++ b/y2024_swerve/BUILD
@@ -68,6 +68,7 @@
"//aos/events/logging:logger_main",
"//frc971/imu_fdcan:can_translator",
"//frc971/imu_fdcan:dual_imu_blender",
+ "//frc971/can_logger",
"//aos/network:message_bridge_client",
"//aos/network:message_bridge_server",
"//aos/network:web_proxy_main",
diff --git a/y2024_swerve/constants/calib_files/calibration_imu-9971-0_cam-24-10_2024-02-24_16-44-05.json b/y2024_swerve/constants/calib_files/calibration_imu-9971-0_cam-24-10_2024-02-24_16-44-05.json
index e5f50e3..9b3f046 100755
--- a/y2024_swerve/constants/calib_files/calibration_imu-9971-0_cam-24-10_2024-02-24_16-44-05.json
+++ b/y2024_swerve/constants/calib_files/calibration_imu-9971-0_cam-24-10_2024-02-24_16-44-05.json
@@ -1,6 +1,6 @@
{
- "node_name": "imu",
- "team_number": 9971,
+ "node_name": "orin1",
+ "team_number": 6971,
"intrinsics": [
646.04834,
0.0,
diff --git a/y2024_swerve/constants/calib_files/calibration_imu-9971-1_cam-24-12_2024-03-24_11-52-49.json b/y2024_swerve/constants/calib_files/calibration_imu-9971-1_cam-24-12_2024-03-24_11-52-49.json
index 530e88a..ee4078d 100755
--- a/y2024_swerve/constants/calib_files/calibration_imu-9971-1_cam-24-12_2024-03-24_11-52-49.json
+++ b/y2024_swerve/constants/calib_files/calibration_imu-9971-1_cam-24-12_2024-03-24_11-52-49.json
@@ -1,6 +1,6 @@
{
"node_name": "imu",
- "team_number": 9971,
+ "team_number": 6971,
"intrinsics": [
647.19928,
0.0,
@@ -41,6 +41,6 @@
],
"calibration_timestamp": 1711306369592332476,
"camera_id": "24-12",
- "camera_number": 1,
+ "camera_number": 0,
"reprojection_error": 1.23409
-}
\ No newline at end of file
+}
diff --git a/y2024_swerve/constants/calib_files/calibration_orin1-9971-0_cam-24-09_2024-03-24_11-52-49.json b/y2024_swerve/constants/calib_files/calibration_orin1-9971-0_cam-24-09_2024-03-24_11-52-49.json
index 97234c9..c9e0114 100755
--- a/y2024_swerve/constants/calib_files/calibration_orin1-9971-0_cam-24-09_2024-03-24_11-52-49.json
+++ b/y2024_swerve/constants/calib_files/calibration_orin1-9971-0_cam-24-09_2024-03-24_11-52-49.json
@@ -1,6 +1,6 @@
{
- "node_name": "orin1",
- "team_number": 9971,
+ "node_name": "imu",
+ "team_number": 6971,
"intrinsics": [
648.187805,
0.0,
@@ -41,6 +41,6 @@
],
"calibration_timestamp": 1711306369593360533,
"camera_id": "24-09",
- "camera_number": 0,
+ "camera_number": 1,
"reprojection_error": 1.881098
-}
\ No newline at end of file
+}