From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Tue, 26 Jun 2018 11:45:51 +0000 (+0200)
Subject: HAMEG: Remove $(CHAN_NAME) from [...]_CHANNEL.db
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=15ecc9ad49a175103824a3f2fed056481db0e28c;p=mvd_epics.git

HAMEG: Remove $(CHAN_NAME) from [...]_CHANNEL.db
---

diff --git a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.db b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.db
index 8cafe84..b8181a9 100644
--- a/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.db
+++ b/HAMEG_HMP4030/HAMEG_HMP4030App/Db/HAMEG_HMP4030_CHANNEL.db
@@ -1,4 +1,4 @@
-record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetVoltage") {
+record (ao, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):SetVoltage") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetVoltage($(CHAN)) $(PORT)")
   field (EGU, "V")
@@ -6,7 +6,7 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetVoltage") {
   field (ADEL, "0.005")
   field (MDEL, "0.001")
 }
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetVoltage") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):GetVoltage") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetVoltage($(CHAN)) $(PORT)")
   field (SCAN, "2 second")
@@ -16,7 +16,7 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetVoltage") {
   field (MDEL, "0.001")
 }
 
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):MeasuredVoltage") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):MeasuredVoltage") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto MeasuredVoltage($(CHAN)) $(PORT)")
   field (SCAN, "2 second")
@@ -26,7 +26,7 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):MeasuredVoltage") {
   field (MDEL, "0.001")
 }
 
-record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetVoltageStepSize") {
+record (ao, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):SetVoltageStepSize") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetVoltageStepSize($(CHAN)) $(PORT)")
   field (EGU, "V")
@@ -35,7 +35,7 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetVoltageStepSize") {
   field (MDEL, "0.001")
 }
 
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetVoltageStepSize") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):GetVoltageStepSize") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetVoltageStepSize($(CHAN)) $(PORT)")
   field (EGU, "V")
@@ -45,7 +45,7 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetVoltageStepSize") {
   field (SCAN, "5 second")
 }
 
-record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetCurrent") {
+record (ao, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):SetCurrent") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetCurrent($(CHAN)) $(PORT)")
   field (EGU, "A")
@@ -53,7 +53,7 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetCurrent") {
   field (ADEL, "0.005")
   field (MDEL, "0.001")
 }
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetCurrent") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):GetCurrent") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetCurrent($(CHAN)) $(PORT)")
   field (SCAN, "2 second")
@@ -63,7 +63,7 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetCurrent") {
   field (MDEL, "0.001")
 }
 
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):MeasuredCurrent") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):MeasuredCurrent") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto MeasuredCurrent($(CHAN)) $(PORT)")
   field (SCAN, "2 second")
@@ -73,7 +73,7 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):MeasuredCurrent") {
   field (MDEL, "0.001")
 }
 
-record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetCurrentStepSize") {
+record (ao, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):SetCurrentStepSize") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetCurrentStepSize($(CHAN)) $(PORT)")
   field (EGU, "A")
@@ -82,7 +82,7 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetCurrentStepSize") {
   field (MDEL, "0.001")
 }
 
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetCurrentStepSize") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):GetCurrentStepSize") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetCurrentStepSize($(CHAN)) $(PORT)")
   field (EGU, "A")
@@ -92,7 +92,7 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetCurrentStepSize") {
   field (SCAN, "5 second")
 }
 
-record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetOutput") {
+record (bo, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):SetOutput") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetOutput($(CHAN)) $(PORT)")
   field (ZNAM, "OFF")
@@ -100,7 +100,7 @@ record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetOutput") {
   field (PINI, "YES")
 }
 
-record (bi, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOutput") {
+record (bi, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):GetOutput") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetOutput($(CHAN)) $(PORT)")
   field (ZNAM, "OFF")
@@ -109,7 +109,7 @@ record (bi, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOutput") {
   field (PINI, "YES")
 }
 
-record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetFuse") {
+record (bo, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):SetFuse") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetFuse($(CHAN)) $(PORT)")
   field (ZNAM, "OFF")
@@ -117,7 +117,7 @@ record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetFuse") {
   field (PINI, "YES")
 }
 
