Skip to content

Use DELAY_NS for non-const SW SPI delay in DUE. (#22320) #22382

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

Merged
thinkyhead merged 3 commits into from
Jul 18, 2021
Merged

Use DELAY_NS for non-const SW SPI delay in DUE. (#22320) #22382

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36c1025
Use DELAY_NS for non-const SW SPI delay in DUE. (#22320)
slowbro Jul 18, 2021
60a3c3d
fix NS calculation
slowbro Jul 18, 2021
ed9d75e
Update HAL_SPI.cpp
thinkyhead Jul 18, 2021
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
8 changes: 4 additions & 4 deletions Marlin/src/HAL/DUE/HAL_SPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
}

// all the others
static uint32_t spiDelayCyclesX4 = 4 * (F_CPU) / 1000000; // 4µs => 125khz
static uint16_t spiDelayNS = 4000; // 4000ns => 125khz

static uint8_t spiTransferX(uint8_t b) { // using Mode 0
int bits = 8;
Expand All @@ -249,12 +249,12 @@
b <<= 1; // little setup time

WRITE(SD_SCK_PIN, HIGH);
DELAY_CYCLES(spiDelayCyclesX4);
DELAY_NS(spiDelayNS);

b |= (READ(SD_MISO_PIN) != 0);

WRITE(SD_SCK_PIN, LOW);
DELAY_CYCLES(spiDelayCyclesX4);
DELAY_NS(spiDelayNS);
} while (--bits);
return b;
}
Expand Down Expand Up @@ -510,7 +510,7 @@
spiRxBlock = (pfnSpiRxBlock)spiRxBlockX;
break;
default:
spiDelayCyclesX4 = ((F_CPU) / 1000000) >> (6 - spiRate) << 2; // spiRate of 2 gives the maximum error with current CPU
spiDelayNS = 4000 >> (6 - spiRate); // spiRate of 2 gives the maximum error with current CPU
spiTransferTx = (pfnSpiTransfer)spiTransferX;
spiTransferRx = (pfnSpiTransfer)spiTransferX;
spiTxBlock = (pfnSpiTxBlock)spiTxBlockX;
Expand Down