STM32F1: Only include USBComposite if flagged (#15243)
This commit is contained in:
parent
1ab3521351
commit
5bf635cec2
@ -42,7 +42,10 @@
|
||||
#include <util/atomic.h>
|
||||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
#include "msc_sd.h"
|
||||
|
||||
#ifdef USE_USB_COMPOSITE
|
||||
#include "msc_sd.h"
|
||||
#endif
|
||||
|
||||
// ------------------------
|
||||
// Defines
|
||||
@ -60,12 +63,6 @@
|
||||
#define MSerial4 Serial4
|
||||
#define MSerial5 Serial5
|
||||
#else
|
||||
#ifndef USE_USB_COMPOSITE
|
||||
extern USBSerial SerialUSB;
|
||||
#define UsbSerial SerialUSB
|
||||
#else
|
||||
#define UsbSerial MarlinCompositeSerial
|
||||
#endif
|
||||
#define MSerial1 Serial
|
||||
#define MSerial2 Serial1
|
||||
#define MSerial3 Serial2
|
||||
|
@ -13,7 +13,6 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <USBComposite.h>
|
||||
|
@ -23,9 +23,7 @@ default_envs = megaatmega2560
|
||||
[common]
|
||||
default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
|
||||
extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
|
||||
build_flags = -fmax-errors=5
|
||||
-g
|
||||
-ggdb
|
||||
build_flags = -fmax-errors=5 -g
|
||||
lib_deps =
|
||||
U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
|
||||
LiquidCrystal@1.3.4
|
||||
|
Loading…
Reference in New Issue
Block a user