Marcio T
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with
14 additions and
8 deletions
-
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
-
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp
-
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp
-
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp
-
Marlin/src/lcd/extui/ui_api.cpp
-
Marlin/src/module/motion.cpp
-
Marlin/src/sd/cardreader.h
|
|
@ -123,6 +123,7 @@ bool MarlinUI::detected() { return true; } |
|
|
|
custom_start_bmp |
|
|
|
#endif |
|
|
|
; |
|
|
|
TERN(CUSTOM_BOOTSCREEN_ANIMATED,,UNUSED(frame)); |
|
|
|
|
|
|
|
u8g.drawBitmapP(left, top, CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH, CUSTOM_BOOTSCREEN_BMPHEIGHT, bmp); |
|
|
|
|
|
|
|
|
|
@ -32,7 +32,10 @@ namespace FTDI { |
|
|
|
#ifdef CLCD_SPI_BUS |
|
|
|
SPIClass EVE_SPI(CLCD_SPI_BUS); |
|
|
|
#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 |
|
|
|
|
|
|
|
void SPI::spi_init() { |
|
|
|
|
|
@ -78,7 +78,9 @@ void BaseScreen::onIdle() { |
|
|
|
} |
|
|
|
|
|
|
|
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 |
|
|
|
|
|
@ -96,7 +96,7 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) { |
|
|
|
#else |
|
|
|
PIN_DISABLED(1, 4, GET_TEXT_F(MSG_RUNOUT_1), FIL_RUNOUT) |
|
|
|
#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) |
|
|
|
#else |
|
|
|
PIN_DISABLED(3, 4, GET_TEXT_F(MSG_RUNOUT_2), FIL_RUNOUT2) |
|
|
|
|
|
@ -54,6 +54,7 @@ |
|
|
|
#include "../../module/printcounter.h" |
|
|
|
#include "../../libs/duration_t.h" |
|
|
|
#include "../../HAL/shared/Delay.h" |
|
|
|
#include "../../sd/cardreader.h" |
|
|
|
|
|
|
|
#if ENABLED(PRINTCOUNTER) |
|
|
|
#include "../../core/utility.h" |
|
|
@ -68,10 +69,6 @@ |
|
|
|
#include "../../feature/e_parser.h" |
|
|
|
#endif |
|
|
|
|
|
|
|
#if ENABLED(SDSUPPORT) |
|
|
|
#include "../../sd/cardreader.h" |
|
|
|
#endif |
|
|
|
|
|
|
|
#if HAS_TRINAMIC_CONFIG |
|
|
|
#include "../../feature/tmc_util.h" |
|
|
|
#include "../../module/stepper/indirection.h" |
|
|
|
|
|
@ -1514,6 +1514,8 @@ void backout_to_tmc_homing_phase(const AxisEnum axis) { |
|
|
|
// retrace by the amount computed in mmDelta.
|
|
|
|
do_homing_move(axis, mmDelta, get_homing_bump_feedrate(axis)); |
|
|
|
} |
|
|
|
#else |
|
|
|
UNUSED(axis); |
|
|
|
#endif |
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -23,6 +23,8 @@ |
|
|
|
|
|
|
|
#include "../inc/MarlinConfig.h" |
|
|
|
|
|
|
|
#define IFSD(A,B) TERN(SDSUPPORT,A,B) |
|
|
|
|
|
|
|
#if ENABLED(SDSUPPORT) |
|
|
|
|
|
|
|
#if BOTH(SDCARD_SORT_ALPHA, SDSORT_DYNAMIC_RAM) |
|
|
@ -30,7 +32,6 @@ |
|
|
|
#endif |
|
|
|
|
|
|
|
#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 MAXDIRNAMELENGTH 8 // DOS folder name size
|
|
|
|