aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorGravatar fauxpark <fauxpark@gmail.com>2019-09-08 01:18:05 +1000
committerGravatar Drashna Jaelre <drashna@live.com>2019-09-07 08:18:05 -0700
commit0d94730da05c9ba1375357cebedd54648463b0b8 (patch)
tree06af62ba84cede4776855cbac4abaa0007838dc2 /tmk_core/protocol
parent91bd2117df4cc4d2be6c840103614f2245e54bd1 (diff)
downloadqmk_firmware-0d94730da05c9ba1375357cebedd54648463b0b8.tar.gz
Adafruit BLE: Set SPI2X bit only when F_CPU is 8MHz (#6671)
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r--tmk_core/protocol/lufa/adafruit_ble.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tmk_core/protocol/lufa/adafruit_ble.cpp b/tmk_core/protocol/lufa/adafruit_ble.cpp
index 1d8ae1038..505794a80 100644
--- a/tmk_core/protocol/lufa/adafruit_ble.cpp
+++ b/tmk_core/protocol/lufa/adafruit_ble.cpp
@@ -151,9 +151,10 @@ static struct SPI_Settings spi;
// Initialize 4Mhz MSBFIRST MODE0
void SPI_init(struct SPI_Settings *spi) {
spi->spcr = _BV(SPE) | _BV(MSTR);
+#if F_CPU == 8000000
+ // For MCUs running at 8MHz (such as Feather 32U4, or 3.3V Pro Micros) we set the SPI doublespeed bit
spi->spsr = _BV(SPI2X);
-
- static_assert(SpiBusSpeed == F_CPU / 2, "hard coded at 4Mhz");
+#endif
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
// Ensure that SS is OUTPUT High