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

feat(sim): hat switches support for NV14 and EL18 #3932

Merged
merged 12 commits into from
Oct 22, 2024

Conversation

elecpower
Copy link
Collaborator

@elecpower elecpower commented Aug 13, 2023

Summary of changes:

To do:

  • graphics for hat and direction clicks
  • clickable areas overlaying graphics
  • keys associated with clicks

@elecpower elecpower added enhancement ✨ New feature or request companion Related to the companion software simulator labels Aug 13, 2023
@elecpower elecpower marked this pull request as draft August 13, 2023 11:18
@elecpower elecpower changed the title Companion enhanced simulators for NV14 and EL18 enh(cpn): simulators for NV14 and EL18 Aug 13, 2023
@elecpower elecpower force-pushed the elecpower/cpn-enh-sims-nv14-el18 branch from 5431c4e to ae612ab Compare August 29, 2023 11:21
@pfeerick pfeerick self-requested a review September 4, 2023 03:46
@pfeerick pfeerick added this to the 2.10 milestone Oct 3, 2023
@pfeerick pfeerick force-pushed the elecpower/cpn-enh-sims-nv14-el18 branch from ae612ab to d8fa33b Compare December 7, 2023 02:42
@pfeerick pfeerick removed their request for review December 7, 2023 02:43
@pfeerick pfeerick modified the milestones: 2.10, 2.11 Dec 7, 2023
@elecpower elecpower removed the companion Related to the companion software label May 8, 2024
@pfeerick pfeerick changed the title enh(cpn): simulators for NV14 and EL18 feat(cpn): hat switches support for NV14 and EL18 simulators Jun 6, 2024
@pfeerick pfeerick added the needs: rebase A git rebase on top of the latest destination branch version is required label Jun 6, 2024
@pfeerick pfeerick changed the title feat(cpn): hat switches support for NV14 and EL18 simulators feat(simulator): hat switches support for NV14 and EL18 Jun 6, 2024
@pfeerick pfeerick force-pushed the elecpower/cpn-enh-sims-nv14-el18 branch from d8fa33b to ff6a35d Compare June 11, 2024 04:29
@pfeerick
Copy link
Member

@elecpower Where were things at with this PR? Was it just making the key events work properly now? Is there anything I can do to help with that now? I have the the handsets as well as some idea of how the hat switching functionality worked...

@pfeerick pfeerick removed the needs: rebase A git rebase on top of the latest destination branch version is required label Jun 11, 2024
@elecpower
Copy link
Collaborator Author

@pfeerick it's been some time so I'll have to get back up to speed, likely tomorrow.

@pfeerick
Copy link
Member

Thanks. No rush ;)

@elecpower
Copy link
Collaborator Author

The hat direction buttons appear to work. Key mapping validation and testing seems to be the missing piece. I think I just did a best guess.
Also ADC refactor has come along and so some more changes to key mappings likely necessary.
If you could test and let's see what else needs fixing.

@pfeerick pfeerick self-assigned this Jul 6, 2024
@pfeerick pfeerick force-pushed the elecpower/cpn-enh-sims-nv14-el18 branch from ff6a35d to c2c0ccc Compare July 25, 2024 08:54
@pfeerick pfeerick force-pushed the elecpower/cpn-enh-sims-nv14-el18 branch from c2c0ccc to 44db9c1 Compare August 2, 2024 04:31
@pfeerick pfeerick changed the title feat(simulator): hat switches support for NV14 and EL18 feat(sim): hat switches support for NV14 and EL18 Aug 2, 2024
@pfeerick pfeerick force-pushed the elecpower/cpn-enh-sims-nv14-el18 branch 2 times, most recently from 75d7185 to 5fe1b5e Compare August 20, 2024 01:34
@elecpower
Copy link
Collaborator Author

This may have short life if generic works sooner rather than later

@pfeerick
Copy link
Member

lol... I think so... I was going to ask how did you want to proceed with this... i.e. finish and get it in or just implement it in generic form...

@elecpower
Copy link
Collaborator Author

If it is ready I'd merge so the sim can be tested.

@pfeerick
Copy link
Member

Ok, I'll check it tonight, let you know what is/isn't working and we can re-evaluate from there ;)

@pfeerick
Copy link
Member

pfeerick commented Aug 20, 2024

Ok, state at present is this... all good except two buttons not doing anything... not sure why though. I moved some buttons around though (as in the keys that trigger them), and also gave the EL18 same treatment... If nothing obvious stands out, I think it's worth merging/near enough for now until it can be resolved.

Left side:
Up     = OK, RADIO SETTINGS
Down   = OK, SCREEN SETTINGS
Right  = OK, MODEL SETTINGS
Left   = NONE
Press  = OK, RTN

Right side:
Up     = NAK, not incrementing/moving up
Down   = NAK, not decrementing/moving down
Right  = OK, NEXT PAGE
Left   = OK, PREV PAGE
Press  = OK, ENTER

@JimB40
Copy link
Collaborator

JimB40 commented Aug 20, 2024

Left side:
Up = OK, RADIO SETTINGS
Down = OK, SCREEN SETTINGS
Left = OK, MODEL SETTINGS
Right = NONE
Press = OK, RTN

Right side:
Up = NAK, not incrementing/moving up
Down = NAK, not decrementing/moving down
Left = OK, NEXT PAGE
Right = OK, PREV PAGE
Press = OK, ENTER

Is that for Simulator in Companion?
Key bindings to hats movement are somehow different than in firmware :)
MDL is LeftHat Right
PAGE> is RightHat Right
PAGE< is RightHat Left

@pfeerick
Copy link
Member

pfeerick commented Aug 20, 2024 via email

@pfeerick pfeerick force-pushed the elecpower/cpn-enh-sims-nv14-el18 branch from c866a8e to 3ddf8c1 Compare August 27, 2024 04:43
@pfeerick pfeerick marked this pull request as ready for review September 3, 2024 03:30
@pfeerick
Copy link
Member

pfeerick commented Sep 3, 2024

Given I think #3932 (comment) is related to some work needed in simulator layer for to support NV14/EL18 (and probably PL18/PL18EV also), rather than a bug in this PR, I'm going to merge this sooner rather than later so it is in place for when simulators get further UI rework.

@pfeerick pfeerick force-pushed the elecpower/cpn-enh-sims-nv14-el18 branch from 3ddf8c1 to c543dcb Compare October 10, 2024 02:26
@pfeerick pfeerick force-pushed the elecpower/cpn-enh-sims-nv14-el18 branch from c543dcb to 3578227 Compare October 21, 2024 00:27
@pfeerick pfeerick merged commit b35223e into main Oct 22, 2024
3 checks passed
@pfeerick pfeerick deleted the elecpower/cpn-enh-sims-nv14-el18 branch October 22, 2024 02:56
@philmoz
Copy link
Collaborator

philmoz commented Oct 24, 2024

Appears to be missing right side Up / Down navigation:
screenshot_nv14_24-10-24_16-03-18

@pfeerick
Copy link
Member

Correct. As per the comment referenced above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement ✨ New feature or request simulator
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants