| commit | 74acd62b075b1a8da5e4d7254da06580098e8172 | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
added analog sensors and cleaned up the sensor data structure a bit
diff --git a/gyro_board/src/usb/CAN.c b/gyro_board/src/usb/CAN.c index 591c6fc..35f811f 100644 --- a/gyro_board/src/usb/CAN.c +++ b/gyro_board/src/usb/CAN.c
@@ -231,6 +231,10 @@ vTaskDelete(NULL); } + // Set all of the CAN stuff to run at CCLK/6, which translates to about 1 Mbit + // (1.042). + SC->PCLKSEL0 |= 3 << 26 | 3 << 28 | 3 << 30; + // Enable CAN SC->PCONP |= PCONP_PCCAN1;