From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Fri, 5 May 2017 12:09:06 +0000 (+0200)
Subject: HUBER_COOLING: clean PP/LAI proto overlap: SetpointMom
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=182f27709110571f61bafc9873405c57cc499951;p=mvd_epics.git

HUBER_COOLING: clean PP/LAI proto overlap: SetpointMom
---

diff --git a/HUBER_COOLING/HUBER_COOLINGApp/Db/Huber_LAI.db b/HUBER_COOLING/HUBER_COOLINGApp/Db/Huber_LAI.db
index d8444f5..a3eb691 100644
--- a/HUBER_COOLING/HUBER_COOLINGApp/Db/Huber_LAI.db
+++ b/HUBER_COOLING/HUBER_COOLINGApp/Db/Huber_LAI.db
@@ -38,34 +38,23 @@ record (mbbi , "$(sys):$(sub):COOLING:$(csys):State") {
   field (THST, "CIRCULATION")
 }
 
-record (ai, "$(sys):$(sub):COOLING:$(csys):SetpointMom:RAW") {
-  field (DTYP, "stream")
-  field (INP,  "@Huber_LAI.proto getSetpoint $(PORT)")
-  field (SCAN, "I/O Intr")
-  field(FLNK, "$(sys):$(sub):COOLING:$(csys):SetpointMom")
-}
-
-record (calc, "$(sys):$(sub):COOLING:$(csys):SetpointMom") {
-  field(CALC, "A&0x100000?NaN:(A&0x80000?(A-0x100000)/100.:A/100.)")
-  field(INPA, "$(sys):$(sub):COOLING:$(csys):SetpointMom:RAW.VAL")
-  field(EGU, "deg C")
-  field(PREC, "3")
-  field(ADEL, "0.02")
-  field(MDEL, "0.02")
-  field(HOPR, "100.0")
-  field(LOPR, "-50.0")
-}
-
-#record (waveform, "$(sys):$(sub):COOLING:$(csys):STAT1:RAW") {
+#record (ai, "$(sys):$(sub):COOLING:$(csys):SetpointMom:RAW") {
 #  field (DTYP, "stream")
-#  field (INP, "@Huber_LAI.proto getStatOne $(PORT)")
-#  field (PINI, "YES")
-#  field (SCAN, "5 second")
-#  field (FTVL, "ULONG")
-#  field (NELM, "5")
-#  field(PREC, "0")
+#  field (INP,  "@Huber_LAI.proto getSetpoint $(PORT)")
+#  field (SCAN, "I/O Intr")
+#  field(FLNK, "$(sys):$(sub):COOLING:$(csys):SetpointMom")
+#}
+#
+#record (calc, "$(sys):$(sub):COOLING:$(csys):SetpointMom") {
+#  field(CALC, "A&0x100000?NaN:(A&0x80000?(A-0x100000)/100.:A/100.)")
+#  field(INPA, "$(sys):$(sub):COOLING:$(csys):SetpointMom:RAW.VAL")
+#  field(EGU, "deg C")
+#  field(PREC, "3")
+#  field(ADEL, "0.02")
+#  field(MDEL, "0.02")
+#  field(HOPR, "100.0")
+#  field(LOPR, "-50.0")
 #}
-
 
 # Stat 1
 record (longin, "$(sys):$(sub):COOLING:$(csys):T0:RAW") {
diff --git a/HUBER_COOLING/HUBER_COOLINGApp/Db/Huber_PP.db b/HUBER_COOLING/HUBER_COOLINGApp/Db/Huber_PP.db
index b5b3ca2..68a3797 100644
--- a/HUBER_COOLING/HUBER_COOLINGApp/Db/Huber_PP.db
+++ b/HUBER_COOLING/HUBER_COOLINGApp/Db/Huber_PP.db
@@ -15,19 +15,19 @@
 # ###         PORT  Asyn Interface      ### #
 #############################################
 
-#record (ai, "$(sys):$(sub):COOLING:$(csys):SetpointMom") {
-#  field (DTYP, "stream")
-#  field (INP,  "@Huber_PP.proto getDesVal $(PORT)")
-#  field (PINI, "YES")
-#  field (EGU,  "°C")
-#  field (PREC, "2")
-#  field (ADEL, "0.05")
-#  field (MDEL, "0.05")
-#  field (ASLO, "0.01")
-#  field (AOFF, "0")
-#  field (HOPR, "100.0")
-#  field (LOPR, "-50.0")
-#}
+record (ai, "$(sys):$(sub):COOLING:$(csys):SetpointMom") {
+  field (DTYP, "stream")
+  field (INP,  "@Huber_PP.proto getDesVal $(PORT)")
+  field (PINI, "YES")
+  field (EGU,  "°C")
+  field (PREC, "2")
+  field (ADEL, "0.05")
+  field (MDEL, "0.05")
+  field (ASLO, "0.01")
+  field (AOFF, "0")
+  field (HOPR, "100.0")
+  field (LOPR, "-50.0")
+}
 
 record (ai, "$(sys):$(sub):COOLING:$(csys):BathTemperatureMom") {
   field (DTYP, "stream")
@@ -75,8 +75,6 @@ record (ao, "$(sys):$(sub):COOLING:$(csys):Setpoint") {
   field (AOFF, "0")
   field (HOPR, "100.0")
   field (LOPR, "-50.0")
-#  field (HOPR, "$(sys):$(sub):COOLING:$(csys):MaximumValue")
-#  field (LOPR, "$(sys):$(sub):COOLING:$(csys):MinimumValue")
   field (FLNK, "$(sys):$(sub):COOLING:$(csys):SetpointMom")
 }
 
diff --git a/HUBER_COOLING/protocols/Huber_PP.proto b/HUBER_COOLING/protocols/Huber_PP.proto
index 1147377..b50ec7d 100644
--- a/HUBER_COOLING/protocols/Huber_PP.proto
+++ b/HUBER_COOLING/protocols/Huber_PP.proto
@@ -50,17 +50,6 @@ getExtTemp {
   in  "TE %d";
 }
 
-getVersion {
-  out "[M01V07C6";
-  in  "[S01V%*02X%6c%*02X";
-}
-
-getFirmware {
-  out "[M01F07B6";
-  in  "[S01F%*02X%8c%*02X";
-}
-
-
 #--------------------------------------------------------------------------------
 
 enableCirculation {