Skip to content

Commit

Permalink
Changed all references to SAM3X8E into SAM3X
Browse files Browse the repository at this point in the history
This more accurately reflects the family of MCUs rather than the
specific MCU that runs the Arduino Due.
  • Loading branch information
McNeight committed Jun 19, 2014
1 parent 8f9a4db commit be3bb44
Show file tree
Hide file tree
Showing 12 changed files with 119 additions and 119 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ For the MCP2515 library release see CAN_MCP2515 branch on this repo
#include <SPI.h>
#include <CAN_MCP2515.h>
#elif defined(ARDUINO_ARCH_SAM) // Arduino Due
#include <CAN_SAM3X8E.h>
#include <CAN_SAM3X.h>
#elif defined(__MK20DX256__) // Teensy 3.1
#include <CAN_K2X.h>
#else
Expand Down
6 changes: 3 additions & 3 deletions examples/CAN_EchoTest/CAN_EchoTest.ino
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "CAN_MCP2515.h"
#elif defined(ARDUINO_ARCH_SAM)
#include <variant.h>
#include "CAN_SAM3X8E.h"
#include "CAN_SAM3X.h"
#else
#error “This library only supports boards with an AVR or SAM processor.”
#endif
Expand All @@ -33,8 +33,8 @@ CAN_MCP2515 CANbus0(10); // Create CAN channel using pin 10 for SPI chip select
CAN_MCP2515 CANbus1(9); // Create CAN channel using pin 9 for SPI chip select
#elif defined(ARDUINO_ARCH_SAM)
// Can't use CAN0 or CAN1 as variable names, as they are defined in
CAN_SAM3X8E CANbus0(0); // Create CAN channel on CAN bus 0
CAN_SAM3X8E CANbus1(1); // Create CAN channel on CAN bus 1
CAN_SAM3X CANbus0(0); // Create CAN channel on CAN bus 0
CAN_SAM3X CANbus1(1); // Create CAN channel on CAN bus 1
#else
#error “This library only supports boards with an AVR or SAM processor.”
#endif
Expand Down
2 changes: 1 addition & 1 deletion examples/ExtendedPingPong/ExtendedPingPong.ino
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <SPI.h>
#include <CAN_MCP2515.h>
#elif defined(ARDUINO_ARCH_SAM) // Arduino Due
#include <CAN_SAM3X8E.h>
#include <CAN_SAM3X.h>
#elif defined(__MK20DX256__) // Teensy 3.1
#include <CAN_K2X.h>
#else
Expand Down
2 changes: 1 addition & 1 deletion examples/ReceiveAnyMessages/ReceiveAnyMessages.ino
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <SPI.h>
#include <CAN_MCP2515.h>
#elif defined(ARDUINO_ARCH_SAM) // Arduino Due
#include <CAN_SAM3X8E.h>
#include <CAN_SAM3X.h>
#elif defined(__MK20DX256__) // Teensy 3.1
#include <CAN_K2X.h>
#else
Expand Down
2 changes: 1 addition & 1 deletion examples/ReceiveCANMessages/ReceiveCANMessages.ino
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <SPI.h>
#include <CAN_MCP2515.h>
#elif defined(ARDUINO_ARCH_SAM) // Arduino Due
#include <CAN_SAM3X8E.h>
#include <CAN_SAM3X.h>
#elif defined(__MK20DX256__) // Teensy 3.1
#include <CAN_K2X.h>
#else
Expand Down
4 changes: 2 additions & 2 deletions examples/ReceiveJ1939Messages/ReceiveJ1939Messages.ino
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <CAN_MCP2515.h>
#elif defined(ARDUINO_ARCH_SAM)
#include <variant.h>
#include <CAN_SAM3X8E.h>
#include <CAN_SAM3X.h>
#else
#error “This library only supports boards with an AVR or SAM processor.”
#endif
Expand All @@ -51,7 +51,7 @@
#if defined(ARDUINO_ARCH_AVR)
CAN_MCP2515 CAN1(10); //Create CAN Channel
#elif defined(ARDUINO_ARCH_SAM)
CAN_SAM3X8E CAN1;
CAN_SAM3X CAN1;
CAN1.init(SystemCoreClock, CAN_BPS_1000K);
#else
#error “This library only supports boards with an AVR or SAM processor.”
Expand Down
2 changes: 1 addition & 1 deletion examples/SendAnyMessages/SendAnyMessages.ino
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <SPI.h>
#include <CAN_MCP2515.h>
#elif defined(ARDUINO_ARCH_SAM) // Arduino Due
#include <CAN_SAM3X8E.h>
#include <CAN_SAM3X.h>
#elif defined(__MK20DX256__) // Teensy 3.1
#include <CAN_K2X.h>
#else
Expand Down
2 changes: 1 addition & 1 deletion examples/SendCANMessages/SendCANMessages.ino
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <SPI.h>
#include <CAN_MCP2515.h>
#elif defined(ARDUINO_ARCH_SAM) // Arduino Due
#include <CAN_SAM3X8E.h>
#include <CAN_SAM3X.h>
#elif defined(__MK20DX256__) // Teensy 3.1
#include <CAN_K2X.h>
#else
Expand Down
2 changes: 1 addition & 1 deletion keywords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ CAN_TIMEOUT_T3 LITERAL1
CAN_TIMEOUT_T4 LITERAL1
CAN_CONTROLLER_AT90CAN LITERAL1
CAN_CONTROLLER_MCP2515 LITERAL1
CAN_CONTROLLER_SAM3X8E LITERAL1
CAN_CONTROLLER_SAM3X LITERAL1
CAN_CONTROLLER_K2X LITERAL1
2 changes: 1 addition & 1 deletion src/CAN.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ DATE VER WHO WHAT
#define CAN_CONTROLLER_MCP2515
#endif // defined(ARDUINO_ARCH_AVR)
#elif defined(ARDUINO_ARCH_SAM) // Arduino Due
#define CAN_CONTROLLER_SAM3X8E
#define CAN_CONTROLLER_SAM3X
#elif defined(__MK20DX256__) // Teensy 3.1
#define CAN_CONTROLLER_K2X
#else
Expand Down
Loading

0 comments on commit be3bb44

Please sign in to comment.