From 3419ef78e8586e707c72abf4cec3c3702c318246 Mon Sep 17 00:00:00 2001 From: Nathan Seidle Date: Thu, 10 Oct 2019 21:18:23 -0600 Subject: [PATCH 1/3] Add SS definitions to work with SD examples The built-in SD examples require SS to be defined even though the chip select pin is set inside the INO. --- variants/SparkFun_Artemis_Thing_Plus/config/variant.h | 11 ++++++----- variants/SparkFun_RedBoard_Artemis/config/variant.h | 1 + .../SparkFun_RedBoard_Artemis_ATP/config/variant.h | 1 + .../SparkFun_RedBoard_Artemis_Nano/config/variant.h | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/variants/SparkFun_Artemis_Thing_Plus/config/variant.h b/variants/SparkFun_Artemis_Thing_Plus/config/variant.h index d3d2ed1..917bce6 100644 --- a/variants/SparkFun_Artemis_Thing_Plus/config/variant.h +++ b/variants/SparkFun_Artemis_Thing_Plus/config/variant.h @@ -62,16 +62,17 @@ extern Uart Serial1; // SPI Pins #define MOSI 11 #define MISO 12 -#define SCK 13 +#define SCK 13 +#define SS 10 // Wire Pins -#define SCL 15 -#define SDA 14 +#define SCL 15 +#define SDA 14 // Wire1 Pins #define SCL1 17 #define SDA1 16 // Serial1 Pins -#define TX1 1 -#define RX1 0 +#define TX1 1 +#define RX1 0 // PDM Microphone Pins #define MIC_DATA 27 #define MIC_CLOCK 28 diff --git a/variants/SparkFun_RedBoard_Artemis/config/variant.h b/variants/SparkFun_RedBoard_Artemis/config/variant.h index fbdc018..cfd7599 100644 --- a/variants/SparkFun_RedBoard_Artemis/config/variant.h +++ b/variants/SparkFun_RedBoard_Artemis/config/variant.h @@ -78,6 +78,7 @@ extern Uart Serial1; #define MOSI 7 #define MISO 6 #define SCK 5 +#define SS 13 #define SCL 15 #define SDA 14 #define TX1 1 diff --git a/variants/SparkFun_RedBoard_Artemis_ATP/config/variant.h b/variants/SparkFun_RedBoard_Artemis_ATP/config/variant.h index c32e2af..02780c4 100644 --- a/variants/SparkFun_RedBoard_Artemis_ATP/config/variant.h +++ b/variants/SparkFun_RedBoard_Artemis_ATP/config/variant.h @@ -64,6 +64,7 @@ extern Uart Serial1; #define MOSI 7 #define MISO 6 #define SCK 5 +#define SS 13 #define SCL 39 #define SDA 40 #define TX1 24 diff --git a/variants/SparkFun_RedBoard_Artemis_Nano/config/variant.h b/variants/SparkFun_RedBoard_Artemis_Nano/config/variant.h index c3ef87d..776bc82 100644 --- a/variants/SparkFun_RedBoard_Artemis_Nano/config/variant.h +++ b/variants/SparkFun_RedBoard_Artemis_Nano/config/variant.h @@ -62,6 +62,7 @@ extern Uart Serial1; #define MOSI 12 #define MISO 13 #define SCK 11 +#define SS A14 #define SDA3 6 #define SCL3 7 #define SDA2 17 From f700106e004ff821d2d8ee4dd9bf13ceefc29d6d Mon Sep 17 00:00:00 2001 From: Nathan Seidle Date: Fri, 11 Oct 2019 11:49:31 -0600 Subject: [PATCH 2/3] Move SS pin define to core file This removes the need to have SS in variant files. --- cores/arduino/ard_sup/Arduino_defines.h | 2 ++ variants/SparkFun_Artemis_Thing_Plus/config/variant.h | 1 - variants/SparkFun_RedBoard_Artemis/config/variant.h | 1 - variants/SparkFun_RedBoard_Artemis_ATP/config/variant.h | 1 - variants/SparkFun_RedBoard_Artemis_Nano/config/variant.h | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cores/arduino/ard_sup/Arduino_defines.h b/cores/arduino/ard_sup/Arduino_defines.h index fe6fd5a..6e896b9 100644 --- a/cores/arduino/ard_sup/Arduino_defines.h +++ b/cores/arduino/ard_sup/Arduino_defines.h @@ -48,3 +48,5 @@ #define bit(b) (1UL << (b)) #define digitalPinToInterrupt(P) (P) // all apollo3 pads are interrupt capable + +#define SS 10 //Built in SD library requires an SS pin be defined. Pin # is arbitrary. \ No newline at end of file diff --git a/variants/SparkFun_Artemis_Thing_Plus/config/variant.h b/variants/SparkFun_Artemis_Thing_Plus/config/variant.h index 917bce6..0e12819 100644 --- a/variants/SparkFun_Artemis_Thing_Plus/config/variant.h +++ b/variants/SparkFun_Artemis_Thing_Plus/config/variant.h @@ -63,7 +63,6 @@ extern Uart Serial1; #define MOSI 11 #define MISO 12 #define SCK 13 -#define SS 10 // Wire Pins #define SCL 15 #define SDA 14 diff --git a/variants/SparkFun_RedBoard_Artemis/config/variant.h b/variants/SparkFun_RedBoard_Artemis/config/variant.h index cfd7599..fbdc018 100644 --- a/variants/SparkFun_RedBoard_Artemis/config/variant.h +++ b/variants/SparkFun_RedBoard_Artemis/config/variant.h @@ -78,7 +78,6 @@ extern Uart Serial1; #define MOSI 7 #define MISO 6 #define SCK 5 -#define SS 13 #define SCL 15 #define SDA 14 #define TX1 1 diff --git a/variants/SparkFun_RedBoard_Artemis_ATP/config/variant.h b/variants/SparkFun_RedBoard_Artemis_ATP/config/variant.h index 02780c4..c32e2af 100644 --- a/variants/SparkFun_RedBoard_Artemis_ATP/config/variant.h +++ b/variants/SparkFun_RedBoard_Artemis_ATP/config/variant.h @@ -64,7 +64,6 @@ extern Uart Serial1; #define MOSI 7 #define MISO 6 #define SCK 5 -#define SS 13 #define SCL 39 #define SDA 40 #define TX1 24 diff --git a/variants/SparkFun_RedBoard_Artemis_Nano/config/variant.h b/variants/SparkFun_RedBoard_Artemis_Nano/config/variant.h index 776bc82..c3ef87d 100644 --- a/variants/SparkFun_RedBoard_Artemis_Nano/config/variant.h +++ b/variants/SparkFun_RedBoard_Artemis_Nano/config/variant.h @@ -62,7 +62,6 @@ extern Uart Serial1; #define MOSI 12 #define MISO 13 #define SCK 11 -#define SS A14 #define SDA3 6 #define SCL3 7 #define SDA2 17 From 126c10fa921bc5d923cba054b0f37c5f1d64b08c Mon Sep 17 00:00:00 2001 From: Owen L - SFE Date: Mon, 14 Oct 2019 12:18:29 -0600 Subject: [PATCH 3/3] reduce odds of a silent failure when acidentally invoking arbitrary SS pin --- cores/arduino/ard_sup/Arduino_defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/arduino/ard_sup/Arduino_defines.h b/cores/arduino/ard_sup/Arduino_defines.h index 6e896b9..dc8e72c 100644 --- a/cores/arduino/ard_sup/Arduino_defines.h +++ b/cores/arduino/ard_sup/Arduino_defines.h @@ -49,4 +49,4 @@ #define digitalPinToInterrupt(P) (P) // all apollo3 pads are interrupt capable -#define SS 10 //Built in SD library requires an SS pin be defined. Pin # is arbitrary. \ No newline at end of file +#define SS 255 //Built in SD library requires an SS pin be defined. Pin # is arbitrary. \ No newline at end of file