Rename LCD conditionals (#19533)
This commit is contained in:
parent
ac900b17e0
commit
58deab1915
|
@ -1106,18 +1106,18 @@
|
|||
#define BOOTSCREEN_TIMEOUT 4000 // (ms) Total Duration to display the boot screen(s)
|
||||
#endif
|
||||
|
||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY) && (HAS_GRAPHICAL_LCD || HAS_CHARACTER_LCD)
|
||||
#if EITHER(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY) && (HAS_MARLINUI_U8GLIB || HAS_MARLINUI_HD44780)
|
||||
//#define SHOW_REMAINING_TIME // Display estimated time to completion
|
||||
#if ENABLED(SHOW_REMAINING_TIME)
|
||||
//#define USE_M73_REMAINING_TIME // Use remaining time from M73 command instead of estimation
|
||||
//#define ROTATE_PROGRESS_DISPLAY // Display (P)rogress, (E)lapsed, and (R)emaining time
|
||||
#endif
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
//#define PRINT_PROGRESS_SHOW_DECIMALS // Show progress with decimal digits
|
||||
#endif
|
||||
|
||||
#if HAS_CHARACTER_LCD
|
||||
#if HAS_MARLINUI_HD44780
|
||||
//#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing
|
||||
#if ENABLED(LCD_PROGRESS_BAR)
|
||||
#define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar
|
||||
|
@ -1328,7 +1328,7 @@
|
|||
* controller events, as there is a trade-off between reliable
|
||||
* printing performance versus fast display updates.
|
||||
*/
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
// Show SD percentage next to the progress bar
|
||||
//#define DOGM_SD_PERCENT
|
||||
|
||||
|
@ -1398,7 +1398,7 @@
|
|||
//#define MARLIN_SNAKE
|
||||
//#define GAMES_EASTER_EGG // Add extra blank lines above the "Games" sub-menu
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
||||
//
|
||||
// Additional options for DGUS / DWIN displays
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include "../shared/Marduino.h"
|
||||
#include "../shared/Delay.h"
|
||||
|
@ -189,5 +189,5 @@ uint8_t u8g_com_HAL_AVR_sw_sp_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
|
|||
return 1;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
#endif // ARDUINO_ARCH_SAM
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
#include "../../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include <U8glib.h>
|
||||
|
||||
|
@ -145,6 +145,6 @@ uint8_t u8g_com_HAL_DUE_shared_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_va
|
|||
return 1;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
||||
#endif // __SAM3X8E__
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
#include "../../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD && DISABLED(U8GLIB_ST7920)
|
||||
#if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
|
||||
|
||||
#undef SPI_SPEED
|
||||
#define SPI_SPEED 2 // About 2 MHz
|
||||
|
@ -144,5 +144,5 @@ uint8_t u8g_com_HAL_DUE_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
|
|||
return 1;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD && !U8GLIB_ST7920
|
||||
#endif // HAS_MARLINUI_U8GLIB && !U8GLIB_ST7920
|
||||
#endif // ARDUINO_ARCH_SAM
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
#include "../../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include "../../shared/Delay.h"
|
||||
|
||||
|
@ -108,5 +108,5 @@ void u8g_spiSend_sw_DUE_mode_3(uint8_t val) { // 3.5MHz
|
|||
}
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
#endif // ARDUINO_ARCH_SAM
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "../../core/macros.h"
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if BOTH(HAS_GRAPHICAL_LCD, SDSUPPORT) && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
|
||||
#if BOTH(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
|
||||
#define LPC_SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
|
||||
// needed due to the speed and mode required for communicating with each device being different.
|
||||
// This requirement can be removed if the SPI access to these devices is updated to use
|
||||
|
|
|
@ -113,7 +113,7 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o
|
|||
#define _IS_RX1_1 IS_RX1
|
||||
#if IS_TX1(TMC_SW_SCK)
|
||||
#error "Serial port pins (1) conflict with other pins!"
|
||||
#elif HAS_SPI_LCD
|
||||
#elif HAS_WIRED_LCD
|
||||
#if IS_TX1(BTN_EN2) || IS_RX1(BTN_EN1)
|
||||
#error "Serial port pins (1) conflict with Encoder Buttons!"
|
||||
#elif ANY_TX(1, SCK_PIN, LCD_PINS_D4, DOGLCD_SCK, LCD_RESET_PIN, LCD_PINS_RS, SHIFT_CLK) \
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "../../core/macros.h"
|
||||
|
||||
#if BOTH(SDSUPPORT, HAS_GRAPHICAL_LCD) && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
|
||||
#if BOTH(SDSUPPORT, HAS_MARLINUI_U8GLIB) && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
|
||||
#define LPC_SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
|
||||
// needed due to the speed and mode required for communicating with each device being different.
|
||||
// This requirement can be removed if the SPI access to these devices is updated to use
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
#include "../../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include <U8glib.h>
|
||||
#include "../../shared/HAL_SPI.h"
|
||||
|
@ -124,6 +124,6 @@ uint8_t u8g_com_HAL_LPC1768_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val,
|
|||
return 1;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
||||
#endif // TARGET_LPC1768
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
|
||||
#include "../../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include <U8glib.h>
|
||||
|
||||
|
@ -193,6 +193,6 @@ uint8_t u8g_com_HAL_LPC1768_ssd_hw_i2c_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_v
|
|||
return 1;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
||||
#endif // TARGET_LPC1768
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
#include "../../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include <U8glib.h>
|
||||
#include "../../shared/HAL_SPI.h"
|
||||
|
@ -133,6 +133,6 @@ uint8_t u8g_com_HAL_LPC1768_ST7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t ar
|
|||
return 1;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
||||
#endif // TARGET_LPC1768
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
#include "../../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD && DISABLED(U8GLIB_ST7920)
|
||||
#if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
|
||||
|
||||
#include <SoftwareSPI.h>
|
||||
|
||||
|
@ -203,5 +203,5 @@ uint8_t u8g_com_HAL_LPC1768_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val,
|
|||
return 1;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD && !U8GLIB_ST7920
|
||||
#endif // HAS_MARLINUI_U8GLIB && !U8GLIB_ST7920
|
||||
#endif // TARGET_LPC1768
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#include "../../../inc/MarlinConfig.h"
|
||||
|
||||
#if BOTH(HAS_GRAPHICAL_LCD, FORCE_SOFT_SPI)
|
||||
#if BOTH(HAS_MARLINUI_U8GLIB, FORCE_SOFT_SPI)
|
||||
|
||||
#include "../HAL.h"
|
||||
#include <U8glib.h>
|
||||
|
@ -161,5 +161,5 @@ uint8_t u8g_com_HAL_STM32F1_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val,
|
|||
return 1;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
#endif // STM32F1
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
* (bypassing U8G), it will allow the LIGHTWEIGHT_UI to operate.
|
||||
*/
|
||||
|
||||
#if BOTH(HAS_GRAPHICAL_LCD, LIGHTWEIGHT_UI)
|
||||
#if BOTH(HAS_MARLINUI_U8GLIB, LIGHTWEIGHT_UI)
|
||||
void ST7920_cs();
|
||||
void ST7920_ncs();
|
||||
void ST7920_set_cmd();
|
||||
|
|
|
@ -1072,7 +1072,7 @@ void setup() {
|
|||
DWIN_UpdateLCD(); // Show bootscreen (first image)
|
||||
#else
|
||||
SETUP_RUN(ui.init());
|
||||
#if HAS_SPI_LCD && ENABLED(SHOW_BOOTSCREEN)
|
||||
#if HAS_WIRED_LCD && ENABLED(SHOW_BOOTSCREEN)
|
||||
SETUP_RUN(ui.show_bootscreen());
|
||||
#endif
|
||||
SETUP_RUN(ui.reset_status()); // Load welcome message early. (Retained if no errors exist.)
|
||||
|
|
|
@ -303,7 +303,7 @@
|
|||
#define LCD_STR_C STR_C
|
||||
#define LCD_STR_E STR_E
|
||||
|
||||
#if HAS_CHARACTER_LCD
|
||||
#if HAS_MARLINUI_HD44780
|
||||
|
||||
// Custom characters defined in the first 8 characters of the LCD
|
||||
#define LCD_STR_BEDTEMP "\x00" // Print only as a char. This will have 'unexpected' results when used in a string!
|
||||
|
|
|
@ -44,7 +44,7 @@ uint8_t PowerMonitor::display_item;
|
|||
|
||||
PowerMonitor power_monitor; // Single instance - this calls the constructor
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#if ENABLED(POWER_MONITOR_CURRENT)
|
||||
void PowerMonitor::draw_current() {
|
||||
|
@ -70,6 +70,6 @@ PowerMonitor power_monitor; // Single instance - this calls the constructor
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
||||
#endif // HAS_POWER_MONITOR
|
||||
|
|
|
@ -88,8 +88,8 @@ public:
|
|||
FORCE_INLINE static float getPower() { return getAmps() * getVolts(); }
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_GRAPHICAL_LCD && DISABLED(LIGHTWEIGHT_UI)
|
||||
#if HAS_WIRED_LCD
|
||||
#if HAS_MARLINUI_U8GLIB && DISABLED(LIGHTWEIGHT_UI)
|
||||
FORCE_INLINE static bool display_enabled() { return flags != 0x00; }
|
||||
#endif
|
||||
#if ENABLED(POWER_MONITOR_CURRENT)
|
||||
|
|
|
@ -359,7 +359,7 @@ inline bool turn_on_heaters() {
|
|||
#if HAS_HEATED_BED
|
||||
|
||||
if (g26_bed_temp > 25) {
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
ui.set_status_P(GET_TEXT(MSG_G26_HEATING_BED), 99);
|
||||
ui.quick_feedback();
|
||||
TERN_(HAS_LCD_MENU, ui.capture());
|
||||
|
@ -378,7 +378,7 @@ inline bool turn_on_heaters() {
|
|||
#endif // HAS_HEATED_BED
|
||||
|
||||
// Start heating the active nozzle
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
ui.set_status_P(GET_TEXT(MSG_G26_HEATING_NOZZLE), 99);
|
||||
ui.quick_feedback();
|
||||
#endif
|
||||
|
@ -391,7 +391,7 @@ inline bool turn_on_heaters() {
|
|||
#endif
|
||||
)) return G26_ERR;
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
ui.reset_status();
|
||||
ui.quick_feedback();
|
||||
#endif
|
||||
|
@ -446,7 +446,7 @@ inline bool prime_nozzle() {
|
|||
else
|
||||
#endif
|
||||
{
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
ui.set_status_P(GET_TEXT(MSG_G26_FIXED_LENGTH), 99);
|
||||
ui.quick_feedback();
|
||||
#endif
|
||||
|
|
|
@ -144,7 +144,7 @@ void GcodeSuite::M48() {
|
|||
float sample_sum = 0.0;
|
||||
|
||||
LOOP_L_N(n, n_samples) {
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
// Display M48 progress in the status bar
|
||||
ui.status_printf_P(0, PSTR(S_FMT ": %d/%d"), GET_TEXT(MSG_M48_POINT), int(n + 1), int(n_samples));
|
||||
#endif
|
||||
|
@ -258,7 +258,7 @@ void GcodeSuite::M48() {
|
|||
SERIAL_ECHOLNPGM("Finished!");
|
||||
dev_report(verbose_level > 0, mean, sigma, min, max, true);
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
// Display M48 results in the status bar
|
||||
char sigma_str[8];
|
||||
ui.status_printf_P(0, PSTR(S_FMT ": %s"), GET_TEXT(MSG_M48_DEVIATION), dtostrf(sigma, 2, 6, sigma_str));
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
*/
|
||||
void GcodeSuite::M430() {
|
||||
bool do_report = true;
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#if ENABLED(POWER_MONITOR_CURRENT)
|
||||
if (parser.seen('I')) { power_monitor.set_current_display(parser.value_bool()); do_report = false; }
|
||||
#endif
|
||||
|
|
|
@ -456,11 +456,11 @@
|
|||
#endif
|
||||
|
||||
#if ENABLED(ULTRA_LCD)
|
||||
#define HAS_SPI_LCD 1
|
||||
#define HAS_WIRED_LCD 1
|
||||
#if ENABLED(DOGLCD)
|
||||
#define HAS_GRAPHICAL_LCD 1
|
||||
#define HAS_MARLINUI_U8GLIB 1
|
||||
#elif DISABLED(HAS_GRAPHICAL_TFT)
|
||||
#define HAS_CHARACTER_LCD 1
|
||||
#define HAS_MARLINUI_HD44780 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
@ -471,7 +471,7 @@
|
|||
#define HAS_ADC_BUTTONS 1
|
||||
#endif
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#ifndef LCD_PIXEL_WIDTH
|
||||
#define LCD_PIXEL_WIDTH 128
|
||||
#endif
|
||||
|
|
|
@ -2455,7 +2455,7 @@
|
|||
*/
|
||||
#if PIN_EXISTS(BEEPER) || EITHER(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
|
||||
#define HAS_BUZZER 1
|
||||
#if NONE(LCD_USE_I2C_BUZZER, PCA9632_BUZZER)
|
||||
#if PIN_EXISTS(BEEPER)
|
||||
#define USE_BEEPER 1
|
||||
#endif
|
||||
#endif
|
||||
|
@ -2483,7 +2483,7 @@
|
|||
/**
|
||||
* Make sure DOGLCD_SCK and DOGLCD_MOSI are defined.
|
||||
*/
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#ifndef DOGLCD_SCK
|
||||
#define DOGLCD_SCK SCK_PIN
|
||||
#endif
|
||||
|
@ -2604,17 +2604,17 @@
|
|||
#define HAS_FOLDER_SORTING 1
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
// Get LCD character width/height, which may be overridden by pins, configs, etc.
|
||||
#ifndef LCD_WIDTH
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#define LCD_WIDTH 21
|
||||
#else
|
||||
#define LCD_WIDTH TERN(ULTIPANEL, 20, 16)
|
||||
#endif
|
||||
#endif
|
||||
#ifndef LCD_HEIGHT
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#define LCD_HEIGHT 5
|
||||
#else
|
||||
#define LCD_HEIGHT TERN(ULTIPANEL, 4, 2)
|
||||
|
|
|
@ -680,7 +680,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
|||
* LCD Info Screen Style
|
||||
*/
|
||||
#if LCD_INFO_SCREEN_STYLE > 0
|
||||
#if HAS_GRAPHICAL_LCD || LCD_WIDTH < 20 || LCD_HEIGHT < 4
|
||||
#if HAS_MARLINUI_U8GLIB || LCD_WIDTH < 20 || LCD_HEIGHT < 4
|
||||
#error "Alternative LCD_INFO_SCREEN_STYLE requires 20x4 Character LCD."
|
||||
#elif LCD_INFO_SCREEN_STYLE > 1
|
||||
#error "LCD_INFO_SCREEN_STYLE only has options 0 and 1 at this time."
|
||||
|
@ -693,16 +693,16 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
|||
#if ENABLED(LCD_PROGRESS_BAR)
|
||||
#if NONE(SDSUPPORT, LCD_SET_PROGRESS_MANUALLY)
|
||||
#error "LCD_PROGRESS_BAR requires SDSUPPORT or LCD_SET_PROGRESS_MANUALLY."
|
||||
#elif !HAS_CHARACTER_LCD
|
||||
#elif !HAS_MARLINUI_HD44780
|
||||
#error "LCD_PROGRESS_BAR requires a character LCD."
|
||||
#elif HAS_GRAPHICAL_LCD
|
||||
#elif HAS_MARLINUI_U8GLIB
|
||||
#error "LCD_PROGRESS_BAR does not apply to graphical displays."
|
||||
#elif ENABLED(FILAMENT_LCD_DISPLAY)
|
||||
#error "LCD_PROGRESS_BAR and FILAMENT_LCD_DISPLAY are not fully compatible. Comment out this line to use both."
|
||||
#elif PROGRESS_MSG_EXPIRE < 0
|
||||
#error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
|
||||
#endif
|
||||
#elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_GRAPHICAL_LCD, HAS_GRAPHICAL_TFT, HAS_CHARACTER_LCD, EXTENSIBLE_UI)
|
||||
#elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI)
|
||||
#error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, or EXTENSIBLE_UI."
|
||||
#endif
|
||||
|
||||
|
@ -713,9 +713,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
|||
/**
|
||||
* Custom Boot and Status screens
|
||||
*/
|
||||
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN) && NONE(HAS_GRAPHICAL_LCD, TOUCH_UI_FTDI_EVE)
|
||||
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN) && NONE(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE)
|
||||
#error "SHOW_CUSTOM_BOOTSCREEN requires Graphical LCD or TOUCH_UI_FTDI_EVE."
|
||||
#elif ENABLED(CUSTOM_STATUS_SCREEN_IMAGE) && !HAS_GRAPHICAL_LCD
|
||||
#elif ENABLED(CUSTOM_STATUS_SCREEN_IMAGE) && !HAS_MARLINUI_U8GLIB
|
||||
#error "CUSTOM_STATUS_SCREEN_IMAGE requires a Graphical LCD."
|
||||
#endif
|
||||
|
||||
|
@ -782,7 +782,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
|||
#error "MESH_BED_LEVELING and BABYSTEP_ZPROBE_OFFSET is not a valid combination"
|
||||
#elif ENABLED(BABYSTEP_ZPROBE_OFFSET) && !HAS_BED_PROBE
|
||||
#error "BABYSTEP_ZPROBE_OFFSET requires a probe."
|
||||
#elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && !HAS_GRAPHICAL_LCD
|
||||
#elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && !HAS_MARLINUI_U8GLIB
|
||||
#error "BABYSTEP_ZPROBE_GFX_OVERLAY requires a Graphical LCD."
|
||||
#elif ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) && DISABLED(BABYSTEP_ZPROBE_OFFSET)
|
||||
#error "BABYSTEP_ZPROBE_GFX_OVERLAY requires a BABYSTEP_ZPROBE_OFFSET."
|
||||
|
@ -1143,7 +1143,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
|||
/**
|
||||
* Required LCD language
|
||||
*/
|
||||
#if HAS_CHARACTER_LCD && !defined(DISPLAY_CHARSET_HD44780)
|
||||
#if HAS_MARLINUI_HD44780 && !defined(DISPLAY_CHARSET_HD44780)
|
||||
#error "You must set DISPLAY_CHARSET_HD44780 to JAPANESE, WESTERN or CYRILLIC for your LCD controller."
|
||||
#endif
|
||||
|
||||
|
@ -1465,7 +1465,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#if ENABLED(MESH_EDIT_GFX_OVERLAY) && !BOTH(AUTO_BED_LEVELING_UBL, HAS_GRAPHICAL_LCD)
|
||||
#if ENABLED(MESH_EDIT_GFX_OVERLAY) && !BOTH(AUTO_BED_LEVELING_UBL, HAS_MARLINUI_U8GLIB)
|
||||
#error "MESH_EDIT_GFX_OVERLAY requires AUTO_BED_LEVELING_UBL and a Graphical LCD."
|
||||
#endif
|
||||
|
||||
|
@ -3081,7 +3081,7 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
|
|||
#undef _PIN_CONFLICT
|
||||
#endif
|
||||
|
||||
#if !HAS_GRAPHICAL_LCD
|
||||
#if !HAS_MARLINUI_U8GLIB
|
||||
#if ENABLED(PRINT_PROGRESS_SHOW_DECIMALS)
|
||||
#error "PRINT_PROGRESS_SHOW_DECIMALS currently requires a Graphical LCD."
|
||||
#endif
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_CHARACTER_LCD
|
||||
#if HAS_MARLINUI_HD44780
|
||||
|
||||
#include "../ultralcd.h"
|
||||
#include "../../MarlinCore.h"
|
||||
|
@ -1119,4 +1119,4 @@ int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
|
|||
|
||||
#endif // DEBUG_LCDPRINT
|
||||
|
||||
#endif // HAS_CHARACTER_LCD
|
||||
#endif // HAS_MARLINUI_HD44780
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_CHARACTER_LCD
|
||||
#if HAS_MARLINUI_HD44780
|
||||
|
||||
/**
|
||||
* ultralcd_HD44780.cpp
|
||||
|
@ -1517,4 +1517,4 @@ void MarlinUI::draw_status_screen() {
|
|||
|
||||
#endif // HAS_LCD_MENU
|
||||
|
||||
#endif // HAS_CHARACTER_LCD
|
||||
#endif // HAS_MARLINUI_HD44780
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include "ultralcd_DOGM.h"
|
||||
|
||||
|
@ -53,4 +53,4 @@ int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
|
|||
return ret;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD && DISABLED(LIGHTWEIGHT_UI)
|
||||
#if HAS_MARLINUI_U8GLIB && DISABLED(LIGHTWEIGHT_UI)
|
||||
|
||||
#include "dogm_Statusscreen.h"
|
||||
#include "ultralcd_DOGM.h"
|
||||
|
@ -913,4 +913,4 @@ void MarlinUI::draw_status_message(const bool blink) {
|
|||
#endif
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD && !LIGHTWEIGHT_UI
|
||||
#endif // HAS_MARLINUI_U8GLIB && !LIGHTWEIGHT_UI
|
||||
|
|
|
@ -67,7 +67,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include "HAL_LCD_com_defines.h"
|
||||
|
||||
|
@ -300,4 +300,4 @@ uint8_t u8g_WriteEscSeqP_2_wire(u8g_t *u8g, u8g_dev_t *dev, const uint8_t *esc_s
|
|||
return 1;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfig.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include <U8glib.h>
|
||||
#include "HAL_LCD_com_defines.h"
|
||||
|
@ -233,4 +233,4 @@ u8g_dev_t u8g_dev_st7565_64128n_HAL_2x_sw_spi = { u8g_dev_st7565_64128n_HAL_2x_f
|
|||
U8G_PB_DEV(u8g_dev_st7565_64128n_HAL_hw_spi, WIDTH, HEIGHT, PAGE_HEIGHT, u8g_dev_st7565_64128n_HAL_fn, U8G_COM_HAL_HW_SPI_FN);
|
||||
u8g_dev_t u8g_dev_st7565_64128n_HAL_2x_hw_spi = { u8g_dev_st7565_64128n_HAL_2x_fn, &u8g_dev_st7565_64128n_HAL_2x_pb, U8G_COM_HAL_HW_SPI_FN };
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include "HAL_LCD_com_defines.h"
|
||||
|
||||
|
@ -205,4 +205,4 @@ u8g_dev_t u8g_dev_st7920_128x64_HAL_4x_hw_spi = { u8g_dev_st7920_128x64_HAL_4x_f
|
|||
u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = { u8g_dev_st7920_128x64_HAL_4x_fn, &u8g_dev_st7920_128x64_HAL_4x_pb, U8G_COM_ST7920_HAL_SW_SPI };
|
||||
#endif
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfig.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD && (PIN_EXISTS(FSMC_CS) || ENABLED(SPI_GRAPHICAL_TFT))
|
||||
#if HAS_MARLINUI_U8GLIB && (PIN_EXISTS(FSMC_CS) || ENABLED(SPI_GRAPHICAL_TFT))
|
||||
|
||||
#include "HAL_LCD_com_defines.h"
|
||||
#include "ultralcd_DOGM.h"
|
||||
|
@ -813,4 +813,4 @@ uint8_t u8g_com_hal_tft_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_p
|
|||
|
||||
U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT, u8g_dev_tft_320x240_upscale_from_128x64_fn, U8G_COM_HAL_TFT_FN);
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD && FSMC_CS
|
||||
#endif // HAS_MARLINUI_U8GLIB && FSMC_CS
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include "HAL_LCD_com_defines.h"
|
||||
|
||||
|
@ -210,4 +210,4 @@ u8g_pb_t u8g_dev_uc1701_mini12864_HAL_2x_pb = { {16, HEIGHT, 0, 0, 0}, WIDTH, u
|
|||
u8g_dev_t u8g_dev_uc1701_mini12864_HAL_2x_sw_spi = { u8g_dev_uc1701_mini12864_HAL_2x_fn, &u8g_dev_uc1701_mini12864_HAL_2x_pb, U8G_COM_HAL_SW_SPI_FN };
|
||||
u8g_dev_t u8g_dev_uc1701_mini12864_HAL_2x_hw_spi = { u8g_dev_uc1701_mini12864_HAL_2x_fn, &u8g_dev_uc1701_mini12864_HAL_2x_pb, U8G_COM_HAL_HW_SPI_FN };
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include <string.h>
|
||||
#include "../fontutils.h"
|
||||
|
@ -312,4 +312,4 @@ int uxg_GetUtf8StrPixelWidthP(u8g_t *pu8g, PGM_P utf8_msg) {
|
|||
return data.adv;
|
||||
}
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#include "../../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include "ultralcd_DOGM.h"
|
||||
#include "u8g_fontutf8.h"
|
||||
|
@ -687,4 +687,4 @@ void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
|
|||
|
||||
#endif // HAS_LCD_MENU
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "../inc/MarlinConfig.h"
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#include "ultralcd.h"
|
||||
#include "../MarlinCore.h"
|
||||
#endif
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include "../inc/MarlinConfigPre.h"
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#include "lcdprint.h"
|
||||
|
||||
|
@ -73,4 +73,4 @@ lcd_uint_t lcd_put_u8str_ind_P(PGM_P const pstr, const int8_t ind, PGM_P const i
|
|||
return n;
|
||||
}
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include "../inc/MarlinConfig.h"
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#include "dogm/u8g_fontutf8.h"
|
||||
typedef u8g_uint_t lcd_uint_t;
|
||||
|
|
|
@ -213,14 +213,14 @@ void MarlinUI::goto_screen(screenFunc_t screen, const uint16_t encoder/*=0*/, co
|
|||
clear_lcd();
|
||||
|
||||
// Re-initialize custom characters that may be re-used
|
||||
#if HAS_CHARACTER_LCD
|
||||
#if HAS_MARLINUI_HD44780
|
||||
if (TERN1(AUTO_BED_LEVELING_UBL, !ubl.lcd_map_control))
|
||||
set_custom_characters(on_status_screen() ? CHARSET_INFO : CHARSET_MENU);
|
||||
#endif
|
||||
|
||||
refresh(LCDVIEW_CALL_REDRAW_NEXT);
|
||||
screen_changed = true;
|
||||
TERN_(HAS_GRAPHICAL_LCD, drawing_screen = false);
|
||||
TERN_(HAS_MARLINUI_U8GLIB, drawing_screen = false);
|
||||
|
||||
TERN_(HAS_LCD_MENU, encoder_direction_normal());
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ typedef void (*selectFunc_t)();
|
|||
#define SS_INVERT 0x02
|
||||
#define SS_DEFAULT SS_CENTER
|
||||
|
||||
#if HAS_GRAPHICAL_LCD && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
|
||||
#if HAS_MARLINUI_U8GLIB && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
|
||||
void _lcd_zoffset_overlay_gfx(const float zvalue);
|
||||
#endif
|
||||
|
||||
|
@ -215,7 +215,7 @@ void _lcd_draw_homing();
|
|||
void line_to_z(const float &z);
|
||||
#endif
|
||||
|
||||
#if HAS_GRAPHICAL_LCD && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
|
||||
#if HAS_MARLINUI_U8GLIB && EITHER(BABYSTEP_ZPROBE_GFX_OVERLAY, MESH_EDIT_GFX_OVERLAY)
|
||||
void _lcd_zoffset_overlay_gfx(const float zvalue);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -60,7 +60,9 @@ void menu_advanced_settings();
|
|||
static int8_t bar_percent = 0;
|
||||
if (ui.use_click()) {
|
||||
ui.goto_previous_screen();
|
||||
#if HAS_MARLINUI_HD44780
|
||||
ui.set_custom_characters(CHARSET_MENU);
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
bar_percent += (int8_t)ui.encoderPosition;
|
||||
|
@ -73,7 +75,9 @@ void menu_advanced_settings();
|
|||
|
||||
void _progress_bar_test() {
|
||||
ui.goto_screen(progress_bar_test);
|
||||
#if HAS_MARLINUI_HD44780
|
||||
ui.set_custom_characters(CHARSET_INFO);
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif // LCD_PROGRESS_BAR_TEST
|
||||
|
|
|
@ -99,7 +99,7 @@ class MenuItem_sdfolder : public MenuItem_sdbase {
|
|||
encoderTopLine = 0;
|
||||
ui.encoderPosition = 2 * (ENCODER_STEPS_PER_MENU_ITEM);
|
||||
ui.screen_changed = true;
|
||||
TERN_(HAS_GRAPHICAL_LCD, ui.drawing_screen = false);
|
||||
TERN_(HAS_MARLINUI_U8GLIB, ui.drawing_screen = false);
|
||||
ui.refresh();
|
||||
}
|
||||
};
|
||||
|
@ -107,7 +107,7 @@ class MenuItem_sdfolder : public MenuItem_sdbase {
|
|||
void menu_media() {
|
||||
ui.encoder_direction_menus();
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
static uint16_t fileCnt;
|
||||
if (ui.first_page) fileCnt = card.get_num_Files();
|
||||
#else
|
||||
|
|
|
@ -205,7 +205,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
|
|||
#if DISABLED(HAS_GRAPHICAL_TFT)
|
||||
extern const char NUL_STR[];
|
||||
SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
|
||||
MENU_ITEM_ADDON_START(0 + ENABLED(HAS_CHARACTER_LCD));
|
||||
MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
|
||||
lcd_put_u8str(tmp);
|
||||
MENU_ITEM_ADDON_END();
|
||||
#else
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
#include "../../feature/babystep.h"
|
||||
#include "../lcdprint.h"
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#include "../dogm/ultralcd_DOGM.h"
|
||||
#endif
|
||||
|
||||
|
@ -68,10 +68,10 @@
|
|||
const float spm = planner.steps_to_mm[axis];
|
||||
MenuEditItemBase::draw_edit_screen(msg, BABYSTEP_TO_STR(spm * babystep.accum));
|
||||
#if ENABLED(BABYSTEP_DISPLAY_TOTAL)
|
||||
const bool in_view = TERN1(HAS_GRAPHICAL_LCD, PAGE_CONTAINS(LCD_PIXEL_HEIGHT - MENU_FONT_HEIGHT, LCD_PIXEL_HEIGHT - 1));
|
||||
const bool in_view = TERN1(HAS_MARLINUI_U8GLIB, PAGE_CONTAINS(LCD_PIXEL_HEIGHT - MENU_FONT_HEIGHT, LCD_PIXEL_HEIGHT - 1));
|
||||
if (in_view) {
|
||||
TERN_(HAS_GRAPHICAL_LCD, ui.set_font(FONT_MENU));
|
||||
lcd_moveto(0, TERN(HAS_GRAPHICAL_LCD, LCD_PIXEL_HEIGHT - MENU_FONT_DESCENT, LCD_HEIGHT - 1));
|
||||
TERN_(HAS_MARLINUI_U8GLIB, ui.set_font(FONT_MENU));
|
||||
lcd_moveto(0, TERN(HAS_MARLINUI_U8GLIB, LCD_PIXEL_HEIGHT - MENU_FONT_DESCENT, LCD_HEIGHT - 1));
|
||||
lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
|
||||
lcd_put_wchar(':');
|
||||
lcd_put_u8str(BABYSTEP_TO_STR(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
|
||||
|
|
|
@ -74,7 +74,7 @@ TouchButtons touch;
|
|||
void TouchButtons::init() { touchIO.Init(); }
|
||||
|
||||
uint8_t TouchButtons::read_buttons() {
|
||||
#ifdef HAS_SPI_LCD
|
||||
#ifdef HAS_WIRED_LCD
|
||||
int16_t x, y;
|
||||
|
||||
if (!touchIO.getRawPoint(&x, &y)) return 0;
|
||||
|
|
|
@ -51,7 +51,7 @@ MarlinUI ui;
|
|||
|
||||
constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#if ENABLED(STATUS_MESSAGE_SCROLLING)
|
||||
uint8_t MarlinUI::status_scroll_offset; // = 0
|
||||
constexpr uint8_t MAX_MESSAGE_LENGTH = _MAX(LONG_FILENAME_LENGTH, MAX_LANG_CHARSIZE * 2 * (LCD_WIDTH));
|
||||
|
@ -62,7 +62,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
|
|||
constexpr uint8_t MAX_MESSAGE_LENGTH = 63;
|
||||
#endif
|
||||
|
||||
#if EITHER(HAS_SPI_LCD, EXTENSIBLE_UI)
|
||||
#if EITHER(HAS_WIRED_LCD, EXTENSIBLE_UI)
|
||||
uint8_t MarlinUI::alert_level; // = 0
|
||||
char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
|
||||
#endif
|
||||
|
@ -114,9 +114,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
|
|||
}
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#include "dogm/ultralcd_DOGM.h"
|
||||
#endif
|
||||
|
||||
|
@ -167,7 +167,7 @@ uint8_t MarlinUI::lcd_status_update_delay = 1; // First update one loop delayed
|
|||
|
||||
millis_t MarlinUI::next_button_update_ms; // = 0
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
bool MarlinUI::drawing_screen, MarlinUI::first_page; // = false
|
||||
#endif
|
||||
|
||||
|
@ -372,7 +372,7 @@ void MarlinUI::init() {
|
|||
|
||||
#endif // HAS_SHIFT_ENCODER
|
||||
|
||||
#if HAS_ENCODER_ACTION && HAS_SLOW_BUTTONS
|
||||
#if BOTH(HAS_ENCODER_ACTION, HAS_SLOW_BUTTONS)
|
||||
slow_buttons = 0;
|
||||
#endif
|
||||
|
||||
|
@ -873,7 +873,7 @@ void MarlinUI::update() {
|
|||
|
||||
#endif // HAS_LCD_MENU
|
||||
|
||||
if (ELAPSED(ms, next_lcd_update_ms) || TERN0(HAS_GRAPHICAL_LCD, drawing_screen)) {
|
||||
if (ELAPSED(ms, next_lcd_update_ms) || TERN0(HAS_MARLINUI_U8GLIB, drawing_screen)) {
|
||||
|
||||
next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL;
|
||||
|
||||
|
@ -971,7 +971,7 @@ void MarlinUI::update() {
|
|||
// This runs every ~100ms when idling often enough.
|
||||
// Instead of tracking changes just redraw the Status Screen once per second.
|
||||
if (on_status_screen() && !lcd_status_update_delay--) {
|
||||
lcd_status_update_delay = TERN(HAS_GRAPHICAL_LCD, 12, 9);
|
||||
lcd_status_update_delay = TERN(HAS_MARLINUI_U8GLIB, 12, 9);
|
||||
if (max_display_update_time) max_display_update_time--; // Be sure never go to a very big number
|
||||
refresh(LCDVIEW_REDRAW_NOW);
|
||||
}
|
||||
|
@ -1010,7 +1010,7 @@ void MarlinUI::update() {
|
|||
|
||||
TERN_(HAS_ADC_BUTTONS, keypad_buttons = 0);
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#if ENABLED(LIGHTWEIGHT_UI)
|
||||
const bool in_status = on_status_screen(),
|
||||
|
@ -1294,7 +1294,7 @@ void MarlinUI::update() {
|
|||
|
||||
#endif // HAS_ENCODER_ACTION
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
#if HAS_DISPLAY
|
||||
|
||||
|
@ -1342,7 +1342,7 @@ void MarlinUI::update() {
|
|||
next_filament_display = ms + 5000UL; // Show status message for 5s
|
||||
#endif
|
||||
|
||||
#if BOTH(HAS_SPI_LCD, STATUS_MESSAGE_SCROLLING)
|
||||
#if BOTH(HAS_WIRED_LCD, STATUS_MESSAGE_SCROLLING)
|
||||
status_scroll_offset = 0;
|
||||
#endif
|
||||
|
||||
|
@ -1501,7 +1501,7 @@ void MarlinUI::update() {
|
|||
set_status_P(print_paused);
|
||||
|
||||
#if ENABLED(PARK_HEAD_ON_PAUSE)
|
||||
TERN_(HAS_SPI_LCD, lcd_pause_show_message(PAUSE_MESSAGE_PARKING, PAUSE_MODE_PAUSE_PRINT)); // Show message immediately to let user know about pause in progress
|
||||
TERN_(HAS_WIRED_LCD, lcd_pause_show_message(PAUSE_MESSAGE_PARKING, PAUSE_MODE_PAUSE_PRINT)); // Show message immediately to let user know about pause in progress
|
||||
queue.inject_P(PSTR("M25 P\nM24"));
|
||||
#elif ENABLED(SDSUPPORT)
|
||||
queue.inject_P(PSTR("M25"));
|
||||
|
@ -1610,11 +1610,11 @@ void MarlinUI::update() {
|
|||
|
||||
refresh();
|
||||
|
||||
#if HAS_SPI_LCD || defined(LED_BACKLIGHT_TIMEOUT)
|
||||
#if HAS_WIRED_LCD || defined(LED_BACKLIGHT_TIMEOUT)
|
||||
const millis_t ms = millis();
|
||||
#endif
|
||||
|
||||
TERN_(HAS_SPI_LCD, next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL); // Delay LCD update for SD activity
|
||||
TERN_(HAS_WIRED_LCD, next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL); // Delay LCD update for SD activity
|
||||
|
||||
#ifdef LED_BACKLIGHT_TIMEOUT
|
||||
leds.reset_timeout(ms);
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#if HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT)
|
||||
#define HAS_DIGITAL_BUTTONS 1
|
||||
#endif
|
||||
#if !HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL)))
|
||||
#if !HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_WIRED_LCD && DISABLED(NEWPANEL)))
|
||||
#define HAS_SHIFT_ENCODER 1
|
||||
#endif
|
||||
|
||||
|
@ -53,7 +53,7 @@
|
|||
#define MULTI_MANUAL 1
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#include "../MarlinCore.h"
|
||||
|
||||
|
@ -104,7 +104,7 @@
|
|||
|
||||
#endif // HAS_LCD_MENU
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
// REPRAPWORLD_KEYPAD (and ADC_KEYPAD)
|
||||
#if ENABLED(REPRAPWORLD_KEYPAD)
|
||||
|
@ -231,7 +231,7 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
enum MarlinFont : uint8_t {
|
||||
FONT_STATUSMENU = 1,
|
||||
FONT_EDIT,
|
||||
|
@ -316,11 +316,11 @@ public:
|
|||
static void refresh();
|
||||
#else
|
||||
FORCE_INLINE static void refresh() {
|
||||
TERN_(HAS_SPI_LCD, refresh(LCDVIEW_CLEAR_CALL_REDRAW));
|
||||
TERN_(HAS_WIRED_LCD, refresh(LCDVIEW_CLEAR_CALL_REDRAW));
|
||||
}
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
static bool detected();
|
||||
static void init_lcd();
|
||||
#else
|
||||
|
@ -381,7 +381,7 @@ public:
|
|||
static void pause_print();
|
||||
static void resume_print();
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
static millis_t next_button_update_ms;
|
||||
|
||||
|
@ -403,7 +403,7 @@ public:
|
|||
static void show_bootscreen();
|
||||
#endif
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
static void set_font(const MarlinFont font_nr);
|
||||
|
||||
|
@ -458,7 +458,7 @@ public:
|
|||
|
||||
#endif
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
static bool drawing_screen, first_page;
|
||||
#else
|
||||
static constexpr bool drawing_screen = false, first_page = true;
|
||||
|
@ -577,7 +577,7 @@ public:
|
|||
|
||||
static void draw_select_screen_prompt(PGM_P const pref, const char * const string=nullptr, PGM_P const suff=nullptr);
|
||||
|
||||
#elif HAS_SPI_LCD
|
||||
#elif HAS_WIRED_LCD
|
||||
|
||||
static constexpr bool lcd_clicked = false;
|
||||
static constexpr bool on_status_screen() { return true; }
|
||||
|
@ -692,7 +692,7 @@ private:
|
|||
static void finish_status(const bool persist);
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS > 0
|
||||
static bool defer_return_to_status;
|
||||
#else
|
||||
|
|
|
@ -351,7 +351,7 @@ void Endstops::event_handler() {
|
|||
if (hit_state == prev_hit_state) return;
|
||||
prev_hit_state = hit_state;
|
||||
if (hit_state) {
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
char chrX = ' ', chrY = ' ', chrZ = ' ', chrP = ' ';
|
||||
#define _SET_STOP_CHAR(A,C) (chr## A = C)
|
||||
#else
|
||||
|
@ -382,7 +382,7 @@ void Endstops::event_handler() {
|
|||
#endif
|
||||
SERIAL_EOL();
|
||||
|
||||
TERN_(HAS_SPI_LCD, ui.status_printf_P(0, PSTR(S_FMT " %c %c %c %c"), GET_TEXT(MSG_LCD_ENDSTOPS), chrX, chrY, chrZ, chrP));
|
||||
TERN_(HAS_WIRED_LCD, ui.status_printf_P(0, PSTR(S_FMT " %c %c %c %c"), GET_TEXT(MSG_LCD_ENDSTOPS), chrX, chrY, chrZ, chrP));
|
||||
|
||||
#if BOTH(SD_ABORT_ON_ENDSTOP_HIT, SDSUPPORT)
|
||||
if (planner.abort_on_endstop_hit) {
|
||||
|
|
|
@ -234,7 +234,7 @@ float Planner::previous_nominal_speed_sqr;
|
|||
xyze_pos_t Planner::position_cart;
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
volatile uint32_t Planner::block_buffer_runtime_us = 0;
|
||||
#endif
|
||||
|
||||
|
@ -747,7 +747,7 @@ block_t* Planner::get_current_block() {
|
|||
if (TEST(block->flag, BLOCK_BIT_RECALCULATE)) return nullptr;
|
||||
|
||||
// We can't be sure how long an active block will take, so don't count it.
|
||||
TERN_(HAS_SPI_LCD, block_buffer_runtime_us -= block->segment_time_us);
|
||||
TERN_(HAS_WIRED_LCD, block_buffer_runtime_us -= block->segment_time_us);
|
||||
|
||||
// As this block is busy, advance the nonbusy block pointer
|
||||
block_buffer_nonbusy = next_block_index(block_buffer_tail);
|
||||
|
@ -761,7 +761,7 @@ block_t* Planner::get_current_block() {
|
|||
}
|
||||
|
||||
// The queue became empty
|
||||
TERN_(HAS_SPI_LCD, clear_block_buffer_runtime()); // paranoia. Buffer is empty now - so reset accumulated time to zero.
|
||||
TERN_(HAS_WIRED_LCD, clear_block_buffer_runtime()); // paranoia. Buffer is empty now - so reset accumulated time to zero.
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
@ -1578,7 +1578,7 @@ void Planner::quick_stop() {
|
|||
// forced to empty, there's no risk the ISR will touch this.
|
||||
delay_before_delivering = BLOCK_DELAY_FOR_1ST_MOVE;
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
// Clear the accumulated runtime
|
||||
clear_block_buffer_runtime();
|
||||
#endif
|
||||
|
@ -2081,7 +2081,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
|
|||
const uint8_t moves_queued = nonbusy_movesplanned();
|
||||
|
||||
// Slow down when the buffer starts to empty, rather than wait at the corner for a buffer refill
|
||||
#if EITHER(SLOWDOWN, HAS_SPI_LCD) || defined(XY_FREQUENCY_LIMIT)
|
||||
#if EITHER(SLOWDOWN, HAS_WIRED_LCD) || defined(XY_FREQUENCY_LIMIT)
|
||||
// Segment time im micro seconds
|
||||
int32_t segment_time_us = LROUND(1000000.0f / inverse_secs);
|
||||
#endif
|
||||
|
@ -2096,14 +2096,14 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
|
|||
// Buffer is draining so add extra time. The amount of time added increases if the buffer is still emptied more.
|
||||
const int32_t nst = segment_time_us + LROUND(2 * time_diff / moves_queued);
|
||||
inverse_secs = 1000000.0f / nst;
|
||||
#if defined(XY_FREQUENCY_LIMIT) || HAS_SPI_LCD
|
||||
#if defined(XY_FREQUENCY_LIMIT) || HAS_WIRED_LCD
|
||||
segment_time_us = nst;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
// Protect the access to the position.
|
||||
const bool was_enabled = stepper.suspend();
|
||||
|
||||
|
@ -3029,7 +3029,7 @@ void Planner::set_max_jerk(const AxisEnum axis, float targetValue) {
|
|||
#endif
|
||||
}
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
uint16_t Planner::block_buffer_runtime() {
|
||||
#ifdef __AVR__
|
||||
|
|
|
@ -218,7 +218,7 @@ typedef struct block_t {
|
|||
uint8_t valve_pressure, e_to_p_pressure;
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
uint32_t segment_time_us;
|
||||
#endif
|
||||
|
||||
|
@ -438,7 +438,7 @@ class Planner {
|
|||
static uint8_t g_uc_extruder_last_move[EXTRUDERS];
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
volatile static uint32_t block_buffer_runtime_us; // Theoretical block buffer runtime in µs
|
||||
#endif
|
||||
|
||||
|
@ -871,7 +871,7 @@ class Planner {
|
|||
block_buffer_tail = next_block_index(block_buffer_tail);
|
||||
}
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
static uint16_t block_buffer_runtime();
|
||||
static void clear_block_buffer_runtime();
|
||||
#endif
|
||||
|
|
|
@ -124,7 +124,7 @@
|
|||
// LCDs and Controllers //
|
||||
//////////////////////////
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
|
||||
#define LCD_PINS_RS 13
|
||||
#define LCD_PINS_ENABLE 17
|
||||
|
@ -152,7 +152,7 @@
|
|||
#define BTN_EN2 12
|
||||
#define BTN_ENC 14
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
||||
// Hardware serial pins
|
||||
// Add the following to Configuration.h or Configuration_adv.h to assign
|
||||
|
|
|
@ -389,7 +389,7 @@
|
|||
// LCDs and Controllers //
|
||||
//////////////////////////
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// LCD Display output pins
|
||||
|
@ -632,4 +632,4 @@
|
|||
#endif
|
||||
#endif // NEWPANEL
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -126,7 +126,7 @@
|
|||
* for the onboard SD card, and a chip select signal is not provided for the remote
|
||||
* SD card.
|
||||
*/
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define BEEPER_PIN P1_31 // EXP1-1
|
||||
|
||||
|
@ -139,7 +139,7 @@
|
|||
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
|
||||
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
|
||||
|
||||
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
|
||||
#if BOTH(HAS_MARLINUI_HD44780, REPRAP_DISCOUNT_SMART_CONTROLLER)
|
||||
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU B300 v1.0"
|
||||
#endif
|
||||
|
||||
|
@ -147,7 +147,7 @@
|
|||
#error "SDSUPPORT is not supported by the BIQU B300 v1.0 when an LCD controller is used"
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
/**
|
||||
* SD Card Reader
|
||||
|
|
|
@ -97,7 +97,7 @@
|
|||
* for the onboard SD card, and a chip select signal is not provided for the remote
|
||||
* SD card.
|
||||
*/
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define BEEPER_PIN P1_31 // EXP1-1
|
||||
|
||||
|
@ -110,7 +110,7 @@
|
|||
#define LCD_PINS_ENABLE P0_18 // (MOSI) EXP1-3
|
||||
#define LCD_PINS_D4 P0_15 // (SCK) EXP1-5
|
||||
|
||||
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && HAS_CHARACTER_LCD
|
||||
#if BOTH(HAS_MARLINUI_HD44780, REPRAP_DISCOUNT_SMART_CONTROLLER)
|
||||
#error "REPRAP_DISCOUNT_SMART_CONTROLLER is not supported by the BIQU BQ111-A4"
|
||||
#endif
|
||||
|
||||
|
@ -118,7 +118,7 @@
|
|||
#error "SDSUPPORT is not supported by the BIQU BQ111-A4 when an LCD controller is used"
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
/**
|
||||
* SD Card Reader
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
* by redrawing the screen after SD card accesses.
|
||||
*/
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#define BTN_EN1 P3_26
|
||||
#define BTN_EN2 P3_25
|
||||
#define BTN_ENC P2_11
|
||||
|
|
|
@ -214,7 +214,7 @@
|
|||
#define EXPA2_09_PIN P0_15
|
||||
#define EXPA2_10_PIN P0_17
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#if ENABLED(ANET_FULL_GRAPHICS_LCD)
|
||||
|
||||
|
@ -350,7 +350,7 @@
|
|||
|
||||
#endif // !CR10_STOCKDISPLAY
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// SD Support
|
||||
|
|
|
@ -232,7 +232,7 @@
|
|||
* ----- -----
|
||||
* EXP2 EXP1
|
||||
*/
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#if ENABLED(ANET_FULL_GRAPHICS_LCD)
|
||||
|
||||
#define LCD_PINS_RS P1_23
|
||||
|
@ -371,9 +371,9 @@
|
|||
|
||||
#endif // !FYSETC_MINI_12864
|
||||
|
||||
#endif // HAS_GRAPHICAL_LCD
|
||||
#endif // HAS_MARLINUI_U8GLIB
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
#if HAS_ADC_BUTTONS
|
||||
#error "ADC BUTTONS do not work unmodifed on SKR 1.4, The ADC ports cannot take more than 3.3v."
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#define BEEPER_PIN P1_30 // (37) not 5V tolerant
|
||||
#endif
|
||||
|
||||
|
|
|
@ -217,7 +217,7 @@
|
|||
* that the garbage/lines are erased immediately after the SD card accesses are completed.
|
||||
*/
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#define BEEPER_PIN P1_31 // EXP1.1
|
||||
#define BTN_ENC P1_30 // EXP1.2
|
||||
#define BTN_EN1 P3_26 // EXP2.5
|
||||
|
|
|
@ -235,7 +235,8 @@
|
|||
* ----- -----
|
||||
* EXP1 EXP2
|
||||
*/
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define BEEPER_PIN P1_31
|
||||
#define BTN_ENC P1_30
|
||||
|
||||
|
@ -321,7 +322,7 @@
|
|||
|
||||
#endif // !CR10_STOCKDISPLAY
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
#ifndef SDCARD_CONNECTION
|
||||
#define SDCARD_CONNECTION ONBOARD
|
||||
|
|
|
@ -326,7 +326,7 @@
|
|||
#define LCD_PINS_ENABLE P0_18 // J3-10 & AUX-3 (SID, MOSI)
|
||||
#define LCD_PINS_D4 P2_06 // J3-8 & AUX-3 (SCK, CLK)
|
||||
|
||||
#elif HAS_SPI_LCD
|
||||
#elif HAS_WIRED_LCD
|
||||
|
||||
//#define SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
|
||||
//#define MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
|
||||
|
@ -372,6 +372,7 @@
|
|||
|
||||
#define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes
|
||||
#define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
|
||||
|
||||
#else
|
||||
|
||||
#if ENABLED(FYSETC_MINI_12864)
|
||||
|
@ -422,7 +423,7 @@
|
|||
//#define LCD_SCREEN_ROT_270
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// Ethernet pins
|
||||
|
|
|
@ -109,7 +109,7 @@
|
|||
//
|
||||
// Display
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#if ENABLED(CR10_STOCKDISPLAY)
|
||||
|
||||
|
@ -185,7 +185,7 @@
|
|||
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// SD Support
|
||||
|
|
|
@ -193,7 +193,7 @@
|
|||
#define EXPA1_09_PIN P0_16
|
||||
#define EXPA1_10_PIN P2_08
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#if ENABLED(CR10_STOCKDISPLAY)
|
||||
|
||||
|
@ -238,7 +238,7 @@
|
|||
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// SD Support
|
||||
|
|
|
@ -141,7 +141,7 @@
|
|||
// connector are shared with the onboard SD card, and Marlin does not support reading
|
||||
// G-code files from the onboard SD card.
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define BEEPER_PIN P0_27 // EXP2-7 - open drain
|
||||
|
||||
|
@ -160,7 +160,7 @@
|
|||
#error "SDSUPPORT is not currently supported by the Cohesion3D boards"
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// Ethernet pins
|
||||
|
|
|
@ -206,7 +206,7 @@
|
|||
#define NEOPIXEL_PIN P1_16 // EXP1-6 => Ethernet pin 6 (top row, 3 from left)
|
||||
#endif
|
||||
|
||||
#elif HAS_SPI_LCD
|
||||
#elif HAS_WIRED_LCD
|
||||
|
||||
#define BEEPER_PIN P1_31 // EXP1-1
|
||||
//#define SD_DETECT_PIN P0_27 // EXP2-7
|
||||
|
@ -222,7 +222,7 @@
|
|||
|
||||
#define KILL_PIN P2_11 // EXP2-10
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// SD Support
|
||||
|
|
|
@ -241,11 +241,12 @@
|
|||
* ----- -----
|
||||
* EXP1 EXP2
|
||||
*/
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#define BEEPER_PIN P1_31
|
||||
#define BTN_ENC P1_30
|
||||
|
||||
#if ENABLED(CR10_STOCKDISPLAY)
|
||||
|
||||
#define LCD_PINS_RS P1_00
|
||||
|
||||
#define BTN_EN1 P0_18
|
||||
|
@ -327,7 +328,7 @@
|
|||
|
||||
#endif // !CR10_STOCKDISPLAY
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
#ifndef SDCARD_CONNECTION
|
||||
#define SDCARD_CONNECTION ONBOARD
|
||||
|
|
|
@ -109,7 +109,7 @@
|
|||
#define STAT_LED_RED_PIN P1_19
|
||||
#define STAT_LED_BLUE_PIN P1_20
|
||||
|
||||
#elif HAS_SPI_LCD
|
||||
#elif HAS_WIRED_LCD
|
||||
|
||||
/*
|
||||
The Smoothieboard supports the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER with either
|
||||
|
|
|
@ -178,6 +178,6 @@
|
|||
#define LCD_PINS_ENABLE P0_18
|
||||
#define LCD_PINS_D4 P0_15
|
||||
#define KILL_PIN P2_11
|
||||
#elif HAS_SPI_LCD
|
||||
#elif HAS_WIRED_LCD
|
||||
#error "Only the CR10_STOCKDISPLAY is supported with TH3D EZBoard."
|
||||
#endif
|
||||
|
|
|
@ -105,7 +105,7 @@
|
|||
#define SUICIDE_PIN 54 // Must be enabled at startup to keep power flowing
|
||||
#define KILL_PIN -1
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define BEEPER_PIN 18
|
||||
|
||||
|
@ -148,4 +148,4 @@
|
|||
|
||||
#endif // !NEWPANEL
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -123,7 +123,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define BEEPER_PIN 18
|
||||
|
||||
|
@ -170,4 +170,4 @@
|
|||
|
||||
#endif // !NEWPANEL
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -122,7 +122,7 @@
|
|||
|
||||
#define BEEPER_PIN 18
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#define LCD_PINS_RS 20
|
||||
#define LCD_PINS_ENABLE 30
|
||||
#define LCD_PINS_D4 14
|
||||
|
|
|
@ -130,7 +130,7 @@
|
|||
//
|
||||
#define BEEPER_PIN 64
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define LCD_PINS_RS 14
|
||||
#define LCD_PINS_ENABLE 15
|
||||
|
@ -152,4 +152,4 @@
|
|||
#define SHIFT_EN 17
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -212,7 +212,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
|
||||
|
||||
|
@ -260,7 +260,7 @@
|
|||
#define BTN_CENTER 15 // J0
|
||||
#define BTN_ENC BTN_CENTER
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// SD Card
|
||||
|
|
|
@ -119,7 +119,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
// OVERLORD OLED pins
|
||||
#define LCD_PINS_RS 20
|
||||
#define LCD_PINS_D5 21
|
||||
|
|
|
@ -137,7 +137,7 @@
|
|||
//
|
||||
#define BEEPER_PIN 29
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#define LCD_PINS_RS 33
|
||||
#define LCD_PINS_ENABLE 30
|
||||
#define LCD_PINS_D4 35
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
#define HEATER_BED_PIN 8
|
||||
#define TEMP_BED_PIN 6
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920
|
||||
#define LCD_PINS_RS 30
|
||||
#define LCD_PINS_ENABLE 20
|
||||
|
|
|
@ -1227,7 +1227,7 @@
|
|||
#define LCD_PINS_D4 -1
|
||||
#endif
|
||||
|
||||
#if HAS_CHARACTER_LCD || TOUCH_UI_ULTIPANEL
|
||||
#if HAS_MARLINUI_HD44780 || TOUCH_UI_ULTIPANEL
|
||||
#ifndef LCD_PINS_D5
|
||||
#define LCD_PINS_D5 -1
|
||||
#endif
|
||||
|
@ -1597,7 +1597,7 @@
|
|||
#define Z4_MS3_PIN -1
|
||||
#endif
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#if !defined(ST7920_DELAY_1) && defined(BOARD_ST7920_DELAY_1)
|
||||
#define ST7920_DELAY_1 BOARD_ST7920_DELAY_1
|
||||
#endif
|
||||
|
|
|
@ -160,7 +160,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
|
||||
#if HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
|
||||
|
||||
#define KILL_PIN 32
|
||||
|
||||
|
@ -188,4 +188,4 @@
|
|||
#define SD_DETECT_PIN 15
|
||||
|
||||
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -166,7 +166,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if ANY(HAS_SPI_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
|
||||
#if ANY(HAS_WIRED_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
|
||||
|
||||
#define KILL_PIN 32
|
||||
|
||||
|
@ -196,4 +196,4 @@
|
|||
|
||||
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
|
||||
|
||||
#endif // HAS_SPI_LCD || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
|
||||
#endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL || TOUCH_UI_FTDI_EVE
|
||||
|
|
|
@ -141,7 +141,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
|
||||
#if HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
|
||||
|
||||
#if !MB(MINIRAMBO_10A)
|
||||
#define KILL_PIN 32
|
||||
|
@ -189,4 +189,4 @@
|
|||
|
||||
#endif // ULTIPANEL || TOUCH_UI_ULTIPANEL
|
||||
|
||||
#endif // HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
|
||||
#endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
|
||||
|
|
|
@ -183,7 +183,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD || TOUCH_UI_ULTIPANEL
|
||||
#if HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
|
||||
|
||||
#define KILL_PIN 80
|
||||
|
||||
|
@ -249,4 +249,4 @@
|
|||
|
||||
#endif // !NEWPANEL
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -106,7 +106,7 @@
|
|||
|
||||
#define BEEPER_PIN 33
|
||||
|
||||
#endif // HAS_SPI_LCD && NEWPANEL
|
||||
#endif // ULTRA_LCD && NEWPANEL
|
||||
|
||||
/**
|
||||
* M3/M4/M5 - Spindle/Laser Control
|
||||
|
|
|
@ -87,7 +87,7 @@
|
|||
//
|
||||
// LCDs and Controllers
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#if ENABLED(ZONESTAR_LCD)
|
||||
#define LCD_PINS_RS 2
|
||||
#define LCD_PINS_ENABLE 36
|
||||
|
|
|
@ -197,7 +197,7 @@
|
|||
#define LCD_PINS_D7 29
|
||||
#endif
|
||||
|
||||
#if HAS_GRAPHICAL_LCD
|
||||
#if HAS_MARLINUI_U8GLIB
|
||||
#ifndef BOARD_ST7920_DELAY_1
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(200)
|
||||
#endif
|
||||
|
|
|
@ -261,7 +261,7 @@
|
|||
#define NEOPIXEL_PIN 25
|
||||
#endif
|
||||
|
||||
#elif HAS_GRAPHICAL_LCD
|
||||
#elif HAS_MARLINUI_U8GLIB
|
||||
|
||||
#define LCD_PINS_RS 16
|
||||
#define LCD_PINS_ENABLE 17
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
//
|
||||
#define BEEPER_PIN 6
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define LCD_SDSS 53
|
||||
|
||||
|
@ -119,4 +119,4 @@
|
|||
#define BTN_ENC 23
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -430,7 +430,7 @@
|
|||
// LCDs and Controllers //
|
||||
//////////////////////////
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// LCD Display output pins
|
||||
|
@ -706,7 +706,7 @@
|
|||
#endif
|
||||
#endif // NEWPANEL
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
#if ENABLED(REPRAPWORLD_KEYPAD) && DISABLED(ADC_KEYPAD)
|
||||
#define SHIFT_OUT 40
|
||||
|
|
|
@ -128,7 +128,7 @@
|
|||
// AnyCubic made the following changes to 1.1.0-RC8
|
||||
// If these are appropriate for your LCD let us know.
|
||||
//
|
||||
#if 0 && HAS_SPI_LCD
|
||||
#if 0 && HAS_WIRED_LCD
|
||||
|
||||
// LCD Display output pins
|
||||
#if BOTH(NEWPANEL, PANEL_ONE)
|
||||
|
@ -154,4 +154,4 @@
|
|||
#define DOGLCD_A0 42
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -271,7 +271,7 @@
|
|||
// LCDs and Controllers //
|
||||
//////////////////////////
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// LCD Display output pins
|
||||
|
|
|
@ -119,7 +119,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define BEEPER_PIN 18
|
||||
|
||||
|
@ -158,7 +158,7 @@
|
|||
|
||||
#endif // !NEWPANEL
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// M3/M4/M5 - Spindle/Laser Control
|
||||
|
|
|
@ -181,7 +181,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
#define BEEPER_PIN 23 // D24 PA15_CTS1
|
||||
#define LCD_PINS_RS 17 // D17 PA12_RXD1
|
||||
#define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
|
||||
|
@ -198,4 +198,4 @@
|
|||
#define BTN_EN2 13 // D13 PB27_TIOB0
|
||||
#define BTN_ENC 16 // D16 PA13_TXD1
|
||||
#endif // NEWPANEL
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -237,7 +237,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if ANY(HAS_SPI_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
|
||||
#if ANY(HAS_WIRED_LCD, TOUCH_UI_ULTIPANEL, TOUCH_UI_FTDI_EVE)
|
||||
#define BEEPER_PIN 23 // D24 PA15_CTS1
|
||||
#define LCD_PINS_RS 17 // D17 PA12_RXD1
|
||||
#define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
|
||||
|
|
|
@ -113,7 +113,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define LCD_PINS_RS 42
|
||||
#define LCD_PINS_ENABLE 43
|
||||
|
@ -168,4 +168,4 @@
|
|||
|
||||
#define BEEPER_PIN -1
|
||||
#endif // SPARK_FULL_GRAPHICS
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -105,7 +105,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#define LCD_PINS_RS 42
|
||||
#define LCD_PINS_ENABLE 43
|
||||
|
@ -171,4 +171,4 @@
|
|||
#define DOGLCD_CS 45
|
||||
|
||||
#endif // SPARK_FULL_GRAPHICS
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -226,7 +226,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#if ENABLED(RADDS_DISPLAY)
|
||||
|
||||
|
@ -287,7 +287,7 @@
|
|||
|
||||
#endif // SPARK_FULL_GRAPHICS
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
#ifndef SDSS
|
||||
#define SDSS 4
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#if BOTH(NEWPANEL, PANEL_ONE)
|
||||
#undef LCD_PINS_D4
|
||||
|
@ -129,4 +129,4 @@
|
|||
|
||||
#endif // NEWPANEL
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -139,7 +139,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
// ramps-fd lcd adaptor
|
||||
|
||||
#define BEEPER_PIN 37
|
||||
|
@ -203,7 +203,7 @@
|
|||
#define DOGLCD_MISO 74 // MISO_PIN
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
#if HAS_TMC_UART
|
||||
/**
|
||||
|
|
|
@ -200,7 +200,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
|
||||
#define BEEPER_PIN 62
|
||||
|
@ -271,4 +271,4 @@
|
|||
#define BTN_ENC 40
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -186,7 +186,7 @@
|
|||
//
|
||||
// LCD / Controller
|
||||
//
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
#if ANY(RADDS_DISPLAY, REPRAP_DISCOUNT_SMART_CONTROLLER, REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
|
||||
#define BEEPER_PIN 62
|
||||
|
@ -253,4 +253,4 @@
|
|||
#define BTN_ENC 40
|
||||
#endif
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
|
|
@ -287,7 +287,7 @@
|
|||
// LCDs and Controllers //
|
||||
//////////////////////////
|
||||
|
||||
#if HAS_SPI_LCD
|
||||
#if HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// LCD Display output pins
|
||||
|
@ -594,7 +594,7 @@
|
|||
#endif
|
||||
#endif // NEWPANEL
|
||||
|
||||
#endif // HAS_SPI_LCD
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
||||
//
|
||||
// SD Support
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue