Browse Source

Fix Arduino DUE compilation (#20058)

Jason Smith 4 years ago
parent
commit
53e79224fc
No account linked to committer's email address

+ 4
- 0
Marlin/src/HAL/STM32/MarlinSPI.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
24
+
23
 #include "MarlinSPI.h"
25
 #include "MarlinSPI.h"
24
 
26
 
25
 static void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb, uint32_t dataSize) {
27
 static void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb, uint32_t dataSize) {
159
   HAL_DMA_DeInit(&_dmaTx);
161
   HAL_DMA_DeInit(&_dmaTx);
160
   return 1;
162
   return 1;
161
 }
163
 }
164
+
165
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC

+ 2
- 0
Marlin/src/feature/controllerfan.cpp View File

34
 
34
 
35
 #if ENABLED(CONTROLLER_FAN_EDITABLE)
35
 #if ENABLED(CONTROLLER_FAN_EDITABLE)
36
   controllerFan_settings_t ControllerFan::settings; // {0}
36
   controllerFan_settings_t ControllerFan::settings; // {0}
37
+ #else
38
+   const controllerFan_settings_t &ControllerFan::settings = controllerFan_defaults;
37
 #endif
39
 #endif
38
 
40
 
39
 void ControllerFan::setup() {
41
 void ControllerFan::setup() {

+ 1
- 1
Marlin/src/feature/controllerfan.h View File

58
     #if ENABLED(CONTROLLER_FAN_EDITABLE)
58
     #if ENABLED(CONTROLLER_FAN_EDITABLE)
59
       static controllerFan_settings_t settings;
59
       static controllerFan_settings_t settings;
60
     #else
60
     #else
61
-      static const controllerFan_settings_t constexpr &settings = controllerFan_defaults;
61
+      static const controllerFan_settings_t &settings;
62
     #endif
62
     #endif
63
     static inline bool state() { return speed > 0; }
63
     static inline bool state() { return speed > 0; }
64
     static inline void init() { reset(); }
64
     static inline void init() { reset(); }

Loading…
Cancel
Save