Merge "Added comment to make vision distance averaging more readable."
diff --git a/vm/Vagrantfile b/vm/Vagrantfile
index c802a5a..1404131 100644
--- a/vm/Vagrantfile
+++ b/vm/Vagrantfile
@@ -21,7 +21,7 @@
config.vm.provider "virtualbox" do |vb|
# Don't boot with headless mode
vb.gui = true
- vb.name = "FRC971-Development-2016"
+ vb.name = "FRC971-Development-2017"
# There are two shortcuts for modifying number of CPUs and amount of
# memory. Modify them to your liking.
diff --git a/vm/setup_code_building.sh b/vm/setup_code_building.sh
index a27b60e..cbb8fcd 100755
--- a/vm/setup_code_building.sh
+++ b/vm/setup_code_building.sh
@@ -46,6 +46,14 @@
kernel.unprivileged_userns_clone = 1
EOT
+# We need to explicitly pull in the java certificates from backports. Otherwise
+# bazel won't install properly.
+cat > /etc/apt/preferences.d/java_certificates <<EOT
+Package: ca-certificates-java
+Pin: release a=jessie-backports
+Pin-Priority: 900
+EOT
+
# Accept the LLVM GPG key so we can install their packages.
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add -
diff --git a/y2017/vision/2017_03_31_camera_settings_michael_when_working b/y2017/vision/2017_03_31_camera_settings_michael_when_working
new file mode 100644
index 0000000..00a5ec9
--- /dev/null
+++ b/y2017/vision/2017_03_31_camera_settings_michael_when_working
@@ -0,0 +1,42 @@
+ brightness (int) : min=0 max=255 step=1 default=128 value=68
+ contrast (int) : min=0 max=255 step=1 default=32 value=32
+ saturation (int) : min=0 max=255 step=1 default=32 value=32
+ white_balance_temperature_auto (bool) : default=1 value=1
+ gain (int) : min=0 max=255 step=1 default=64 value=0
+ power_line_frequency (menu) : min=0 max=2 default=2 value=2
+ white_balance_temperature (int) : min=0 max=10000 step=10 default=4000 value=10000 flags=inactive
+ sharpness (int) : min=0 max=255 step=1 default=24 value=24
+ backlight_compensation (int) : min=0 max=1 step=1 default=0 value=0
+ exposure_auto (menu) : min=0 max=3 default=3 value=1
+ exposure_absolute (int) : min=1 max=10000 step=1 default=166 value=10
+ exposure_auto_priority (bool) : default=0 value=1
+ brightness (int) : min=0 max=255 step=1 default=128 value=68
+ contrast (int) : min=0 max=255 step=1 default=32 value=32
+ saturation (int) : min=0 max=255 step=1 default=32 value=32
+ white_balance_temperature_auto (bool) : default=1 value=1
+ gain (int) : min=0 max=255 step=1 default=64 value=0
+ power_line_frequency (menu) : min=0 max=2 default=2 value=2
+ white_balance_temperature (int) : min=0 max=10000 step=10 default=4000 value=10000 flags=inactive
+ sharpness (int) : min=0 max=255 step=1 default=24 value=24
+ backlight_compensation (int) : min=0 max=1 step=1 default=0 value=0
+ brightness (int) : min=0 max=255 step=1 default=128 value=68
+ contrast (int) : min=0 max=255 step=1 default=32 value=32
+ saturation (int) : min=0 max=255 step=1 default=32 value=32
+ white_balance_temperature_auto (bool) : default=1 value=1
+ gain (int) : min=0 max=255 step=1 default=64 value=0
+ power_line_frequency (menu) : min=0 max=2 default=2 value=2
+ white_balance_temperature (int) : min=0 max=10000 step=10 default=4000 value=9840 flags=inactive
+ sharpness (int) : min=0 max=255 step=1 default=24 value=24
+ backlight_compensation (int) : min=0 max=1 step=1 default=0 value=0
+ exposure_auto (menu) : min=0 max=3 default=3 value=1
+ exposure_absolute (int) : min=1 max=10000 step=1 default=166 value=10
+ exposure_auto_priority (bool) : default=0 value=1
+ brightness (int) : min=0 max=255 step=1 default=128 value=68
+ contrast (int) : min=0 max=255 step=1 default=32 value=32
+ saturation (int) : min=0 max=255 step=1 default=32 value=32
+ white_balance_temperature_auto (bool) : default=1 value=1
+ gain (int) : min=0 max=255 step=1 default=64 value=0
+ power_line_frequency (menu) : min=0 max=2 default=2 value=2
+ white_balance_temperature (int) : min=0 max=10000 step=10 default=4000 value=9840 flags=inactive
+ sharpness (int) : min=0 max=255 step=1 default=24 value=24
+ backlight_compensation (int) : min=0 max=1 step=1 default=0 value=0
diff --git a/y2017/vision/ConfigFile.pb b/y2017/vision/ConfigFile.pb
new file mode 100644
index 0000000..cceb2e7
--- /dev/null
+++ b/y2017/vision/ConfigFile.pb
@@ -0,0 +1,55 @@
+robot_configs {
+ key: "Comp"
+ value {
+ camera_device_path: "/dev/v4l/by-id/usb-046d_0825_B07B8DE0-video-index0"
+ roborio_ipaddr: "10.9.71.2"
+ jetson_ipaddr: "10.9.71.179"
+ port: 8082
+ }
+}
+robot_configs {
+ key: "Spare"
+ value {
+ camera_device_path: "/dev/v4l/by-id/usb-046d_0825_B07B8DE0-video-index0"
+ roborio_ipaddr: "10.9.71.2"
+ jetson_ipaddr: "10.9.71.179"
+ port: 8082
+ }
+}
+robot_configs {
+ key: "Laptop"
+ value {
+ camera_device_path: "/dev/video0"
+ roborio_ipaddr: "10.99.71.2"
+ jetson_ipaddr: "10.9.71.179"
+ port: 8082
+ }
+}
+robot_configs {
+ key: "Practice"
+ value {
+ camera_device_path: "/dev/v4l/by-id/usb-046d_0825_B07B8DE0-video-index0"
+ roborio_ipaddr: "10.99.71.2"
+ jetson_ipaddr: "10.9.71.179"
+ port: 8082
+ }
+}
+robot_configs {
+ key: "Test"
+ value {
+ camera_device_path: "/dev/v4l/by-id/usb-046d_0825_22801330-video-index0"
+ roborio_ipaddr: "10.99.71.2"
+ jetson_ipaddr: "10.9.71.179"
+ port: 8082
+ }
+}
+camera_params {
+ width: 1280
+ height: 960
+ exposure: 10
+ brightness: 68
+ gain: 0
+ fps: 20
+}
+game_params {
+}