Skip to content

Commit

Permalink
Merge pull request #3 from MarlinFirmware/bugfix-2.0.x
Browse files Browse the repository at this point in the history
Bugfix 2.0.x merge 210820191917
  • Loading branch information
viniciusbn authored Aug 21, 2019
2 parents 6f6c96b + 012f577 commit fc8706e
Show file tree
Hide file tree
Showing 288 changed files with 6,824 additions and 308 deletions.
3 changes: 3 additions & 0 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,9 @@
//#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
#endif

// BACK menu items keep the highlight at the top
//#define TURBO_BACK_MENU_ITEM

/**
* LED Control Menu
* Add LED Control to the LCD menu
Expand Down
2 changes: 2 additions & 0 deletions Marlin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1141)
else ifeq ($(HARDWARE_MOTHERBOARD),1142)
# Overlord/Overlord Pro
else ifeq ($(HARDWARE_MOTHERBOARD),1143)
# ADIMLab Granty
else ifeq ($(HARDWARE_MOTHERBOARD),1144)

#
# RAMBo and derivatives
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HAL_STM32F1/HAL_spi_STM32F1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#ifdef __STM32F1__

#include "../../inc/MarlinConfig.h"
#include <SPI.h>
#include "SPI.h"

// ------------------------
// Public functions
Expand Down
Loading

0 comments on commit fc8706e

Please sign in to comment.