zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix compile for Taz Pro (#19424)

Browse source
This commit is contained in:
InsanityAutomation 2020-09-19 10:20:15 -04:00 committed by GitHub
parent 435e1535cc
commit 4696142a31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
View file

@ -32,7 +32,7 @@
#ifdef SHOW_CUSTOM_BOOTSCREEN #ifdef SHOW_CUSTOM_BOOTSCREEN
#ifdef TOUCH_UI_PORTRAIT #ifdef TOUCH_UI_PORTRAIT
#include "../theme/_bootscreen_portrait.h" #include "../theme/bootscreen_logo_portrait.h"
#else #else
#include "../theme/_bootscreen_landscape.h" #include "../theme/_bootscreen_landscape.h"
#endif #endif

3
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp
View file

@ -94,9 +94,6 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
switch (tag) { switch (tag) {
case 1: GOTO_PREVIOUS(); break; case 1: GOTO_PREVIOUS(); break;
case 2: case 2:
#ifndef BED_LEVELING_COMMANDS
#define BED_LEVELING_COMMANDS "G29"
#endif
#if HAS_MESH #if HAS_MESH
BedMeshScreen::startMeshProbe(); BedMeshScreen::startMeshProbe();
#else #else

4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
View file

@ -27,6 +27,10 @@
#include "../theme/theme.h" #include "../theme/theme.h"
#include "string_format.h" #include "string_format.h"
#ifndef BED_LEVELING_COMMANDS
#define BED_LEVELING_COMMANDS "G29"
#endif
extern tiny_timer_t refresh_timer; extern tiny_timer_t refresh_timer;
/********************************* DL CACHE SLOTS ******************************/ /********************************* DL CACHE SLOTS ******************************/

42
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h Normal file
View file

File diff suppressed because one or more lines are too long