From 5f33bc12881eb20f74ef99bb834ca78e6c04b40e Mon Sep 17 00:00:00 2001 From: oclyke Date: Wed, 30 Sep 2020 09:25:01 -0400 Subject: [PATCH 1/3] patch support for Arduino SD lib this is a temporary patch for #271 the better fix would be for Arduino to implement an SD lib that has fall-backs that leverage the SPI api or the digital pin functions in that order --- variants/SFE_ARTEMIS/variant.h | 6 ++++++ variants/SFE_ARTEMIS_ATP/variant.h | 6 ++++++ variants/SFE_ARTEMIS_DK/variant.h | 6 ++++++ variants/SFE_ARTEMIS_NANO/variant.h | 6 ++++++ variants/SFE_ARTEMIS_THING_PLUS/variant.h | 6 ++++++ 5 files changed, 30 insertions(+) diff --git a/variants/SFE_ARTEMIS/variant.h b/variants/SFE_ARTEMIS/variant.h index 398a1b05..0c5d8ffe 100644 --- a/variants/SFE_ARTEMIS/variant.h +++ b/variants/SFE_ARTEMIS/variant.h @@ -25,4 +25,10 @@ // UART extern UART Serial1; +// temporary patch to support Arduino SD library +#define SS 0 +#define MOSI SPI_SDO +#define MISO SPI_SDI +#define SCK SPI_CLK + #endif // _VARIANT_H_ diff --git a/variants/SFE_ARTEMIS_ATP/variant.h b/variants/SFE_ARTEMIS_ATP/variant.h index 398a1b05..0c5d8ffe 100644 --- a/variants/SFE_ARTEMIS_ATP/variant.h +++ b/variants/SFE_ARTEMIS_ATP/variant.h @@ -25,4 +25,10 @@ // UART extern UART Serial1; +// temporary patch to support Arduino SD library +#define SS 0 +#define MOSI SPI_SDO +#define MISO SPI_SDI +#define SCK SPI_CLK + #endif // _VARIANT_H_ diff --git a/variants/SFE_ARTEMIS_DK/variant.h b/variants/SFE_ARTEMIS_DK/variant.h index 93cb9e3e..cfa83b68 100644 --- a/variants/SFE_ARTEMIS_DK/variant.h +++ b/variants/SFE_ARTEMIS_DK/variant.h @@ -30,4 +30,10 @@ #define VARIANT_Wire_SDA I2C_SDA #define VARIANT_Wire_SCL I2C_SCL +// temporary patch to support Arduino SD library +#define SS 0 +#define MOSI SPI_SDO +#define MISO SPI_SDI +#define SCK SPI_CLK + #endif // _VARIANT_H_ diff --git a/variants/SFE_ARTEMIS_NANO/variant.h b/variants/SFE_ARTEMIS_NANO/variant.h index 754cd9b7..6881ffd7 100644 --- a/variants/SFE_ARTEMIS_NANO/variant.h +++ b/variants/SFE_ARTEMIS_NANO/variant.h @@ -28,4 +28,10 @@ // UART extern UART Serial1; +// temporary patch to support Arduino SD library +#define SS 0 +#define MOSI SPI_SDO +#define MISO SPI_SDI +#define SCK SPI_CLK + #endif // _VARIANT_H_ diff --git a/variants/SFE_ARTEMIS_THING_PLUS/variant.h b/variants/SFE_ARTEMIS_THING_PLUS/variant.h index 398a1b05..0c5d8ffe 100644 --- a/variants/SFE_ARTEMIS_THING_PLUS/variant.h +++ b/variants/SFE_ARTEMIS_THING_PLUS/variant.h @@ -25,4 +25,10 @@ // UART extern UART Serial1; +// temporary patch to support Arduino SD library +#define SS 0 +#define MOSI SPI_SDO +#define MISO SPI_SDI +#define SCK SPI_CLK + #endif // _VARIANT_H_ From afda94c483de62d008e03f2997e98f272f50eedc Mon Sep 17 00:00:00 2001 From: Wenn0101 Date: Fri, 16 Oct 2020 13:47:04 -0600 Subject: [PATCH 2/3] update SFE_ARTEMIS_MM_PB with SD workaround --- variants/SFE_ARTEMIS_MM_PB/variant.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/variants/SFE_ARTEMIS_MM_PB/variant.h b/variants/SFE_ARTEMIS_MM_PB/variant.h index e3621ca9..4d6aa60e 100644 --- a/variants/SFE_ARTEMIS_MM_PB/variant.h +++ b/variants/SFE_ARTEMIS_MM_PB/variant.h @@ -29,4 +29,10 @@ #define VARIANT_Wire1_SDA I2C1_SDA #define VARIANT_Wire1_SCL I2C1_SCL +// temporary patch to support Arduino SD library +#define SS 0 +#define MOSI SPI_SDO +#define MISO SPI_SDI +#define SCK SPI_CLK + #endif // _VARIANT_H_ From 7f7ec2d030bffc68c872b1e60bc2563045e8a9cc Mon Sep 17 00:00:00 2001 From: Wenn0101 Date: Fri, 16 Oct 2020 13:50:23 -0600 Subject: [PATCH 3/3] update SS for artemis_mm_pb --- variants/SFE_ARTEMIS_MM_PB/variant.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/SFE_ARTEMIS_MM_PB/variant.h b/variants/SFE_ARTEMIS_MM_PB/variant.h index 4d6aa60e..270ed127 100644 --- a/variants/SFE_ARTEMIS_MM_PB/variant.h +++ b/variants/SFE_ARTEMIS_MM_PB/variant.h @@ -30,7 +30,7 @@ #define VARIANT_Wire1_SCL I2C1_SCL // temporary patch to support Arduino SD library -#define SS 0 +#define SS SPI_CS #define MOSI SPI_SDO #define MISO SPI_SDI #define SCK SPI_CLK