zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Arduino DUE compilation (#20058)

Browse source
This commit is contained in:
Jason Smith 2020-11-10 01:32:08 -08:00 committed by GitHub
parent 2abb674c87
commit 53e79224fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/HAL/STM32/MarlinSPI.cpp
View file

@ -20,6 +20,8 @@
* *
*/ */
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
#include "MarlinSPI.h" #include "MarlinSPI.h"
static void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb, uint32_t dataSize) { 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)
HAL_DMA_DeInit(&_dmaTx); HAL_DMA_DeInit(&_dmaTx);
return 1; return 1;
} }
#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC

2
Marlin/src/feature/controllerfan.cpp
View file

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

2
Marlin/src/feature/controllerfan.h
View file

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