Skip to content

Use an instance of SPI that can be more easily customized #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lukecyca wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use an instance of SPI that can be more easily customized #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08e2ec2
Use an instance of SPI that can be more easily customized with custom…
lukecyca May 14, 2019
3def086
Remove include SPI.h
lukecyca May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 74 additions & 65 deletions transports/wiring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#define YIELD()
#endif

SPIClass *spi = NULL;

class GDTransport {
private:
byte model;
Expand All @@ -39,12 +41,19 @@ class GDTransport {
void begin0() {
ios();

SPI.begin();
// With custom SPI pins
//spi = new SPIClass(HSPI);
//spi->begin(14, 12, 13, 2);

// With default SPI pins
spi = new SPIClass();
spi->begin();

#if defined(TEENSYDUINO) || defined(ARDUINO_ARCH_STM32L4) || defined(ARDUINO_ARCH_STM32)
SPI.beginTransaction(SPISettings(3000000, MSBFIRST, SPI_MODE0));
spi->beginTransaction(SPISettings(3000000, MSBFIRST, SPI_MODE0));
#else
#if !defined(__DUE__) && !defined(ESP8266) && !defined(ESP32) && !defined(ARDUINO_ARCH_STM32)
SPI.setClockDivider(SPI_CLOCK_DIV2);
spi->setClockDivider(SPI_CLOCK_DIV2);
SPSR = (1 << SPI2X);
#endif
#endif
Expand All @@ -71,7 +80,7 @@ class GDTransport {
// Test point: saturate SPI
while (0) {
digitalWrite(CS, LOW);
SPI.transfer(0x55);
spi->transfer(0x55);
digitalWrite(CS, HIGH);
}

Expand All @@ -83,12 +92,12 @@ class GDTransport {
hostcmd(0x68);
delay(120);
digitalWrite(CS, LOW);
Serial.println(SPI.transfer(0x10), HEX);
Serial.println(SPI.transfer(0x24), HEX);
Serial.println(SPI.transfer(0x00), HEX);
Serial.println(SPI.transfer(0xff), HEX);
Serial.println(SPI.transfer(0x00), HEX);
Serial.println(SPI.transfer(0x00), HEX);
Serial.println(spi->transfer(0x10), HEX);
Serial.println(spi->transfer(0x24), HEX);
Serial.println(spi->transfer(0x00), HEX);
Serial.println(spi->transfer(0xff), HEX);
Serial.println(spi->transfer(0x00), HEX);
Serial.println(spi->transfer(0x00), HEX);
Serial.println();

digitalWrite(CS, HIGH);
Expand Down Expand Up @@ -118,21 +127,21 @@ class GDTransport {
wp += 4;
freespace -= 4;
#if defined(ESP8266)
// SPI.writeBytes((uint8_t*)&x, 4);
SPI.write32(x, 0);
// spi->writeBytes((uint8_t*)&x, 4);
spi->write32(x, 0);
#elif defined(ESP32)
// SPI.write32(x) has the wrong byte order.
SPI.writeBytes((uint8_t*)&x, 4);
// spi->write32(x) has the wrong byte order.
spi->writeBytes((uint8_t*)&x, 4);
#else
union {
uint32_t c;
uint8_t b[4];
};
c = x;
SPI.transfer(b[0]);
SPI.transfer(b[1]);
SPI.transfer(b[2]);
SPI.transfer(b[3]);
spi->transfer(b[0]);
spi->transfer(b[1]);
spi->transfer(b[2]);
spi->transfer(b[3]);
#endif
}
void cmdbyte(byte x) {
Expand All @@ -141,7 +150,7 @@ class GDTransport {
}
wp++;
freespace--;
SPI.transfer(x);
spi->transfer(x);
}
void cmd_n(byte *s, uint16_t n) {
if (freespace < n) {
Expand All @@ -150,21 +159,21 @@ class GDTransport {
wp += n;
freespace -= n;
#if defined(ARDUINO_ARCH_STM32)
SPI.write(s, n);
spi->write(s, n);
#else
while (n > 8) {
n -= 8;
SPI.transfer(*s++);
SPI.transfer(*s++);
SPI.transfer(*s++);
SPI.transfer(*s++);
SPI.transfer(*s++);
SPI.transfer(*s++);
SPI.transfer(*s++);
SPI.transfer(*s++);
spi->transfer(*s++);
spi->transfer(*s++);
spi->transfer(*s++);
spi->transfer(*s++);
spi->transfer(*s++);
spi->transfer(*s++);
spi->transfer(*s++);
spi->transfer(*s++);
}
while (n--)
SPI.transfer(*s++);
spi->transfer(*s++);
#endif
}

Expand Down Expand Up @@ -192,8 +201,8 @@ class GDTransport {
{
__end(); // stop streaming
__start(addr);
SPI.transfer(0); // dummy
byte r = SPI.transfer(0);
spi->transfer(0); // dummy
byte r = spi->transfer(0);
stream();
return r;
}
Expand All @@ -202,7 +211,7 @@ class GDTransport {
{
__end(); // stop streaming
__wstart(addr);
SPI.transfer(v);
spi->transfer(v);
stream();
}

Expand All @@ -211,9 +220,9 @@ class GDTransport {
uint16_t r = 0;
__end(); // stop streaming
__start(addr);
SPI.transfer(0);
r = SPI.transfer(0);
r |= (SPI.transfer(0) << 8);
spi->transfer(0);
r = spi->transfer(0);
r |= (spi->transfer(0) << 8);
stream();
return r;
}
Expand All @@ -222,34 +231,34 @@ class GDTransport {
{
__end(); // stop streaming
__wstart(addr);
SPI.transfer(v);
SPI.transfer(v >> 8);
spi->transfer(v);
spi->transfer(v >> 8);
stream();
}

uint32_t rd32(uint32_t addr)
{
__end(); // stop streaming
__start(addr);
SPI.transfer(0);
spi->transfer(0);
union {
uint32_t c;
uint8_t b[4];
};
b[0] = SPI.transfer(0);
b[1] = SPI.transfer(0);
b[2] = SPI.transfer(0);
b[3] = SPI.transfer(0);
b[0] = spi->transfer(0);
b[1] = spi->transfer(0);
b[2] = spi->transfer(0);
b[3] = spi->transfer(0);
stream();
return c;
}
void rd_n(byte *dst, uint32_t addr, uint16_t n)
{
__end(); // stop streaming
__start(addr);
SPI.transfer(0);
spi->transfer(0);
while (n--)
*dst++ = SPI.transfer(0);
*dst++ = spi->transfer(0);
stream();
}
#if defined(ARDUINO) && !defined(__DUE__) && !defined(ESP8266) && !defined(ESP32) && !defined(ARDUINO_ARCH_STM32L4) && !defined(ARDUINO_ARCH_STM32)
Expand Down Expand Up @@ -279,12 +288,12 @@ class GDTransport {
__end(); // stop streaming
__wstart(addr);
#if defined(ESP8266) || defined(ESP32)
SPI.writeBytes(src, n);
spi->writeBytes(src, n);
#elif defined(ARDUINO_ARCH_STM32)
SPI.write(src, n);
spi->write(src, n);
#else
while (n--)
SPI.transfer(*src++);
spi->transfer(*src++);
#endif
stream();
}
Expand All @@ -294,10 +303,10 @@ class GDTransport {
{
__end(); // stop streaming
__wstart(addr);
SPI.transfer(v);
SPI.transfer(v >> 8);
SPI.transfer(v >> 16);
SPI.transfer(v >> 24);
spi->transfer(v);
spi->transfer(v >> 8);
spi->transfer(v >> 16);
spi->transfer(v >> 24);
stream();
}

Expand All @@ -316,17 +325,17 @@ class GDTransport {
static void __start(uint32_t addr) // start an SPI transaction to addr
{
digitalWrite(CS, LOW);
SPI.transfer(addr >> 16);
SPI.transfer(highByte(addr));
SPI.transfer(lowByte(addr));
spi->transfer(addr >> 16);
spi->transfer(highByte(addr));
spi->transfer(lowByte(addr));
}

static void __wstart(uint32_t addr) // start an SPI write transaction to addr
{
digitalWrite(CS, LOW);
SPI.transfer(0x80 | (addr >> 16));
SPI.transfer(highByte(addr));
SPI.transfer(lowByte(addr));
spi->transfer(0x80 | (addr >> 16));
spi->transfer(highByte(addr));
spi->transfer(lowByte(addr));
}

static void __end() // end the SPI transaction
Expand All @@ -352,27 +361,27 @@ class GDTransport {
unsigned int r;

__start(addr);
SPI.transfer(0); // dummy
r = SPI.transfer(0);
r |= (SPI.transfer(0) << 8);
spi->transfer(0); // dummy
r = spi->transfer(0);
r |= (spi->transfer(0) << 8);
__end();
return r;
}

static void __wr16(uint32_t addr, unsigned int v)
{
__wstart(addr);
SPI.transfer(lowByte(v));
SPI.transfer(highByte(v));
spi->transfer(lowByte(v));
spi->transfer(highByte(v));
__end();
}

static void hostcmd(byte a)
{
digitalWrite(CS, LOW);
SPI.transfer(a);
SPI.transfer(0x00);
SPI.transfer(0x00);
spi->transfer(a);
spi->transfer(0x00);
spi->transfer(0x00);
digitalWrite(CS, HIGH);
}

Expand Down