3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

STM32F1: Only include USBComposite if flagged (#15243)

Browse source
This commit is contained in:
Tanguy Pruvot 2019-09-13 01:35:27 +02:00 • committed by Scott Lahteine
parent 1ab3521351
commit 5bf635cec2
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Marlin/src/HAL/HAL_STM32F1/HAL.h
View file

@ -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

1
Marlin/src/HAL/HAL_STM32F1/msc_sd.h
View file

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