SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix undefined/unused, Touch UI (#17874)

Browse source
This commit is contained in:
Marcio T 2020-05-04 12:57:12 -06:00 committed by GitHub
parent 5e23fd6ef1
commit 2a959cde6f
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
View file

@ -123,6 +123,7 @@ bool MarlinUI::detected() { return true; }
custom_start_bmp custom_start_bmp
#endif #endif
; ;
TERN(CUSTOM_BOOTSCREEN_ANIMATED,,UNUSED(frame));
u8g.drawBitmapP(left, top, CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH, CUSTOM_BOOTSCREEN_BMPHEIGHT, bmp); u8g.drawBitmapP(left, top, CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH, CUSTOM_BOOTSCREEN_BMPHEIGHT, bmp);

5
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
View file

@ -32,7 +32,10 @@ namespace FTDI {
#ifdef CLCD_SPI_BUS #ifdef CLCD_SPI_BUS
SPIClass EVE_SPI(CLCD_SPI_BUS); SPIClass EVE_SPI(CLCD_SPI_BUS);
#endif #endif
SPISettings SPI::spi_settings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0); #ifndef CLCD_HW_SPI_SPEED
#define CLCD_HW_SPI_SPEED 8000000 >> SPI_SPEED
#endif
SPISettings SPI::spi_settings(CLCD_HW_SPI_SPEED, MSBFIRST, SPI_MODE0);
#endif #endif
void SPI::spi_init() { void SPI::spi_init() {

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

@ -78,7 +78,9 @@ void BaseScreen::onIdle() {
} }
void BaseScreen::reset_menu_timeout() { void BaseScreen::reset_menu_timeout() {
TERN_(LCD_TIMEOUT_TO_STATUS, last_interaction = millis()); #if LCD_TIMEOUT_TO_STATUS
last_interaction = millis();
#endif
} }
#if LCD_TIMEOUT_TO_STATUS #if LCD_TIMEOUT_TO_STATUS

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

@ -96,7 +96,7 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
#else #else
PIN_DISABLED(1, 4, GET_TEXT_F(MSG_RUNOUT_1), FIL_RUNOUT) PIN_DISABLED(1, 4, GET_TEXT_F(MSG_RUNOUT_1), FIL_RUNOUT)
#endif #endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && PIN_EXISTS(FIL_RUNOUT2) #if ENABLED(FILAMENT_RUNOUT_SENSOR) && PIN_EXISTS(FIL_RUNOUT2) && EXTRUDERS > 1
PIN_ENABLED (3, 4, GET_TEXT_F(MSG_RUNOUT_2), FIL_RUNOUT2, FIL_RUNOUT_INVERTING) PIN_ENABLED (3, 4, GET_TEXT_F(MSG_RUNOUT_2), FIL_RUNOUT2, FIL_RUNOUT_INVERTING)
#else #else
PIN_DISABLED(3, 4, GET_TEXT_F(MSG_RUNOUT_2), FIL_RUNOUT2) PIN_DISABLED(3, 4, GET_TEXT_F(MSG_RUNOUT_2), FIL_RUNOUT2)

5
Marlin/src/lcd/extui/ui_api.cpp
View file

@ -54,6 +54,7 @@
#include "../../module/printcounter.h" #include "../../module/printcounter.h"
#include "../../libs/duration_t.h" #include "../../libs/duration_t.h"
#include "../../HAL/shared/Delay.h" #include "../../HAL/shared/Delay.h"
#include "../../sd/cardreader.h"
#if ENABLED(PRINTCOUNTER) #if ENABLED(PRINTCOUNTER)
#include "../../core/utility.h" #include "../../core/utility.h"
@ -68,10 +69,6 @@
#include "../../feature/e_parser.h" #include "../../feature/e_parser.h"
#endif #endif
#if ENABLED(SDSUPPORT)
#include "../../sd/cardreader.h"
#endif
#if HAS_TRINAMIC_CONFIG #if HAS_TRINAMIC_CONFIG
#include "../../feature/tmc_util.h" #include "../../feature/tmc_util.h"
#include "../../module/stepper/indirection.h" #include "../../module/stepper/indirection.h"

2
Marlin/src/module/motion.cpp
View file

@ -1514,6 +1514,8 @@ void backout_to_tmc_homing_phase(const AxisEnum axis) {
// retrace by the amount computed in mmDelta. // retrace by the amount computed in mmDelta.
do_homing_move(axis, mmDelta, get_homing_bump_feedrate(axis)); do_homing_move(axis, mmDelta, get_homing_bump_feedrate(axis));
} }
#else
UNUSED(axis);
#endif #endif
} }

3
Marlin/src/sd/cardreader.h
View file

@ -23,6 +23,8 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#define IFSD(A,B) TERN(SDSUPPORT,A,B)
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
#if BOTH(SDCARD_SORT_ALPHA, SDSORT_DYNAMIC_RAM) #if BOTH(SDCARD_SORT_ALPHA, SDSORT_DYNAMIC_RAM)
@ -30,7 +32,6 @@
#endif #endif
#define SD_ORDER(N,C) (TERN(SDCARD_RATHERRECENTFIRST, C - 1 - (N), N)) #define SD_ORDER(N,C) (TERN(SDCARD_RATHERRECENTFIRST, C - 1 - (N), N))
#define IFSD(A,B) TERN(SDSUPPORT,A,B)
#define MAX_DIR_DEPTH 10 // Maximum folder depth #define MAX_DIR_DEPTH 10 // Maximum folder depth
#define MAXDIRNAMELENGTH 8 // DOS folder name size #define MAXDIRNAMELENGTH 8 // DOS folder name size