From 176654791e790010972a7514ef08f328fb4b1884 Mon Sep 17 00:00:00 2001 From: Karl Andersson Date: Sun, 4 Nov 2018 22:03:45 +0100 Subject: [PATCH] Use board-specific or platform SPI pins in HAL_STM32 (#12323) --- Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp | 6 +----- Marlin/src/HAL/HAL_STM32/spi_pins.h | 8 ++++---- Marlin/src/pins/pins_ARMED.h | 8 -------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp b/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp index 5f9bbc33b4..597305fa06 100644 --- a/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp +++ b/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp @@ -26,11 +26,7 @@ // Includes // -------------------------------------------------------------------------- -#include "HAL.h" -#include "../shared/HAL_SPI.h" -#include "pins_arduino.h" -#include "spi_pins.h" -#include "../../core/macros.h" +#include "../../inc/MarlinConfig.h" #include diff --git a/Marlin/src/HAL/HAL_STM32/spi_pins.h b/Marlin/src/HAL/HAL_STM32/spi_pins.h index df1dd5483d..1136a78c22 100644 --- a/Marlin/src/HAL/HAL_STM32/spi_pins.h +++ b/Marlin/src/HAL/HAL_STM32/spi_pins.h @@ -22,14 +22,14 @@ * Define SPI Pins: SCK, MISO, MOSI, SS */ #ifndef SCK_PIN - #define SCK_PIN 13 + #define SCK_PIN PIN_SPI_SCK #endif #ifndef MISO_PIN - #define MISO_PIN 12 + #define MISO_PIN PIN_SPI_MISO #endif #ifndef MOSI_PIN - #define MOSI_PIN 11 + #define MOSI_PIN PIN_SPI_MOSI #endif #ifndef SS_PIN - #define SS_PIN 14 + #define SS_PIN PIN_SPI_SS #endif diff --git a/Marlin/src/pins/pins_ARMED.h b/Marlin/src/pins/pins_ARMED.h index dd4b73d99e..333469ba02 100644 --- a/Marlin/src/pins/pins_ARMED.h +++ b/Marlin/src/pins/pins_ARMED.h @@ -104,13 +104,6 @@ #define E1_CS_PIN PE5 #endif -// -// SPI -// -#define SCK_PIN PA5 -#define MISO_PIN PA6 -#define MOSI_PIN PA7 - // // Temperature Sensors // @@ -133,7 +126,6 @@ // Misc functions // #define SDSS PE7 -#define SS_PIN PE7 #define LED_PIN PB7 // Heart beat #define PS_ON_PIN PA10 #define KILL_PIN PA8