Skip to content
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

Jump to bottom

add Lcd fysetc tft81050 test and fix msg conflict #23604

Merged
merged 10 commits into from
Jan 26, 2022
Merged

add Lcd fysetc tft81050 test and fix msg conflict #23604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
09c87ba
🔨 Add .vscode/extensions.json
thinkyhead Jan 2, 2022
5ea12f2
🔨 Add .vscode/extensions.json
thinkyhead Jan 2, 2022
711dd07
🔨 Add .vscode/extensions.json
thinkyhead Jan 2, 2022
47c05c1
Merge branch 'bugfix-2.0.x' of https://github.com/ellensp/Marlin into…
ellensp Jan 4, 2022
3f591c9
add LCD_FYSETC_TFT81050 test
ellensp Jan 23, 2022
dc09829
remove dumplicate MSG_PLEASE_WAIT
ellensp Jan 23, 2022
f891166
move to correct build env
ellensp Jan 23, 2022
95563f3
fix typo in test descrition
ellensp Jan 23, 2022
f033b82
Merge branch 'bugfix-2.0.x' into pr/23604
thinkyhead Jan 26, 2022
6cef19b
Update FYSETC_S6
thinkyhead Jan 26, 2022
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
1 change: 0 additions & 1 deletion Marlin/src/lcd/extui/ftdi_eve_touch_ui/language/language_en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ namespace Language_en {
PROGMEM Language_Str MSG_LOAD_FILAMENT = u8"Load/Extrude";
PROGMEM Language_Str MSG_MOMENTARY = u8"Momentary";
PROGMEM Language_Str MSG_CONTINUOUS = u8"Continuous";
PROGMEM Language_Str MSG_PLEASE_WAIT = u8"Please wait...";
PROGMEM Language_Str MSG_PRINT_MENU = u8"Print Menu";
PROGMEM Language_Str MSG_FINE_MOTION = u8"Fine motion";
PROGMEM Language_Str MSG_ENABLE_MEDIA = u8"Enable Media";
Expand Down
8 changes: 8 additions & 0 deletions buildroot/tests/FYSETC_S6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,13 @@ opt_enable MEATPACK_ON_SERIAL_PORT_1
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
#
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
exec_test $1 $2 "FYSETC S6 2 with LCD FYSETC TFT81050" "$3"

# cleanup
restore_configs