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

Merge pull request #8762 from victorpv/patch-2

Browse source 
[2.0.x] STM32F1 HAL: Fix issue #8585. Updates to readme.
This commit is contained in:
Scott Lahteine 2017-12-12 18:28:18 -06:00 committed by GitHub
parent ac168a03c8 084f2434a7
commit a641992c1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 35 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

@ -37,7 +37,7 @@
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
#include "../HAL.h" #include "../HAL.h"
#include "../SPI.h" #include "SPI.h"
#include "pins_arduino.h" #include "pins_arduino.h"
#include "spi_pins.h" #include "spi_pins.h"
#include "../../core/macros.h" #include "../../core/macros.h"

6
Marlin/src/HAL/HAL_STM32F1/README.md
View file

@ -1,6 +1,6 @@
# This HAL is for STM32F103 boards used with libmaple/stm32duino Arduino core. # This HAL is for STM32F103 boards used with libmaple/stm32duino Arduino core.
# This HAL is in development and has not been tested with an actual printer. # This HAL is in development. Currently has been tested in Malyan M200 (103CBT6), Chitu 3d (103ZET6), and custom boards(103VET6).
### The stm32 core needs a modification in the file util.h to avoid conflict with Marlin macros for Debug. ### The stm32 core needs a modification in the file util.h to avoid conflict with Marlin macros for Debug.
Since only 1 file needs change in the stm32duino core, it's preferable over making changes to Marlin. Since only 1 file needs change in the stm32duino core, it's preferable over making changes to Marlin.
@ -22,11 +22,13 @@ Add the following 3 lines:
### Main developers: ### Main developers:
Victorpv Victorpv
xC000005
### Most up to date repository for this HAL: ### Most up to date repository for this HAL:
https://github.com/victorpv/Marlin/tree/bugfix-2.0.x https://github.com/victorpv/Marlin/tree/bugfix-2.0.x
PRs should be first sent to that fork, and once tested merged to Marlin bugfix-2.0.x branch. PRs should only be sent to Marlin bugfix-2.0.x branch once tested in printing so not to introduce new bugs.
For testing/dev, you can submit to the above branch

32
Marlin/src/HAL/HAL_STM32F1/readme.md
View file

@ -1,32 +0,0 @@
# This HAL is for STM32F103 boards used with libmaple/stm32duino Arduino core.
# This HAL is in development and has not been tested with an actual printer.
### The stm32 core needs a modification in the file util.h to avoid conflict with Marlin macros for Debug.
Since only 1 file needs change in the stm32duino core, it's preferable over making changes to Marlin.
After these lines:
<>
#else
#define ASSERT_FAULT(exp) (void)((0))
#endif
<>
Add the following 3 lines:
<>
#undef DEBUG_NONE
#undef DEBUG_FAULT
#undef DEBUG_ALL
<>
### Main developers:
Victorpv
### Most up to date repository for this HAL:
https://github.com/victorpv/Marlin/tree/bugfix-2.0.x
PRs should be first sent to that fork, and once tested merged to Marlin bugfix-2.0.x branch.