Skip to content

Commit

Permalink
Fix camera config labels
Browse files Browse the repository at this point in the history
  • Loading branch information
abhaybd committed Apr 12, 2024
1 parent 82b668b commit d208081
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion camera-config/HandCameraCalibration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: "hand"
description: "Camera located on the hand of the rover."
# Make sure that this camera_id matches the one defined in the udev rules.
camera_id: 40
camera_id: 20
calib_info:
calibration_time: "Sat 01 May 2021 01:54:16 PM PDT"
board_width: 11
Expand Down
2 changes: 1 addition & 1 deletion camera-config/MastCameraCalibration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: "mast"
description: "Camera located on the mast of the rover."
# Make sure that this camera_id matches the one defined in the udev rules.
camera_id: 20
camera_id: 40
calib_info:
calibration_time: "Sat 01 May 2021 01:54:16 PM PDT"
board_width: 11
Expand Down
4 changes: 2 additions & 2 deletions src/Constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ const double MAX_DTHETA = kinematics::DiffDriveKinematics(EFF_WHEEL_BASE)
// TODO: We need to recalibrate the camera, since we replaced it with a different one.
// TODO: rename cameras (in MC as well) as appropriate
constexpr const char* MAST_CAMERA_CONFIG_PATH = "../camera-config/MastCameraCalibration.yml";
const robot::types::CameraID MAST_CAMERA_ID = "front"; // TODO: replace with real camera name
const robot::types::CameraID MAST_CAMERA_ID = "upperArm"; // TODO: replace with real camera name

constexpr const char* FOREARM_CAMERA_CONFIG_PATH =
"../camera-config/ForearmCameraCalibration.yml";
const robot::types::CameraID FOREARM_CAMERA_ID = "rear";

constexpr const char* HAND_CAMERA_CONFIG_PATH = "../camera-config/HandCameraCalibration.yml";
const robot::types::CameraID HAND_CAMERA_ID = "upperArm";
const robot::types::CameraID HAND_CAMERA_ID = "front";

/**
@deprecated No need for this constant once we fully switch over the Mission Control PlanViz
Expand Down

0 comments on commit d208081

Please sign in to comment.