Skip to content

Allow disabling of DFKPS AUTOONOFF PV with DISABLE_AUTOONOFF macro #498

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.

Sign up for GitHub

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 1 commit into from
May 20, 2020
Merged

Allow disabling of DFKPS AUTOONOFF PV with DISABLE_AUTOONOFF macro #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DFKPS/DFKPS-IOC-01App/Db/DFKPS_common.db
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ record(bo, "$(P)AUTOONOFF")
field(PINI, "YES")
field(SIML, "$(P)SIM")
field(SIOL, "$(P)SIM:AUTOONOFF")
field(SDIS, "$(P)DISABLE")
field(DISP, "$(DISABLE_AUTOONOFF)")
info(autosaveFields, "VAL")
}

Expand Down
3 changes: 3 additions & 0 deletions DFKPS/iocBoot/iocDFKPS-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@

<macro name="STAB_TOLERANCE" pattern="^-?[0-9]+\.?[0-9]*$" description="If value of current in Amps is within this tolerance of the setpoint, consider the field as stable" defaultValue="2" hasDefault="YES" />
<macro name="OFF_TOLERANCE" pattern="^-?[0-9]+\.?[0-9]*$" description="If value of current in Amps is within this tolerance of 0, consider the field as off." defaultValue="0" hasDefault="YES" />

<macro name="DISABLE_AUTOONOFF" pattern="^(0|1)$" description="Disable automatic PSU on/off feature" defaultValue="1" hasDefault="YES" />

</macros>
</config_part>
</ioc_config>
2 changes: 1 addition & 1 deletion DFKPS/iocBoot/iocDFKPS-IOC-01/st-common.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ stringiftest "SLEW" "$(USE_SLEW=0)" 5 "1"
epicsEnvSet "SP_PINI" "$(SP_AT_STARTUP=NO)"

## Load record instances
dbLoadRecords("$(TOP)/db/DFKPS_common.db", "device=$(MYPVPREFIX)$(IOCNAME), P=$(MYPVPREFIX)$(IOCNAME):, FWI=$(FACTOR_WRITE_I=1000), FRI=$(FACTOR_READ_I=1), FRV=$(FACTOR_READ_V=1), port=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),SP_PINI=$(SP_PINI), VADC=$(VADC=2), DEV_TYPE=$(DEV_TYPE=8000), CALIBRATED=$(CALIBRATED=1), USE_SLEW=$(USE_SLEW=0), POLARITY=$(POLARITY=BIPOLAR), MAX_RAW_SETPOINT=$(MAX_RAW_SETPOINT=1000000), OFF_TOLERANCE=$(OFF_TOLERANCE=0)")
dbLoadRecords("$(TOP)/db/DFKPS_common.db", "device=$(MYPVPREFIX)$(IOCNAME), P=$(MYPVPREFIX)$(IOCNAME):, FWI=$(FACTOR_WRITE_I=1000), FRI=$(FACTOR_READ_I=1), FRV=$(FACTOR_READ_V=1), port=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),SP_PINI=$(SP_PINI), VADC=$(VADC=2), DEV_TYPE=$(DEV_TYPE=8000), CALIBRATED=$(CALIBRATED=1), USE_SLEW=$(USE_SLEW=0), POLARITY=$(POLARITY=BIPOLAR), MAX_RAW_SETPOINT=$(MAX_RAW_SETPOINT=1000000), OFF_TOLERANCE=$(OFF_TOLERANCE=0), DISABLE_AUTOONOFF=$(DISABLE_AUTOONOFF=1)"
dbLoadRecords("$(UTILITIES)/db/check_stability.db", "P=$(MYPVPREFIX)$(IOCNAME):,INP_VAL=$(MYPVPREFIX)$(IOCNAME):CURR,SP=$(MYPVPREFIX)$(IOCNAME):CURR:SP:RBV,NSAMP=5,TOLERANCE=$(STAB_TOLERANCE=2)")
$(IFPOLAR) dbLoadRecords("$(TOP)/db/DFKPS_polarity.db", "device=$(MYPVPREFIX)$(IOCNAME), P=$(MYPVPREFIX)$(IOCNAME):, port=L0")
$(IFCALIB) dbLoadRecords("$(TOP)/db/DFKPS_calibrated.db", "device=$(MYPVPREFIX)$(IOCNAME), P=$(MYPVPREFIX)$(IOCNAME):, CALIB_BASE_DIR=$(CALIB_BASE_DIR),CALIB_DIR=$(CALIB_DIR),CALIB_FILE=$(CALIB_FILE=default_calib.dat),DRVHI=$(DRIVE_HIGH=5000000),DRVLO=$(DRIVE_LOW=-5000000), port=L0, FWI=$(FACTOR_WRITE_I=1000)")
Expand Down