Procházet zdrojové kódy

Fix Arduino DUE compilation (#20058)

Jason Smith před 3 roky
rodič
revize
53e79224fc
No account linked to committer's email address

+ 4
- 0
Marlin/src/HAL/STM32/MarlinSPI.cpp Zobrazit soubor

@@ -20,6 +20,8 @@
20 20
  *
21 21
  */
22 22
 
23
+#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
24
+
23 25
 #include "MarlinSPI.h"
24 26
 
25 27
 static void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb, uint32_t dataSize) {
@@ -159,3 +161,5 @@ uint8_t MarlinSPI::dmaSend(const void * transmitBuf, uint16_t length, bool minc)
159 161
   HAL_DMA_DeInit(&_dmaTx);
160 162
   return 1;
161 163
 }
164
+
165
+#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC

+ 2
- 0
Marlin/src/feature/controllerfan.cpp Zobrazit soubor

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

+ 1
- 1
Marlin/src/feature/controllerfan.h Zobrazit soubor

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

Loading…
Zrušit
Uložit