Skip to content

Fix compilation error due to lack of xy_uint8_t constructor. #26342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 22, 2023
Merged

Fix compilation error due to lack of xy_uint8_t constructor. #26342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87135b1
Fix compilation error due to lack of xy_uint8_t constructor.
marciot Oct 14, 2023
40828c5
needs braces
thinkyhead Oct 22, 2023
92bc46a
add test
thinkyhead Oct 22, 2023
cf88427
more ftdi feature tests
thinkyhead Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/inc/Conditionals_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,7 +1230,7 @@
#define _HAS_1(N) (defined(MAIN_MENU_ITEM_##N##_DESC) && defined(MAIN_MENU_ITEM_##N##_GCODE))
#define HAS_USER_ITEM(V...) DO(HAS,||,V)
#else
#define HAS_USER_ITEM(N) 0
#define HAS_USER_ITEM(...) 0
#endif

/**
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_view_screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ constexpr static float gaugeThickness = 0.25;
#endif

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() {
Expand Down
4 changes: 3 additions & 1 deletion Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/filament_runout_screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ void FilamentRunoutScreen::onRedraw(draw_mode_t what) {

bool FilamentRunoutScreen::onTouchHeld(uint8_t tag) {
using namespace ExtUI;
const float increment = getIncrement();
#if HAS_FILAMENT_RUNOUT_DISTANCE
const float increment = getIncrement();
#endif
switch (tag) {
case 2: setFilamentRunoutEnabled(!getFilamentRunoutEnabled()); break;
#if HAS_FILAMENT_RUNOUT_DISTANCE
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/language_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ void LanguageMenu::onRedraw(draw_mode_t) {
#endif
}

extern uint8_t ftdi_language;

bool LanguageMenu::onTouchEnd(uint8_t tag) {

if (tag > 0 && tag <= NUM_LANGUAGES) {
Expand Down
9 changes: 6 additions & 3 deletions buildroot/tests/FYSETC_S6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@ opt_set Y_DRIVER_TYPE TMC2209 Z_DRIVER_TYPE TMC2130
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
opt_set MOTHERBOARD BOARD_FYSETC_S6_V2_0 SERIAL_PORT 1
opt_enable TOUCH_UI_FTDI_EVE LCD_FYSETC_TFT81050 S6_TFT_PINMAP
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 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"

# cleanup
Expand Down