Browse Source

STM32F1: Only include USBComposite if flagged (#15243)

Tanguy Pruvot 5 years ago
parent
commit
5bf635cec2
3 changed files with 5 additions and 11 deletions
  1. 4
    7
      Marlin/src/HAL/HAL_STM32F1/HAL.h
  2. 0
    1
      Marlin/src/HAL/HAL_STM32F1/msc_sd.h
  3. 1
    3
      platformio.ini

+ 4
- 7
Marlin/src/HAL/HAL_STM32F1/HAL.h View File

@@ -42,7 +42,10 @@
42 42
 #include <util/atomic.h>
43 43
 
44 44
 #include "../../inc/MarlinConfigPre.h"
45
-#include "msc_sd.h"
45
+
46
+#ifdef USE_USB_COMPOSITE
47
+  #include "msc_sd.h"
48
+#endif
46 49
 
47 50
 // ------------------------
48 51
 // Defines
@@ -60,12 +63,6 @@
60 63
   #define MSerial4  Serial4
61 64
   #define MSerial5  Serial5
62 65
 #else
63
-  #ifndef USE_USB_COMPOSITE
64
-    extern USBSerial SerialUSB;
65
-    #define UsbSerial SerialUSB
66
-  #else
67
-    #define UsbSerial MarlinCompositeSerial
68
-  #endif
69 66
   #define MSerial1  Serial
70 67
   #define MSerial2  Serial1
71 68
   #define MSerial3  Serial2

+ 0
- 1
Marlin/src/HAL/HAL_STM32F1/msc_sd.h View File

@@ -13,7 +13,6 @@
13 13
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14 14
  *
15 15
  */
16
-
17 16
 #pragma once
18 17
 
19 18
 #include <USBComposite.h>

+ 1
- 3
platformio.ini View File

@@ -23,9 +23,7 @@ default_envs = megaatmega2560
23 23
 [common]
24 24
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
25 25
 extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
26
-build_flags = -fmax-errors=5
27
-  -g
28
-  -ggdb
26
+build_flags = -fmax-errors=5 -g
29 27
 lib_deps =
30 28
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
31 29
   LiquidCrystal@1.3.4

Loading…
Cancel
Save