-
Notifications
You must be signed in to change notification settings - Fork 18
Add role for ADXSPD driver #128
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
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
a5d315b
Add role for ADXSPD driver
jwlodek 1ff4eef
Fix linting issues
jwlodek 178fe7f
Fix version id
jwlodek 76a2263
Update Makefile
jwlodek 3254cb0
Merge branch 'main' of https://github.com/NSLS2/nsls2.ioc_deploy into…
jwlodek a6638d0
Include curl development package
jwlodek b5dd875
Merge branch 'add-adxspd-role' of https://github.com/jwlodek/nsls2.io…
jwlodek 66a3d06
Merge branch 'main' of https://github.com/NSLS2/nsls2.ioc_deploy into…
jwlodek c025b15
Add pinned hash for adxspd
jwlodek 0578663
Remove ffmpegServer dependency
jwlodek 9741c33
Fixing typo
jwlodek 1012867
Merge branch 'main' of https://github.com/NSLS2/nsls2.ioc_deploy into…
jwlodek 28f22c2
Fix typo
jwlodek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| --- | ||
|
|
||
| deploy_ioc_use_ad_common: true | ||
| deploy_ioc_required_module: adxspd_986de77 | ||
| deploy_ioc_template_root_path: | ||
| "{{ deploy_ioc_required_module_path }}/iocs/xspdIOC" | ||
| deploy_ioc_req_file_list: | ||
| - name: auto_settings.req | ||
| macros: "P=$(PREFIX)" | ||
| deploy_ioc_device_specific_env: | ||
| PORT: "XSPD1" | ||
| QSIZE: 20 | ||
| NCHANS: 2048 | ||
| CBUFFS: 500 | ||
| MAX_THREADS: 8 | ||
| EPICS_DB_INCLUDE_PATH: "$(ADCORE)/db" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # adxspd | ||
|
|
||
| Ansible role for deploying ADXSPD IOC instances. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- | ||
|
|
||
| adxspd-01: | ||
| type: adxspd | ||
| environment: | ||
| ENGINEER: C. Engineer | ||
| PREFIX: XF:31ID1-ES{XSPD-Det:1} | ||
| XSIZE: 1576 | ||
| YSIZE: 1200 | ||
| NUM_MODULES: 1 | ||
| IP: "192.168.1.1" | ||
| PORT_NUM: 8008 | ||
| DEVICE_ID: "lambda01" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| --- | ||
|
|
||
| type: enum("adxspd") | ||
| environment: | ||
| ENGINEER: str() | ||
| PREFIX: str() | ||
| XSIZE: int() | ||
| YSIZE: int() | ||
| NUM_MODULES: int() | ||
| IP: any(hostname(), ip()) | ||
| PORT_NUM: int() | ||
|
|
||
| # Optional device identifier. | ||
| # If not specified, first device discovered will be used. | ||
| DEVICE_ID: str(required=False) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| --- | ||
| # Tasks for adxspd role | ||
|
|
||
| - name: Install base.cmd | ||
| ansible.builtin.template: | ||
| src: templates/base.cmd.j2 | ||
| dest: "{{ deploy_ioc_ioc_directory }}/iocBoot/base.cmd" | ||
| mode: "0664" | ||
| owner: "{{ host_config.softioc_user }}" | ||
| group: "{{ host_config.softioc_group }}" | ||
|
|
||
| - name: Install auto_settings.req | ||
| ansible.builtin.template: | ||
| src: templates/auto_settings.req.j2 | ||
| dest: "{{ deploy_ioc_as_directory }}/req/auto_settings.req" | ||
| mode: "0664" | ||
| owner: "{{ host_config.softioc_user }}" | ||
| group: "{{ host_config.softioc_group }}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| file "ADXSPD_settings.req", P=$(P), R=cam1: | ||
| file "commonPlugin_settings.req", P=$(P) | ||
| {% if deploy_ioc_merged_env.FFMPEGSERVER is defined and ioc.environment.FFMSTREAM_PORT is defined%} | ||
| file "ffmpegServer_settings.req", P=$(P), R=ffmstream1: | ||
| {% endif %} | ||
| {% if deploy_ioc_merged_env.ADCOMPVISION is defined %} | ||
| file "NDCV_settings.req", P=$(P), R=CV1: | ||
| {% endif %} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
|
|
||
| dbLoadDatabase("{{ deploy_ioc_template_root_path }}/dbd/{{ deploy_ioc_executable }}.dbd") | ||
| {{ deploy_ioc_executable }}_registerRecordDeviceDriver(pdbbase) | ||
|
|
||
| # adxspd specific commands | ||
| {% if ioc.environment.DEVICE_ID is defined %} | ||
| ADXSPDConfig("$(PORT)", "$(IP):$(PORT_NUM)", "$(DEVICE_ID)") | ||
| {% else %} | ||
| ADXSPDConfig("$(PORT)", "$(IP):$(PORT_NUM)") | ||
| {% endif %} | ||
|
|
||
| dbLoadRecords("$(ADXSPD)/db/ADXSPD.template","P=$(PREFIX),R=cam1:,PORT=$(PORT),ADDR=0,TIMEOUT=1") | ||
| {% for module_index in range(1, ioc.environment.NUM_MODULES + 1) %} | ||
| dbLoadRecords("$(ADXSPD)/db/ADXSPDModule.template", "P=$(PREFIX), R=mod{{ module_index }}:,PORT=$(PORT)_MOD{{ module_index }},ADDR=0,TIMEOUT=1") | ||
| {% endfor %} | ||
|
|
||
| set_requestfile_path("$(ADXSPD)/xspdApp/Db") | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| --- | ||
|
|
||
| adxspd_986de77: | ||
| name: ADXSPD | ||
| version: 986de77 | ||
| url: https://github.com/NSLS2/ADXSPD | ||
| include_base_ad_config: True | ||
| executable: xspdApp | ||
| pkg_deps: | ||
| - curl-devel | ||
| module_deps: | ||
| - adcompvision_9750d13 | ||
| - adcore_60080dc |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.