Skip to content

Flesh out support for Ethernet protocol variant #1

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
mdavidsaver wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Flesh out support for Ethernet protocol variant #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cbf9f3
db cleanup
mdavidsaver Apr 4, 2019
82bd45c
Selectable .proto file
mdavidsaver Apr 4, 2019
7082cb9
redo ethernet proto
mdavidsaver Apr 4, 2019
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
10 changes: 4 additions & 6 deletions digitelQpcApp/Db/digitelQPCController.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# This database is for a single QPC Controller
#
# SYSTEM - PV prefix or system name
# QPC - QPC Controller PV part name


Expand All @@ -9,23 +8,23 @@ record(stringin, "$(QPC):MODEL")
field(DESC, "Reads Device Model")
field(PINI, "YES")
field(DTYP, "stream")
field(INP, "@digitelQpc.proto getModel($(unit=01)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto getModel($(unit=01)) $(port)")
}

record(stringin, "$(QPC):FIRMWARE")
{
field(DESC, "Reads Device Firmware")
field(PINI, "YES")
field(DTYP, "stream")
field(INP, "@digitelQpc.proto getFirmware($(unit=01)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto getFirmware($(unit=01)) $(port)")
}

record(mbbo,"$(QPC):SETPUNITS")
{
field(DESC,"Set Pressure Units controller")
field(NOBT,"2")
field(DTYP, "stream")
field(OUT,"@digitelQpc.proto setPressUnit($(unit=01)) $(port)")
field(OUT,"@digitelQpc$(QPCBUS=).proto setPressUnit($(unit=01)) $(port)")
field(ZRVL,"0")
field(ONVL,"1")
field(TWVL,"2")
Expand All @@ -41,8 +40,7 @@ record(mbbi,"$(QPC):PUNITS")
field(DTYP, "stream")
field(SCAN, "Passive")
field(PINI, "YES")
field(INP,"@digitelQpc.proto getPressureUnit($(unit=01)) $(port)")
# field(INP, "$(SYSTEM)$(PMP):SETPUNITS.VAL CP NMS")
field(INP,"@digitelQpc$(QPCBUS=).proto getPressureUnit($(unit=01)) $(port)")
field(ZRVL,"0")
field(ONVL,"1")
field(TWVL,"2")
Expand Down
54 changes: 23 additions & 31 deletions digitelQpcApp/Db/digitelQpcIonp.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,6 @@
# SPT - Set point number for this pump
# SPLY - Which pump supply number

#record(stringin, "$(device):CONTROLLER")
#{
# field(DESC, "QPC Controller")
# field(PINI, "YES")
# field(VAL, $(controller))
#}


################################################################################
# Text string on front panel
#
Expand All @@ -62,7 +54,7 @@ record(stringout, "$(device):SETTEXT")
field(DESC, "Text String")
field(VAL , "$(text=$(device))")
field(DTYP, "stream")
field(OUT, "@digitelQpc.proto settext($(unit),$(SPLY),$(device)) $(port)")
field(OUT, "@digitelQpc$(QPCBUS=).proto settext($(unit),$(SPLY),$(device)) $(port)")
field(PINI, "YES")
}

