Browse Source

Merge pull request #8762 from victorpv/patch-2

[2.0.x] STM32F1 HAL: Fix issue #8585. Updates to readme.
Scott Lahteine 7 years ago
parent
commit
a641992c1d
No account linked to committer's email address

+ 1
- 1
Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp View File

@@ -37,7 +37,7 @@
37 37
 // --------------------------------------------------------------------------
38 38
 
39 39
 #include "../HAL.h"
40
-#include "../SPI.h"
40
+#include "SPI.h"
41 41
 #include "pins_arduino.h"
42 42
 #include "spi_pins.h"
43 43
 #include "../../core/macros.h"

+ 4
- 2
Marlin/src/HAL/HAL_STM32F1/README.md View File

@@ -1,6 +1,6 @@
1 1
 # This HAL is for STM32F103 boards used with libmaple/stm32duino Arduino core.
2 2
 
3
-# This HAL is in development and has not been tested with an actual printer.
3
+# This HAL is in development. Currently has been tested in Malyan M200 (103CBT6), Chitu 3d (103ZET6), and custom boards(103VET6).
4 4
 
5 5
 ### The stm32 core needs a modification in the file util.h to avoid conflict with Marlin macros for Debug.
6 6
 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:
22 22
 
23 23
 ### Main developers:
24 24
 Victorpv
25
+xC000005
25 26
 
26 27
 
27 28
 ### Most up to date repository for this HAL:
28 29
 https://github.com/victorpv/Marlin/tree/bugfix-2.0.x
29 30
 
30
-PRs should be first sent to that fork, and once tested merged to Marlin bugfix-2.0.x branch.
31
+PRs should only be sent to Marlin bugfix-2.0.x branch once tested in printing so not to introduce new bugs.
32
+For testing/dev, you can submit to the above branch
31 33
 
32 34
 

+ 0
- 32
Marlin/src/HAL/HAL_STM32F1/readme.md View File

@@ -1,32 +0,0 @@
1
-# This HAL is for STM32F103 boards used with libmaple/stm32duino Arduino core.
2
-
3
-# This HAL is in development and has not been tested with an actual printer.
4
-
5
-### The stm32 core needs a modification in the file util.h to avoid conflict with Marlin macros for Debug.
6
-Since only 1 file needs change in the stm32duino core, it's preferable over making changes to Marlin.
7
-
8
-
9
-After these lines:
10
-<>
11
-#else
12
-#define ASSERT_FAULT(exp) (void)((0))
13
-#endif
14
-<>
15
-
16
-Add the following 3 lines:
17
-<>
18
-#undef DEBUG_NONE
19
-#undef DEBUG_FAULT
20
-#undef DEBUG_ALL
21
-<>
22
-
23
-### Main developers:
24
-Victorpv
25
-
26
-
27
-### Most up to date repository for this HAL:
28
-https://github.com/victorpv/Marlin/tree/bugfix-2.0.x
29
-
30
-PRs should be first sent to that fork, and once tested merged to Marlin bugfix-2.0.x branch.
31
-
32
-

Loading…
Cancel
Save