Skip to content

Allow ethernet comms for Mercury ITC #963

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

Open
Tom-Willemsen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow ethernet comms for Mercury ITC #963

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
3 changes: 3 additions & 0 deletions MERCURY_ITC/iocBoot/iocMERCURY-IOC-01/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<macro name="PRESSURE_1" pattern="^.*[.].*$" description="Card identifier for Pressure 1 (e.g. DB1.P1). Blank for no controller." hasDefault="YES" defaultValue="" />
<macro name="PRESSURE_2" pattern="^.*[.].*$" description="Card identifier for Pressure 2 (e.g. DB1.P1). Blank for no controller." hasDefault="YES" defaultValue="" />

<macro name="IPADDR" pattern="^.*$" description="IP Address for Ethernet comms" hasDefault="YES" defaultValue="" />
<macro name="IPPORT" pattern="^.*$" description="IP Port for Ethernet comms" hasDefault="YES" defaultValue="7020" />

<macro name="SPC_TYPE_1" pattern="^(FLOW|VTI|NONE)$" description="Software pressure control method to use on Temperature 1" hasDefault="YES" defaultValue="NONE" />
<macro name="SPC_TYPE_2" pattern="^(FLOW|VTI|NONE)$" description="Software pressure control method to use on Temperature 2" hasDefault="YES" defaultValue="NONE" />
<macro name="SPC_TYPE_3" pattern="^(FLOW|VTI|NONE)$" description="Software pressure control method to use on Temperature 3" hasDefault="YES" defaultValue="NONE" />
Expand Down
27 changes: 15 additions & 12 deletions MERCURY_ITC/iocBoot/iocMERCURY-IOC-01/st-common.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,21 @@ $(IFRECSIM) drvAsynSerialPortConfigure("L0", "$(PORT=NUL)", 0, 1, 0, 0)
# For dev sim devices
$(IFDEVSIM) drvAsynIPPortConfigure("L0", "localhost:$(EMULATOR_PORT=57677)")

## For real device use:
$(IFNOTDEVSIM) $(IFNOTRECSIM) drvAsynSerialPortConfigure("L0", "$(PORT)", 0, 0, 0, 0)
$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "baud", "$(BAUD=57600)")
$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "bits", "$(BITS=8)")
$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "parity", "$(PARITY=none)")
$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "stop", "$(STOP=2)")

## Flow control off
$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", 0, "clocal", "Y")
$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0",0,"crtscts","N")
$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0",0,"ixon","N")
$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0",0,"ixoff","N")
stringiftest("IPADDR", "$(IPADDR=)", 0x2)

## If serial comms mode
$(IFNOTDEVSIM) $(IFNOTRECSIM) $(IFNOTIPADDR) drvAsynSerialPortConfigure("L0", "$(PORT)", 0, 0, 0, 0)
$(IFNOTDEVSIM) $(IFNOTRECSIM) $(IFNOTIPADDR) asynSetOption("L0", -1, "baud", "$(BAUD=57600)")
$(IFNOTDEVSIM) $(IFNOTRECSIM) $(IFNOTIPADDR) asynSetOption("L0", -1, "bits", "$(BITS=8)")
$(IFNOTDEVSIM) $(IFNOTRECSIM) $(IFNOTIPADDR) asynSetOption("L0", -1, "parity", "$(PARITY=none)")
$(IFNOTDEVSIM) $(IFNOTRECSIM) $(IFNOTIPADDR) asynSetOption("L0", -1, "stop", "$(STOP=2)")
$(IFNOTDEVSIM) $(IFNOTRECSIM) $(IFNOTIPADDR) asynSetOption("L0", 0, "clocal", "Y")
$(IFNOTDEVSIM) $(IFNOTRECSIM) $(IFNOTIPADDR) asynSetOption("L0",0,"crtscts","N")
$(IFNOTDEVSIM) $(IFNOTRECSIM) $(IFNOTIPADDR) asynSetOption("L0",0,"ixon","N")
$(IFNOTDEVSIM) $(IFNOTRECSIM) $(IFNOTIPADDR) asynSetOption("L0",0,"ixoff","N")

## If ethernet comms mode
$(IFNOTDEVSIM) $(IFNOTRECSIM) $(IFIPADDR) drvAsynIPPortConfigure("L0", "$(IPADDR=):$(IPPORT=7020)")

## Load record instances

Expand Down