Namespace updates

FRC_CAN.cpp

@@ -1,9 +1,9 @@
 #include "frc/CAN.h"
-#include "mcp2515/mcp2515.h"
+#include "frc/mcp2515.h"
 
 using namespace frc;
 
-MCP2515 *CAN::m_mcp2515 = nullptr;
+frc::MCP2515 *CAN::m_mcp2515 = nullptr;
 uint8_t CAN::m_interruptPin = 0;
 CAN::MessageCallback CAN::m_messageCb = nullptr;
 CAN::UnknownMessageCallback CAN::m_unknownMessageCb = nullptr;

README.md

@@ -0,0 +1,4 @@
+FRC Arduino MCP2515 CAN interface library
+---------------------------------------------------------
+
+Documentation incoming

examples/FRC_CAN_Communication/FRC_CAN_Communication.ino

@@ -1,13 +1,13 @@
 
-#include "mcp2515/mcp2515.h"
+#include "frc/mcp2515.h"
 #include "frc/CAN.h"
 
 // Define the CS pin and the interrupt pin
 #define CAN_CS 10
 #define CAN_INTERRUPT 2
 
 // Create an MCP2515 device. Only need to create 1 of these
-MCP2515 mcp2515{CAN_CS};
+frc::MCP2515 mcp2515{CAN_CS};
 
 // Create an FRC CAN Device. You can create up to 16 of these in 1 progam
 // Any more will overflow a global array
@@ -31,7 +31,7 @@ void setup() {
     auto err = mcp2515.reset();
     // CAN rate must be 1000KBPS to work with the FRC Ecosystem
     // Clock rate must match clock rate of CAN Board.
-    err = mcp2515.setBitrate(CAN_1000KBPS, CAN_CLOCK::MCP_8MHZ);
+    err = mcp2515.setBitrate(frc::CAN_1000KBPS, frc::CAN_CLOCK::MCP_8MHZ);
 
     // Set up to normal CAN mode
     err = mcp2515.setNormalMode();

frc/CAN.h

@@ -2,10 +2,9 @@
 
 #include <stdint.h>
 
-class MCP2515;
-
 namespace frc
 {
+class MCP2515;
 struct CANData
 {
   uint8_t data[8];

mcp2515/mcp2515.h → frc/mcp2515.h

@@ -1,8 +1,8 @@
-#ifndef _MCP2515_H_
-#define _MCP2515_H_
+#ifndef _FRC_MCP2515_H_
+#define _FRC_MCP2515_H_
 
 #include <SPI.h>
-#include "can.h"
+#include "frc/can_core.h"
 
 /*
  *  Speed 8M
@@ -169,6 +169,8 @@
 #define MCP_20MHz_33k3BPS_CFG2 (0xFF)
 #define MCP_20MHz_33k3BPS_CFG3 (0x87)
 
+namespace frc {
+
 enum CAN_CLOCK {
     MCP_20MHZ,
     MCP_16MHZ,
@@ -486,4 +488,6 @@ class MCP2515
         void clearERRIF();
 };
 
+}
+
 #endif

keywords.txt

@@ -0,0 +1,15 @@
+MCP2515	KEYWORD1
+CAN KEYWORD1
+
+CAN_5KBPS	LITERAL1
+CAN_10KBPS	LITERAL1
+CAN_20KBPS	LITERAL1
+CAN_40KBPS	LITERAL1
+CAN_50KBPS	LITERAL1
+CAN_80KBPS	LITERAL1
+CAN_100KBPS	LITERAL1
+CAN_125KBPS	LITERAL1
+CAN_200KBPS	LITERAL1
+CAN_250KBPS	LITERAL1
+CAN_500KBPS	LITERAL1
+CAN_1000KBPS	LITERAL1

mcp2515.cpp

@@ -1,4 +1,6 @@
-#include "mcp2515/mcp2515.h"
+#include "frc/mcp2515.h"
+
+using namespace frc;
 
 const struct MCP2515::TXBn_REGS MCP2515::TXB[MCP2515::N_TXBUFFERS] = {
     {MCP_TXB0CTRL, MCP_TXB0SIDH, MCP_TXB0DATA},