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

Add notification window when pressed on title bar and info-box, Add new TFT70 Status Screen, Fix FAN_CTRL_COUNT error during config upload & clean up #1060

Merged
merged 15 commits into from
Sep 16, 2020

Conversation

guruathwal
Copy link
Contributor

@guruathwal guruathwal commented Sep 5, 2020

  • Add notification window to show last 3 messages received from the printer/machine when pressed on Title Bar on any screen and the Info-box on the Status screen.
  • Show notification dot in the top left corner when notifications are received.
  • Add truncate option in GUI_DispLenString to truncate long text and avoid text clipping.
  • Fix fan_ctrl_count error during config upload (error in config.ini #1064)
  • Add a new status screen for TFT70
  • BMP images on SPIflash are now stored with dimensions.
  • Clean-up and remove unnecessary code and remove some global variables to reduce RAM usage.
  • Add auto-detect for chamber heater and machine size (needs enabling M115_GEOMETRY_REPORT in marlin firmware).
  • Add flash data/config check to notify if updating font, icons or config is required after a firmware update.

Fixes #1064

Add notification window to show last 3 messages received from printer when pressed on titlebar.
@guruathwal guruathwal marked this pull request as draft September 5, 2020 15:39
@traffic-light
Copy link
Contributor

Nice. Was planning to do this by myself 😊

@guruathwal guruathwal marked this pull request as ready for review September 6, 2020 04:28
@guruathwal guruathwal changed the title Add notification window when pressed on title bar and info-box Add notification window when pressed on title bar and info-box, Fix FAN_CTRL_COUNT error during config upload Sep 7, 2020
@oldman4U
Copy link
Contributor

oldman4U commented Sep 7, 2020

Gurmeet is my hero;-)

@blueeagle69
Copy link

Come on BTT merge this to the Master branch.

@traffic-light
Copy link
Contributor

Come on BTT merge this to the Master branch.

Especially because it's fixing a bug what's pretty annoying.

- Add a new status screen for TFT70
- BMP images on SPIflash are now stored with dimensions.
- cleanup and remove unnecessary code and remove some global variables to reduce ram usage.
@guruathwal guruathwal changed the title Add notification window when pressed on title bar and info-box, Fix FAN_CTRL_COUNT error during config upload Add notification window when pressed on title bar and info-box, Add new TFT70 Status Screen, Fix FAN_CTRL_COUNT error during config upload & clean up Sep 8, 2020
@guruathwal guruathwal marked this pull request as draft September 9, 2020 16:33
@guruathwal
Copy link
Contributor Author

The fonts on TFT28 & TFT35 status screen were not meant to be larger.

@guruathwal
Copy link
Contributor Author

if the preheat menu is freezing you may reflash the config file

@oldman4U
Copy link
Contributor

Wouldn‘t it be good to have a kind of firmware vs config.ini check with a mismatch warning!?

@guruathwal
Copy link
Contributor Author

@oldman4U
almost done...
image

@oldman4U
Copy link
Contributor

👍🏻

@guruathwal
Copy link
Contributor Author

guruathwal commented Sep 11, 2020

@discip your config file is not being read by the TFT a correct update will show a white progress bar and keyword counts being updated. if not then it is not being updated. I fixed some issue with the update process. Try with the latest commit.

@guruathwal guruathwal marked this pull request as ready for review September 11, 2020 18:01
@guruathwal
Copy link
Contributor Author

@GregSKR are you using the precompiled binaries or compiling yourself?

@GregSKR
Copy link
Contributor

GregSKR commented Sep 11, 2020

@guruathwal this is what I always do:

  • download latest version on your fork
  • change platformio.ini for TFT35V2.0 and config.ini for my personal parameters
  • compile it with Visual Studio Code
  • do a full flash (firmware+fonts+bmp+config.ini)

This is what I did a few hours ago, config.ini looks like crashing at loading. I see you made a correction for that.
So just did it again now, with your latest commit and

  • preheat menu is now ok, all labels displayed, no freezing 👍
  • the fonts on status screen are back to normal 👍
  • (and custom menus are ok, too)
    THANKS FOR THIS 👍 😃

But still no notification history...
When power my Ender-3, I got 2 notifications on my TFT (echo: fade height 10.0 and echo: bed levelling ON).
Go to Terminal and run M117 TEST
Back to status screen echo: TEST is showing
But history is still empty... 😢

@discip
Copy link
Contributor

discip commented Sep 11, 2020

@guruathwal

THANK YOU! 👍

I second what @GregSKR stated above.
The good and the none working as well.

@oldman4U
Copy link
Contributor

I believe i could find some time tomorrow and do some tests.

Got a brand new SKR v1.4 and have TFT 35 E3 and TFT 28 to test, as well as SKR E3 DIP and SKR Pro v1.1.

Any particular combination i should test?

Let me know

@guruathwal
Copy link
Contributor Author

@GregSKR those messages are ignored by the firmware and only messages received from the printer are stored in the notification menu.
try sending messages with M118

@GregSKR
Copy link
Contributor

GregSKR commented Sep 12, 2020

