File tree Expand file tree Collapse file tree 5 files changed +13
-6
lines changed
lcd/extui/ftdi_eve_touch_ui/generic Expand file tree Collapse file tree 5 files changed +13
-6
lines changed Original file line number Diff line number Diff line change 1230
1230
#define _HAS_1 (N ) (defined(MAIN_MENU_ITEM_##N##_DESC) && defined(MAIN_MENU_ITEM_##N##_GCODE))
1231
1231
#define HAS_USER_ITEM (V ...) DO(HAS,||,V)
1232
1232
#else
1233
- #define HAS_USER_ITEM (N ) 0
1233
+ #define HAS_USER_ITEM (... ) 0
1234
1234
#endif
1235
1235
1236
1236
/**
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ constexpr static float gaugeThickness = 0.25;
53
53
#endif
54
54
55
55
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 } ));
57
57
}
58
58
59
59
void BedMeshViewScreen::onEntry () {
Original file line number Diff line number Diff line change @@ -46,7 +46,9 @@ void FilamentRunoutScreen::onRedraw(draw_mode_t what) {
46
46
47
47
bool FilamentRunoutScreen::onTouchHeld (uint8_t tag) {
48
48
using namespace ExtUI ;
49
- const float increment = getIncrement ();
49
+ #if HAS_FILAMENT_RUNOUT_DISTANCE
50
+ const float increment = getIncrement ();
51
+ #endif
50
52
switch (tag) {
51
53
case 2 : setFilamentRunoutEnabled (!getFilamentRunoutEnabled ()); break ;
52
54
#if HAS_FILAMENT_RUNOUT_DISTANCE
Original file line number Diff line number Diff line change @@ -53,6 +53,8 @@ void LanguageMenu::onRedraw(draw_mode_t) {
53
53
#endif
54
54
}
55
55
56
+ extern uint8_t ftdi_language;
57
+
56
58
bool LanguageMenu::onTouchEnd (uint8_t tag) {
57
59
58
60
if (tag > 0 && tag <= NUM_LANGUAGES) {
Original file line number Diff line number Diff line change @@ -14,11 +14,14 @@ opt_set Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2130
14
14
exec_test $1 $2 " FYSETC S6 Example" " $3 "
15
15
16
16
#
17
- # Build with the default configurations with FYSETC TFT81050
17
+ # Build with FTDI Eve Touch UI and some features
18
18
#
19
19
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
22
25
exec_test $1 $2 " FYSETC S6 2 with LCD FYSETC TFT81050" " $3 "
23
26
24
27
# cleanup
You can’t perform that action at this time.
0 commit comments