Browse Source

Fix wrappers on HAL/STM32F1 .cpp files (#19581)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
ellensp 4 years ago
parent
commit
b947590082

+ 0
- 3
Marlin/src/HAL/STM32F1/HAL_SPI.cpp View File

24
 /**
24
 /**
25
  * Software SPI functions originally from Arduino Sd2Card Library
25
  * Software SPI functions originally from Arduino Sd2Card Library
26
  * Copyright (c) 2009 by William Greiman
26
  * Copyright (c) 2009 by William Greiman
27
- */
28
-
29
-/**
30
  * Adapted to the STM32F1 HAL
27
  * Adapted to the STM32F1 HAL
31
  */
28
  */
32
 
29
 

+ 3
- 0
Marlin/src/HAL/STM32F1/eeprom_bl24cxx.cpp View File

25
  * with simple implementations supplied by Marlin.
25
  * with simple implementations supplied by Marlin.
26
  */
26
  */
27
 
27
 
28
+#ifdef __STM32F1__
29
+
28
 #include "../../inc/MarlinConfig.h"
30
 #include "../../inc/MarlinConfig.h"
29
 
31
 
30
 #if ENABLED(IIC_BL24CXX_EEPROM)
32
 #if ENABLED(IIC_BL24CXX_EEPROM)
79
 }
81
 }
80
 
82
 
81
 #endif // IIC_BL24CXX_EEPROM
83
 #endif // IIC_BL24CXX_EEPROM
84
+#endif // __STM32F1__

+ 3
- 0
Marlin/src/HAL/STM32F1/eeprom_if_iic.cpp View File

25
  * Enable USE_SHARED_EEPROM if not supplied by the framework.
25
  * Enable USE_SHARED_EEPROM if not supplied by the framework.
26
  */
26
  */
27
 
27
 
28
+#ifdef __STM32F1__
29
+
28
 #include "../../inc/MarlinConfig.h"
30
 #include "../../inc/MarlinConfig.h"
29
 
31
 
30
 #if ENABLED(IIC_BL24CXX_EEPROM)
32
 #if ENABLED(IIC_BL24CXX_EEPROM)
49
 }
51
 }
50
 
52
 
51
 #endif // IIC_BL24CXX_EEPROM
53
 #endif // IIC_BL24CXX_EEPROM
54
+#endif // __STM32F1__

+ 5
- 5
Marlin/src/HAL/STM32F1/eeprom_wired.cpp View File

17
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
17
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
18
  *
18
  *
19
  */
19
  */
20
+
21
+/**
22
+ * HAL PersistentStore for STM32F1
23
+ */
24
+
20
 #ifdef __STM32F1__
25
 #ifdef __STM32F1__
21
 
26
 
22
 #include "../../inc/MarlinConfig.h"
27
 #include "../../inc/MarlinConfig.h"
23
 
28
 
24
 #if USE_WIRED_EEPROM
29
 #if USE_WIRED_EEPROM
25
 
30
 
26
-/**
27
- * PersistentStore for Arduino-style EEPROM interface
28
- * with simple implementations supplied by Marlin.
29
- */
30
-
31
 #include "../shared/eeprom_if.h"
31
 #include "../shared/eeprom_if.h"
32
 #include "../shared/eeprom_api.h"
32
 #include "../shared/eeprom_api.h"
33
 
33
 

+ 2
- 2
Marlin/src/HAL/STM32F1/msc_sd.cpp View File

13
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
13
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
14
  *
14
  *
15
  */
15
  */
16
-#ifdef USE_USB_COMPOSITE
16
+#if defined(__STM32F1__) && defined(USE_USB_COMPOSITE)
17
 
17
 
18
 #include "msc_sd.h"
18
 #include "msc_sd.h"
19
 #include "SPI.h"
19
 #include "SPI.h"
77
   #endif
77
   #endif
78
 }
78
 }
79
 
79
 
80
-#endif // USE_USB_COMPOSITE
80
+#endif // __STM32F1__ && USE_USB_COMPOSITE

+ 3
- 0
Marlin/src/HAL/STM32F1/onboard_sd.cpp View File

11
  * Redistributions of source code must retain the above copyright notice.
11
  * Redistributions of source code must retain the above copyright notice.
12
  */
12
  */
13
 
13
 
14
+#ifdef __STM32F1__
15
+
14
 #include "../../inc/MarlinConfig.h"
16
 #include "../../inc/MarlinConfig.h"
15
 
17
 
16
 #if SD_CONNECTION_IS(ONBOARD)
18
 #if SD_CONNECTION_IS(ONBOARD)
553
 #endif // _DISKIO_IOCTL
555
 #endif // _DISKIO_IOCTL
554
 
556
 
555
 #endif // SD_CONNECTION_IS(ONBOARD)
557
 #endif // SD_CONNECTION_IS(ONBOARD)
558
+#endif // __STM32F1__

Loading…
Cancel
Save