Expand All @@ -73,7 +65,7 @@ record(bo, "$(device):SETAUTOST")
{
field(DESC, "Auto Restart")
field(DTYP, "stream")
field(OUT, "@digitelQpc.proto setautost($(unit=01),$(SPLY),$(device)) $(port)")
field(OUT, "@digitelQpc$(QPCBUS=).proto setautost($(unit=01),$(SPLY),$(device)) $(port)")
field(ZNAM, "No")
field(ONAM, "Yes")
field(DOL, "0")
Expand All @@ -87,7 +79,7 @@ record(bi, "$(device):AUTOST")
{
field(DESC, "Auto Restart")
field(DTYP, "stream")
field(INP, "@digitelQpc.proto autost($(unit=01),$(SPLY)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto autost($(unit=01),$(SPLY)) $(port)")
field(SCAN, "10 second")
field(PINI, "YES")
field(ZNAM, "No")
Expand All @@ -104,7 +96,7 @@ record(ai, "$(device):CAL") {
field(DESC, "Calibration Factor")
field(DTYP, "stream")
field(PINI, "YES")
field(INP, "@digitelQpc.proto getcal($(unit=01),$(SPLY)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto getcal($(unit=01),$(SPLY)) $(port)")
field(SCAN, "10 second")
field(LOPR, "0.0")
field(HOPR, "9.99")
Expand All @@ -117,7 +109,7 @@ record(ai, "$(device):CAL") {
record(ao, "$(device):SETCAL") {
field(DESC, "Calibration Factor")
field(DTYP, "stream")
field(OUT, "@digitelQpc.proto setcal($(unit=01),$(SPLY)) $(port)")
field(OUT, "@digitelQpc$(QPCBUS=).proto setcal($(unit=01),$(SPLY)) $(port)")
field(DRVL, "0.0")
field(DRVH, "9.99")
field(LOPR, "0.0")
Expand All @@ -131,7 +123,7 @@ record(ai, "$(device):GETV") {
field(DESC, "Get Target Voltage")
field(DTYP, "stream")
field(PINI, "YES")
field(INP, "@digitelQpc.proto getVoltageSetpoint($(unit=01),$(SPLY)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto getVoltageSetpoint($(unit=01),$(SPLY)) $(port)")
field(SCAN, "1 second")
field(LOPR, "3000")
field(HOPR, "7000")
Expand Down Expand Up @@ -164,7 +156,7 @@ record(calcout, "$(device):ISON")
record(ao, "$(device):SETV") {
field(DESC, "Set target voltage")
field(DTYP, "stream")
field(OUT, "@digitelQpc.proto setVoltage($(unit=01),$(SPLY)) $(port)")
field(OUT, "@digitelQpc$(QPCBUS=).proto setVoltage($(unit=01),$(SPLY)) $(port)")
field(PINI, "YES")
field(DOL, "$(HV=3000)")
field(DRVL, "3000")
Expand All @@ -182,7 +174,7 @@ record(bo, "$(device):SETHV")
{
field(DESC, "HV On / Off")
field(DTYP, "stream")
field(OUT, "@digitelQpc.proto sethv($(unit=01),$(SPLY),$(device)) $(port)")
field(OUT, "@digitelQpc$(QPCBUS=).proto sethv($(unit=01),$(SPLY),$(device)) $(port)")
field(ZNAM, "Stop")
field(ONAM, "Start")
field(DOL, "$(device):ISON PP")
Expand All @@ -209,7 +201,7 @@ record(ai, "$(device):I")
field(SCAN, "5 second")
# field(PINI, "YES")
field(DTYP, "stream")
field(INP, "@digitelQpc.proto getCurrent($(unit=01),$(SPLY)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto getCurrent($(unit=01),$(SPLY)) $(port)")
}

record(ai, "$(device):P")
Expand All @@ -218,7 +210,7 @@ record(ai, "$(device):P")
field(SCAN, "5 second")
# field(PINI, "YES")
field(DTYP, "stream")
field(INP, "@digitelQpc.proto getPressure($(unit=01),$(SPLY)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto getPressure($(unit=01),$(SPLY)) $(port)")
}

record(ai, "$(device):V")
Expand All @@ -228,7 +220,7 @@ record(ai, "$(device):V")
# field(PINI, "YES")
field(PREC, "0")
field(DTYP, "stream")
field(INP, "@digitelQpc.proto getVoltage($(unit=01),$(SPLY)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto getVoltage($(unit=01),$(SPLY)) $(port)")
}

record(stringin, "$(device):SCAN")
Expand Down Expand Up @@ -260,7 +252,7 @@ record(mbbi, "$(device):QPCSTA")
{
field(DESC, "Supply Status")
field(DTYP, "stream")
field(INP, "@digitelQpc.proto getStatus($(unit=01),$(SPLY),$(device):STATUSERRMSG) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto getStatus($(unit=01),$(SPLY),$(device):STATUSERRMSG) $(port)")
field(SCAN, "5 second")
field(ZRST, "Standby")
field(ONST, "Starting")
Expand Down Expand Up @@ -380,7 +372,7 @@ record(bo, "$(device):ENABLE")
field(PINI, "NO")
field(VAL, "1")
field(DTYP, "stream")
field(OUT, "@digitelQpc.proto sethv($(unit=01),$(SPLY),$(device)) $(port)")
field(OUT, "@digitelQpc$(QPCBUS=).proto sethv($(unit=01),$(SPLY),$(device)) $(port)")
}

record(bo, "$(device):DISABLE")
Expand All @@ -389,7 +381,7 @@ record(bo, "$(device):DISABLE")
field(PINI, "NO")
field(VAL, "0")
field(DTYP, "stream")
field(OUT, "@digitelQpc.proto sethv($(unit=01),$(SPLY),$(device)) $(port)")
field(OUT, "@digitelQpc$(QPCBUS=).proto sethv($(unit=01),$(SPLY),$(device)) $(port)")
}

###################################################################
Expand All @@ -400,15 +392,15 @@ record(ai, "$(device):PUMPSIZE")
field(PINI, "YES")
field(SCAN, "10 second")
field(DTYP, "stream")
field(INP, "@digitelQpc.proto getPumpSize($(unit=01),$(SPLY)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto getPumpSize($(unit=01),$(SPLY)) $(port)")
field(EGU,"L/S")
}
record(ao, "$(device):SETPUMPSIZE") {
field(DESC, "Sets Pump Size (L/S) for Pump $(SPLY)")
field(DTYP, "stream")
field(PINI, "YES")
field(DOL, "$(SIZE=500)")
field(OUT, "@digitelQpc.proto setPumpSize($(unit=01),$(SPLY)) $(port)")
field(OUT, "@digitelQpc$(QPCBUS=).proto setPumpSize($(unit=01),$(SPLY)) $(port)")
field(OMSL, "supervisory")
field(EGU,"L/S")
field(DRVH,"1200")
Expand All @@ -430,7 +422,7 @@ record(ai, "$(device):GETSP")
field(PINI, "YES")
field(SCAN, "5 second")
field(DTYP, "stream")
field(INP, "@digitelQpc.proto getSetpoints($(unit=01),$(SPLY),$(device)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto getSetpoints($(unit=01),$(SPLY),$(device)) $(port)")
field(PREC,"1")
}

Expand Down Expand Up @@ -492,7 +484,7 @@ record(ai, "$(device):RANGELOWER")
# the controller will simply return an error.
record(ai, "$(device):SETSPON")
{
field(DESC, "Set on press for Spt$(SPT)")
field(DESC, "Set on press for Spt$(SPT=$(SPLY))")
field(DTYP, "Soft Channel")
field(HOPR,"1.0E-4")
field(LOPR,"1.0e-11")
Expand All @@ -503,7 +495,7 @@ record(ai, "$(device):SETSPON")

record(ai, "$(device):SETSPOFF")
{
field(DESC, "Set off press for Spt$(SPT)")
field(DESC, "Set off press for Spt$(SPT=$(SPLY))")
field(DTYP, "Soft Channel")
field(HOPR,"1.0E-4")
field(LOPR,"1.0e-11")
Expand Down Expand Up @@ -550,11 +542,11 @@ record(calcout,"$(device):WRITESP")
field(DTYP, "stream")
field(CALC,"0")
field(PINI, "YES")
field(INPA,"$(SPT)")
field(INPA,"$(SPT=$(SPLY))")
field(INPB,"$(SPLY)")
field(INPC,"$(device):SETSPON.VAL NPP NMS")
field(INPD,"$(device):SETSPOFF.VAL NPP NMS")
field(OUT,"@digitelQpc.proto setSetpoints($(unit=01),$(device)) $(port)")
field(OUT,"@digitelQpc$(QPCBUS=).proto setSetpoints($(unit=01),$(device)) $(port)")
}

record(stringin, "$(device):SPOFFMESSAGE")
Expand Down Expand Up @@ -599,7 +591,7 @@ record(longin, "$(device):ERRGET")
{
field(DESC, "Get Error Code")
field(DTYP, "stream")
field(INP, "@digitelQpc.proto err($(unit),$(SPLY)) $(port)")
field(INP, "@digitelQpc$(QPCBUS=).proto err($(unit),$(SPLY)) $(port)")
field(SCAN, "Passive")
}

Expand Down Expand Up @@ -653,4 +645,4 @@ record(mbbi, "$(device):ERR")
field(TTSV, "MINOR")
field(FTSV, "MINOR")
field(FFSV, "MINOR")
}
}
Loading