Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix 2.0.x merge 210820191917 #3

Merged
merged 10 commits into from
Aug 21, 2019
Merged

Bugfix 2.0.x merge 210820191917 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0cc524b
Prevent BOARD_NAME conflict with env
thinkyhead Aug 21, 2019
5e77760
Add TURBO_BACK_MENU_ITEM option (#14991)
thinkyhead Aug 21, 2019
f1942f6
[cron] Bump distribution date
thinkyhead Aug 21, 2019
825c2c3
Fix fan speed encoder scaling (#15010)
marcio-ao Aug 21, 2019
69641f1
Fix incompatible types error (#15009)
marcio-ao Aug 21, 2019
8c2cfaa
Fix BigTree_Btt002 build
thinkyhead Aug 21, 2019
bd1ced1
LulzBot Touch UI Followup (#15007)
marcio-ao Aug 21, 2019
4581957
Clean up some pins
thinkyhead Aug 21, 2019
4be9822
ADIMLab Granty pins/config (#14919)
ETE-Design Aug 21, 2019
012f577
STM32F1: Import (rogerclarkmelbourne) SPI class (#15002)
tpruvot Aug 21, 2019
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
3 changes: 3 additions & 0 deletions Marlin/Configuration_adv.h
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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