Fix ExtUI + Archim compile, typos (#17825)
This commit is contained in:
Marcio T
GitHub
parent
208af8cb15
commit
db32af9171
|
|
@ -23,102 +23,4 @@
|
|||
|
||||
#include "compat.h"
|
||||
|
||||
// Define the display board used (see "ftdi_eve_boards.h" for definitions)
|
||||
|
||||
//#define LCD_FTDI_VM800B35A // FTDI 3.5" 320x240 with FT800
|
||||
//#define LCD_4DSYSTEMS_4DLCD_FT843 // 4D Systems 4.3" 480x272
|
||||
//#define LCD_HAOYU_FT800CB // Haoyu with 4.3" or 5" 480x272
|
||||
//#define LCD_HAOYU_FT810CB // Haoyu with 5" 800x480
|
||||
//#define LCD_ALEPHOBJECTS_CLCD_UI // Aleph Objects Color LCD User Interface
|
||||
|
||||
// Leave the following commented out to use a board's default resolution.
|
||||
// If you have changed the LCD panel, you may override the resolution
|
||||
// below (see "ftdi_eve_resolutions.h" for definitions):
|
||||
|
||||
//#define TOUCH_UI_320x240
|
||||
//#define TOUCH_UI_480x272
|
||||
//#define TOUCH_UI_800x480
|
||||
|
||||
// Define the printer interface or pins used (see "ui_pin_mappings.h" for definitions):
|
||||
|
||||
//#define CR10_TFT_PINMAP
|
||||
//#define AO_EXP1_DEPRECATED_PINMAP // UltraLCD EXP1 connector, old AlephObject's wiring
|
||||
//#define AO_EXP1_PINMAP // UltraLCD EXP1 connector, new AlephObject's wiring
|
||||
//#define AO_EXP2_PINMAP // UltraLCD EXP2 connector, new AlephObject's wiring
|
||||
//#define OTHER_PIN_LAYOUT
|
||||
|
||||
// Otherwise. Define all the pins manually:
|
||||
|
||||
#ifdef OTHER_PIN_LAYOUT
|
||||
// Select interfacing pins, the following pin specifiers are supported:
|
||||
//
|
||||
// ARDUINO_DIGITAL_1 - Arduino pin via digitalWrite/digitalRead
|
||||
// AVR_A1 - Fast AVR port access via PORTA/PINA/DDRA
|
||||
// 1 - When compiling Marlin, use Marlin pin IDs.
|
||||
|
||||
// The pins for CS and MOD_RESET (PD) must be chosen.
|
||||
#define CLCD_MOD_RESET 9
|
||||
#define CLCD_SPI_CS 10
|
||||
|
||||
// If using software SPI, specify pins for SCLK, MOSI, MISO
|
||||
//#define CLCD_USE_SOFT_SPI
|
||||
#ifdef CLCD_USE_SOFT_SPI
|
||||
#define CLCD_SOFT_SPI_MOSI 11
|
||||
#define CLCD_SOFT_SPI_MISO 12
|
||||
#define CLCD_SOFT_SPI_SCLK 13
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Defines how to orient the display. An inverted (i.e. upside-down) display
|
||||
// is supported on the FT800. The FT810 or better also support a portrait
|
||||
// and mirrored orientation.
|
||||
//#define TOUCH_UI_INVERTED
|
||||
//#define TOUCH_UI_PORTRAIT
|
||||
//#define TOUCH_UI_MIRRORED
|
||||
|
||||
// Enable UTF8 processing and rendering. Unsupported characters
|
||||
// will be shown as '?'.
|
||||
//#define TOUCH_UI_USE_UTF8
|
||||
#ifdef TOUCH_UI_USE_UTF8
|
||||
// Western accents support. These accented characters use
|
||||
// combined bitmaps and require relatively little storage.
|
||||
#define TOUCH_UI_UTF8_WESTERN_CHARSET
|
||||
#ifdef TOUCH_UI_UTF8_WESTERN_CHARSET
|
||||
// Additional character groups. These characters require
|
||||
// full bitmaps and take up considerable storage:
|
||||
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
|
||||
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
|
||||
//#define TOUCH_UI_UTF8_GERMANIC // ß
|
||||
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
|
||||
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
|
||||
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
|
||||
//#define TOUCH_UI_UTF8_ORDINALS // º ª
|
||||
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
|
||||
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
|
||||
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// When labels do not fit buttons, use smaller font
|
||||
//#define TOUCH_UI_FIT_TEXT
|
||||
|
||||
// Enable support for selection of languages at run-time
|
||||
// (otherwise will use the value of LCD_LANGUAGE)
|
||||
//#define TOUCH_UI_LANGUAGE_MENU
|
||||
|
||||
// Use a numeric passcode for "Parental lock".
|
||||
// This is a recommended for smaller displays.
|
||||
//#define TOUCH_UI_PASSCODE
|
||||
|
||||
// The timeout (in ms) to return to the status screen from sub-menus
|
||||
//#define LCD_TIMEOUT_TO_STATUS 15000
|
||||
|
||||
// Enable this to debug the event framework
|
||||
//#define TOUCH_UI_DEBUG
|
||||
|
||||
// Enable the developer's menu and screens
|
||||
//#define DEVELOPER_SCREENS
|
||||
|
||||
// Sets the SPI speed in Hz
|
||||
|
||||
#define SPI_FREQUENCY 8000000 >> SPI_SPEED
|
||||
// Configure this display with options in Configuration_adv.h
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
namespace FTDI {
|
||||
|
||||
#ifndef CLCD_USE_SOFT_SPI
|
||||
#ifndef __AVR__
|
||||
#ifdef CLCD_SPI_BUS
|
||||
SPIClass EVE_SPI(CLCD_SPI_BUS);
|
||||
#endif
|
||||
SPISettings SPI::spi_settings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
namespace FTDI {
|
||||
|
||||
#if defined(__AVR__) || defined(CLCD_USE_SOFT_SPI)
|
||||
#if !defined(CLCD_SPI_BUS) || defined(CLCD_USE_SOFT_SPI)
|
||||
#define SPI_OBJ ::SPI
|
||||
#else
|
||||
extern SPIClass EVE_SPI;
|
||||
|
|
|
|||
|
|
@ -99,9 +99,8 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
|
|||
.enabled(ENABLED(SENSORLESS_HOMING))
|
||||
.tag(14).button( TMC_HOMING_THRS_POS, GET_TEXT_F(MSG_TMC_HOMING_THRS))
|
||||
.enabled(EITHER(HAS_MULTI_HOTEND, BLTOUCH))
|
||||
.tag(4) .button( OFFSETS_POS, GET_TEXT_F(TERN(HAS_MULTI_HOTEND, MSG_OFFSETS_MENU, MSG_RESET_BLTOUCH))
|
||||
.enabled(EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR)
|
||||
)
|
||||
.tag(4) .button( OFFSETS_POS, GET_TEXT_F(TERN(HAS_MULTI_HOTEND, MSG_OFFSETS_MENU, MSG_RESET_BLTOUCH)))
|
||||
.enabled(EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR))
|
||||
.tag(11).button( FILAMENT_POS, GET_TEXT_F(MSG_FILAMENT))
|
||||
.tag(12).button( ENDSTOPS_POS, GET_TEXT_F(MSG_LCD_ENDSTOPS))
|
||||
.tag(15).button( DISPLAY_POS, GET_TEXT_F(MSG_DISPLAY_MENU))
|
||||
|
|
@ -109,7 +108,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
|
|||
.tag(10).button( RESTORE_DEFAULTS_POS, GET_TEXT_F(MSG_RESTORE_DEFAULTS))
|
||||
.tag(5) .button( VELOCITY_POS, GET_TEXT_F(MSG_VELOCITY))
|
||||
.tag(6) .button( ACCELERATION_POS, GET_TEXT_F(MSG_ACCELERATION))
|
||||
.tag(7) .button( JERK_POS, GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK))
|
||||
.tag(7) .button( JERK_POS, GET_TEXT_F(TERN(HAS_JUNCTION_DEVIATION, MSG_JUNCTION_DEVIATION, MSG_JERK)))
|
||||
.enabled(ENABLED(BACKLASH_GCODE))
|
||||
.tag(8).button( BACKLASH_POS, GET_TEXT_F(MSG_BACKLASH))
|
||||
.colors(action_btn)
|
||||
|
|
|
|||
|
|
@ -72,14 +72,14 @@ void TuneMenu::onRedraw(draw_mode_t what) {
|
|||
.enabled(EITHER(LIN_ADVANCE, FILAMENT_RUNOUT_SENSOR))
|
||||
.tag(9).button( FILAMENT_POS, GET_TEXT_F(MSG_FILAMENT))
|
||||
.enabled(EITHER(HAS_BED_PROBE, BABYSTEPPING))
|
||||
.tag(4).button( NUDGE_NOZ_POS, GET_TEXT_F(TERN(BABYSTEPPING, MSG_NUDGE_NOZZLE, MSG_ZPROBE_ZOFFSET))
|
||||
.tag(4).button( NUDGE_NOZ_POS, GET_TEXT_F(TERN(BABYSTEPPING, MSG_NUDGE_NOZZLE, MSG_ZPROBE_ZOFFSET)))
|
||||
.tag(5).button( SPEED_POS, GET_TEXT_F(MSG_PRINT_SPEED))
|
||||
.tag(isPrintingFromMediaPaused() ? 7 : 6)
|
||||
.enabled(TERN0(SDSUPPORT, isPrintingFromMedia()))
|
||||
.button( PAUSE_POS, isPrintingFromMediaPaused() ? GET_TEXT_F(MSG_RESUME_PRINT) : GET_TEXT_F(MSG_PAUSE_PRINT))
|
||||
.enabled(TERN0(SDSUPPORT, isPrintingFromMedia()))
|
||||
.tag(8).button( STOP_POS, GET_TEXT_F(MSG_STOP_PRINT))
|
||||
.tag(1).colors(action_btn)
|
||||
.tag(8).button( STOP_POS, GET_TEXT_F(MSG_STOP_PRINT))
|
||||
.tag(1).colors(action_btn)
|
||||
.button( BACK_POS, GET_TEXT_F(MSG_BACK));
|
||||
}
|
||||
#undef GRID_COLS
|
||||
|
|
|
|||
|
|
@ -106,13 +106,15 @@ namespace ExtUI {
|
|||
// whether successful or not.
|
||||
}
|
||||
|
||||
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
|
||||
// Called when any mesh points are updated
|
||||
}
|
||||
#if HAS_MESH
|
||||
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const float zval) {
|
||||
// Called when any mesh points are updated
|
||||
}
|
||||
|
||||
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {
|
||||
// Called to indicate a special condition
|
||||
}
|
||||
void onMeshUpdate(const int8_t xpos, const int8_t ypos, const ExtUI::probe_state_t state) {
|
||||
// Called to indicate a special condition
|
||||
}
|
||||
#endif
|
||||
|
||||
#if ENABLED(POWER_LOSS_RECOVERY)
|
||||
void onPowerLossResume() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue