bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Use board-specific or platform SPI pins in HAL_STM32 (#12323)

Browse Source
This commit is contained in:
Karl Andersson
2018-11-04 22:03:45 +01:00
committed by Scott Lahteine
parent 60dbd8161c
commit 176654791e
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp
View File

@@ -26,11 +26,7 @@
// Includes // Includes
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#include "HAL.h" #include "../../inc/MarlinConfig.h"
#include "../shared/HAL_SPI.h"
#include "pins_arduino.h"
#include "spi_pins.h"
#include "../../core/macros.h"
#include <SPI.h> #include <SPI.h>

8
Marlin/src/HAL/HAL_STM32/spi_pins.h
View File

@@ -22,14 +22,14 @@
* Define SPI Pins: SCK, MISO, MOSI, SS * Define SPI Pins: SCK, MISO, MOSI, SS
*/ */
#ifndef SCK_PIN #ifndef SCK_PIN
#define SCK_PIN 13 #define SCK_PIN PIN_SPI_SCK
#endif #endif
#ifndef MISO_PIN #ifndef MISO_PIN
#define MISO_PIN 12 #define MISO_PIN PIN_SPI_MISO
#endif #endif
#ifndef MOSI_PIN #ifndef MOSI_PIN
#define MOSI_PIN 11 #define MOSI_PIN PIN_SPI_MOSI
#endif #endif
#ifndef SS_PIN #ifndef SS_PIN
#define SS_PIN 14 #define SS_PIN PIN_SPI_SS
#endif #endif

8
Marlin/src/pins/pins_ARMED.h
View File

@@ -104,13 +104,6 @@
#define E1_CS_PIN PE5 #define E1_CS_PIN PE5
#endif #endif
//
// SPI
//
#define SCK_PIN PA5
#define MISO_PIN PA6
#define MOSI_PIN PA7
// //
// Temperature Sensors // Temperature Sensors
// //
@@ -133,7 +126,6 @@
// Misc functions // Misc functions
// //
#define SDSS PE7 #define SDSS PE7
#define SS_PIN PE7
#define LED_PIN PB7 // Heart beat #define LED_PIN PB7 // Heart beat
#define PS_ON_PIN PA10 #define PS_ON_PIN PA10
#define KILL_PIN PA8 #define KILL_PIN PA8