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.

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

improved Terminal menu #1227

Merged
merged 8 commits into from
Nov 4, 2020
Merged

Conversation

digant73
Copy link
Contributor

@digant73 digant73 commented Nov 2, 2020

IMPROVEMENTS:

  • Improved Terminal menu:
  1. Changed layout providing a control bar. Configurable colors are used such as:
  • infoSettings.font_color: used for keyboard
  • infoSettings.bg_color: used for keyboard
  • infoSettings.marlin_mode_font_color: used on terminal window
  • infoSettings.marlin_mode_bg_color: used on terminal window
  1. page and total page count provided in the terminal window

PR STATE:

  • FINAL: Ready to be merged with BTT main branch:

IMG_20201102_220422_1
IMG_20201102_220442_1
IMG_20201102_220505_1

@oldman4U
Copy link
Contributor

oldman4U commented Nov 2, 2020

Wouldn"t it be good to release it together with #1191?

@digant73
Copy link
Contributor Author

digant73 commented Nov 2, 2020

@oldman4U no problem. If the owner of that PR agrees, I can merge his changes in my PR.

@StarNamer
Copy link

@digant73 Your changes look like what I was think of moving on to if you hadn't already done it and hopefully will be a significant improvement. Moving the non-printing buttons to their own group makes the layout much cleaner.

My changes were basically to include a variation of the number of columns (in ui_draw.h) to better make use of the space on the TFT35 while not making the key areas too small on the TFT24/28. For ease of editing, I moved the array definitions from SendGCode.h to SendGCode.c and, for ease of future layout changes, eventually decided to simply replicate the entire arrays for each variant rather than try to dynamically construct them by macros or multiple tests. I'm sure you'd be able to adopt them easily.

It looks like you've also picked up changes for scrolling the output similar to PR 1171 which I'm looking forward to using.

By the way, I'm still puzzled by the inclusion of ">" on the 123 page since I haven't identified a use for it. What am I missing?

Looks like a great job and I hope to download your changes and take a look later in week.

@StarNamer
Copy link

StarNamer commented Nov 3, 2020

Decided I couldn't wait to look at your code. I see, you've moved the arrays/enums into SendGCode.c, the same as I did.

If the TFT24/28 can handle the extra row you've added, then it should work for both the TFT24/28 and the TFT35.

If it can't, you could do something like:
"1", "2", "3", "4", "M", "G",
"5", "6", "7", "8", "X", "Y",
"9", "0", ".", "-", "E", "F",
"ABC", "Space", "Del", "Back"
With something similar on the ABC page.

If 5 rows are OK on the TFT35, then additional keys could be added...
"1", "2", "3", "M", "G", "S", "T",
"4", "5", "6", "X", "Y", "Z", "E",
"7", "8", "9", "I", "J", "P", "R",
".", "0", "-", "F", "V", "/", "~",
"ABC", "Space", "Del", "Back"

I'll try to find time to try out a few ideas in the next few days, based on your code.

@StarNamer
Copy link

First attempt. Need a few tweaks, but it's 1am!
20201103_011500

@oldman4U
Copy link
Contributor

oldman4U commented Nov 3, 2020

It is 3am here reading your posts. I am excited 😆

@digant73
Copy link
Contributor Author

digant73 commented Nov 3, 2020

@StarNamer My PR is on top of the merged #1171. Simply provide me your layouts here and I will merge them on my PR

@rightawy
Copy link

rightawy commented Nov 3, 2020

What happened to the concern for people with handicapped and large fingers? #967 (comment)

@oldman4U
Copy link
Contributor

oldman4U commented Nov 3, 2020

@rightawy

As far as I understand, StarNamer provides the interface depending on the size of the screen, so it should work like before for the smaller screens. Bigger screens can hold more elements (even the resolution is sometimes lower compared to the TFT35), so it makes sense to allow more elements for those screens (or have bigger buttons).

In general I hope that people like me having big hands do not expect the same functionality independent of the size of the screen. This would be like buying a small car but expecting the comfort of a big car. Somehow this does not match.

My 2 cents like always;-)

@bigtreetech
Copy link
Owner

@StarNamer Hello, Now I merge this PR, you can make new resolution adaptation changes in #1191, and I will merge #1191 after your optimization

@bigtreetech bigtreetech merged commit 01f3419 into bigtreetech:master Nov 4, 2020
delwinbest added a commit to delwinbest/BIGTREETECH-TouchScreenFirmware that referenced this pull request Nov 21, 2020
* master: (114 commits)
  Avoid marking coordinate as unknown when parsing a M18/M84 S<timeout> (bigtreetech#1243)
  Update language_ru.h (bigtreetech#1261)
  MKS_TFT_28 as own compile target (bigtreetech#1246)
  Bootloader for display TFT50 V3.0 (bigtreetech#1101)
  Update Hungarian Language (bigtreetech#1247)
  Temperature update when printing from onboard SD, M155 instead of M105 for query temperature (bigtreetech#1244)
  Added a way to make a manual input to screen showing a value ( Temp, flow , speed etc...) (bigtreetech#1104)
  Improved Terminal menu based on TFT size and resolution (bigtreetech#1231)
  Add support for Home Offset (bigtreetech#1198)
  Add support to be able to control case light (bigtreetech#1214)
  improved Terminal menu (bigtreetech#1227)
  Language pack auto-generate script (bigtreetech#1215)
  Update French Translation (bigtreetech#1216)
  Update language_de.h (bigtreetech#1219)
  Fixed compiler warnings (bigtreetech#1220)
  Update language_ru.h (bigtreetech#1221)
  Update language_ru.ini (bigtreetech#1222)
  Update language CZ (bigtreetech#1223)
  sync upsteam branch (bigtreetech#1171)
  Fix to display M117 messages in info area (bigtreetech#1189)
  ...

# Conflicts:
#	platformio.ini
@digant73 digant73 deleted the bugfix-2020-11-02 branch May 31, 2021 14:11
jeffeb3 pushed a commit to V1EngineeringInc/BIGTREETECH-TouchScreenFirmware that referenced this pull request Nov 10, 2021
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.

6 participants