-
-
Notifications
You must be signed in to change notification settings - Fork 310
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: add inverted sources #4722
Conversation
It might be easier for me to revert my Companion changes and rebase my PR to this PR. I'll have a play with it later in the week. |
I need to 'merge' #4735 into this one |
Merge of 4735 done |
@elecpower When you have a chance can you rebase this to current main. I'd like to continue testing in conjunction with the radio side changes. |
Request noted |
3b967d2
to
e8ed206
Compare
@philmoz rebased |
Looks good, thanks. If you're ok with it, I will add the radio side changes to this PR. |
I'm okay with you adding your changes. |
I have merged the radio changes into this PR, I will close 4513 in favour of the one. |
Might be a good idea to include the other PR's summary above and remove my what happens next. |
0c4cb94
to
7c1100e
Compare
@elecpower - when you have a chance can you please check the rebase to make sure I haven't messed anything up. |
Will check out now I have Cloudbuild in a testable state. |
@philmoz rebase okay but I have found some more areas where some fixes are required due to the +1 shift:
I'll fix these with individual commits |
Refer PR #4890 for last part of fixes |
b5abc08
to
e75e400
Compare
e75e400
to
e57603f
Compare
Thanks for the rebase @philmoz ... am I right in the assumption it is ready for review? |
I think so. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Colorlcd (TX16S):
- "Invert" button seems to be a couple pixels too far down and to the right, means the toolbar moves when you press the button
Generally:
- SF -> Adjust -> GV# -> mixer source : inverted source does not survive power cycle
- LS -> a>x seems generally broken visually - colourlcd won't let me set V2 values any more - shows !GPS instead of 0, bw128 shows wrong V1 on overview
- bw128 EM'd when paging from curves to LS screen with above config after having written it via Companion, or after attempting to configure it on radio and exiting edit page.
- bw212 appears to be missing implementation of showing
!
but it is marked as a TODO
Possibly issues from all the rebases - will take a look. |
e57603f
to
57d6b23
Compare
These should be fixed now. |
BW128: LS -> a<x V1 does not show invert option. That said, I'm unsure if this is an issue or not, since you can always choose your V2 accordingly. But I feel it should be there. |
It's working for me - can you share an image of where it's wrong for you. |
Looking a lot better, thanks! :) I think I caught it happening... on both bw128 and bw212, the "Invert" option falls off the popup menu if "Telemetry" item is present... ie. it will work just fine with a blank model, but seems as if it has telemetry sensors the option is never visible. Without telem With telem bw212 inputs screen needs to learn to show common to both bw128 and 212 is that with some inverted inputs the V2 field changes it's units incorrectly... i.e. I have seen it show "0.0V" for one input, and can get this to happen in simulator (V2 field is blank, but somehow editable). |
I think these are fixed now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bw128, bw212 and colorlcd (tx16s) all appear to generally be working as expected! Looking good! :)
Summary of Changes
As a pre-requisite for #4452 add the ability to invert a 'Source'.
Currently supports Inputs, Mixes, Logical Switches and Special/Global functions.
TODO:
Companion changes:
The Companion refactor changes RawSource index from zero to one based to support negative indexes (as RawSwitch).
The opportunity was taken to undertake some overdue housekeeping of RawSource and move timers from source type Special to new Timers. Also rename legacy type SOURCE_TYPE_STICK to SOURCE_TYPE_INPUT as more appropriate.