-record (bi, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetFuse") {
+record (bi, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):GetFuse") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetFuse($(CHAN)) $(PORT)")
   field (ZNAM, "OFF")
@@ -126,7 +126,7 @@ record (bi, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetFuse") {
   field (PINI, "YES")
 }
 
-record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetOVPVoltage") {
+record (ao, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):SetOVPVoltage") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetOVPVoltage($(CHAN)) $(PORT)")
   field (EGU, "V")
@@ -135,7 +135,7 @@ record (ao, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetOVPVoltage") {
   field (MDEL, "0.001")
 }
 
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOVPVoltage") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):GetOVPVoltage") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetOVPVoltage($(CHAN)) $(PORT)")
   field (EGU, "V")
@@ -145,12 +145,12 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOVPVoltage") {
   field (SCAN, "2 second")
 }
 
-record (bo, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):ClearVoltageProtection") {
+record (bo, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):ClearVoltageProtection") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto ClearVoltageProtection($(CHAN)) $(PORT)")
 }
 
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOVPVoltageMin") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):GetOVPVoltageMin") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetOVPVoltageLimit($(CHAN),MIN) $(PORT)")
   field (EGU, "V")
@@ -160,7 +160,7 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOVPVoltageMin") {
   field (PINI, "YES")
 }
 
-record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOVPVoltageMax") {
+record (ai, "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):GetOVPVoltageMax") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetOVPVoltageLimit($(CHAN),MAX) $(PORT)")
   field (EGU, "V")
@@ -170,7 +170,7 @@ record (ai, "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOVPVoltageMax") {
   field (PINI, "YES")
 }
 
-record (mbbi , "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOVPMode") {
+record (mbbi , "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):GetOVPMode") {
   field (DTYP, "stream")
   field (INP,  "@HAMEG_HMP4030.proto GetOVPMode($(CHAN)) $(PORT)")
   field (SCAN, "5 second")
@@ -179,7 +179,7 @@ record (mbbi , "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):GetOVPMode") {
   field (ONST, "PROTECTED")
 }
 
-record (mbbo , "$(sys):$(sub):POWER:$(vsys):$(CHAN_NAME):SetOVPMode") {
+record (mbbo , "$(sys):$(sub):POWER:$(vsys):CHAN$(CHAN):SetOVPMode") {
   field (DTYP, "stream")
   field (OUT,  "@HAMEG_HMP4030.proto SetOVPMode($(CHAN)) $(PORT)")
   field (PINI, "YES")
diff --git a/HAMEG_HMP4030/iocBoot/iocHAMEG_HMP4030/st.cmd b/HAMEG_HMP4030/iocBoot/iocHAMEG_HMP4030/st.cmd
index e007af2..efa3704 100755
--- a/HAMEG_HMP4030/iocBoot/iocHAMEG_HMP4030/st.cmd
+++ b/HAMEG_HMP4030/iocBoot/iocHAMEG_HMP4030/st.cmd
@@ -24,9 +24,9 @@ asynSetOption ("HAMEG_PORT", 0, "crtscts", "N")
 #dbLoadRecords("db/xxx.db","user=scs")
 
 dbLoadRecords("db/HAMEG_HMP4030.db",         "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT")
-dbLoadRecords("db/HAMEG_HMP4030_CHANNEL.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT,CHAN_NAME=CHAN1,CHAN=1")
-dbLoadRecords("db/HAMEG_HMP4030_CHANNEL.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT,CHAN_NAME=CHAN2,CHAN=2")
-dbLoadRecords("db/HAMEG_HMP4030_CHANNEL.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT,CHAN_NAME=CHAN3,CHAN=3")
+dbLoadRecords("db/HAMEG_HMP4030_CHANNEL.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT,CHAN=1")
+dbLoadRecords("db/HAMEG_HMP4030_CHANNEL.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT,CHAN=2")
+dbLoadRecords("db/HAMEG_HMP4030_CHANNEL.db", "PORT=HAMEG_PORT,sys=CBM,sub=MVD,vsys=PRESTO_RECIPIENT,CHAN=3")
 
 cd "${TOP}/iocBoot/${IOC}"
 iocInit