@guruathwal Oh, my bad, didn't notice there is some filtering! I just tested with M118 and... got it!!!
Thanks again, looks like this PR is ready for merging ❤️

@digant73
Copy link
Contributor

digant73 commented Sep 13, 2020

@guruathwal
hi, a possible cleanup in the "hostActionCommands" function on parseAck.c. I will change the dialog type to DIALOG_TYPE_ALERT for the three dialog boxes below (starting at line 236). As you see, currently INFO and ERROR are used while for the buzzer a more appropriate notify sound is used:

    BUZZER_PLAY(sound_notify);
    popupReminder(DIALOG_TYPE_INFO,(u8 *)"Message", (u8 *)hostAction.prompt_begin);
    break;
  case 1:
    BUZZER_PLAY(sound_notify);
    showDialog(DIALOG_TYPE_ERROR, (u8*)"Action command", (u8 *)hostAction.prompt_begin, (u8 *)hostAction.prompt_button1, NULL, breakAndContinue, NULL, NULL);
    break;
  case 2:
    BUZZER_PLAY(sound_notify);
    showDialog(DIALOG_TYPE_ERROR, (u8*)"Action command", (u8 *)hostAction.prompt_begin, (u8 *)hostAction.prompt_button1, (u8 *)hostAction.prompt_button2, resumeAndPurge, resumeAndContinue, NULL);

@traffic-light
Copy link
Contributor

This is a promising update. Thank you for your time @guruathwal :-)

(the font/ icon/ ini check is really a great thing :-) )

@charakaSamawry
Copy link

line 21 "REPORT_FAN_CHANGE (in Configuration_adv.h)" referring to line 3114 of config_adv (version 020006) seems to be irrelevant now..? (version 020008) guessing it doesnt matter but confusing and should be removed from top of config.ini, where it says you must enable it.

@guruathwal
Copy link
Contributor Author

@charakaSamawry it is still relevant. why is it confusing to enable a line in marlin firmware?

@charakaSamawry
Copy link

In version 20008 that line does not exist.

@charakaSamawry it is still relevant. why is it confusing to enable a line in marlin firmware?

@charakaSamawry
Copy link

It does
https://github.com/MarlinFirmware/Marlin/blob/50ba20fe1f27cdcb0f0f98f11cb42248dbc186f7/Marlin/Configuration_adv.h#L3205-L3207

So it does thank you. Weird I did search it in vscode .......no caps maybe 🤷‍♂️didn’t think that mattered though

@charakaSamawry
Copy link

charakaSamawry commented Oct 29, 2020

im still confused lol! i dont have the line added on july 15th. but the change shows in my fork on july 15th. My fork also shows as uptodate with bugfix .. i mustve buggered up somewhere i guess.. my forks and changes are all public. ill let u knw when i find what i did lol

@charakaSamawry
Copy link

charakaSamawry commented Oct 29, 2020

charakaSamawry/Marlin@4f50b68

🤷‍♂️ lost some 'S's in http:// links when i changed some config stuff as well... sorry im a wolly

Manu512 pushed a commit to Manu512/BIGTREETECH-TouchScreenFirmware that referenced this pull request Nov 3, 2020
…ew TFT70 Status Screen, Fix FAN_CTRL_COUNT error during config upload & clean up (bigtreetech#1060)

* Add notification window when pressed on titlebar

Add notification window to show last 3 messages received from printer when pressed on titlebar.

* open notification window when pressed on info box in status screen

* fix infobox touch & button display

* Fix FAN_CTRL_COUNT error during config upload

* remove global variables

* cleanup  and add new statusscreen for tft70

- Add a new status screen for TFT70
- BMP images on SPIflash are now stored with dimensions.
- cleanup and remove unnecessary code and remove some global variables to reduce ram usage.

* Update language_en.h

* add auto-detect heated chamber and machine size

* fix some bugs

* fix text display on statusscreen

* Update PreheatMenu.c

* Add flash data & config check

* update precompiled bin

Co-authored-by: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
jeffeb3 pushed a commit to V1EngineeringInc/BIGTREETECH-TouchScreenFirmware that referenced this pull request Nov 10, 2021
…ew TFT70 Status Screen, Fix FAN_CTRL_COUNT error during config upload & clean up (bigtreetech#1060)

* Add notification window when pressed on titlebar

Add notification window to show last 3 messages received from printer when pressed on titlebar.

* open notification window when pressed on info box in status screen

* fix infobox touch & button display

* Fix FAN_CTRL_COUNT error during config upload

* remove global variables

* cleanup  and add new statusscreen for tft70

- Add a new status screen for TFT70
- BMP images on SPIflash are now stored with dimensions.
- cleanup and remove unnecessary code and remove some global variables to reduce ram usage.

* Update language_en.h

* add auto-detect heated chamber and machine size

* fix some bugs

* fix text display on statusscreen

* Update PreheatMenu.c

* Add flash data & config check

* update precompiled bin

Co-authored-by: BigTreeTech <38851044+bigtreetech@users.noreply.github.com>
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.

error in config.ini
10 participants