Adding a camera_id to our intrinsic calibration file
We'll need to manually label and track these, since the pi cameras
don't have an internal serial number (as best I can tell).
I think this is important, since we can swap cameras between pi's
and it's hard to be sure we've got the right calibration based on
pi hostame.
Including calibration files for cameras 22-01 to 22-07
Added a little detail to the CHECK, since it wasn't very clear
Change-Id: I6dd6f8e19355bb0fefce2fcb7fd79ba5c95fb374
Signed-off-by: Jim Ostrowski <yimmy13@gmail.com>
diff --git a/y2022/vision/camera_definition.py b/y2022/vision/camera_definition.py
index a45c704..30057a5 100644
--- a/y2022/vision/camera_definition.py
+++ b/y2022/vision/camera_definition.py
@@ -48,6 +48,7 @@
self.turret_ext = None
self.node_name = ""
self.team_number = -1
+ self.camera_id = ""
self.timestamp = 0
@@ -144,6 +145,10 @@
team_number = calib_dict["team_number"]
node_name = calib_dict["node_name"]
+ camera_id = "UNKNOWN"
+ if "camera_id" in calib_dict:
+ camera_id = calib_dict["camera_id"]
+
camera_matrix = np.asarray(calib_dict["intrinsics"]).reshape(
(3, 3))
dist_coeffs = np.asarray(calib_dict["dist_coeffs"]).reshape((1, 5))
@@ -158,6 +163,7 @@
camera_params.node_name = node_name
camera_params.team_number = team_number
+ camera_params.camera_id = camera_id
camera_params.camera_int.camera_matrix = copy.copy(camera_matrix)
camera_params.camera_int.dist_coeffs = copy.copy(dist_coeffs)
camera_list.append(camera_params)