-
Notifications
You must be signed in to change notification settings - Fork 8
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
Pressure Control: Disable manual controls when user access is enabled #2137
base: main
Are you sure you want to change the base?
Conversation
fefd073
to
f33927c
Compare
@t-b I think it also makes sense to stop the application of a manual pressure, when user access is checked. |
94fac2a
to
84481a1
Compare
@timjarsky Thanks for testing. I've revised the solution completely. Please test. |
84481a1
to
9f4bd85
Compare
@t-b this assertion when moving the headstage slider with user access enabled is also in main
|
@t-b the changes specific to this PR look good. |
9f4bd85
to
d2dd674
Compare
@timjarsky Fixed. |
@t-b, when enabling user access, the Apply button and the psi setvar for manual pressure control are disabled. However, when selecting another headstage while user access is enabled (and functional), the Apply button is enabled on the newly selected headstage. It should remain disabled. When turning off user access, the Apply button and psi setvar become enabled, however, the pressure is not applied to the headstage. I wonder if the desired behavior should be that User access works with manual pressure control and the manual value is only applied when user access is turned off. |
I'm not sure. The code suggests that user access is a per headstage setting, see e.g. P_GetUserAccess.
Fixed.
We can chat about this today. |
We don't need to take care of a non-existing pressure data wave.
We need to save returned free waves in WAVE statements first before using them.
…r access This avoids a runtime assertion.
This is broken since e29c778 (PGC_SetAndActivateControl: Make setting a disabled control an error, 2021-09-30).
d2dd674
to
633d0cc
Compare
Tim will playaround to find out the desired behaviour regarding user pressure. |
@t-b User access and manual interactions should mimic user access and auto pressure option interactions; the manual mode should be maintained (not disabled) while giving the user access. So, all that is being switched are the TTLs, and the regulator output pressure is maintained (as is the button state). |
Otherwise we can get an assertion as the manual pressure pulse interferes.
Close #2124