Merge changes I2fbcd394,I861317ea,Icba24385
* changes:
Updated intrinsic and extrinsic data for 971-3
Update for pi-7971-3 intrinsic calibration
Update to 7971-2 with new intrinsic parameters
diff --git a/y2023/constants/7971.json b/y2023/constants/7971.json
index 5c0877d..74fd3aa 100644
--- a/y2023/constants/7971.json
+++ b/y2023/constants/7971.json
@@ -4,10 +4,10 @@
"calibration": {% include 'y2023/vision/calib_files/calibration_pi-7971-1_cam-23-01_ext_2023-02-19.json' %}
},
{
- "calibration": {% include 'y2023/vision/calib_files/calibration_pi-7971-2_cam-23-02_ext_2023-04-05.json' %}
+ "calibration": {% include 'y2023/vision/calib_files/calibration_pi-7971-2_cam-23-02_ext_2023-04-08.json' %}
},
{
- "calibration": {% include 'y2023/vision/calib_files/calibration_pi-7971-3_cam-23-03_ext_2023-04-05.json' %}
+ "calibration": {% include 'y2023/vision/calib_files/calibration_pi-7971-3_cam-23-03_ext_2023-04-08.json' %}
},
{
"calibration": {% include 'y2023/vision/calib_files/calibration_pi-7971-4_cam-23-04_ext_2023-02-19.json' %}
diff --git a/y2023/constants/971.json b/y2023/constants/971.json
index 35a9a1e..b9351fd 100644
--- a/y2023/constants/971.json
+++ b/y2023/constants/971.json
@@ -7,7 +7,7 @@
"calibration": {% include 'y2023/vision/calib_files/calibration_pi-971-2_cam-23-06_ext_2023-03-25.json' %}
},
{
- "calibration": {% include 'y2023/vision/calib_files/calibration_pi-971-3_cam-23-07_ext_2023-03-26.json' %}
+ "calibration": {% include 'y2023/vision/calib_files/calibration_pi-971-3_cam-23-04_ext_2023-04-10.json' %}
},
{
"calibration": {% include 'y2023/vision/calib_files/calibration_pi-971-4_cam-23-08_ext_2023-02-22.json' %}
diff --git a/y2023/vision/calib_files/calibration_pi-7971-2_cam-23-02_ext_2023-04-08.json b/y2023/vision/calib_files/calibration_pi-7971-2_cam-23-02_ext_2023-04-08.json
new file mode 100644
index 0000000..8728938
--- /dev/null
+++ b/y2023/vision/calib_files/calibration_pi-7971-2_cam-23-02_ext_2023-04-08.json
@@ -0,0 +1 @@
+{ "node_name": "pi2", "team_number": 7971, "intrinsics": [ 888.573181, 0.0, 649.254517, 0.0, 888.493774, 370.136658, 0.0, 0.0, 1.0 ], "fixed_extrinsics": { "data": [ -0.482031, 0.00240341, 0.87615, 0.149719, -0.87612, -0.0100773, -0.481987, -0.000995038, 0.00767093, -0.999947, 0.00696306, 0.0062866, 0.0, 0.0, 0.0, 1.0 ] }, "dist_coeffs": [ -0.449155, 0.251979, -0.000308, -0.000179, -0.080278 ], "calibration_timestamp": 1358499769498335208, "camera_id": "23-02" }
diff --git a/y2023/vision/calib_files/calibration_pi-7971-3_cam-23-03_ext_2023-04-08.json b/y2023/vision/calib_files/calibration_pi-7971-3_cam-23-03_ext_2023-04-08.json
new file mode 100644
index 0000000..6eb481f
--- /dev/null
+++ b/y2023/vision/calib_files/calibration_pi-7971-3_cam-23-03_ext_2023-04-08.json
@@ -0,0 +1 @@
+{ "node_name": "pi3", "team_number": 7971, "intrinsics": [ 887.863831, 0.0, 625.956909, 0.0, 888.210205, 372.510437, 0.0, 0.0, 1.0 ], "fixed_extrinsics": { "data": [ 0.517483, 0.00906969, 0.855645, 0.156941, -0.855687, 0.00935422, 0.517409, 0.0833421, -0.00331132, -0.999915, 0.0126013, 0.0124048, 0.0, 0.0, 0.0, 1.0 ] }, "dist_coeffs": [ -0.449028, 0.257065, 0.000478, -0.000113, -0.086986 ], "calibration_timestamp": 1358501967378322133, "camera_id": "23-03" }
diff --git a/y2023/vision/calib_files/calibration_pi-971-3_cam-23-04_ext_2023-04-10.json b/y2023/vision/calib_files/calibration_pi-971-3_cam-23-04_ext_2023-04-10.json
new file mode 100644
index 0000000..f76623c
--- /dev/null
+++ b/y2023/vision/calib_files/calibration_pi-971-3_cam-23-04_ext_2023-04-10.json
@@ -0,0 +1,2 @@
+{ "node_name": "pi3", "team_number": 971, "intrinsics": [ 890.071899, 0.0, 620.69519, 0.0, 890.307434, 365.158844, 0.0, 0.0, 1.0 ], "fixed_extrinsics": { "data": [ 0.482409, -0.181339, -0.85697, -0.115455, -0.871457, -0.000440151, -0.490471, -0.175596, 0.0885639, 0.983421, -0.158241, 0.61873, 0.0, 0.0, 0.0, 1.0 ] }, "dist_coeffs": [ -0.449088, 0.25594, 0.000415, 0.000142, -0.084656 ], "calibration_timestamp": 1358501982039874176, "camera_id": "23-04" }
+
diff --git a/y2023/vision/calib_files/calibration_pi-971-3_cam-23-07_ext_2023-02-22.json b/y2023/vision/calib_files/calibration_pi-971-3_cam-23-07_ext_2023-02-22.json
deleted file mode 100644
index 8c86d20..0000000
--- a/y2023/vision/calib_files/calibration_pi-971-3_cam-23-07_ext_2023-02-22.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "node_name": "pi3", "team_number": 971, "intrinsics": [ 892.627869, 0.0, 629.289978, 0.0, 891.73761, 373.299896, 0.0, 0.0, 1.0 ], "fixed_extrinsics": { "data": [ 0.492232, -0.163335, -0.855002, 0.020122, -0.866067, 0.006706, -0.499883, -0.174518, 0.087382, 0.986548, -0.138158, 0.645307, 0.0, 0.0, 0.0, 1.0 ] }, "dist_coeffs": [ -0.454901, 0.266778, -0.000316, -0.000469, -0.091357 ], "calibration_timestamp": 1358500316768663953, "camera_id": "23-07" }
\ No newline at end of file
diff --git a/y2023/vision/calib_files/calibration_pi-971-3_cam-23-07_ext_2023-03-26.json b/y2023/vision/calib_files/calibration_pi-971-3_cam-23-07_ext_2023-03-26.json
deleted file mode 100644
index 64d1c95..0000000
--- a/y2023/vision/calib_files/calibration_pi-971-3_cam-23-07_ext_2023-03-26.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "node_name": "pi3", "team_number": 971, "intrinsics": [ 892.627869, 0.0, 629.289978, 0.0, 891.73761, 373.299896, 0.0, 0.0, 1.0 ], "fixed_extrinsics": { "data": [0.514403, -0.183311, -0.837728, -0.0051253, -0.851817, 0.00353495, -0.523827, -0.214622, 0.0989849, 0.983049, -0.154329, 0.62819, 0.0, 0.0, 0.0, 1.0 ] }, "dist_coeffs": [ -0.454901, 0.266778, -0.000316, -0.000469, -0.091357 ], "calibration_timestamp": 1358500316768663953, "camera_id": "23-07" }