From c52c3d596b5237f4081a004e96bcfa2841f72a45 Mon Sep 17 00:00:00 2001
From: Edward Wall <edward.wall@psi.ch>
Date: Tue, 11 Mar 2025 09:40:38 +0100
Subject: [PATCH] update for new database layout

---
 scripts/shutter.cmd             |  4 +--
 templates/shutter.substitutions | 43 +++++++++++++++++----------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/scripts/shutter.cmd b/scripts/shutter.cmd
index 45acf4d..3e38d98 100644
--- a/scripts/shutter.cmd
+++ b/scripts/shutter.cmd
@@ -12,8 +12,8 @@ require s7plcFW
 # )
 
 epicsEnvSet("SPS_REGISTER_NAME", "$(SPS_REGISTER_NAME=SPS-$(FETCH_DB))")
-epicsEnvSet("SPS_FETCH_SIZE", "36")
-epicsEnvSet("SPS_WRITE_SIZE", "2")
+epicsEnvSet("SPS_FETCH_SIZE", "152")
+epicsEnvSet("SPS_WRITE_SIZE", "1")
 
 s7plcFWConfigure("$(SPS_REGISTER_NAME)", "$(SPS_IP)", "$(FETCH_PORT=2000),1,$(FETCH_DB),0,$(SPS_FETCH_SIZE)", "$(WRITE_PORT=2001),1,$(WRITE_DB=$(FETCH_DB)),0,$(SPS_WRITE_SIZE)", $(SPS_ENDIANNESS=1), $(SPS_RECEIVE_TIMEOUT=1000), $(SPS_RECEIVE_DELAY=200), 0)
 
diff --git a/templates/shutter.substitutions b/templates/shutter.substitutions
index 2d3e772..b0a4cf5 100644
--- a/templates/shutter.substitutions
+++ b/templates/shutter.substitutions
@@ -1,22 +1,22 @@
 file "$(sinqSPS_DB)/writebit.db"
 {
-pattern
-{OFFSET, BIT, BIT_NAME        }
-{2     , 7  , "OPEN-SHUTTER"  }
-{3     , 0  , "CLOSE-SHUTTER" }
+  pattern
+  {OFFSET, BIT, BIT_NAME        }
+  {0     , 0  , "OPEN-SHUTTER"  }
+  {0     , 1  , "CLOSE-SHUTTER" }
 }
 
 file "$(sinqSPS_DB)/readbit.db"
 {
-pattern
-{OFFSET, BIT, BIT_NAME        }
-{2     , 0  , "PSYS-OK"       }
-{2     , 1  , "SHUTTER-READY" }
-{2     , 2  , "EMERGENCY-STOP"}
-{2     , 3  , "NOT-LOCKED"    }
-{2     , 4  , "CLOSED"        }
-{2     , 5  , "OPEN"          }
-{2     , 6  , "REMOTE-OKAY"   }
+  pattern
+  {OFFSET, BIT, BIT_NAME            }
+  {1     , 0  , "PSYS-OK"           }
+  {1     , 1  , "SHUTTER-READY"     }
+  {1     , 2  , "EMERGENCY-STOP-OFF"}
+  {1     , 3  , "NOT-LOCKED"        }
+  {1     , 4  , "CLOSED"            }
+  {1     , 5  , "OPEN"              }
+  {1     , 6  , "REMOTE-OKAY"       }
 }
 
 # The way that the strings are currently implemented in the SPS, the first two
@@ -25,12 +25,13 @@ pattern
 # we add two to the offset to skip these bytes.
 file "$(sinqSPS_DB)/readstring.db"
 {
-pattern
-{OFFSET, LENGTH, STRING_NAME      }
-{6     , 24    , "PSYS-OK-TXT"    }
-{32    , 22    , "SHUTTER-READY"  }
-{56    , 30    , "EMERGENCY-STOP" }
-{88    , 22    , "NOT-LOCKED"     }
-{110   , 19    , "OPEN"           }
-{134   , 32    , "REMOTE-ENABLED" }
+  pattern
+  {OFFSET, LENGTH, STRING_NAME          }
+  {6     , 11    , "PSYS-OK-TXT"        }
+  {20    , 17    , "SHUTTER-READY-TXT"  }
+  {40    , 17    , "EMERGENCY-STOP-TXT" }
+  {60    , 19    , "BLOCKED-TXT"        }
+  {82    , 24    , "BLOCKED-REASON-TXT" }
+  {108   , 14    , "OPEN-TXT"           }
+  {124   , 27    , "REMOTE-TXT"         }
 }