Skip to content

Commit

Permalink
Fix wrappers on HAL/STM32F1 .cpp files (MarlinFirmware#19581)
Browse files Browse the repository at this point in the history
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
  • Loading branch information
ellensp and thinkyhead committed Oct 16, 2020
1 parent 20bcaa7 commit b947590
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 10 deletions.
3 changes: 0 additions & 3 deletions Marlin/src/HAL/STM32F1/HAL_SPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
/**
* Software SPI functions originally from Arduino Sd2Card Library
* Copyright (c) 2009 by William Greiman
*/

/**
* Adapted to the STM32F1 HAL
*/

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/HAL/STM32F1/eeprom_bl24cxx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
* with simple implementations supplied by Marlin.
*/

#ifdef __STM32F1__

#include "../../inc/MarlinConfig.h"

#if ENABLED(IIC_BL24CXX_EEPROM)
Expand Down Expand Up @@ -79,3 +81,4 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
}

#endif // IIC_BL24CXX_EEPROM
#endif // __STM32F1__
3 changes: 3 additions & 0 deletions Marlin/src/HAL/STM32F1/eeprom_if_iic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
* Enable USE_SHARED_EEPROM if not supplied by the framework.
*/

#ifdef __STM32F1__

#include "../../inc/MarlinConfig.h"

#if ENABLED(IIC_BL24CXX_EEPROM)
Expand All @@ -49,3 +51,4 @@ uint8_t eeprom_read_byte(uint8_t *pos) {
}

#endif // IIC_BL24CXX_EEPROM
#endif // __STM32F1__
10 changes: 5 additions & 5 deletions Marlin/src/HAL/STM32F1/eeprom_wired.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

/**
* HAL PersistentStore for STM32F1
*/

#ifdef __STM32F1__

#include "../../inc/MarlinConfig.h"

#if USE_WIRED_EEPROM

/**
* PersistentStore for Arduino-style EEPROM interface
* with simple implementations supplied by Marlin.
*/

#include "../shared/eeprom_if.h"
#include "../shared/eeprom_api.h"

Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/HAL/STM32F1/msc_sd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#ifdef USE_USB_COMPOSITE
#if defined(__STM32F1__) && defined(USE_USB_COMPOSITE)

#include "msc_sd.h"
#include "SPI.h"
Expand Down Expand Up @@ -77,4 +77,4 @@ void MSC_SD_init() {
#endif
}

#endif // USE_USB_COMPOSITE
#endif // __STM32F1__ && USE_USB_COMPOSITE
3 changes: 3 additions & 0 deletions Marlin/src/HAL/STM32F1/onboard_sd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
* Redistributions of source code must retain the above copyright notice.
*/

#ifdef __STM32F1__

#include "../../inc/MarlinConfig.h"

#if SD_CONNECTION_IS(ONBOARD)
Expand Down Expand Up @@ -553,3 +555,4 @@ DRESULT disk_read (
#endif // _DISKIO_IOCTL

#endif // SD_CONNECTION_IS(ONBOARD)
#endif // __STM32F1__

0 comments on commit b947590

Please sign in to comment.