Merge "Enable aarch64 toolchain for host."
diff --git a/frc971/control_loops/python/path_edit.py b/frc971/control_loops/python/path_edit.py
index 9a0f7fe..ed500d7 100755
--- a/frc971/control_loops/python/path_edit.py
+++ b/frc971/control_loops/python/path_edit.py
@@ -496,19 +496,16 @@
elif self.zoom_transform.xx >= 16:
scale = min(scale, 1)
+ # undo the scaled translation that the old zoom transform did
+ x, y = self.invert(self.zoom_transform).transform_point(event.x, event.y)
+
# move the origin to point
- self.zoom_transform.translate(event.x, event.y)
+ self.zoom_transform.translate(x, y)
# scale from new origin
self.zoom_transform.scale(scale, scale)
# move back
- self.zoom_transform.translate(-event.x, -event.y)
-
- # snap to the edge when near 1x scaling
- if 0.99 < self.zoom_transform.xx < 1.01 and -50 < self.zoom_transform.x0 < 50:
- self.zoom_transform.x0 = 0
- self.zoom_transform.y0 = 0
- print("snap")
+ self.zoom_transform.translate(-x, -y)
self.queue_draw()
diff --git a/scouting/deploy/postinst b/scouting/deploy/postinst
index a7a8b16..be2b170 100644
--- a/scouting/deploy/postinst
+++ b/scouting/deploy/postinst
@@ -19,6 +19,10 @@
# Make sure it's all usable by the user.
chown -R www-data:www-data /var/frc971/scouting/
+# Update the timestamps on the files so that web browsers pull the new version.
+# Otherwise users have to explicitly bypass the cache when visiting the site.
+find /opt/frc971/scouting_server/scouting/www/ -type f -exec touch {} +
+
systemctl daemon-reload
systemctl enable scouting.service
systemctl start scouting.service || :
diff --git a/y2022/vision/camera_reader_main.cc b/y2022/vision/camera_reader_main.cc
index d5ba448..dac2100 100644
--- a/y2022/vision/camera_reader_main.cc
+++ b/y2022/vision/camera_reader_main.cc
@@ -6,7 +6,7 @@
// bazel run //y2022/vision:camera_reader -- --config y2022/aos_config.json
// --override_hostname pi-7971-1 --ignore_timestamps true
DEFINE_string(config, "aos_config.json", "Path to the config file to use.");
-DEFINE_double(duty_cycle, 0.5, "Duty cycle of the LEDs");
+DEFINE_double(duty_cycle, 0.6, "Duty cycle of the LEDs");
DEFINE_uint32(exposure, 5,
"Exposure time, in 100us increments; 0 implies auto exposure");