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

updated graphics for idle screen & for missing tip #1138

Merged
merged 6 commits into from
Dec 26, 2021
Merged

updated graphics for idle screen & for missing tip #1138

merged 6 commits into from
Dec 26, 2021

Conversation

discip
Copy link
Collaborator

@discip discip commented Dec 21, 2021

TS80(P)

idle screen:
idle screen
missing tip:
missing tip

TS100 / Pinecil

idle screen:
idle screen_Pinecil
missing tip:
missing tip_II

MHP30

idle screen:
idle screen
missing tip:
missing tip

reference picture:
MHP30

I tried several designs and this is all I came up with.
If someone is capable of creating better pictures, I will definitively have a look.

kind regards

@Ralim
Copy link
Owner

Ralim commented Dec 21, 2021

Should we start doing different graphics for different models?

Been thinking about this for a bit since the MHP30 doesnt really make sense with the iron tip.

And this definitely looks like a TS80(P) 🤣

Thoughts?

@discip
Copy link
Collaborator Author

discip commented Dec 21, 2021

Good evening,
since no one complained about the previous design, I just proceeded using it.
In fact it is an alternated version of this #1119 (comment).
And as I was asked about my opinion on implementing this, I jumped right in.

If someone does not like this, I will leave it.
But if you are willing to implement the code part for different models, I will try my best on delivering the graphics. 😃

@Ralim
Copy link
Owner

Ralim commented Dec 22, 2021

I like it, dont get me wrong :)

Just thinking that especially with the MHP30 we should probably start to make the icons a bit nicer

But if you are willing to implement the code part for different models, I will try my best on delivering the graphics. smiley

Easiest way is to #ifdef them for now

so

#ifdef MODEL_TS100
<logo here>
#endif
#ifdef MODEL_Pinecil
<logo here>
#endif
#ifdef MODEL_MHP30
<logo here>
#endif

#if defined(MODEL_TS80) + defined(MODEL_TS80P) > 1
<logo here>
#endif

@discip
Copy link
Collaborator Author

discip commented Dec 22, 2021

No worries, I did not get you wrong. 😊

Since I do not know the code well enough:

#ifdef MODEL_TS100
.
.
.

Will it work,

  1. if I enter it like this, or
  2. would you have to change other parts of code beforehand?

If the 1st is true, please give me some time and I will try to cover them all.

Are the tips for the TS100 and for the Pinecil are not identical?
So I would have to tune in only 2 more, instead of 3. 😁

And we definitely will need more space, so would you mind adding this flipping feature (#1097 (comment)) you proposed?

@discip discip marked this pull request as draft December 22, 2021 00:56
@Ralim
Copy link
Owner

Ralim commented Dec 22, 2021

So it will work, basically the #ifdef stuff is a compile-time switch, so depending on what model is selected it will either include or exclude the content inside the #ifdef -> #endif sections.

No change should be required

Ah, Pinecil and TS100 are indeed the same

You wont need extra space as only one option will get compiled in :)

Example:

#if defined(MODEL_TS80) + defined(MODEL_Pinecil) > 1
const uint8_t idleScreenBG[] = {};
const uint8_t disconnectedTipIcon[] = {};
const uint8_t disconnectedTipIconFlip[] = {};
#endif

#ifdef MODEL_MHP30
const uint8_t idleScreenBG[] = {};
const uint8_t disconnectedTipIcon[] = {};
const uint8_t disconnectedTipIconFlip[] = {};
#endif

#if defined(MODEL_TS80) + defined(MODEL_TS80P) > 1
const uint8_t idleScreenBG[] = {};
const uint8_t disconnectedTipIcon[] = {};
const uint8_t disconnectedTipIconFlip[] = {};
#endif

And fill in the values

@discip
Copy link
Collaborator Author

discip commented Dec 22, 2021

So it will work, basically the #ifdef stuff is a compile-time switch, so depending on what model is selected it will either include or exclude the content inside the #ifdef -> #endif sections.

I know about that, I was not sure, if the code already knew, 'how to handle':

#if defined(MODEL_TS80) ...

Hopefully I made myself clear this time. 😊
Apologies for the confusion. 😔

So I'll try my best and afterwards I'm going to ping you about the result. 😃

regards

@Ralim
Copy link
Owner

Ralim commented Dec 22, 2021

Ahhh, yeah the MODEL_?? stuff is used all throughout the code (look in the configuration.h files for example)
Its what actually picks what your building for :)

@discip discip marked this pull request as ready for review December 26, 2021 22:36
@discip
Copy link
Collaborator Author

discip commented Dec 26, 2021

@Ralim
Since you have the MHP30, would you please give this a go, I unfortunately do not own such device. 🥺

Thanks in advance

@Ralim
Copy link
Owner

Ralim commented Dec 26, 2021

Looks good on MHP30 :)
Will merge in

Thank you ❤️

@Ralim Ralim merged commit f13b7be into Ralim:master Dec 26, 2021
@discip
Copy link
Collaborator Author

discip commented Dec 26, 2021

Glad you like it. 😃

@discip discip deleted the patch-1 branch December 26, 2021 23:02
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.

2 participants