melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix STM32 compilation with PlatformIO (#10245)

Browse Source
This commit is contained in:
Alexey Shvetsov 2018-03-29 01:35:20 +03:00 committed by Scott Lahteine
parent 9d2ea5d64b
commit cbdc78ec0f
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp
View File

@ -41,7 +41,7 @@
#include "pins_arduino.h" #include "pins_arduino.h"
#include "spi_pins.h" #include "spi_pins.h"
#include "../../core/macros.h" #include "../../core/macros.h"
#include <spi.h> #include <SPI.h>
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Public Variables // Public Variables

4
Marlin/src/config/examples/stm32f103ret6/Configuration.h
View File

@ -1159,7 +1159,7 @@
// M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. // M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
// //
#define EEPROM_SETTINGS // Enable for M500 and M501 commands //#define EEPROM_SETTINGS // Enable for M500 and M501 commands
//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release!
//#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. //#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
@ -1176,7 +1176,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

9
platformio.ini
View File

@ -235,6 +235,15 @@ board = genericSTM32F103RE
build_flags = !python Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py build_flags = !python Marlin/src/HAL/HAL_STM32F1/stm32f1_flag_script.py
${common.build_flags} ${common.build_flags}
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
lib_ignore = U8glib-HAL
c1921b4
libf3c
lib066
Adafruit NeoPixel_ID28
Adafruit NeoPixel
libf3e
TMC26XStepper
lib_ldf_mode = 1
src_filter = ${common.default_src_filter} src_filter = ${common.default_src_filter}
monitor_baud = 250000 monitor_baud = 250000