-
Notifications
You must be signed in to change notification settings - Fork 1
Ticket3071: Add IOC for Kicker PSU #313
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
Open
ghost
wants to merge
17
commits into
master
Choose a base branch
from
Ticket3071_Add_IOC_KICKER
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
b35774d
Add template IOC
f49acdb
Added DAQ records to IOC
792d0a6
Added modbus files
4f275ac
Updated to configure modbus
ae2f9d5
Updated DAQ config
9c7196b
Updated DAQ config and loaded current records
a3453c5
Added changes to work with device
b38705c
Added Modbus support files to build
b19f48f
Updated records loading
344cc86
Tidy up of iocBoot
0a994d8
Merge branch 'master' into Ticket3071_Add_IOC_KICKER
1929c11
Tidy up st-daq for testing
0fdbfd2
Merge branch 'Ticket3071_Add_IOC_KICKER' of https://github.com/ISISCo…
e11504e
Commented out heartbeat modbus config line
4ee635f
Created DAQ port name as a macro, number of elements sampled as a mac…
9af0d8b
Merge commit '518963dff513da92908a471ba6c8f0c75ca91559' into Ticket30…
b9655c9
Tidy up
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| TOP=../.. | ||
| include $(TOP)/configure/CONFIG | ||
| #---------------------------------------- | ||
| # ADD MACRO DEFINITIONS AFTER THIS LINE | ||
|
|
||
| #---------------------------------------------------- | ||
| # Optimization of db files using dbst (DEFAULT: NO) | ||
| #DB_OPT = YES | ||
|
|
||
| #---------------------------------------------------- | ||
| # Create and install (or just install) into <top>/db | ||
| # databases, templates, substitutions like this | ||
| #DB += xxx.db | ||
|
|
||
| #---------------------------------------------------- | ||
| # If <anyname>.db template is not named <anyname>*.template add | ||
| # <anyname>_template = <templatename> | ||
|
|
||
| include $(TOP)/configure/RULES | ||
| #---------------------------------------- | ||
| # ADD RULES AFTER THIS LINE | ||
|
|
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,9 @@ | ||
| TOP = .. | ||
| include $(TOP)/configure/CONFIG | ||
| DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*)) | ||
| DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*)) | ||
| DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*)) | ||
| DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*)) | ||
| DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) | ||
| include $(TOP)/configure/RULES_DIRS | ||
|
|
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,23 @@ | ||
| /* KICKER-IOC-01Main.cpp */ | ||
| /* Author: Marty Kraimer Date: 17MAR2000 */ | ||
|
|
||
| #include <stddef.h> | ||
| #include <stdlib.h> | ||
| #include <stddef.h> | ||
| #include <string.h> | ||
| #include <stdio.h> | ||
|
|
||
| #include "epicsExit.h" | ||
| #include "epicsThread.h" | ||
| #include "iocsh.h" | ||
|
|
||
| int main(int argc,char *argv[]) | ||
| { | ||
| if(argc>=2) { | ||
| iocsh(argv[1]); | ||
| epicsThreadSleep(.2); | ||
| } | ||
| iocsh(NULL); | ||
| epicsExit(0); | ||
| return(0); | ||
| } |
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,9 @@ | ||
| TOP=../.. | ||
| # This file should do very little - it's purpose is to set the APPNAME and then load build.mak | ||
|
|
||
| # this definition is used in build.mak | ||
| APPNAME=KICKER-IOC-01 | ||
|
|
||
| # If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory | ||
| # there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory | ||
| include $(TOP)/KICKER-IOC-01App/src/build.mak |
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,76 @@ | ||
| TOP=../.. | ||
|
|
||
| include $(TOP)/configure/CONFIG | ||
| #---------------------------------------- | ||
| # ADD MACRO DEFINITIONS AFTER THIS LINE | ||
| #============================= | ||
|
|
||
| ### NOTE: there should only be one build.mak for a given IOC family and this should be located in the ###-IOC-01 directory | ||
|
|
||
| #============================= | ||
| # Build the IOC application KICKER-IOC-01 | ||
| # We actually use $(APPNAME) below so this file can be included by multiple IOCs | ||
|
|
||
| PROD_IOC = $(APPNAME) | ||
| # KICKER-IOC-01.dbd will be created and installed | ||
| DBD += $(APPNAME).dbd | ||
|
|
||
| # KICKER-IOC-01.dbd will be made up from these files: | ||
| $(APPNAME)_DBD += base.dbd | ||
| ## ISIS standard dbd ## | ||
| $(APPNAME)_DBD += devSequencer.dbd | ||
| $(APPNAME)_DBD += icpconfig.dbd | ||
| $(APPNAME)_DBD += pvdump.dbd | ||
| $(APPNAME)_DBD += asSupport.dbd | ||
| $(APPNAME)_DBD += devIocStats.dbd | ||
| $(APPNAME)_DBD += caPutLog.dbd | ||
| $(APPNAME)_DBD += utilities.dbd | ||
| ## Stream device support ## | ||
| $(APPNAME)_DBD += stream.dbd | ||
| $(APPNAME)_DBD += asyn.dbd | ||
| $(APPNAME)_DBD += drvAsynSerialPort.dbd | ||
| $(APPNAME)_DBD += drvAsynIPPort.dbd | ||
| $(APPNAME)_DBD += calcSupport.dbd | ||
| $(APPNAME)_DBD += DAQmxSupport.dbd | ||
| $(APPNAME)_DBD += modbusSupport.dbd | ||
| ## add other dbd here ## | ||
| #$(APPNAME)_DBD += xxx.dbd | ||
|
|
||
| # Add all the support libraries needed by this IOC | ||
| ## ISIS standard libraries ## | ||
| $(APPNAME)_LIBS += seqDev seq pv | ||
| $(APPNAME)_LIBS += devIocStats | ||
| $(APPNAME)_LIBS += pvdump $(MYSQLLIB) easySQLite sqlite | ||
| $(APPNAME)_LIBS += caPutLog | ||
| $(APPNAME)_LIBS += icpconfig pugixml | ||
| $(APPNAME)_LIBS += autosave | ||
| $(APPNAME)_LIBS += utilities pcre libjson zlib | ||
| ## Stream device libraries ## | ||
| $(APPNAME)_LIBS += stream | ||
| $(APPNAME)_LIBS += pcre | ||
| $(APPNAME)_LIBS += asyn | ||
| ## Add other libraries here ## | ||
| $(APPNAME)_LIBS += calc | ||
| #$(APPNAME)_LIBS += xxx | ||
| $(APPNAME)_LIBS += DAQmxSupport | ||
| $(APPNAME)_LIBS += modbus | ||
|
|
||
| # KICKER-IOC-01_registerRecordDeviceDriver.cpp derives from KICKER-IOC-01.dbd | ||
| $(APPNAME)_SRCS += $(APPNAME)_registerRecordDeviceDriver.cpp | ||
|
|
||
| # Build the main IOC entry point on workstation OSs. | ||
| $(APPNAME)_SRCS_DEFAULT += $(APPNAME)Main.cpp | ||
| $(APPNAME)_SRCS_vxWorks += -nil- | ||
|
|
||
| # Add support from base/src/vxWorks if needed | ||
| #$(APPNAME)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary | ||
|
|
||
| # Finally link to the EPICS Base libraries | ||
| $(APPNAME)_LIBS += $(EPICS_BASE_IOC_LIBS) | ||
|
|
||
| #=========================== | ||
|
|
||
| include $(TOP)/configure/RULES | ||
| #---------------------------------------- | ||
| # ADD RULES AFTER THIS LINE | ||
|
|
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,31 @@ | ||
| # Makefile at top of application tree | ||
| TOP = . | ||
| include $(TOP)/configure/CONFIG | ||
|
|
||
| # Directories to build, any order | ||
| DIRS += configure | ||
| DIRS += $(wildcard *Sup) | ||
| DIRS += $(wildcard *App) | ||
| DIRS += $(wildcard *Top) | ||
| DIRS += $(wildcard iocBoot) | ||
|
|
||
| # The build order is controlled by these dependency rules: | ||
|
|
||
| # All dirs except configure depend on configure | ||
| $(foreach dir, $(filter-out configure, $(DIRS)), \ | ||
| $(eval $(dir)_DEPEND_DIRS += configure)) | ||
|
|
||
| # Any *App dirs depend on all *Sup dirs | ||
| $(foreach dir, $(filter %App, $(DIRS)), \ | ||
| $(eval $(dir)_DEPEND_DIRS += $(filter %Sup, $(DIRS)))) | ||
|
|
||
| # Any *Top dirs depend on all *Sup and *App dirs | ||
| $(foreach dir, $(filter %Top, $(DIRS)), \ | ||
| $(eval $(dir)_DEPEND_DIRS += $(filter %Sup %App, $(DIRS)))) | ||
|
|
||
| # iocBoot depends on all *App dirs | ||
| iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS)) | ||
|
|
||
| # Add any additional dependency rules here: | ||
|
|
||
| include $(TOP)/configure/RULES_TOP |
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,29 @@ | ||
| # CONFIG - Load build configuration data | ||
| # | ||
| # Do not make changes to this file! | ||
|
|
||
| # Allow user to override where the build rules come from | ||
| RULES = $(EPICS_BASE) | ||
|
|
||
| # RELEASE files point to other application tops | ||
| include $(TOP)/configure/RELEASE | ||
| -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common | ||
| ifdef T_A | ||
| -include $(TOP)/configure/RELEASE.Common.$(T_A) | ||
| -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A) | ||
| endif | ||
|
|
||
| CONFIG = $(RULES)/configure | ||
| include $(CONFIG)/CONFIG | ||
|
|
||
| # Override the Base definition: | ||
| INSTALL_LOCATION = $(TOP) | ||
|
|
||
| # CONFIG_SITE files contain other build configuration settings | ||
| include $(TOP)/configure/CONFIG_SITE | ||
| -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common | ||
| ifdef T_A | ||
| -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A) | ||
| -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) | ||
| 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,43 @@ | ||
| # CONFIG_SITE | ||
|
|
||
| # Make any application-specific changes to the EPICS build | ||
| # configuration variables in this file. | ||
| # | ||
| # Host/target specific settings can be specified in files named | ||
| # CONFIG_SITE.$(EPICS_HOST_ARCH).Common | ||
| # CONFIG_SITE.Common.$(T_A) | ||
| # CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) | ||
|
|
||
| # CHECK_RELEASE controls the consistency checking of the support | ||
| # applications pointed to by the RELEASE* files. | ||
| # Normally CHECK_RELEASE should be set to YES. | ||
| # Set CHECK_RELEASE to NO to disable checking completely. | ||
| # Set CHECK_RELEASE to WARN to perform consistency checking but | ||
| # continue building even if conflicts are found. | ||
| CHECK_RELEASE = YES | ||
|
|
||
| # Set this when you only want to compile this application | ||
| # for a subset of the cross-compiled target architectures | ||
| # that Base is built for. | ||
| #CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32 | ||
|
|
||
| # To install files into a location other than $(TOP) define | ||
| # INSTALL_LOCATION here. | ||
| #INSTALL_LOCATION=</absolute/path/to/install/top> | ||
|
|
||
| # Set this when the IOC and build host use different paths | ||
| # to the install location. This may be needed to boot from | ||
| # a Microsoft FTP server say, or on some NFS configurations. | ||
| #IOCS_APPL_TOP = </IOC's/absolute/path/to/install/top> | ||
|
|
||
| # For application debugging purposes, override the HOST_OPT and/ | ||
| # or CROSS_OPT settings from base/configure/CONFIG_SITE | ||
| #HOST_OPT = NO | ||
| #CROSS_OPT = NO | ||
|
|
||
| # These allow developers to override the CONFIG_SITE variable | ||
| # settings without having to modify the configure/CONFIG_SITE | ||
| # file itself. | ||
| -include $(TOP)/../CONFIG_SITE.local | ||
| -include $(TOP)/configure/CONFIG_SITE.local | ||
|
|
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 @@ | ||
| TOP=.. | ||
|
|
||
| include $(TOP)/configure/CONFIG | ||
|
|
||
| TARGETS = $(CONFIG_TARGETS) | ||
| CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) | ||
|
|
||
| include $(TOP)/configure/RULES |
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,75 @@ | ||
| # RELEASE - Location of external support modules | ||
| # | ||
| # IF YOU MAKE ANY CHANGES to this file you must subsequently | ||
| # do a "gnumake rebuild" in this application's top level | ||
| # directory. | ||
| # | ||
| # The build process does not check dependencies against files | ||
| # that are outside this application, thus you should do a | ||
| # "gnumake rebuild" in the top level directory after EPICS_BASE | ||
| # or any other external module pointed to below is rebuilt. | ||
| # | ||
| # Host- or target-specific settings can be given in files named | ||
| # RELEASE.$(EPICS_HOST_ARCH).Common | ||
| # RELEASE.Common.$(T_A) | ||
| # RELEASE.$(EPICS_HOST_ARCH).$(T_A) | ||
| # | ||
| # This file is parsed by both GNUmake and an EPICS Perl script, | ||
| # so it can ONLY contain definitions of paths to other support | ||
| # modules, variable definitions that are used in module paths, | ||
| # and include statements that pull in other RELEASE files. | ||
| # Variables may be used before their values have been set. | ||
| # Build variables that are NOT used in paths should be set in | ||
| # the CONFIG_SITE file. | ||
|
|
||
| # Variables and paths to dependent modules: | ||
| #MODULES = /path/to/modules | ||
| #MYMODULE = $(MODULES)/my-module | ||
|
|
||
| # If using the sequencer, point SNCSEQ at its top directory: | ||
| #SNCSEQ = $(MODULES)/seq-ver | ||
|
|
||
| # EPICS_BASE should appear last so earlier modules can override stuff: | ||
| EPICS_BASE = C:/Instrument/Apps/EPICS/base/master | ||
|
|
||
| # Set RULES here if you want to use build rules from somewhere | ||
| # other than EPICS_BASE: | ||
| #RULES = $(MODULES)/build-rules | ||
|
|
||
| # These allow developers to override the RELEASE variable settings | ||
| # without having to modify the configure/RELEASE file itself. | ||
| -include $(TOP)/../RELEASE.local | ||
| -include $(TOP)/configure/RELEASE.local | ||
|
|
||
| # Macros required for basic ioc/stream device | ||
| ACCESSSECURITY=$(SUPPORT)/AccessSecurity/master | ||
| ASUBFUNCTIONS=$(SUPPORT)/asubFunctions/master | ||
| ASYN=$(SUPPORT)/asyn/master | ||
| AUTOSAVE=$(SUPPORT)/autosave/master | ||
| CALC=$(SUPPORT)/calc/master | ||
| CAPUTLOG=$(SUPPORT)/caPutLog/master | ||
| DAQMXBASE=$(SUPPORT)/DAQmxBase/master | ||
| DEVIOCSTATS=$(SUPPORT)/devIocStats/master | ||
| ICPCONFIG=$(SUPPORT)/icpconfig/master | ||
| LIBJSON=$(SUPPORT)/libjson/master | ||
| MODBUS=$(SUPPORT)/modbus/master | ||
| MYSQL=$(SUPPORT)/MySQL/master | ||
| ONCRPC=$(SUPPORT)/oncrpc/master | ||
| PCRE=$(SUPPORT)/pcre/master | ||
| PUGIXML=$(SUPPORT)/pugixml/master | ||
| PVDUMP=$(SUPPORT)/pvdump/master | ||
| SNCSEQ=$(SUPPORT)/seq/master | ||
| SQLITE=$(SUPPORT)/sqlite/master | ||
| SSCAN=$(SUPPORT)/sscan/master | ||
| STREAMDEVICE=$(SUPPORT)/StreamDevice/master | ||
| UTILITIES=$(SUPPORT)/utilities/master | ||
| ZLIB=$(SUPPORT)/zlib/master | ||
|
|
||
| # optional extra local definitions here | ||
| -include $(TOP)/configure/RELEASE.private | ||
|
|
||
| include $(TOP)/../../../ISIS_CONFIG | ||
| -include $(TOP)/../../../ISIS_CONFIG.$(EPICS_HOST_ARCH) | ||
|
|
||
| # IOC-specific support module | ||
| KICKER=$(SUPPORT)/kicker/master |
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,6 @@ | ||
| # RULES | ||
|
|
||
| include $(CONFIG)/RULES | ||
|
|
||
| # Library should be rebuilt because LIBOBJS may have changed. | ||
| $(LIBNAME): ../Makefile |
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,2 @@ | ||
| #RULES.ioc | ||
| include $(CONFIG)/RULES.ioc |
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,2 @@ | ||
| #RULES_DIRS | ||
| include $(CONFIG)/RULES_DIRS |
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 @@ | ||
| #RULES_TOP | ||
| include $(CONFIG)/RULES_TOP | ||
|
|
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,6 @@ | ||
| TOP = .. | ||
| include $(TOP)/configure/CONFIG | ||
| DIRS += $(wildcard *ioc*) | ||
| DIRS += $(wildcard as*) | ||
| include $(CONFIG)/RULES_DIRS | ||
|
|
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,6 @@ | ||
| TOP = ../.. | ||
| include $(TOP)/configure/CONFIG | ||
| #ARCH = windows-x64 | ||
| ARCH = $(EPICS_HOST_ARCH) | ||
| TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh | ||
| include $(TOP)/configure/RULES.ioc |
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,11 @@ | ||
| <?xml version="1.0" ?> | ||
| <ioc_config xmlns:xi="http://www.w3.org/2001/XInclude"> | ||
| <config_part> | ||
| <ioc_desc>Kicker PSU</ioc_desc> | ||
| <macros> | ||
| <macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM port" /> | ||
| </macros> | ||
| <pvsets> | ||
| </pvsets> | ||
| </config_part> | ||
| </ioc_config> |
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,6 @@ | ||
| ## NI cDAQ-9185 | ||
| epicsEnvSet("CDAQAI","cDAQ9185-1D195CFMod3") | ||
|
|
||
| ## input | ||
| $(IFNOTRECSIM) DAQmxConfig("R0", "$(CDAQAI)/ai0", 0, "AI","N=1000 F=1000") ## Kicker Volt | ||
|
||
| $(IFNOTRECSIM) DAQmxConfig("R0", "$(CDAQAI)/ai1", 1, "AI","N=1000 F=1000") ## Kicker Curr | ||
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.
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.
Is this a hard-coded address for this specific hardware unit, or is this a more general model number which would allow this IOC to be used by other instruments or facilities? If it is tied to a single unit, could this be made more generic through macros?