From 4426fa8413931c6215780074a1512f0ad475344a Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Thu, 16 Jul 2020 20:34:47 +0100 Subject: [PATCH] Refactor to use db templates and add rolling average --- TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/Makefile | 4 +- .../Db/devTektronix_MSO_4104B.db | 457 +----------------- .../devTektronix_MSO_4104B_ch.substitutions | 10 + .../Db/devTektronix_MSO_4104B_ch.template | 172 +++++++ .../iocBoot/iocTEKMSO4104B-IOC-01/st.cmd | 3 +- 5 files changed, 191 insertions(+), 455 deletions(-) create mode 100644 TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B_ch.substitutions create mode 100644 TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B_ch.template diff --git a/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/Makefile b/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/Makefile index 5907a3908..ed5d4a7b0 100644 --- a/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/Makefile +++ b/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/Makefile @@ -10,8 +10,8 @@ include $(TOP)/configure/CONFIG #---------------------------------------------------- # Create and install (or just install) into /db # databases, templates, substitutions like this -DB += devTektronix_MSO_4104B.db - +DB += devTektronix_MSO_4104B.db devTektronix_MSO_4104B_ch.db + #---------------------------------------------------- # If .db template is not named *.template add # _template = diff --git a/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B.db b/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B.db index 9943a0ba6..3acfa05db 100644 --- a/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B.db +++ b/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B.db @@ -9,6 +9,7 @@ record(bo, "$(P):SIM") field(ZNAM, "NO") field(ONAM, "YES") field(FLNK, "$(P):IDN") + field(VAL, $(RECSIM=0)) } record(bo, "$(P):DISABLE") @@ -45,319 +46,6 @@ record(stringin,"$(P):IDN") field(SDIS, "$(P):DISABLE") } -# Specific Channel commands - -# Records for calculated Y data disabled as only raw data plotted in CSS -# (as well as forward-links pointing to those records) - -record(waveform,"$(P):RAWYDATA_CH1") -{ - field(SCAN, "5 second") - field(DESC, "Get data points") - field(DTYP, "stream") - field(NELM, "10000") - field(FTVL, "LONG") - field(INP, "@devTektronix_MSO_4104B.proto getYDATA(1) $(PORT)") - field(FLNK, "$(P):XINC_CH1") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:RAWYDATA_CH1") - field(SDIS, "$(P):DISABLE") -} - -record(ai, "$(P):XINC_CH1") -{ - field(DESC, "get x increment of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getXINC(1) $(PORT)") - field(FLNK, "$(P):YMULT_CH1") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:XINC_CH1") - field(SDIS, "$(P):DISABLE") -} - -record(ai, "$(P):YMULT_CH1") -{ - field(DESC, "get y multiplier of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getYMULT(1) $(PORT)") - field(FLNK, "$(P):XUNIT_CH1") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:YMULT_CH1") - field(SDIS, "$(P):DISABLE") -} - -record(stringin,"$(P):XUNIT_CH1") -{ - field(DESC, "get x unit of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getXUNIT(1) $(PORT)") - field(FLNK, "$(P):YUNIT_CH1") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:XUNIT_CH1") - field(SDIS, "$(P):DISABLE") -} - -record(stringin,"$(P):YUNIT_CH1") -{ - field(DESC, "get y unit of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getYUNIT(1) $(PORT)") -# field(FLNK, "$(P):ACALC_YDATA_CH1") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:YUNIT_CH1") - field(SDIS, "$(P):DISABLE") -} - -#record(acalcout,"$(P):ACALC_YDATA_CH1") -#{ -# field(NELM, "10000") -# field(DESC, "scale y data points") -# field(INAA, "$(P):RAWYDATA_CH1") -# field(INPA, "$(P):YMULT_CH1") -# field(CALC, "AA * A") -# field(FLNK, "$(P):YDATA_CH1") -#} - -#record(waveform, "$(P):YDATA_CH1") -#{ -# field(NELM, "10000") -# field(DESC, "scaled y data points") -# field(INP, "$(P):ACALC_YDATA_CH1.AVAL") -# field(FTVL, "DOUBLE") -# field(SIML, "$(P):SIM") -# field(SIOL, "$(P):SIM:YDATA_CH1") -# field(SDIS, "$(P):DISABLE") -#} - -record(waveform,"$(P):RAWYDATA_CH2") -{ - field(SCAN, "5 second") - field(DESC, "Get y data points") - field(DTYP, "stream") - field(NELM, "10000") - field(FTVL, "LONG") - field(INP, "@devTektronix_MSO_4104B.proto getYDATA(2) $(PORT)") - field(FLNK, "$(P):XINC_CH2") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:RAWYDATA_CH2") - field(SDIS, "$(P):DISABLE") -} - -record(ai, "$(P):XINC_CH2") -{ - field(DESC, "get x increment of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getXINC(2) $(PORT)") - field(PREC, "3") - field(FLNK, "$(P):YMULT_CH2") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:XINC_CH2") - field(SDIS, "$(P):DISABLE") -} - -record(ai, "$(P):YMULT_CH2") -{ - field(DESC, "get y multiplier of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getYMULT(2) $(PORT)") - field(FLNK, "$(P):XUNIT_CH2") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:YMULT_CH2") - field(SDIS, "$(P):DISABLE") -} - -record(stringin,"$(P):XUNIT_CH2") -{ - field(DESC, "get x unit of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getXUNIT(2) $(PORT)") - field(FLNK, "$(P):YUNIT_CH2") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:XUNIT_CH2") - field(SDIS, "$(P):DISABLE") -} - -record(stringin,"$(P):YUNIT_CH2") -{ - field(DESC, "get y unit of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getYUNIT(2) $(PORT)") -# field(FLNK, "$(P):ACALC_YDATA_CH2") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:YUNIT_CH2") - field(SDIS, "$(P):DISABLE") -} - -#record(acalcout,"$(P):ACALC_YDATA_CH2") -#{ -# field(NELM, "10000") -# field(DESC, "scale y data points") -# field(INAA, "$(P):RAWYDATA_CH2") -# field(INPA, "$(P):YMULT_CH2") -# field(CALC, "AA * A") -# field(FLNK, "$(P):YDATA_CH2") -#} - -#record(waveform, "$(P):YDATA_CH2") -#{ -# field(NELM, "10000") -# field(DESC, "scaled y data points") -# field(INP, "$(P):ACALC_YDATA_CH2.AVAL") -# field(FTVL, "DOUBLE") -#} - -record(waveform, "$(P):RAWYDATA_CH3") -{ - field(SCAN, "5 second") - field(DESC, "Get y data points") - field(DTYP, "stream") - field(NELM, "10000") - field(FTVL, "LONG") - field(INP, "@devTektronix_MSO_4104B.proto getYDATA(3) $(PORT)") - field(FLNK, "$(P):XINC_CH3") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:RAWYDATA_CH3") - field(SDIS, "$(P):DISABLE") -} - -record(ai, "$(P):XINC_CH3") -{ - field(DESC, "get x increment of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getXINC(3) $(PORT)") - field(FLNK, "$(P):YMULT_CH3") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:XINC_CH3") - field(SDIS, "$(P):DISABLE") -} - -record(ai, "$(P):YMULT_CH3") -{ - field(DESC, "get y multiplier of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getYMULT(3) $(PORT)") - field(FLNK, "$(P):XUNIT_CH3") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:YMULT_CH3") - field(SDIS, "$(P):DISABLE") -} - -record(stringin, "$(P):XUNIT_CH3") -{ - field(DESC, "get x unit of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getXUNIT(3) $(PORT)") - field(FLNK, "$(P):YUNIT_CH3") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:XUNIT_CH3") - field(SDIS, "$(P):DISABLE") -} - -record(stringin, "$(P):YUNIT_CH3") -{ - field(DESC, "get y unit of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getYUNIT(3) $(PORT)") -# field(FLNK, "$(P):ACALC_YDATA_CH3") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:YUNIT_CH3") - field(SDIS, "$(P):DISABLE") -} - -#record(acalcout,"$(P):ACALC_YDATA_CH3") -#{ -# field(NELM, "10000") -# field(DESC, "scale y data points") -# field(INAA, "$(P):RAWYDATA_CH3") -# field(INPA, "$(P):YMULT_CH3") -# field(CALC, "AA * A") -# field(FLNK, "$(P):YDATA_CH3") -#} - -#record(waveform, "$(P):YDATA_CH3") -#{ -# field(NELM, "10000") -# field(DESC, "scaled y data points") -# field(INP, "$(P):ACALC_YDATA_CH3.AVAL") -# field(FTVL, "DOUBLE") -#} - -record(waveform, "$(P):RAWYDATA_CH4") -{ - field(SCAN, "5 second") - field(DESC, "Get y data points") - field(DTYP, "stream") - field(NELM, "10000") - field(FTVL, "LONG") - field(INP, "@devTektronix_MSO_4104B.proto getYDATA(4) $(PORT)") - field(FLNK, "$(P):XINC_CH4") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:RAWYDATA_CH4") - field(SDIS, "$(P):DISABLE") -} - -record(ai, "$(P):XINC_CH4") -{ - field(DESC, "get x increment of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getXINC(4) $(PORT)") - field(FLNK, "$(P):YMULT_CH4") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:XINC_CH4") - field(SDIS, "$(P):DISABLE") -} - -record(ai, "$(P):YMULT_CH4") -{ - field(DESC, "get y multiplier of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getYMULT(4) $(PORT)") - field(FLNK, "$(P):XUNIT_CH4") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:YMULT_CH4") - field(SDIS, "$(P):DISABLE") -} - -record(stringin, "$(P):XUNIT_CH4") -{ - field(DESC, "get x unit of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getXUNIT(4) $(PORT)") - field(FLNK, "$(P):YUNIT_CH4") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:XUNIT_CH4") - field(SDIS, "$(P):DISABLE") -} - -record(stringin, "$(P):YUNIT_CH4") -{ - field(DESC, "get y unit of plot") - field(DTYP, "stream") - field(INP, "@devTektronix_MSO_4104B.proto getYUNIT(4) $(PORT)") -# field(FLNK, "$(P):ACALC_YDATA_CH4") - field(SIML, "$(P):SIM") - field(SIOL, "$(P):SIM:YUNIT_CH4") - field(SDIS, "$(P):DISABLE") -} - -#record(acalcout,"$(P):ACALC_YDATA_CH4") -#{ -# field(NELM, "10000") -# field(DESC, "scale y data points") -# field(INAA, "$(P):RAWYDATA_CH4") -# field(INPA, "$(P):YMULT_CH4") -# field(CALC, "AA * A") -# field(FLNK, "$(P):YDATA_CH4") -#} - -#record(waveform, "$(P):YDATA_CH4") -#{ -# field(NELM, "10000") -# field(DESC, "scaled y data points") -# field(INP, "$(P):ACALC_YDATA_CH4.AVAL") -# field(FTVL, "DOUBLE") -#} - # The following two records generate values for the x-axis record(aSub,"$(P):ASUB") @@ -368,8 +56,8 @@ record(aSub,"$(P):ASUB") field(INPA, "$(P):XINC_CH1") field(OUTA, "$(P):OUT") field(FTVA, "DOUBLE") - field(NOVA, "10000") - field(NEVA, "10000") + field(NOVA, "$(NELM)") + field(NEVA, "$(NELM)") field(FLNK, "$(P):XDATA") } @@ -377,7 +65,7 @@ record(waveform, "$(P):XDATA") { field(INP, "$(P):ASUB.VALA") field(DTYP, "Soft Channel") - field(NELM, "10000") + field(NELM, "$(NELM)") field(FTVL, "DOUBLE") } @@ -394,144 +82,9 @@ record(stringin, "$(P):SIM:IDN") field(VAL, "Tektronix Simulated IDN String") } -record(waveform,"$(P):SIM:RAWYDATA_CH1") -{ - field(NELM, "10000") - field(FTVL, "LONG") -} - -record(ai, "$(P):SIM:XINC_CH1") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "0.01") -} - -record(ai, "$(P):SIM:YMULT_CH1") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "0.1") -} - -record(stringin, "$(P):SIM:XUNIT_CH1") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "s") -} - -record(stringin, "$(P):SIM:YUNIT_CH1") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "V") -} - -record(waveform,"$(P):SIM:RAWYDATA_CH2") -{ - field(NELM, "10000") - field(FTVL, "LONG") -} - -record(ai, "$(P):SIM:XINC_CH2") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "0.02") -} - -record(ai, "$(P):SIM:YMULT_CH2") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "0.2") -} - -record(stringin, "$(P):SIM:XUNIT_CH2") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "s") -} - -record(stringin, "$(P):SIM:YUNIT_CH2") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "V") -} - -record(waveform,"$(P):SIM:RAWYDATA_CH3") -{ - field(NELM, "10000") - field(FTVL, "LONG") -} - -record(ai, "$(P):SIM:XINC_CH3") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "0.03") -} - -record(ai, "$(P):SIM:YMULT_CH3") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "0.3") -} - -record(stringin, "$(P):SIM:XUNIT_CH3") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "s") -} - -record(stringin, "$(P):SIM:YUNIT_CH3") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "V") -} - -record(waveform,"$(P):SIM:RAWYDATA_CH4") -{ - field(NELM, "10000") - field(FTVL, "LONG") -} - -record(ai, "$(P):SIM:XINC_CH4") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "0.04") -} - -record(ai, "$(P):SIM:YMULT_CH4") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "0.4") -} - -record(stringin, "$(P):SIM:XUNIT_CH4") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "s") -} - -record(stringin, "$(P):SIM:YUNIT_CH4") -{ - field(SCAN, "Passive") - field(DTYP, "Soft Channel") - field(VAL, "V") -} record(waveform,"$(P):SIM:XDATA") { - field(NELM, "10000") + field(NELM, "$(NELM)") field(FTVL, "LONG") } diff --git a/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B_ch.substitutions b/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B_ch.substitutions new file mode 100644 index 000000000..71f51e756 --- /dev/null +++ b/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B_ch.substitutions @@ -0,0 +1,10 @@ +global {P = "\$(P)", PORT = "\$(PORT)", NELM = "\$(NELM)"} + +file "devTektronix_MSO_4104B.template" +{ + pattern { C } + { 1 } + { 2 } + { 3 } + { 4 } +} diff --git a/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B_ch.template b/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B_ch.template new file mode 100644 index 000000000..26e9f7243 --- /dev/null +++ b/TEKMSO4104B/TEKMSO4104B-IOC-01App/Db/devTektronix_MSO_4104B_ch.template @@ -0,0 +1,172 @@ + +# +# Simple YDATAbase and stream protocol file for basic SCPI (IEEE488.2) commands +# + +# +# waveform, acalcout and asub records not changed # +# + + + +# Specific Channel commands + +# Records for calculated Y data disabled as only raw data plotted in CSS +# (as well as forward-links pointing to those records) + +record(waveform,"$(P):RAWYDATA_CH$(C)") +{ + field(SCAN, "5 second") + field(DESC, "Get data points") + field(DTYP, "stream") + field(NELM, "$(NELM)") + field(FTVL, "LONG") + field(INP, "@devTektronix_MSO_4104B.proto getYDATA($(C)) $(PORT)") + field(FLNK, "$(P):XINC_CH$(C)") + field(SIML, "$(P):SIM") + field(SIOL, "$(P):SIM:RAWYDATA_CH$(C)") + field(SDIS, "$(P):DISABLE") +} + +record(ai, "$(P):XINC_CH$(C)") +{ + field(DESC, "get x increment of plot") + field(DTYP, "stream") + field(INP, "@devTektronix_MSO_4104B.proto getXINC($(C)) $(PORT)") + field(FLNK, "$(P):YMULT_CH$(C)") + field(SIML, "$(P):SIM") + field(SIOL, "$(P):SIM:XINC_CH$(C)") + field(SDIS, "$(P):DISABLE") +} + +record(ai, "$(P):YMULT_CH$(C)") +{ + field(DESC, "get y multiplier of plot") + field(DTYP, "stream") + field(INP, "@devTektronix_MSO_4104B.proto getYMULT($(C)) $(PORT)") + field(FLNK, "$(P):XUNIT_CH$(C)") + field(SIML, "$(P):SIM") + field(SIOL, "$(P):SIM:YMULT_CH$(C)") + field(SDIS, "$(P):DISABLE") +} + +record(stringin,"$(P):XUNIT_CH$(C)") +{ + field(DESC, "get x unit of plot") + field(DTYP, "stream") + field(INP, "@devTektronix_MSO_4104B.proto getXUNIT($(C)) $(PORT)") + field(FLNK, "$(P):YUNIT_CH$(C)") + field(SIML, "$(P):SIM") + field(SIOL, "$(P):SIM:XUNIT_CH$(C)") + field(SDIS, "$(P):DISABLE") +} + +record(stringin,"$(P):YUNIT_CH$(C)") +{ + field(DESC, "get y unit of plot") + field(DTYP, "stream") + field(INP, "@devTektronix_MSO_4104B.proto getYUNIT($(C)) $(PORT)") + field(FLNK, "$(P):YLOW_CH$(C)") + field(SIML, "$(P):SIM") + field(SIOL, "$(P):SIM:YUNIT_CH$(C)") + field(SDIS, "$(P):DISABLE") +} + +record(compress,"$(P):YLOW_CH$(C)") +{ + field(INP, "$(P):RAWYDATA_CH$(C)") + field(ALG, "N to 1 Low Value") + field(NSAM, "1") + field(N, "$(NELM)") + field(FLNK, "$(P):YHIGH_CH$(C)") +} + +record(compress,"$(P):YHIGH_CH$(C)") +{ + field(INP, "$(P):RAWYDATA_CH$(C)") + field(ALG, "N to 1 High Value") + field(NSAM, "1") + field(N, "$(NELM)") + field(FLNK, "$(P):YMED_CH$(C)") +} + +record(compress,"$(P):YMED_CH$(C)") +{ + field(INP, "$(P):RAWYDATA_CH$(C)") + field(ALG, "N to 1 Median") + field(NSAM, "1") + field(N, "$(NELM)") + field(FLNK, "$(P):YAVG_CH$(C)") +} + +record(compress,"$(P):YAVG_CH$(C)") +{ + field(INP, "$(P):RAWYDATA_CH$(C)") + field(ALG, "N to 1 Average") + field(NSAM, "1") + field(N, "$(NELM)") +# field(FLNK, "$(P):ACALC_YDATA_CH$(C)") +} + +#record(acalcout,"$(P):ACALC_YDATA_CH$(C)") +#{ +# field(NELM, "$(NELM)") +# field(DESC, "scale y data points") +# field(INAA, "$(P):RAWYDATA_CH$(C)") +# field(INPA, "$(P):YMULT_CH$(C)") +# field(CALC, "AA * A") +# field(FLNK, "$(P):YDATA_CH$(C)") +#} + +#record(waveform, "$(P):YDATA_CH$(C)") +#{ +# field(NELM, "$(NELM)") +# field(DESC, "scaled y data points") +# field(INP, "$(P):ACALC_YDATA_CH$(C).AVAL") +# field(FTVL, "DOUBLE") +# field(SIML, "$(P):SIM") +# field(SIOL, "$(P):SIM:YDATA_CH$(C)") +# field(SDIS, "$(P):DISABLE") +#} + + +### SIMULATION RECORDS ### + +# +# waveform, acalcout and asub records not changed # +# + +record(waveform,"$(P):SIM:RAWYDATA_CH$(C)") +{ + field(NELM, "$(NELM)") + field(FTVL, "LONG") +} + +record(ai, "$(P):SIM:XINC_CH$(C)") +{ + field(SCAN, "Passive") + field(DTYP, "Soft Channel") + field(VAL, "0.01") +} + +record(ai, "$(P):SIM:YMULT_CH$(C)") +{ + field(SCAN, "Passive") + field(DTYP, "Soft Channel") + field(VAL, "0.1") +} + +record(stringin, "$(P):SIM:XUNIT_CH$(C)") +{ + field(SCAN, "Passive") + field(DTYP, "Soft Channel") + field(VAL, "s") +} + +record(stringin, "$(P):SIM:YUNIT_CH$(C)") +{ + field(SCAN, "Passive") + field(DTYP, "Soft Channel") + field(VAL, "V") +} + diff --git a/TEKMSO4104B/iocBoot/iocTEKMSO4104B-IOC-01/st.cmd b/TEKMSO4104B/iocBoot/iocTEKMSO4104B-IOC-01/st.cmd index f26fd71eb..be9839ed7 100644 --- a/TEKMSO4104B/iocBoot/iocTEKMSO4104B-IOC-01/st.cmd +++ b/TEKMSO4104B/iocBoot/iocTEKMSO4104B-IOC-01/st.cmd @@ -28,7 +28,8 @@ vxi11Configure("IP", "130.246.49.179", 0, 0.0,"inst0", 0, 0) < $(IOCSTARTUP)/dbload.cmd ## Load our record instances -dbLoadRecords("db/devTektronix_MSO_4104B.db","P=$(MYPVPREFIX)$(IOCNAME), PORT=IP") +dbLoadRecords("db/devTektronix_MSO_4104B.db","P=$(MYPVPREFIX)$(IOCNAME),PORT=IP,NELM=10000,RECSIM=$(RECSIM)") +dbLoadRecords("db/devTektronix_MSO_4104B_ch.db","P=$(MYPVPREFIX)$(IOCNAME),PORT=IP,NELM=10000") ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called < $(IOCSTARTUP)/preiocinit.cmd