Skip to content

Rotary encoder additional invert options for B&W screens (replacement)#2045

Merged
pfeerick merged 13 commits intoEdgeTX:mainfrom
breadoven:abo_invertmod_rotary_encoder
Aug 4, 2022
Merged

Rotary encoder additional invert options for B&W screens (replacement)#2045
pfeerick merged 13 commits intoEdgeTX:mainfrom
breadoven:abo_invertmod_rotary_encoder

Conversation

@breadoven
Copy link
Contributor

@breadoven breadoven commented Jun 14, 2022

Replacement for damaged PR #1826.

Adds 2 additional rotary encoder invert options for B&W screens changing behaviour of menu navigation including popup menus. Not used for colour screens due to different navigation method.

Rotary Invert setting changed from Check box to Combo with Normal, Inverted, V-N, V-A where:

Normal = vertical and horizontal "normal"
Inverted = vertical and horizontal inverted
V-N = vertical movement inverted (Normal), horizontal row movement behaviour unchanged (always cycles through all settings in rows)
V-A = vertical movement inverted (Alternative), horizontal row movement behaviour changed so left scroll moves selection directly down LH settings without cycling through multiple settings in rows. Movement along rows of settings only happens when right scrolling, moving up a row when scrolling beyond last setting in row.

LUA API function added providing rotary encoder inverted status.

Sim tested OK on X9D+ 2019, ZORRO, TX16S, TPRO, T18, TX12, T12. QX7 ACCESS, X10 EXPRESS. Fully tested on ZORRO radio.

@pfeerick pfeerick added this to the 2.8 milestone Jun 16, 2022
Copy link
Member

@gagarinlg gagarinlg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the whitespace removel changes are nice as they clean up the files, but they really clutter this PR.

@pfeerick pfeerick self-assigned this Jul 27, 2022
@pfeerick pfeerick force-pushed the abo_invertmod_rotary_encoder branch from c15de55 to 45889e6 Compare August 2, 2022 08:10
@elecpower
Copy link
Collaborator

Companion side looks okay

@pfeerick
Copy link
Member

pfeerick commented Aug 2, 2022

@elecpower Damn ... did you have your psychic hat on? That question was going to be asked soon... 😆

breadoven and others added 11 commits August 3, 2022 12:15
- Remove references to invertRotary, change to RotEncDir or similar
- Add compatabilty importing to companion, firmware
- Rename Lua API call
- Move magic numbers to enum
- Improve B&W option handling so it doesn't apply changes while in menu
@pfeerick pfeerick force-pushed the abo_invertmod_rotary_encoder branch from c772199 to 199c77a Compare August 3, 2022 02:31
Of the three X9D variants, the X9D+2019 is the only one that
has a rotary encoder as standard. However, as the base config
file is for the X9D, this meant it wasn't reading or writing the
config value. Rather than add a seperate config file for it for
a single variable, simple to just allow it across all targets.
@pfeerick pfeerick dismissed gagarinlg’s stale review August 4, 2022 02:00

Requested changes have been made

@pfeerick pfeerick force-pushed the abo_invertmod_rotary_encoder branch from 71d7f13 to 79135e4 Compare August 4, 2022 03:17
@pfeerick
Copy link
Member

pfeerick commented Aug 4, 2022

Whoops... just missed the nightly window... looks like this is ready to merge though. Just a last minute string change and changing the UI on colorlcd so that it is a choice there also (which while not only consistent with other radios and companion, but also means it's ready if more options are added on the colorlcd side also).

Have tested this on Zorro, X9D+2019, X9D+, TX12 and TX16S, syncing most if not all radios with Companion (read/write) and also Simulator. Time for others to find any bugs ;)

@pfeerick pfeerick added enhancement ✨ New feature or request color Related generally to color LCD radios UX-UI Related to user experience (UX) or user interface (UI) behaviour B&W Related generally to black and white LCD radios labels Aug 4, 2022
@pfeerick pfeerick merged commit 62692db into EdgeTX:main Aug 4, 2022
@breadoven
Copy link
Contributor Author

Thanks for finishing this off, easier for you than me having to work out all the changes since last time I looked at it.

Just need to sort out the Telemetry button now so it does more than just turn on the telemetry page ( (assuming not already done).

@pfeerick
Copy link
Member

pfeerick commented Aug 4, 2022

I don't think there's been any change there, so all yours ;)

@breadoven breadoven deleted the abo_invertmod_rotary_encoder branch September 11, 2023 20:17
@pfeerick pfeerick mentioned this pull request Dec 9, 2023
1 task
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 enhancement ✨ New feature or request UX-UI Related to user experience (UX) or user interface (UI) behaviour

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants