Skip to content

Bugfix2.0 "more" menu for lvglui interface#20939

Closed
Malderin wants to merge 763 commits intoMarlinFirmware:2.0.xfrom
Malderin:bugfix2.0_more_menu_lvglui
Closed

Bugfix2.0 "more" menu for lvglui interface#20939
Malderin wants to merge 763 commits intoMarlinFirmware:2.0.xfrom
Malderin:bugfix2.0_more_menu_lvglui

Conversation

@Malderin
Copy link
Contributor

@Malderin Malderin commented Jan 30, 2021

Description

Added "more" menu when using the interface from MKS LVGL (#define TFT_LVGL_UI in configuration.h). The menu is activated by the #define CUSTOM_USER_MENUS parameter in configuration_adv.h It is possible to add up to 7 custom commands.
Tested on MKS Robin nano v.2 with mks tft 35.

1
2

thinkyhead and others added 30 commits December 21, 2020 00:17
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
@rhapsodyv
Copy link
Member

I don’t think this PR will work this way. Where this code came from? From MKS?

@Malderin
Copy link
Contributor Author

I don’t think this PR will work this way. Where this code came from? From MKS?

The code in draw_more.cpp is already present in the main code of marlin bugfix 2.0.
I just added the missing lines to configuration_adv.h and draw_tool.cpp to display the menu.

@rhapsodyv
Copy link
Member

Try recreate the PR from bugfix. The branch you used as base is totally out of the shape.

For example: you can create a new branch from bugfix and copy the code to make more menu working to this new branch.

It will a lot less work, than fixing all those conflicts.

The current state of this branch is a dead end.

@rhapsodyv rhapsodyv closed this Jan 30, 2021
@Malderin Malderin deleted the bugfix2.0_more_menu_lvglui branch January 30, 2021 23:30
@Malderin
Copy link
Contributor Author

@rhapsodyv
#20940

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.