Skip to content

Commit 9864bab

Browse files
marciotthinkyhead
authored andcommitted
🩹 Fix FTDI Eve Touch UI meshGetter, etc. (MarlinFirmware#26342)
Co-authored-by: Scott Lahteine <[email protected]>
1 parent a11c51e commit 9864bab

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

Marlin/src/inc/Conditionals_adv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,7 @@
12301230
#define _HAS_1(N) (defined(MAIN_MENU_ITEM_##N##_DESC) && defined(MAIN_MENU_ITEM_##N##_GCODE))
12311231
#define HAS_USER_ITEM(V...) DO(HAS,||,V)
12321232
#else
1233-
#define HAS_USER_ITEM(N) 0
1233+
#define HAS_USER_ITEM(...) 0
12341234
#endif
12351235

12361236
/**

Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ constexpr static float gaugeThickness = 0.25;
5353
#endif
5454

5555
static float meshGetter(uint8_t x, uint8_t y, void*) {
56-
return ExtUI::getMeshPoint(xy_uint8_t(x, y));
56+
return ExtUI::getMeshPoint(xy_uint8_t({ x, y }));
5757
}
5858

5959
void BedMeshViewScreen::onEntry() {

Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ void FilamentRunoutScreen::onRedraw(draw_mode_t what) {
4646

4747
bool FilamentRunoutScreen::onTouchHeld(uint8_t tag) {
4848
using namespace ExtUI;
49-
const float increment = getIncrement();
49+
#if HAS_FILAMENT_RUNOUT_DISTANCE
50+
const float increment = getIncrement();
51+
#endif
5052
switch (tag) {
5153
case 2: setFilamentRunoutEnabled(!getFilamentRunoutEnabled()); break;
5254
#if HAS_FILAMENT_RUNOUT_DISTANCE

Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ void LanguageMenu::onRedraw(draw_mode_t) {
5353
#endif
5454
}
5555

56+
extern uint8_t ftdi_language;
57+
5658
bool LanguageMenu::onTouchEnd(uint8_t tag) {
5759

5860
if (tag > 0 && tag <= NUM_LANGUAGES) {

buildroot/tests/FYSETC_S6

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@ opt_set Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2130
1414
exec_test $1 $2 "FYSETC S6 Example" "$3"
1515

1616
#
17-
# Build with the default configurations with FYSETC TFT81050
17+
# Build with FTDI Eve Touch UI and some features
1818
#
1919
restore_configs
20-
opt_set MOTHERBOARD BOARD_FYSETC_S6_V2_0 SERIAL_PORT 1
21-
opt_enable TOUCH_UI_FTDI_EVE LCD_FYSETC_TFT81050 S6_TFT_PINMAP
20+
opt_set MOTHERBOARD BOARD_FYSETC_S6_V2_0 SERIAL_PORT 1 X_DRIVER_TYPE TMC2130
21+
opt_enable TOUCH_UI_FTDI_EVE LCD_FYSETC_TFT81050 S6_TFT_PINMAP LCD_LANGUAGE_2 SDSUPPORT CUSTOM_MENU_MAIN \
22+
FIX_MOUNTED_PROBE AUTO_BED_LEVELING_UBL Z_SAFE_HOMING \
23+
EEPROM_SETTINGS PRINTCOUNTER CALIBRATION_GCODE LIN_ADVANCE \
24+
FILAMENT_RUNOUT_SENSOR ADVANCED_PAUSE_FEATURE NOZZLE_PARK_FEATURE
2225
exec_test $1 $2 "FYSETC S6 2 with LCD FYSETC TFT81050" "$3"
2326

2427
# cleanup

0 commit comments

Comments
 (0)