fix mode 3

This commit is contained in:
ladyada 2025-09-11 12:20:44 -04:00
parent aa29b351d1
commit fb90221892
1 changed files with 40 additions and 17 deletions

View File

@ -195,51 +195,74 @@ void Adafruit_SPIDevice::transfer(uint8_t *buffer, size_t len) {
if (bitdelay_us) { if (bitdelay_us) {
delayMicroseconds(bitdelay_us); delayMicroseconds(bitdelay_us);
} }
if (_dataMode == SPI_MODE0 || _dataMode == SPI_MODE2) { if (_dataMode == SPI_MODE0 || _dataMode == SPI_MODE2) {
towrite = send & b; towrite = send & b;
if ((_mosi != -1) && (lastmosi != towrite)) { if ((_mosi != -1) && (lastmosi != towrite)) {
BUSIO_WRITE_MOSI(towrite); BUSIO_WRITE_MOSI(towrite);
lastmosi = towrite; lastmosi = towrite;
} }
BUSIO_SET_CLOCK_HIGH(); BUSIO_SET_CLOCK_HIGH();
if (bitdelay_us) { if (bitdelay_us) {
delayMicroseconds(bitdelay_us); delayMicroseconds(bitdelay_us);
} }
if (_miso != -1) { if (_miso != -1) {
if (BUSIO_READ_MISO()) if (BUSIO_READ_MISO())
reply |= b; reply |= b;
}
} }
BUSIO_SET_CLOCK_LOW(); BUSIO_SET_CLOCK_LOW();
} else { // if (_dataMode == SPI_MODE1 || _dataMode == SPI_MODE3) } else if (_dataMode == SPI_MODE3) {
BUSIO_SET_CLOCK_HIGH(); if (_mosi != -1) { // transmit on falling edge
BUSIO_WRITE_MOSI(send & b);
}
BUSIO_SET_CLOCK_LOW();
if (bitdelay_us) { if (bitdelay_us) {
delayMicroseconds(bitdelay_us); delayMicroseconds(bitdelay_us);
} }
BUSIO_SET_CLOCK_HIGH();
if (bitdelay_us) {
delayMicroseconds(bitdelay_us);
}
if (_miso != -1) { // read on rising edge
if (BUSIO_READ_MISO()) {
reply |= b;
}
}
} else { // || _dataMode == SPI_MODE1)
BUSIO_SET_CLOCK_HIGH();
if (bitdelay_us) {
delayMicroseconds(bitdelay_us);
}
if (_mosi != -1) { if (_mosi != -1) {
BUSIO_WRITE_MOSI(send & b); BUSIO_WRITE_MOSI(send & b);
} }
BUSIO_SET_CLOCK_LOW(); BUSIO_SET_CLOCK_LOW();
if (_miso != -1) { if (_miso != -1) {
if (BUSIO_READ_MISO()) { if (BUSIO_READ_MISO()) {
reply |= b; reply |= b;
} }
} }
} }
if (_miso != -1) { }
buffer[i] = reply; if (_miso != -1) {
} buffer[i] = reply;
} }
} }
return; return;