commit 28d9778ebf852090c3a06e88eb2f04429a3a2ec6
author Brian Silverman <brians> Thu Oct 31 17:33:52 2013 -0700
committer Brian Silverman <brians> Thu Oct 31 17:50:36 2013 -0700
tree 79030fcb08318613a3fed315d125d32f835e10e1
parent 1ba46c7f4b80224f600849b28b5b23a907333d99

added a checksum of the data structure to the gyro board data

frc971/input/input.gyp

diff --git a/frc971/input/input.gyp b/frc971/input/input.gyp
index 23dfda6..5558618 100644
--- a/frc971/input/input.gyp
+++ b/frc971/input/input.gyp
@@ -56,6 +56,9 @@
         '<(DEPTH)/gyro_board/src/libusb-driver/libusb-driver.gyp:libusb_wrap',
         '<(AOS)/common/common.gyp:time',
       ],
+      'defines': [
+        'GYRO_BOARD_DATA_CHECKSUM=<!(<(DEPTH)/gyro_board/src/usb/data_struct_checksum.sh)',
+      ],
     },
   ],
 }

frc971/input/usb_receiver.cc

diff --git a/frc971/input/usb_receiver.cc b/frc971/input/usb_receiver.cc
index b70ff61..81b960e 100644
--- a/frc971/input/usb_receiver.cc
+++ b/frc971/input/usb_receiver.cc
@@ -18,23 +18,29 @@
   if (ReceiveData()) {
     Reset();
   } else {
-    if (phase_locker_.IsCurrentPacketGood(transfer_received_time_, frame_number_)) {
-      static const int kCountsPerSecond = 100000;
-      const ::aos::time::Time timestamp =
-          ::aos::time::Time(data()->timestamp / kCountsPerSecond,
-                            (data()->timestamp * ::aos::time::Time::kNSecInSec /
-                             kCountsPerSecond) %
-                                ::aos::time::Time::kNSecInSec);
+    static const int kCountsPerSecond = 100000;
+    const ::aos::time::Time timestamp =
+        ::aos::time::Time(data()->timestamp / kCountsPerSecond,
+                          (data()->timestamp * ::aos::time::Time::kNSecInSec /
+                           kCountsPerSecond) %
+                          ::aos::time::Time::kNSecInSec);
 
-      if (data()->robot_id != expected_robot_id_) {
-        LOG(ERROR, "gyro board sent data for robot id %hhd instead of %hhd!"
-            " dip switches are %hhx\n",
-            data()->robot_id, expected_robot_id_, data()->dip_switches);
-        return;
-      } else {
-        LOG(DEBUG, "processing dips %hhx frame %" PRId32 " at %f\n",
-            data()->dip_switches, data()->frame_number, timestamp.ToSeconds());
-      }
+    if (data()->robot_id != expected_robot_id_) {
+      LOG(ERROR, "gyro board sent data for robot id %hhd instead of %hhd!"
+          " dip switches are %hhx\n",
+          data()->robot_id, expected_robot_id_, data()->dip_switches);
+      return;
+    }
+    if (data()->checksum != GYRO_BOARD_DATA_CHECKSUM) {
+      LOG(ERROR,
+          "gyro board sent checksum %" PRIu16 " instead of %" PRIu16 "!\n",
+          data()->checksum, GYRO_BOARD_DATA_CHECKSUM);
+      return;
+    }
+
+    if (phase_locker_.IsCurrentPacketGood(transfer_received_time_, frame_number_)) {
+      LOG(DEBUG, "processing dips %hhx frame %" PRId32 " at %f\n",
+          data()->dip_switches, data()->frame_number, timestamp.ToSeconds());
 
       ProcessData(timestamp);
     }