From: Philipp Klaus <klaus@physik.uni-frankfurt.de>
Date: Tue, 12 Sep 2017 11:59:25 +0000 (+0200)
Subject: HUBER_COOLING: expect length & checksum to be hex
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=4bf8dc1aa2a5ee2e5427f0540bf4cc8c6b61d517;p=mvd_epics.git

HUBER_COOLING: expect length & checksum to be hex
---

diff --git a/HUBER_COOLING/protocols/Huber_LAI.proto b/HUBER_COOLING/protocols/Huber_LAI.proto
index 9d4ff90..47721a3 100644
--- a/HUBER_COOLING/protocols/Huber_LAI.proto
+++ b/HUBER_COOLING/protocols/Huber_LAI.proto
@@ -41,36 +41,36 @@ getState {
   #           O0083408CFC504D7
   # Input "O0083408CAC504D2" does not match format "%*02X#{OFF=79|INTERNAL=73|EXTERNAL=69|CIRCULATION=67}"
   #in  "%.1/\[S01G[[:xdigit:]]{2}(.*)[[:xdigit:]]{2}/";
-  in  "[S01G%*02X%{O|I|E|C}%*15c";
+  in  "[S01G%*02X%{O|I|E|C}%*13c%*02X";
 }
 
 getSetpoint {
-  in  "[S01G%*4c%04X%*10c";
+  in  "[S01G%*4c%04X%*8c%*02X";
 }
 
 getInternal {
-  in  "[S01G%*8c%04X%*6c";
+  in  "[S01G%*8c%04X%*4c%*02X";
 }
 
 getExternal {
-  in  "[S01G%*12c%04X%*2c";
+  in  "[S01G%*12c%04X%*02X";
 }
 
 getStat1 {
   out "[M01S081F5";
-  in  "[S01S%*2c"
+  in  "[S01S%*02X"
       "1"
       "%04X"
       "%(\$1:TC:RAW.VAL)04X"
       "%(\$1:T1:RAW.VAL)04X"
       "%(\$1:TIntern:RAW.VAL)04X"
       "%(\$1:TProcess:RAW.VAL)04X"
-      "%*2c";
+      "%*02X";
 }
 
 getStat2 {
   out "[M01S082F6";
-  in  "[S01S%*2c"
+  in  "[S01S%*02X"
       "2"
       "%02X"
       "%(\$1:HT:RAW.VAL)02X"
@@ -80,24 +80,24 @@ getStat2 {
       "%(\$1:unknown1:RAW.VAL)02X"
       "%(\$1:unknown2:RAW.VAL)02X"
       "%(\$1:AIF_IN:RAW.VAL)04X"
-      "%*2c";
+      "%*02X";
 }
 
 getStat3 {
   out "[M01S083F7";
-  in  "[S01S%*2c"
+  in  "[S01S%*02X"
       "3"
       "%04X"
       "%(\$1:TX1:RAW.VAL)04X"
       "%(\$1:TX0:RAW.VAL)04X"
       "%(\$1:Pressure:RAW.VAL)04X"
       "%(\$1:PumpSpeed:RAW.VAL)04X"
-      "%*2c";
+      "%*02X";
 }
 
 #getStatOne {
 #  out "[M01S081F5";
-#  in  "[S01S%*2c1%04X%*2c";
+#  in  "[S01S%*02X1%04X%*02X";
 #}
 
 #--------------------------------------------------------------------------------