Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions Marlin/src/HAL/HAL_STM32F1/HAL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
// --------------------------------------------------------------------------

#define __I
#define __IO
#define __IO volatile
typedef struct
{
__I uint32_t CPUID; /*!< Offset: 0x000 (R/ ) CPUID Base Register */
Expand Down Expand Up @@ -105,7 +105,7 @@ uint8 adc_pins[] = {
TEMP_0_PIN,
#endif
#if HAS_TEMP_ADC_1
TEMP_1_PIN
TEMP_1_PIN,
#endif
#if HAS_TEMP_ADC_2
TEMP_2_PIN,
Expand Down Expand Up @@ -175,6 +175,24 @@ static void NVIC_SetPriorityGrouping(uint32_t PriorityGroup) {
// Public functions
// --------------------------------------------------------------------------

//
// Leave PA11/PA12 intact if USBSerial is not used
//
#if SERIAL_USB
namespace wirish { namespace priv {
#if SERIAL_PORT > 0
#if SERIAL_PORT2
#if SERIAL_PORT2 > 0
void board_setup_usb(void) {}
#endif
#else
void board_setup_usb(void) {}
#endif
#endif
} }
#endif


void HAL_init(void) {
NVIC_SetPriorityGrouping(0x3);
}
Expand Down
2,021 changes: 2,021 additions & 0 deletions Marlin/src/config/examples/Mks/Robin/Configuration.h

Large diffs are not rendered by default.

Loading