Add imu to /etc/hosts as pi5
Still would need to manually change /etc/hosts for imu pi
Also updating camera calibration files
Change-Id: I9ffe8f604bed692408867d17f41ac33de5b7abc2
Signed-off-by: Jim Ostrowski <yimmy13@gmail.com>
diff --git a/frc971/raspi/rootfs/change_hostname.sh b/frc971/raspi/rootfs/change_hostname.sh
index c9b0b35..f555048 100755
--- a/frc971/raspi/rootfs/change_hostname.sh
+++ b/frc971/raspi/rootfs/change_hostname.sh
@@ -1,9 +1,10 @@
#!/bin/bash
-set -euo pipefail
+set -xeuo pipefail
HOSTNAME="$1"
+# TODO<Jim>: Should probably add handling for imu hostname, too
if [[ ! "${HOSTNAME}" =~ ^pi-[0-9]*-[0-9]$ ]]; then
echo "Invalid hostname ${HOSTNAME}, needs to be pi-[team#]-[pi#]"
exit 1
@@ -22,6 +23,7 @@
echo "${HOSTNAME}" > /etc/hostname
+# Put corret team number in pi's IP addresses, or add them if needed
if grep '^10\.[0-9]*\.[0-9]*\.[0-9]*\s*pi-[0-9]*-[0-9] pi[0-9]$' /etc/hosts >/dev/null ;
then
sed -i "s/^10\.[0-9]*\.[0-9]*\(\.[0-9]*\s*pi-\)[0-9]*\(-[0-9] pi[0-9]\)$/${IP_BASE}\1${TEAM_NUMBER}\2/" /etc/hosts
@@ -31,6 +33,7 @@
done
fi
+# Put corret team number in roborio's address, or add it if missing
if grep '^10\.[0-9]*\.[0-9]*\.2\s*roborio$' /etc/hosts >/dev/null;
then
sed -i "s/^10\.[0-9]*\.[0-9]*\(\.2\s*roborio\)$/${IP_BASE}\1/" /etc/hosts
@@ -38,9 +41,23 @@
echo -e "${IP_BASE}.2\troborio" >> /etc/hosts
fi
+# Put corret team number in logger's address, or add it if missing
if grep '^10\.[0-9]*\.[0-9]*\.13\s*logger$' /etc/hosts >/dev/null;
then
sed -i "s/^10\.[0-9]*\.[0-9]*\(\.13\s*logger\)$/${IP_BASE}\1/" /etc/hosts
else
echo -e "${IP_BASE}.13\tlogger" >> /etc/hosts
fi
+
+# Put corret team number in imu's address, or add it if missing
+if grep '^10\.[0-9]*\.[0-9]*\.105\s.*\s*imu$' /etc/hosts >/dev/null;
+then
+ sed -i "s/^10\.[0-9]*\.[0-9]*\(\.105\s.*imu\)$/${IP_BASE}\1/" /etc/hosts
+else
+ if grep '^10\.[0-9]*\.[0-9]*\.105\s*pi-[0-9]*-[0-9]*\s*pi5$' /etc/hosts
+ then
+ sed -i "s/^10\.[0-9]*\.[0-9]*\(\.[0-9]*\s*pi-\)[0-9]*\(-[0-9] pi5\)$/${IP_BASE}\1${TEAM_NUMBER}\2 imu/" /etc/hosts
+ else
+ echo -e "${IP_BASE}.105\tpi-${TEAM_NUMBER}-5 pi5 imu" >> /etc/hosts
+ fi
+fi
diff --git a/y2022/vision/calib_files/calibration_pi-971-1_2022-02-06_15-19-00.000000000.json b/y2022/vision/calib_files/calibration_pi-971-1_2022-02-06_15-19-00.000000000.json
deleted file mode 100755
index 6a4f05c..0000000
--- a/y2022/vision/calib_files/calibration_pi-971-1_2022-02-06_15-19-00.000000000.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "node_name": "pi1",
- "team_number": 971,
- "intrinsics": [
- 398.312439,
- 0.0,
- 348.653015,
- 0.0,
- 397.627533,
- 257.368805,
- 0.0,
- 0.0,
- 1.0
- ],
- "dist_coeffs": [
- 0.143741,
- -0.274336,
- -0.000311,
- -0.000171,
- 0.10252
- ],
- "calibration_timestamp": 1635600750700335075
-}
diff --git a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-02_2022-01-28_05-35-16.002911868.json b/y2022/vision/calib_files/calibration_pi-971-2_cam-22-02_2022-01-28_05-35-16.002911868.json
similarity index 92%
rename from y2022/vision/calib_files/calibration_pi-971-1_cam-22-02_2022-01-28_05-35-16.002911868.json
rename to y2022/vision/calib_files/calibration_pi-971-2_cam-22-02_2022-01-28_05-35-16.002911868.json
index b147867..2c9cf48 100644
--- a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-02_2022-01-28_05-35-16.002911868.json
+++ b/y2022/vision/calib_files/calibration_pi-971-2_cam-22-02_2022-01-28_05-35-16.002911868.json
@@ -1,5 +1,5 @@
{
- "node_name": "pi1",
+ "node_name": "pi2",
"team_number": 971,
"intrinsics": [
390.833618,
@@ -21,4 +21,4 @@
],
"calibration_timestamp": 1643348116002911868,
"camera_id": "22-02"
-}
\ No newline at end of file
+}
diff --git a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-03_2022-02-12_16-53-00.000000000.json b/y2022/vision/calib_files/calibration_pi-971-3_cam-22-03_2022-02-12_16-53-00.000000000.json
similarity index 93%
rename from y2022/vision/calib_files/calibration_pi-971-1_cam-22-03_2022-02-12_16-53-00.000000000.json
rename to y2022/vision/calib_files/calibration_pi-971-3_cam-22-03_2022-02-12_16-53-00.000000000.json
index a107065..bfcaa5f 100644
--- a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-03_2022-02-12_16-53-00.000000000.json
+++ b/y2022/vision/calib_files/calibration_pi-971-3_cam-22-03_2022-02-12_16-53-00.000000000.json
@@ -1,5 +1,5 @@
{
- "node_name": "pi1",
+ "node_name": "pi3",
"team_number": 971,
"intrinsics": [
388.182281,
diff --git a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-04_2022-01-28_05-26-43.135661745.json b/y2022/vision/calib_files/calibration_pi-971-4_cam-22-04_2022-01-28_05-26-43.135661745.json
similarity index 92%
rename from y2022/vision/calib_files/calibration_pi-971-1_cam-22-04_2022-01-28_05-26-43.135661745.json
rename to y2022/vision/calib_files/calibration_pi-971-4_cam-22-04_2022-01-28_05-26-43.135661745.json
index 8c19c46..cb0c66d 100755
--- a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-04_2022-01-28_05-26-43.135661745.json
+++ b/y2022/vision/calib_files/calibration_pi-971-4_cam-22-04_2022-01-28_05-26-43.135661745.json
@@ -1,5 +1,5 @@
{
- "node_name": "pi1",
+ "node_name": "pi4",
"team_number": 971,
"intrinsics": [
386.619232,
@@ -21,4 +21,4 @@
],
"calibration_timestamp": 1643347603135661745,
"camera_id": "22-04"
-}
\ No newline at end of file
+}
diff --git a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-05_2022-02-16_20-40-00.000000000.json b/y2022/vision/calib_files/calibration_pi-971-5_cam-22-05_2022-02-16_20-40-00.000000000.json
similarity index 93%
rename from y2022/vision/calib_files/calibration_pi-971-1_cam-22-05_2022-02-16_20-40-00.000000000.json
rename to y2022/vision/calib_files/calibration_pi-971-5_cam-22-05_2022-02-16_20-40-00.000000000.json
index a5ebf82..6a48cec 100755
--- a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-05_2022-02-16_20-40-00.000000000.json
+++ b/y2022/vision/calib_files/calibration_pi-971-5_cam-22-05_2022-02-16_20-40-00.000000000.json
@@ -1,5 +1,5 @@
{
- "node_name": "pi1",
+ "node_name": "pi5",
"team_number": 971,
"intrinsics": [
387.791046,
diff --git a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-06_2022-02-16_20-54-00.000000000.json b/y2022/vision/calib_files/calibration_pi-971-6_cam-22-06_2022-02-16_20-54-00.000000000.json
similarity index 93%
rename from y2022/vision/calib_files/calibration_pi-971-1_cam-22-06_2022-02-16_20-54-00.000000000.json
rename to y2022/vision/calib_files/calibration_pi-971-6_cam-22-06_2022-02-16_20-54-00.000000000.json
index 71aaf02..0c5b905 100755
--- a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-06_2022-02-16_20-54-00.000000000.json
+++ b/y2022/vision/calib_files/calibration_pi-971-6_cam-22-06_2022-02-16_20-54-00.000000000.json
@@ -1,5 +1,5 @@
{
- "node_name": "pi1",
+ "node_name": "pi6",
"team_number": 971,
"intrinsics": [
389.730774,
diff --git a/y2022/vision/calib_files/calibration_pi-971-1_cam-22-07_2022-02-16_21-20-00.000000000.json b/y2022/vision/calib_files/calibration_pi-9971-1_cam-22-07_2022-02-16_21-20-00.000000000.json
similarity index 100%
rename from y2022/vision/calib_files/calibration_pi-971-1_cam-22-07_2022-02-16_21-20-00.000000000.json
rename to y2022/vision/calib_files/calibration_pi-9971-1_cam-22-07_2022-02-16_21-20-00.000000000.json