0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🩹 Fix FTDI Eve Touch UI meshGetter, etc. (#26342)

Browse source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Marcio T 2023-10-22 16:22:16 -06:00 committed by GitHub
parent c345087b41
commit 9e6d0ea610
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_adv.h
View file

@ -1230,7 +1230,7 @@
#define _HAS_1(N) (defined(MAIN_MENU_ITEM_##N##_DESC) && defined(MAIN_MENU_ITEM_##N##_GCODE)) #define _HAS_1(N) (defined(MAIN_MENU_ITEM_##N##_DESC) && defined(MAIN_MENU_ITEM_##N##_GCODE))
#define HAS_USER_ITEM(V...) DO(HAS,||,V) #define HAS_USER_ITEM(V...) DO(HAS,||,V)
#else #else
#define HAS_USER_ITEM(N) 0 #define HAS_USER_ITEM(...) 0
#endif #endif
/** /**

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
View file

@ -53,7 +53,7 @@ constexpr static float gaugeThickness = 0.25;
#endif #endif
static float meshGetter(uint8_t x, uint8_t y, void*) { static float meshGetter(uint8_t x, uint8_t y, void*) {
return ExtUI::getMeshPoint(xy_uint8_t(x, y)); return ExtUI::getMeshPoint(xy_uint8_t({ x, y }));
} }
void BedMeshViewScreen::onEntry() { void BedMeshViewScreen::onEntry() {

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
View file

@ -46,7 +46,9 @@ void FilamentRunoutScreen::onRedraw(draw_mode_t what) {
bool FilamentRunoutScreen::onTouchHeld(uint8_t tag) { bool FilamentRunoutScreen::onTouchHeld(uint8_t tag) {
using namespace ExtUI; using namespace ExtUI;
#if HAS_FILAMENT_RUNOUT_DISTANCE
const float increment = getIncrement(); const float increment = getIncrement();
#endif
switch (tag) { switch (tag) {
case 2: setFilamentRunoutEnabled(!getFilamentRunoutEnabled()); break; case 2: setFilamentRunoutEnabled(!getFilamentRunoutEnabled()); break;
#if HAS_FILAMENT_RUNOUT_DISTANCE #if HAS_FILAMENT_RUNOUT_DISTANCE

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
View file

@ -53,6 +53,8 @@ void LanguageMenu::onRedraw(draw_mode_t) {
#endif #endif
} }
extern uint8_t ftdi_language;
bool LanguageMenu::onTouchEnd(uint8_t tag) { bool LanguageMenu::onTouchEnd(uint8_t tag) {
if (tag > 0 && tag <= NUM_LANGUAGES) { if (tag > 0 && tag <= NUM_LANGUAGES) {

9
buildroot/tests/FYSETC_S6
View file

@ -14,11 +14,14 @@ opt_set Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2130
exec_test $1 $2 "FYSETC S6 Example" "$3" exec_test $1 $2 "FYSETC S6 Example" "$3"
# #
# Build with the default configurations with FYSETC TFT81050 # Build with FTDI Eve Touch UI and some features
# #
restore_configs restore_configs
opt_set MOTHERBOARD BOARD_FYSETC_S6_V2_0 SERIAL_PORT 1 opt_set MOTHERBOARD BOARD_FYSETC_S6_V2_0 SERIAL_PORT 1 X_DRIVER_TYPE TMC2130
opt_enable TOUCH_UI_FTDI_EVE LCD_FYSETC_TFT81050 S6_TFT_PINMAP opt_enable TOUCH_UI_FTDI_EVE LCD_FYSETC_TFT81050 S6_TFT_PINMAP LCD_LANGUAGE_2 SDSUPPORT CUSTOM_MENU_MAIN \
FIX_MOUNTED_PROBE AUTO_BED_LEVELING_UBL Z_SAFE_HOMING \
EEPROM_SETTINGS PRINTCOUNTER CALIBRATION_GCODE LIN_ADVANCE \
FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE
exec_test $1 $2 "FYSETC S6 2 with LCD FYSETC TFT81050" "$3" exec_test $1 $2 "FYSETC S6 2 with LCD FYSETC TFT81050" "$3"
# cleanup # cleanup