From 4feffca178b82ecb17a8e59c9f4b3c70d3fd7e3c Mon Sep 17 00:00:00 2001 From: victorpv Date: Mon, 11 Dec 2017 23:07:39 -0600 Subject: [PATCH 1/3] fix for issue #8585 As reported in this issue: https://github.com/MarlinFirmware/Marlin/issues/8585 I have it working fine in my local copy like that change. --- Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp b/Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp index cfada2f61..5ddbfc0d9 100644 --- a/Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp +++ b/Marlin/src/HAL/HAL_STM32F1/HAL_spi_Stm32f1.cpp @@ -37,7 +37,7 @@ // -------------------------------------------------------------------------- #include "../HAL.h" -#include "../SPI.h" +#include "SPI.h" #include "pins_arduino.h" #include "spi_pins.h" #include "../../core/macros.h" From 7c7ae5ebef500fe5814a25daca3104934eadbfd8 Mon Sep 17 00:00:00 2001 From: victorpv Date: Mon, 11 Dec 2017 23:10:44 -0600 Subject: [PATCH 2/3] Delete duplicated file. --- Marlin/src/HAL/HAL_STM32F1/readme.md | 32 ---------------------------- 1 file changed, 32 deletions(-) delete mode 100644 Marlin/src/HAL/HAL_STM32F1/readme.md diff --git a/Marlin/src/HAL/HAL_STM32F1/readme.md b/Marlin/src/HAL/HAL_STM32F1/readme.md deleted file mode 100644 index 1345d59b3..000000000 --- a/Marlin/src/HAL/HAL_STM32F1/readme.md +++ /dev/null @@ -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. - - From 084f2434a75839af2eee7ae3a37d40bc3e80ed6d Mon Sep 17 00:00:00 2001 From: victorpv Date: Mon, 11 Dec 2017 23:14:13 -0600 Subject: [PATCH 3/3] Update readme.md --- Marlin/src/HAL/HAL_STM32F1/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Marlin/src/HAL/HAL_STM32F1/README.md b/Marlin/src/HAL/HAL_STM32F1/README.md index 1345d59b3..a28000f03 100644 --- a/Marlin/src/HAL/HAL_STM32F1/README.md +++ b/Marlin/src/HAL/HAL_STM32F1/README.md @@ -1,6 +1,6 @@ # 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. 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: Victorpv +xC000005 ### 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. +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