From 9a56a8820030055e609f2aca5571107fed40b94c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 15 Jun 2019 14:57:42 -0500 Subject: [PATCH] Use OUT_WRITE in SPI pin init --- Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp | 3 +-- Marlin/src/HAL/HAL_LPC1768/main.cpp | 6 ++---- Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp | 3 +-- Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp | 3 +-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp b/Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp index d48b14d61..c837eb062 100644 --- a/Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp +++ b/Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp @@ -62,8 +62,7 @@ void spiBegin() { #error "SS_PIN not defined!" #endif - WRITE(SS_PIN, HIGH); - SET_OUTPUT(SS_PIN); + OUT_WRITE(SS_PIN, HIGH); } void spiInit(uint8_t spiRate) { diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/HAL_LPC1768/main.cpp index cc74eedc1..258e150e2 100644 --- a/Marlin/src/HAL/HAL_LPC1768/main.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/main.cpp @@ -78,13 +78,11 @@ void HAL_init() { //_DBG("\n\nDebug running\n"); // Initialise the SD card chip select pins as soon as possible #if PIN_EXISTS(SS) - WRITE(SS_PIN, HIGH); - SET_OUTPUT(SS_PIN); + OUT_WRITE(SS_PIN, HIGH); #endif #if defined(ONBOARD_SD_CS) && ONBOARD_SD_CS > -1 - WRITE(ONBOARD_SD_CS, HIGH); - SET_OUTPUT(ONBOARD_SD_CS); + OUT_WRITE(ONBOARD_SD_CS, HIGH); #endif USB_Init(); // USB Initialization diff --git a/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp b/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp index 86cdb5781..41562b8cc 100644 --- a/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp +++ b/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp @@ -69,8 +69,7 @@ void spiBegin(void) { #error "SS_PIN not defined!" #endif - SET_OUTPUT(SS_PIN); - WRITE(SS_PIN, HIGH); + OUT_WRITE(SS_PIN, HIGH); } /** Configure SPI for specified SPI speed */ diff --git a/Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp b/Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp index 78b312470..7a338a2f2 100644 --- a/Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp +++ b/Marlin/src/HAL/HAL_STM32F7/HAL_spi_STM32F7.cpp @@ -81,8 +81,7 @@ void spiBegin(void) { #error SS_PIN not defined! #endif - SET_OUTPUT(SS_PIN); - WRITE(SS_PIN, HIGH); + OUT_WRITE(SS_PIN, HIGH); } /** Configure SPI for specified SPI speed */