diff options
author | Craig Link <craigl@zillowgroup.com> | 2021-02-28 14:40:23 +0300 |
---|---|---|
committer | Craig Link <craigl@zillowgroup.com> | 2021-02-28 14:40:23 +0300 |
commit | 29554f8e3661e1c2f449023c79d71599a37111df (patch) | |
tree | 6c75e308428a671e98d4d079c1ffd63ab7bfd12a | |
parent | 56acf0ad701441f229e7d129db26c94b33d8b09b (diff) |
Add native SPI support for ARM D51 (and others) by providing a Ardunio.Core SPI wrapper
Add support for Seeed Wio Terminal
-rw-r--r-- | src/platforms/arm/d51/fastled_arm_d51.h | 1 | ||||
-rw-r--r-- | src/platforms/arm/d51/fastpin_arm_d51.h | 8 | ||||
-rw-r--r-- | src/platforms/arm/d51/led_sysdefs_arm_d51.h | 4 | ||||
-rw-r--r-- | src/platforms/fastspi_ardunio_core.h | 103 |
4 files changed, 110 insertions, 6 deletions
diff --git a/src/platforms/arm/d51/fastled_arm_d51.h b/src/platforms/arm/d51/fastled_arm_d51.h index 0c14bf2f..912a9018 100644 --- a/src/platforms/arm/d51/fastled_arm_d51.h +++ b/src/platforms/arm/d51/fastled_arm_d51.h @@ -2,6 +2,7 @@ #define __INC_FASTLED_ARM_D51_H #include "fastpin_arm_d51.h" +#include "../../fastspi_ardunio_core.h" #include "clockless_arm_d51.h" #endif diff --git a/src/platforms/arm/d51/fastpin_arm_d51.h b/src/platforms/arm/d51/fastpin_arm_d51.h index 4a7a79bc..c2a34cc4 100644 --- a/src/platforms/arm/d51/fastpin_arm_d51.h +++ b/src/platforms/arm/d51/fastpin_arm_d51.h @@ -138,11 +138,13 @@ _FL_DEFPIN( 8, 6, 0); // SDA/SCL _FL_DEFPIN(12, 17, 0); _FL_DEFPIN(13, 16, 0); // match GPIO pin nubers 9..11 MISO/MOSI/SCK -_FL_DEFPIN(9, 0, 1); _FL_DEFPIN(10, 2, 1); _FL_DEFPIN(11, 3, 1); +_FL_DEFPIN(PIN_SPI_MISO, 0, 1); _FL_DEFPIN(PIN_SPI_MOSI, 2, 1); _FL_DEFPIN(PIN_SPI_SCK, 3, 1); -#define SPI_DATA 10 -#define SPI_CLOCK 11 +#define SPI_DATA PIN_SPI_MOSI +#define SPI_CLOCK PIN_SPI_SCK + +#define ARDUNIO_CORE_SPI #define HAS_HARDWARE_PIN_SUPPORT 1 #endif diff --git a/src/platforms/arm/d51/led_sysdefs_arm_d51.h b/src/platforms/arm/d51/led_sysdefs_arm_d51.h index fd6a25e2..77726fa2 100644 --- a/src/platforms/arm/d51/led_sysdefs_arm_d51.h +++ b/src/platforms/arm/d51/led_sysdefs_arm_d51.h @@ -3,8 +3,6 @@ #define FASTLED_ARM -// Note this is an M4, not an M0+, but this enables the shared m0clockless.h -#define FASTLED_ARM_M0_PLUS #ifndef INTERRUPT_THRESHOLD #define INTERRUPT_THRESHOLD 1 @@ -12,7 +10,7 @@ // Default to allowing interrupts #ifndef FASTLED_ALLOW_INTERRUPTS -#define FASTLED_ALLOW_INTERRUPTS 0 +#define FASTLED_ALLOW_INTERRUPTS 1 #endif #if FASTLED_ALLOW_INTERRUPTS == 1 diff --git a/src/platforms/fastspi_ardunio_core.h b/src/platforms/fastspi_ardunio_core.h new file mode 100644 index 00000000..a0f92288 --- /dev/null +++ b/src/platforms/fastspi_ardunio_core.h @@ -0,0 +1,103 @@ +#ifndef __INC_FASTSPI_ARDUNIO_CORE_H +#define __INC_FASTSPI_ARDUNIO_CORE_H + +FASTLED_NAMESPACE_BEGIN + +#if defined(ARDUNIO_CORE_SPI) +#include <SPI.h> + +template <uint8_t _DATA_PIN, uint8_t _CLOCK_PIN, uint32_t _SPI_CLOCK_RATE, SPIClass & _SPIObject> +class ArdunioCoreSPIOutput { + +public: + ArdunioCoreSPIOutput() {} + + // set the object representing the selectable -- ignore for now + void setSelect(Selectable *pSelect) { /* TODO */ } + + // initialize the SPI subssytem + void init() { _SPIObject.begin(); } + + // latch the CS select + void inline select() __attribute__((always_inline)) { + // begin the SPI transaction + _SPIObject.beginTransaction(SPISettings(_SPI_CLOCK_RATE, MSBFIRST, SPI_MODE0)); + } + + // release the CS select + void inline release() __attribute__((always_inline)) { + _SPIObject.endTransaction(); + } + + // wait until all queued up data has been written + static void waitFully() { /* TODO */ } + + // write a byte out via SPI (returns immediately on writing register) - + void inline writeByte(uint8_t b) __attribute__((always_inline)) { + _SPIObject.transfer(b); + } + + // write a word out via SPI (returns immediately on writing register) + void inline writeWord(uint16_t w) __attribute__((always_inline)) { + _SPIObject.transfer16(w); + } + + // A raw set of writing byte values, assumes setup/init/waiting done elsewhere + static void writeBytesValueRaw(uint8_t value, int len) { + while(len--) { _SPIObject.transfer(value); } + } + + // A full cycle of writing a value for len bytes, including select, release, and waiting + void writeBytesValue(uint8_t value, int len) { + select(); writeBytesValueRaw(value, len); release(); + } + + // A full cycle of writing a value for len bytes, including select, release, and waiting + template <class D> void writeBytes(register uint8_t *data, int len) { + uint8_t *end = data + len; + select(); + // could be optimized to write 16bit words out instead of 8bit bytes + while(data != end) { + writeByte(D::adjust(*data++)); + } + D::postBlock(len); + waitFully(); + release(); + } + + // A full cycle of writing a value for len bytes, including select, release, and waiting + void writeBytes(register uint8_t *data, int len) { writeBytes<DATA_NOP>(data, len); } + + // write a single bit out, which bit from the passed in byte is determined by template parameter + template <uint8_t BIT> inline void writeBit(uint8_t b) { + // todo + } + + // write a block of uint8_ts out in groups of three. len is the total number of uint8_ts to write out. The template + // parameters indicate how many uint8_ts to skip at the beginning and/or end of each grouping + template <uint8_t FLAGS, class D, EOrder RGB_ORDER> void writePixels(PixelController<RGB_ORDER> pixels) { + select(); + int len = pixels.mLen; + + while(pixels.has(1)) { + if(FLAGS & FLAG_START_BIT) { + writeBit<0>(1); + } + writeByte(D::adjust(pixels.loadAndScale0())); + writeByte(D::adjust(pixels.loadAndScale1())); + writeByte(D::adjust(pixels.loadAndScale2())); + + pixels.advanceData(); + pixels.stepDithering(); + } + D::postBlock(len); + release(); + } + +}; + + +#endif + +FASTLED_NAMESPACE_END +#endif |