-
-
Notifications
You must be signed in to change notification settings - Fork 340
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
feat(el18): Use trim hats as keys for navigation #3894
Conversation
Hi @mha1 thankyou for coding the Companion side and it works however you have followed a method for the ui I have slowly been replacing. So rather than me try to explain and point you at multiple code snippets to cover your change, do you have any issue with me knocking up a branch that you can review and merge back into yours? |
nope, have at it. |
Neil, you might want to wait a bit. There was some UI discussion started, see #3202 |
Michael, noted though I'll do the common parts and pause until the discussion reaches a conclusion |
@mha1 here is my version of cpn side for consideration and merging onto yours. Note: mine is branched from yours. |
First go at model level hats mode selection (overriding radio setting). |
@elecpower Thank you very much Neil. I merged your changes, checks are running. Depending on how well accepted the model level selection of hats mode in the Trims sub menu is I might ask for the favor to implement this also in Companion. Under the Setup tab just before the |
@mha1 I updated my branch with your latest and added model level setting code on my branch again. |
@elecpower Thanks, merged and harmonized radio and companion yaml tags and id's @pfeerick @JimB40 please let me know if you came to an agreement were best to put the hats mode model level settings. after ADC filter or in Trims doesn't make a difference for me. I believe it fits the Trims head line pretty well but don't mind shifting it one level up. Just let me know. |
For me either Peter decides. |
@mha1 Michael I would strongly recommend adding back the HATS_ prefix to then enums as there are other MODEs already and likely in the future. Having an enum of MODE_GLOBAL when it is not global is sure to mislead and catch someone out. The yaml text is in context of the label so I have no issue with hatsMode: GLOBAL |
PR #3903 adds the bubble popup you were asking about on Discord. |
Is fine... I hadn't considered the "trims off means navigation only" path Robert mentioned earlier, so if trims get disabled as a radio or model level feature, that option will implicitly get forced to "keys only", so you don't need access to the option anyway. |
bff3860
to
0dad502
Compare
@philmoz This is so much better. Thank you very much! I merged your PR and unfortunately pushed. Do you want me to revert this commit and wait for your PR to be merged? |
No problem - better to get it tested anyway. We can sort it out when the PR's get merged. |
tried it on your el18? |
The build from this PR works on my EL18. I would suggest that the default for the model level setting should be Global (like enabled features). If you look at the 'Enabled Features' model settings, I display the current radio level setting when the model is set to global to let users know the state. Might be nice to add this as well. |
Thank you for testing and your suggestion, makes sense. Will discuss with @JimB40 |
Added hats mode defaults:
|
Dear Translators, I'd very much appreciate your support for a new NV14/EL18 feature. FlySky NV14/EL18 radios have two little joy sticks usually used as trims. Those joysticks are called "hats". This PR adds logic to make the hats available as keys for navigating the GUI. The hats can be moved up, down, left, right and pressed. "Hats mode" refers to the state of the hats. In "Trims mode" the hats act as trims, in "Keys mode" they act as Keys according to the key map shown in #3894 (comment). Switching between the two hats modes is possible. Option "Switchable" refers to a users setting that allows switching between trims mode and hats mode. Don't hesitate to ask if you have any question. ENG original text:
Thanks, |
in FR:
#define TR_HATSMODE "Mode chapeaux"
#define TR_HATSOPT "Trims uniquement","Touches
uniquement","Permutable","Global"
#define TR_HATSMODE_TRIMS "Mode chapeaux: Trims"
#define TR_HATSMODE_KEYS "Mode chapeaux: Touches"
Le dim. 6 août 2023 à 16:10, Michael ***@***.***> a écrit :
… Dear Translators,
I'd very much appreciate your support for a new NV14/EL18 feature.
FlySky NV14/EL18 radios have two little joy sticks usually used as trims.
Those joysticks are called "hats". This PR adds logic to make the hats
available as keys for navigating the GUI. The hats can be moved up, down,
left, right and pressed. "Hats mode" refers to the state of the hats. In
"Trims mode" the hats act as trims, in "Keys mode" they act as Keys
according to the key map shown in #3894 (comment)
<#3894 (comment)>. Switching
between the two hats modes is possible. Option "Switchable" refers to a
users setting that allows switching between trims mode and hats mode.
Don't hesitate to ask if you have any question.
ENG original text:
#define TR_HATSMODE "Hats mode"
#define TR_HATSOPT "Trims only","Keys only","Switchable","Global"
#define TR_HATSMODE_TRIMS "Hats mode: Trims"
#define TR_HATSMODE_KEYS "Hats mode: Keys"
- @zyren <https://github.com/zyren> CN / TW
- @Eldenroot <https://github.com/Eldenroot> CZ
- @HThuren <https://github.com/HThuren> DA
- @ParkerEde <https://github.com/ParkerEde> / @TheIsotopes
<https://github.com/TheIsotopes> DE
- @Pat6874 <https://github.com/Pat6874> FR
- @offer-shmuely <https://github.com/offer-shmuely> HE
- @robustini <https://github.com/robustini> IT
- @ToshihiroMakuuchi <https://github.com/ToshihiroMakuuchi> JP
- @ulfhedlund <https://github.com/ulfhedlund> SE
- @ajjjjjjjj <https://github.com/ajjjjjjjj> PL
Thanks,
Michael
—
Reply to this email directly, view it on GitHub
<#3894 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/A6HE7XJDMUVRC2GDWP4RI7DXT6QVBANCNFSM6AAAAAA3BE4L5M>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
Hi Michael, Can we understand 'hat' as a joystik ? |
@HThuren Well, they are little joysticks and I suppose the are called hats because the sticks grow wider at the top. To me the little joystick sticks look a bit like tiny mushrooms. I'll leave it up to you. Call them whatever makes sense in your language. Maybe calling them joystick might collide with the USB mode where the radio can act as Joystick when connected to a PC. |
I am thinking about to use “joysticks” word for these "hats". |
Well, maybe joystick USB should be renamed then... because hats mode is more confusing :) |
We don't want to open this can of worms, do we? Hats is a NV14/EL18 thing only. By calling the hats hats (I understand this is a real term for the NV14/EL18) you confuse NV14/EL18 owners only (if at all). |
Oh, and don't worry to much, the Hats mode setting is visible on NV14/EL18 radios only. |
Fixes #3202
Summary of changes: