Factoring out camera_params.proto.
Change-Id: Idf886f9cb33764d505d5cff11ca766cea96d2024
diff --git a/y2017/vision/vision_config.proto b/y2017/vision/vision_config.proto
index 0bb7279..5501507 100644
--- a/y2017/vision/vision_config.proto
+++ b/y2017/vision/vision_config.proto
@@ -1,31 +1,9 @@
syntax = "proto2";
+import "aos/vision/image/camera_params.proto";
+
package y2017.vision;
-// Stores configuration for camera related settings and specs.
-message CameraSettings {
- // The focal length of the camera in pixels.
- optional double focal_length = 1 [default = 1418.6];
-
- // Width of the image.
- optional int32 width = 2 [default = 1280];
-
- // Height of the image.
- optional int32 height = 3 [default = 960];
-
- // Exposure setting.
- optional int32 exposure = 4 [default = 10];
-
- // Brightness setting.
- optional int32 brightness = 5 [default = 128];
-
- // Hardware gain multiplier on pixel values.
- optional double gain = 6 [default = 1.0];
-
- // Frames per second to run camera.
- optional double fps = 7 [default = 30.0];
-}
-
message GameSpecific {
// Needs more woojy.
optional int32 woojy = 1;
@@ -51,9 +29,9 @@
// Map robot name to the robot dependent configuration.
map<string, RobotConfig> robot_configs = 1;
- // Parameters for camera bringup.
- optional CameraSettings camera_params = 2;
+ // Year independent camera parameters.
+ optional aos.vision.CameraParams camera_params = 3;
// Parameters for this specific game
- optional GameSpecific game_params = 3;
+ optional GameSpecific game_params = 4;
}