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

fix(sim): key labels match physical radios #5865

Merged
merged 5 commits into from
Feb 10, 2025
Merged

Conversation

elecpower
Copy link
Collaborator

@elecpower elecpower commented Feb 3, 2025

Fixes #5860

Summary of changes:

  • define override key labels per groups of radio targets to more closely match physical radios
  • affects radio diagnostics and libsim buttons

TODO:

  • add radio specific keys for all radios to lookup matrix

@elecpower elecpower added color Related generally to color LCD radios B&W Related generally to black and white LCD radios simulator labels Feb 3, 2025
@elecpower elecpower added this to the 2.11 milestone Feb 3, 2025
@elecpower elecpower marked this pull request as draft February 3, 2025 11:45
@mha1
Copy link
Contributor

mha1 commented Feb 3, 2025

V16, TX12Mk2, GX12 and I suppose all Radiomaster radios having two separate buttons for up and down have those buttons labelled "Page>" and "Page<". All single button radios I know use "</>" apart from Taranis like X9D+ and +2019 use "page".

@mha1
Copy link
Contributor

mha1 commented Feb 3, 2025

much better

image

@philmoz
Copy link
Collaborator

philmoz commented Feb 4, 2025

Jumper radios like the bumblebee use '</>' as the page key label.

This is the list I was working on - have not checked them all, and I will be away for a few days.

KEY_LABELS = [
    {
        "targets": {"boxer", "f16", "mt12", "gx12", "pocket", "tx12", "tx12mk2", "tx16s", "v16", "zorro"},
        "keys": {
            "EXIT": { "label": "RTN" }
        }
    },
    {
        "targets": {"bumblebee", "t12max", "t14", "t15", "t20", "t20v2", "tpro", "tpros", "tprov2"},
        "keys": {
            "PAGEDN": {"label": "</>" },
        }
    },
    {
        "targets": {"x7", "x7access", "x9e"},
        "keys": {
            "PAGEDN": {"label": "PAGE" },
        }
    },
    {
        "targets": {"t16", "t18"},
        "keys": {
            "EXIT": {"RTN" },
            "PAGEDN": {"label": "PAGE" },
        }
    },
    {
        "targets": {"x9d", "x9d+", "x9d+2019"},
        "keys": {
            "ENTER": { "label": "ENT" },
            "PAGEDN": { "label": "PAGE" }
        }
    },
    {
        "targets": {"x10", "x10express"},
        "keys": {
            "EXIT": {"RTN" },
            "PAGEDN": { "label": "PgUp/Dn" }
        }
    },
]

@elecpower
Copy link
Collaborator Author

Thanks @philmoz

@elecpower elecpower force-pushed the elecpower/fix-hw-key-labels branch from 53a44f9 to dcc33b5 Compare February 5, 2025 10:59
@elecpower elecpower force-pushed the elecpower/fix-hw-key-labels branch from dcc33b5 to 71e4ffd Compare February 6, 2025 18:39
@elecpower
Copy link
Collaborator Author

This will partially break the simulator key mapping help. To avoid holding up this PR with 2.11 getting close, a separate PR will be created to fix the help as it is a lower priority and there maybe some compromises depending on what this PR unearths.

@pfeerick
Copy link
Member

pfeerick commented Feb 9, 2025

Is there anything left to do for this PR... for now?

@elecpower
Copy link
Collaborator Author

The code change appears to fix the issue. The matrix is still a wip however we could merge this one and create another to finish.

@pfeerick
Copy link
Member

pfeerick commented Feb 9, 2025

Ok, I'll see if any other handset key names jump out at me tomorrow morning and then merge....

There are about 6 targets left... tlite, lr3pro, commando8 and the x9 / xlite radios... the lr3pro/commando8 are near enough IMO as they don't actually have any real legends for the keys... x9/xlite I don't know about at all. I just realised after merging the the TLite does have a legend for the keys... (under the sleeve I have mine in 🤦) so it wants ENT/RTN also.

@pfeerick pfeerick marked this pull request as ready for review February 9, 2025 23:22
@pfeerick pfeerick merged commit 08d1b86 into main Feb 10, 2025
51 checks passed
@pfeerick pfeerick deleted the elecpower/fix-hw-key-labels branch February 10, 2025 03:01
pfeerick added a commit that referenced this pull request Feb 10, 2025
@pfeerick pfeerick changed the title fix(chore): key labels match physical radios fix(cpn): key labels match physical radios Feb 10, 2025
@pfeerick pfeerick changed the title fix(cpn): key labels match physical radios fix(sim): key labels match physical radios Feb 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
B&W Related generally to black and white LCD radios color Related generally to color LCD radios simulator
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CPN W64 TX12Mk2: Function of PgUp and PgDn buttons swapped
4 participants