aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2014-10-21 12:52:06 +0200
committerCristian Maglie <c.maglie@bug.st>2014-11-14 00:23:11 +0100
commit39b2b392345801ae53490b0a8dde1f44aa842109 (patch)
treeca7c2fd13690b71bb3589efa65c1d5c5e6ff30c3
parentf61b5ee5deeeb2f2ce969ac840cd7958097bb8c3 (diff)
[avr] Small comments and headers fixes in SPI
-rw-r--r--libraries/SPI/SPI.cpp1
-rw-r--r--libraries/SPI/SPI.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index 9a7a400..30ac13c 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2010 by Cristian Maglie <c.maglie@bug.st>
* Copyright (c) 2014 by Paul Stoffregen <paul@pjrc.com> (Transaction API)
+ * Copyright (c) 2014 by Matthijs Kooijman <matthijs@stdin.nl> (SPISettings AVR)
* SPI Master library for arduino.
*
* This file is free software; you can redistribute it and/or modify
diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
index 962100b..b54e2df 100644
--- a/libraries/SPI/SPI.h
+++ b/libraries/SPI/SPI.h
@@ -21,7 +21,7 @@
// Uncomment this line to add detection of mismatched begin/end transactions.
// A mismatch occurs if other libraries fail to use SPI.endTransaction() for
-// each SPI.beginTransaction(). Connect a LED to this pin. The LED will turn
+// each SPI.beginTransaction(). Connect an LED to this pin. The LED will turn
// on if any mismatch is ever detected.
//#define SPI_TRANSACTION_MISMATCH_LED 5
@@ -147,7 +147,7 @@ public:
// Initialize the SPI library
static void begin();
- // If SPI is to used from within an interrupt, this function registers
+ // If SPI is used from within an interrupt, this function registers
// that interrupt with the SPI library, so beginTransaction() can
// prevent conflicts. The input interruptNumber is the number used
// with attachInterrupt. If SPI is used from a different interrupt