A few small random changes
Fix description in printed text in set_orin_clock.sh
Put a print statement in image_logger that alerts to not starting logging
until the joystick enabled is pressed
Added more info about format of channel required to use viewer for
orins that have multiple cameras attached
Change-Id: Ieef69e88e9524bceb0f95525643880d6329b67ab
Signed-off-by: Jim Ostrowski <yimmy13@gmail.com>
diff --git a/frc971/orin/set_orin_clock.sh b/frc971/orin/set_orin_clock.sh
index bc9dd8f..fd615c5 100755
--- a/frc971/orin/set_orin_clock.sh
+++ b/frc971/orin/set_orin_clock.sh
@@ -12,7 +12,7 @@
for orin in $ORIN_LIST; do
echo "========================================================"
- echo "Setting clock for ${ROBOT_PREFIX}71.10${orin}"
+ echo "Setting clock for 10.${ROBOT_PREFIX}.71.10${orin}"
echo "========================================================"
current_time=`sudo hwclock`
IFS="."
diff --git a/frc971/vision/image_logger.cc b/frc971/vision/image_logger.cc
index cb8fc4e..01ceaf4 100644
--- a/frc971/vision/image_logger.cc
+++ b/frc971/vision/image_logger.cc
@@ -75,6 +75,8 @@
});
}
+ LOG(INFO) << "Starting image_logger; will wait on joystick enabled to start "
+ "logging";
event_loop.OnRun([]() {
errno = 0;
setpriority(PRIO_PROCESS, 0, -20);
diff --git a/y2024/vision/viewer.cc b/y2024/vision/viewer.cc
index c72c08e..c741445 100644
--- a/y2024/vision/viewer.cc
+++ b/y2024/vision/viewer.cc
@@ -86,7 +86,9 @@
frc971::constants::ConstantsFetcher<y2024::Constants> constants_fetcher(
&event_loop);
- CHECK(absl::GetFlag(FLAGS_channel).length() == 8);
+ CHECK(absl::GetFlag(FLAGS_channel).length() == 8)
+ << " channel should be of the form '/cameraN' for viewing images from "
+ "camera N";
int camera_id = std::stoi(absl::GetFlag(FLAGS_channel).substr(7, 1));
const auto *calibration_data = FindCameraCalibration(
constants_fetcher.constants(), event_loop.node()->name()->string_view(),