-
Notifications
You must be signed in to change notification settings - Fork 9
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
Use pvxslibs instead of qsrv #132
Conversation
@mdavidsaver I'm trying to use QSRV2 in pythonSoftIOC, but I'm missing something. When I make the changes in this PR, install into a venv, and run
I thought these symbols might have been from the demo application, so commented out everything apart from the
I see these same errors when importing in CI: I am using pvxslibs 1.2.1a1. I added the DSOs and include path in |
Codecov Report
@@ Coverage Diff @@
## master #132 +/- ##
==========================================
+ Coverage 87.34% 87.56% +0.21%
==========================================
Files 14 14
Lines 996 1005 +9
==========================================
+ Hits 870 880 +10
+ Misses 126 125 -1
|
def qform_string(rec): | ||
rec.add_info("Q:form", "String") | ||
return rec |
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.
This makes QSRV2 treat a waveform as a string...
|
||
fields['NELM'] = length | ||
fields['FTVL'] = 'UCHAR' | ||
fields['FTVL'] = 'CHAR' |
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.
... but only if FTVL is CHAR
ctypes.CDLL(find_dso('pvxslibs.lib.pvxsIoc'), ctypes.RTLD_GLOBAL) | ||
os.environ.setdefault('PVXS_QSRV_ENABLE', 'YES') |
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.
pvxslibs needs to be loaded here, rather than linked in like dbCore, etc
Also work around Flake8 5.0 issue by pinning.
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.
Looks good to me. At some point we may want to add more tests for various other QSRV features but this is fine for now.
Once this is merged could you also close #133 ?
This is not currently working