From 39519d8c1ca1e2079cc4760a9ec0c1b5b6f92ece Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Mon, 4 Aug 2014 15:45:59 +1000
Subject: [PATCH] Don't register poll/write when simulating in LS-3xx drivers

---
 .../environment/temperature/sct_lakeshore_336.tcl    |  8 ++++++--
 .../environment/temperature/sct_lakeshore_340.tcl    |  8 ++++++--
 .../environment/temperature/sct_lakeshore_370.tcl    | 12 ++++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
index f14c3284..797c9f49 100644
--- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
+++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
@@ -1536,7 +1536,9 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p
     }
     if {$pollEnabled == 1} {
       # clientput "enabling polling for $nodeName"
-      $sct_controller poll $nodeName
+      if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+        $sct_controller poll $nodeName
+      }
     }
     hsetprop $nodeName $rdFunc ${ns}::$rdFunc $scobj_hpath $rdCmd $idx
     if {$writable == 1} {
@@ -1544,7 +1546,9 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p
       hsetprop $nodeName writestatus UNKNOWN
       hsetprop $nodeName noResponse ${ns}::noResponse
       if {$pollEnabled == 1} {
-        $sct_controller write $nodeName
+        if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+          $sct_controller write $nodeName
+        }
       }
     }
     switch -exact $dataType {
diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl
index da8a9dee..8e2e8738 100644
--- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl
+++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl
@@ -1712,7 +1712,9 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p
     }
     if {$pollEnabled == 1} {
       # clientput "enabling polling for $nodeName"
-      $sct_controller poll $nodeName
+      if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+        $sct_controller poll $nodeName
+      }
     }
     hsetprop $nodeName $rdFunc ${ns}::$rdFunc $idx
     if {$writable == 1} {
@@ -1720,7 +1722,9 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p
       hsetprop $nodeName writestatus UNKNOWN
       hsetprop $nodeName noResponse ${ns}::noResponse
       if {$pollEnabled == 1} {
-        $sct_controller write $nodeName
+        if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+          $sct_controller write $nodeName
+        }
       }
     }
     switch -exact $dataType {
diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl
index 6b4750c0..74233b4a 100644
--- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl
+++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl
@@ -734,8 +734,10 @@ namespace eval ::scobj::[set vendor]_[set device] {
         if { $readable >= 0 && $readable <= 300 } {
           set poll_period [expr {int($readable)}]
         }
-        debug_log 1 "Registering node $nodeName for poll at $poll_period seconds"
-        $sct_controller poll $nodeName $poll_period
+        if {[SplitReply [environment_simulation]]=="false"} {
+          debug_log 1 "Registering node $nodeName for poll at $poll_period seconds"
+          $sct_controller poll $nodeName $poll_period
+        }
       }
       if {$writable == 1} {
         # the node is writable so set it up to invoke a callback when written
@@ -752,8 +754,10 @@ namespace eval ::scobj::[set vendor]_[set device] {
         hsetprop $nodeName write ${ns}::$func_name $scobj_hpath $next_state $wrCmd
         hsetprop $nodeName $next_state ${ns}::$next_state $scobj_hpath
         hsetprop $nodeName writestatus UNKNOWN
-        debug_log 1 "Registering node $nodeName for write callback"
-        $sct_controller write $nodeName
+        if {[SplitReply [environment_simulation]]=="false"} {
+          debug_log 1 "Registering node $nodeName for write callback"
+          $sct_controller write $nodeName
+        }
       }
       # Initialise the previous value to test against
       switch -exact $dataType {