From 912d059452fac497e25ae553302b00721b1ba22d Mon Sep 17 00:00:00 2001
From: l_samenv <l_samenv@samenv.psi.ch>
Date: Mon, 30 Oct 2023 14:55:35 +0100
Subject: [PATCH 1/3] haake: change running to pumprunning

---
 tcl/startup/haake.tcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tcl/startup/haake.tcl b/tcl/startup/haake.tcl
index 21f1b10..d9b85d1 100644
--- a/tcl/startup/haake.tcl
+++ b/tcl/startup/haake.tcl
@@ -8,7 +8,7 @@ proc makeHaake {{name thermostat} {with2sensors 0}} {
 proc haakeLayout {{name ""} args} {
   if {[string compare [sicsdescriptor th] notfound] == 0} return 
   set reset 1
-  if {! [result th running]} {
+  if {! [result th pumprunning]} {
     Style Warning
     Label pump not running
     NoNewline
@@ -61,7 +61,7 @@ proc haakeLayout {{name ""} args} {
     set reset 0
   }
   Newline
-  CheckBox "pump running" "th running"
+  CheckBox "pump running" "th pumprunning"
   CheckBox "confirm alarm" "th reset/$reset"
   Tip "check this if an external sample sensor is used"
   if {[result th with2sensors] >= 0} {

From 325412e7674199e6a21cde407d1c7dbce83f64d0 Mon Sep 17 00:00:00 2001
From: l_samenv <l_samenv@samenv.psi.ch>
Date: Mon, 30 Oct 2023 14:55:54 +0100
Subject: [PATCH 2/3] add ori7.stick

---
 tcl/ori7.stick | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 tcl/ori7.stick

diff --git a/tcl/ori7.stick b/tcl/ori7.stick
new file mode 100644
index 0000000..284fbed
--- /dev/null
+++ b/tcl/ori7.stick
@@ -0,0 +1,3 @@
+stickDesc = standard ORI7 stick
+
+stick_sensors x186350 undefined

From e5063b56933543f8e99bdc587e69c0057ce2fdb2 Mon Sep 17 00:00:00 2001
From: l_samenv <l_samenv@samenv.psi.ch>
Date: Mon, 30 Oct 2023 14:56:11 +0100
Subject: [PATCH 3/3] fix fix_stick_sensors

---
 tcl/seacom.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tcl/seacom.tcl b/tcl/seacom.tcl
index 260c381..31ea428 100644
--- a/tcl/seacom.tcl
+++ b/tcl/seacom.tcl
@@ -655,7 +655,7 @@ proc stick_sensors {sensor1 sensor2} {
 proc fix_stick_sensors {} {
   # fix stick sensors
   foreach path {/tt/ts/curve /tt/ts_2/curve} {
-     set curv [silent "" sctval $path]
+     set curv [sctval $path ""]
      if {$curv ne ""} {
        hset $path $curv
      }