bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

STM32F1 USB cdc/msc composite device (#15180)

Browse Source 
Co-Authored-By: bigtreetech <38851044+bigtreetech@users.noreply.github.com>
This commit is contained in:
Scott Lahteine
2019-09-08 02:27:23 -05:00
parent 8bca3fcf2c
commit dbea6f0022
13 changed files with 872 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/src/HAL/HAL_STM32F1/HAL.h
View File

@@ -42,21 +42,30 @@
#include <util/atomic.h>
#include "../../inc/MarlinConfigPre.h"
#include "msc_sd.h"
// ------------------------
// Defines
// ------------------------
#ifdef SERIAL_USB
#define UsbSerial Serial
#ifndef USE_USB_COMPOSITE
#define UsbSerial Serial
#else
#define UsbSerial MarlinCompositeSerial
#endif
#define MSerial1 Serial1
#define MSerial2 Serial2
#define MSerial3 Serial3
#define MSerial4 Serial4
#define MSerial5 Serial5
#else
extern USBSerial SerialUSB;
#define UsbSerial SerialUSB
#ifndef USE_USB_COMPOSITE
extern USBSerial SerialUSB;
#define UsbSerial SerialUSB
#else
#define UsbSerial MarlinCompositeSerial
#endif
#define MSerial1 Serial
#define MSerial2 Serial1
#define MSerial3 Serial2
@@ -111,6 +120,8 @@
// Set interrupt grouping for this MCU
void HAL_init(void);
#define HAL_IDLETASK 1
void HAL_idletask(void);
/**
* TODO: review this to return 1 for pins that are not analog input