commit 1623c33c332b1b4a3f222375e69a8d787accc658
author Brian Silverman <brians> Tue Oct 01 18:05:16 2013 -0700
committer Brian Silverman <brians> Tue Oct 01 18:47:43 2013 -0700
tree a9a1e2e1b6dba64d834610a2593daeb3e3886f8a
parent 466d66922d29dbba394201851888c163fedec987
parent a106e0fb054a6b680d9bc1dd2aff5fc8d20f8b5e

merging the recent gyro board code updates in

I'm merging the wrong way in the middle because the merge is complicated
because there are changes to things that got split out into different
files.

gyro_board/src/usb/data_struct.h

diff --git a/gyro_board/src/usb/data_struct.h b/gyro_board/src/usb/data_struct.h
index ac86a1a..edccea3 100644
--- a/gyro_board/src/usb/data_struct.h
+++ b/gyro_board/src/usb/data_struct.h
@@ -41,6 +41,8 @@
           uint8_t angle_adjust_bottom_hall_effect : 1;
           uint8_t top_disc : 1;
           uint8_t bottom_disc : 1;
+          uint8_t loader_top : 1;
+          uint8_t loader_bottom : 1;
         };
         uint16_t booleans;
       };