commit 74acd62b075b1a8da5e4d7254da06580098e8172
author Brian Silverman <brians> Sat Oct 26 14:47:14 2013 -0700
committer Brian Silverman <brians> Sat Oct 26 15:56:49 2013 -0700
tree 36b56484065fb2f45b7fb0a84c57d23e8cf1eae3
parent bd3d5d4cc64396b557d5cf42888ad66dafcb75b2

added analog sensors and cleaned up the sensor data structure a bit

gyro_board/src/usb/encoder.c

diff --git a/gyro_board/src/usb/encoder.c b/gyro_board/src/usb/encoder.c
index 205f44e..9277340 100644
--- a/gyro_board/src/usb/encoder.c
+++ b/gyro_board/src/usb/encoder.c
@@ -499,12 +499,15 @@
   if (is_bot3) {
     packet->robot_id = 1;
   } else {  // is main robot
-    packet->robot_id = 0;
+    packet->robot_id = 2;
 
     packet->main.shooter = encoder1_val;
     packet->main.left_drive = encoder5_val;
     packet->main.right_drive = encoder4_val;
     packet->main.indexer = encoder3_val;
+    packet->main.battery_voltage = analog(0);
+    packet->main.left_drive_hall = analog(1);
+    packet->main.right_drive_hall = analog(3);
 
     NVIC_DisableIRQ(EINT3_IRQn);