Merge changes I59b6180e,Ic86e922b

* changes:
  Added v10 libraries
  Corrected the number of CAN init attempts in C++
This commit is contained in:
Brad Miller (WPI)
2014-06-27 08:01:55 -07:00
committed by Gerrit Code Review
7 changed files with 1 additions and 1 deletions

BIN
ni-libraries/libFRC_FPGA_ChipObject.so Normal file → Executable file

Binary file not shown.

BIN
ni-libraries/libFRC_NetworkCommunication.so Normal file → Executable file

Binary file not shown.

BIN
ni-libraries/libRoboRIO_FRC_ChipObject.so Normal file → Executable file

Binary file not shown.

BIN
ni-libraries/libi2c.so Normal file → Executable file

Binary file not shown.

BIN
ni-libraries/libspi.so Normal file → Executable file

Binary file not shown.

View File

@@ -30,7 +30,7 @@ constexpr double CANJaguar::kApproxBusVoltage;
static const int32_t kSendMessagePeriod = 20;
static const uint32_t kFullMessageIDMask = (CAN_MSGID_API_M | CAN_MSGID_MFR_M | CAN_MSGID_DTYPE_M);
static const int32_t kReceiveStatusAttempts = 5000;
static const int32_t kReceiveStatusAttempts = 50;
static int32_t sendMessageHelper(uint32_t messageID, const uint8_t *data, uint8_t dataSize, int32_t period)
{