commit 713e0306d4a7b75795afbd126eebd0e721fce00d
author Austin Schuh <austin.linux@gmail.com> Sat Nov 21 17:57:10 2020 -0800
committer Gerrit Code Review <gerrit@software.frc971.org> Sat Nov 21 17:57:10 2020 -0800
tree d0ab07c9bcffb4ba6d9705970c1a87952c33d1a3
parent 776624a4827a6ec689bf760754fb2d07a032d78e
parent fa5ee95dff2d91a0729d5013de1d87ff03e1f3a7

Merge changes Ib975918d,I718e326d

* changes:
  Reduce ImageMatchResult space usage
  Update roboRIO flashing script

frc971/config/setup_roborio.sh

diff --git a/frc971/config/setup_roborio.sh b/frc971/config/setup_roborio.sh
index 36d91b7..9e502e6 100755
--- a/frc971/config/setup_roborio.sh
+++ b/frc971/config/setup_roborio.sh
@@ -33,7 +33,7 @@
   ssh "admin@${ROBOT_HOSTNAME}" mkdir robot_code
   ssh "admin@${ROBOT_HOSTNAME}" ln -s /media/sda1/aos_log-current robot_code/aos_log-current
   echo "Adding aos_dump autocomplete to profile"
-  ssh "admin@${ROBOT_HOSTNAME}" 'echo "if [ -f /home/admin/robot_code/aos_dump_autocomplete.sh ]; then; source /home/admin/robot_code/aos_dump_autocomplete.sh; fi;" >> /etc/profile'
+  ssh "admin@${ROBOT_HOSTNAME}" 'echo "if [ -f /home/admin/robot_code/aos_dump_autocomplete.sh ]; then source /home/admin/robot_code/aos_dump_autocomplete.sh; fi;" >> /etc/profile'
 fi
 
 if [[ "$(ssh admin@${ROBOT_HOSTNAME} uname -r)" != "4.14.87-rt49-cg-7.0.0f0-xilinx-zynq-189" ]]; then
@@ -41,7 +41,10 @@
   exit 1
 fi
 
-ssh "admin@${ROBOT_HOSTNAME}" mkdir "/lib/modules/4.14.87-rt49-cg-7.0.0f0-xilinx-zynq-189/kernel/net/sctp/"
+ssh "admin@${ROBOT_HOSTNAME}" 'echo "net.core.wmem_max=1262560" >> /etc/sysctl.conf'
+ssh "admin@${ROBOT_HOSTNAME}" 'echo "net.core.rmem_max=1262560" >> /etc/sysctl.conf'
+
+ssh "admin@${ROBOT_HOSTNAME}" mkdir "/lib/modules/4.14.87-rt49-cg-7.0.0f0-xilinx-zynq-189/kernel/net/sctp/ -p"
 scp frc971/config/sctp.ko "admin@${ROBOT_HOSTNAME}:/lib/modules/4.14.87-rt49-cg-7.0.0f0-xilinx-zynq-189/kernel/net/sctp/sctp.ko"
 ssh "admin@${ROBOT_HOSTNAME}" depmod
 

y2020/vision/camera_reader.cc

diff --git a/y2020/vision/camera_reader.cc b/y2020/vision/camera_reader.cc
index fd79d09..24e9ae1 100644
--- a/y2020/vision/camera_reader.cc
+++ b/y2020/vision/camera_reader.cc
@@ -212,7 +212,7 @@
     aos::Sender<sift::ImageMatchResult> *result_sender, bool send_details) {
   auto builder = result_sender->MakeBuilder();
   const auto camera_calibration_offset =
-      aos::CopyFlatBuffer(camera_calibration_, builder.fbb());
+      aos::RecursiveCopyFlatBuffer(camera_calibration_, builder.fbb());
 
   flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<sift::Feature>>>
       features_offset;