commit c6e42eeb273f7d100497676b5585ccb7b14b4835
author Milind Upadhyay <milind.upadhyay@gmail.com> Tue Dec 27 00:02:11 2022 -0800
committer Milind Upadhyay <milind.upadhyay@gmail.com> Mon Jan 09 19:23:13 2023 -0700
tree 515afb704637e3ad450dab6b748a314322241079
parent 915d6002bb67d632999b1b260464cb5d07275d49

Add field for image channel in charuco lib

Allows us to easily send it to /camera/decimated for mapping, which is
what we're using until we start logging at full frequency.

Also, move some command line flags out of charuco lib to avoid manually setting flags.

Signed-off-by: Milind Upadhyay <milind.upadhyay@gmail.com>
Change-Id: Iae4d9ed06260154a0fb4d4c67ea03b06a28e4411

frc971/vision/calibration_accumulator.h

diff --git a/frc971/vision/calibration_accumulator.h b/frc971/vision/calibration_accumulator.h
index d21f4c6..d9f6065 100644
--- a/frc971/vision/calibration_accumulator.h
+++ b/frc971/vision/calibration_accumulator.h
@@ -1,5 +1,5 @@
-#ifndef Y2020_VISION_CALIBRATION_ACCUMULATOR_H_
-#define Y2020_VISION_CALIBRATION_ACCUMULATOR_H_
+#ifndef FRC971_VISION_CALIBRATION_ACCUMULATOR_H_
+#define FRC971_VISION_CALIBRATION_ACCUMULATOR_H_
 
 #include <vector>
 
@@ -82,7 +82,8 @@
  public:
   Calibration(aos::SimulatedEventLoopFactory *event_loop_factory,
               aos::EventLoop *image_event_loop, aos::EventLoop *imu_event_loop,
-              std::string_view pi, CalibrationData *data);
+              std::string_view pi, TargetType target_type,
+              std::string_view image_channel, CalibrationData *data);
 
   // Processes a charuco detection that is returned from charuco_lib.
   // For a valid detection(s), it stores camera observation
@@ -115,4 +116,4 @@
 }  // namespace vision
 }  // namespace frc971
 
-#endif  // Y2020_VISION_CALIBRATION_ACCUMULATOR_H_
+#endif  // FRC971_VISION_CALIBRATION_ACCUMULATOR_H_