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

DAP_UpdateChanAmpAssignPanel: Don't use PGC_SetAndActivateControl for control setting #1866

Merged
merged 2 commits into from
Sep 7, 2023

Conversation

t-b
Copy link
Collaborator

@t-b t-b commented Aug 31, 2023

This reverts commit c17cefc (DAP: Use PGC_SetAndActivateControl in DAP_UpdateChanAmpAssignPanel, 2023-07-24).

The reason this does not work is that using PGC calls also the GUI control procedure. But we don't want to call the GUI procedure here as we are syncing from CAA wave to the GUI.

Found as setting pressure devices doesn't work anymore. The hardware pressure controls and the associations controls share the same GUI control procedures DAP_SetVarProc_CAA and DAP_PopMenuProc_CAA and thus using PGC on associations control also triggers a pressure control update.

@MichaelHuth The reverted commit introduced in #1804 broke the pressure device selection. Do you remember why the commit was required?

runwithOpts(testsuite = "UTF_ConfigurationHardware.ipf") passes in this branch locally as well.

Close #1868

@t-b t-b added the PR:NeedsBackport (Pull requests only) Mark it as requiring a backport to the latest release branch label Aug 31, 2023
@MichaelHuth
Copy link
Collaborator

This was changed to get rid of directly using the GUI operations. The CAA feedback was circumvented by working on a copy of the CAA wave. Though it looks like there are more dependencies.

@MichaelHuth MichaelHuth assigned t-b and unassigned MichaelHuth Sep 1, 2023
@t-b
Copy link
Collaborator Author

t-b commented Sep 4, 2023

  • Add comment to code why it the way it is
  • Add issue to fix that properly

… control setting

This reverts commit c17cefc (DAP: Use PGC_SetAndActivateControl in DAP_UpdateChanAmpAssignPanel, 2023-07-24).

The reason this does not work is that using PGC calls also the GUI control
procedure. But we don't want to call the GUI procedure here as we are
syncing from CAA wave to the GUI.

Found as setting pressure devices doesn't work anymore. The hardware
pressure controls and the associations controls share the same GUI control
procedures DAP_SetVarProc_CAA and DAP_PopMenuProc_CAA and thus using PGC
on associations control also triggers a pressure control update.
@t-b t-b force-pushed the bugfix/1866-pressure-controls branch from 756188e to 44b4441 Compare September 5, 2023 15:28
@t-b t-b changed the base branch from main to release/2.7 September 5, 2023 15:28
@t-b t-b assigned timjarsky and unassigned t-b Sep 5, 2023
@t-b t-b added PR:NeedsForwardPort (Pull requests only) Mark it as requiring a forwardport to the main branch and removed PR:NeedsBackport (Pull requests only) Mark it as requiring a backport to the latest release branch labels Sep 5, 2023
@t-b t-b marked this pull request as ready for review September 5, 2023 15:28
@t-b t-b requested a review from timjarsky as a code owner September 5, 2023 15:28
@t-b
Copy link
Collaborator Author

t-b commented Sep 5, 2023

@timjarsky Ready!

@timjarsky timjarsky assigned t-b and unassigned timjarsky Sep 7, 2023
@t-b t-b merged commit 3b2f717 into release/2.7 Sep 7, 2023
16 checks passed
@t-b t-b deleted the bugfix/1866-pressure-controls branch September 7, 2023 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR:NeedsForwardPort (Pull requests only) Mark it as requiring a forwardport to the main branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pressure controls are messed up when changing headstage
3 participants