From 8ff7368f34c9846bdd8d85573292d734d956dc96 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Tue, 2 Dec 2014 13:25:03 +1100
Subject: [PATCH] develop keysight_N8740A.sct

---
 .../environment/sct_keysight_N8740A.tcl       | 437 ++++++++++++------
 1 file changed, 289 insertions(+), 148 deletions(-)

diff --git a/site_ansto/instrument/config/environment/sct_keysight_N8740A.tcl b/site_ansto/instrument/config/environment/sct_keysight_N8740A.tcl
index 463fc56f..bb079087 100644
--- a/site_ansto/instrument/config/environment/sct_keysight_N8740A.tcl
+++ b/site_ansto/instrument/config/environment/sct_keysight_N8740A.tcl
@@ -30,6 +30,33 @@ proc ::scobj::keysight_N8740A::sics_log {debug_level debug_string} {
   } catch_message ]
 }
 
+# checklimits function for driveable interface
+proc ::scobj::keysight_N8740A::checklimits {tc_root} {
+  set catch_status [ catch {
+    debug_log ${tc_root} 1 "checklimits tc_root=${tc_root} sct=[sct] target=[sct target]"
+    set setpoint [sct target]
+    if { [hpropexists [sct] lowerlimit] } {
+      set lolimit [sct lowerlimit]
+    } else {
+      # lowerlimit not set, use target
+      set lolimit [sct target]
+    }
+    if { [hpropexists [sct] upperlimit] } {
+      set hilimit [sct upperlimit]
+    } else {
+      # upperlimit not set, use target
+      set hilimit [sct target]
+    }
+# checklimits hook code goes here
+    if { ${setpoint} < ${lolimit} || ${setpoint} > ${hilimit} } {
+      sct driving 0
+      error "setpoint ${setpoint} violates limits (${lolimit}..${hilimit}) on [sct]"
+    }
+    return OK
+  } catch_message ]
+  handle_exception ${catch_status} ${catch_message}
+}
+
 # check function for hset change
 proc ::scobj::keysight_N8740A::checkrange {tc_root} {
   set catch_status [ catch {
@@ -56,6 +83,45 @@ proc ::scobj::keysight_N8740A::checkrange {tc_root} {
   handle_exception ${catch_status} ${catch_message}
 }
 
+# checkstatus function for driveable interface
+proc ::scobj::keysight_N8740A::checkstatus {tc_root} {
+  set catch_status [ catch {
+# checkstatus hook code goes here
+    if {[sct driving]} {
+      set sp "[sct target]"
+      if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
+        set pv "${sp}"
+        hupdateif ${tc_root}/[sct driveable] ${sp}
+      } else {
+        set pv "[hval ${tc_root}/[sct driveable]]"
+      }
+      if { abs(${pv} - ${sp}) <= [sct tolerance] } {
+        if { [hpropexists [sct] settle_time] } {
+          if { [hpropexists [sct] settle_time_start] } {
+            if { [sct utime] - [sct settle_time_start] >= [sct settle_time]} {
+              sct driving 0
+              return "idle"
+            }
+            return "busy"
+          } else {
+            sct utime settle_time_start
+            return "busy"
+          }
+        }
+        sct driving 0
+        return "idle"
+      }
+      if { [hpropexists [sct] settle_time_start] } {
+        hdelprop [sct] settle_time_start
+      }
+      return "busy"
+    } else {
+      return "idle"
+    }
+  } catch_message ]
+  handle_exception ${catch_status} ${catch_message}
+}
+
 # function to request the read of a parameter on a device
 proc ::scobj::keysight_N8740A::getValue {tc_root nextState cmd_str} {
   set catch_status [ catch {
@@ -74,6 +140,18 @@ proc ::scobj::keysight_N8740A::getValue {tc_root nextState cmd_str} {
   handle_exception ${catch_status} ${catch_message}
 }
 
+# halt function for driveable interface
+proc ::scobj::keysight_N8740A::halt {tc_root} {
+  set catch_status [ catch {
+    debug_log ${tc_root} 1 "halt tc_root=${tc_root} sct=[sct] driving=[sct driving]"
+    ### TODO hset [sct] [hval [sct]]
+# halt hook code goes here
+    sct driving 0
+    return "idle"
+  } catch_message ]
+  handle_exception ${catch_status} ${catch_message}
+}
+
 # function to check the write parameter on a device
 proc ::scobj::keysight_N8740A::noResponse {tc_root} {
   set catch_status [ catch {
@@ -119,7 +197,13 @@ proc ::scobj::keysight_N8740A::setValue {tc_root nextState cmd_str} {
     }
     set par [sct target]
     set cmd "${cmd_str}${par}"
-# setValue hook code goes here
+# setValue hook code starts
+    set cmd "${cmd_str}${par}@@NOREPLY@@"
+# setValue hook code ends
+    if { [hpropexists [sct] geterror] } {
+      debug_log ${tc_root} 9 "[sct] error: [sct geterror]"
+      error "[sct geterror]"
+    }
     if { [hpropexists [sct] driving] } {
       if { [hpropexists [sct] writestatus] && [sct writestatus] == "start" } {
         sct driving 1
@@ -147,111 +231,169 @@ proc ::scobj::keysight_N8740A::mkDriver { sct_controller name device_class simul
 
     set scobj_hpath /sics/${name}
 
-    hfactory ${scobj_hpath}/state plain user int
-    hsetprop ${scobj_hpath}/state read ${ns}::getValue ${scobj_hpath} rdValue {OUTPUT:STATE?}
-    hsetprop ${scobj_hpath}/state rdValue ${ns}::rdValue ${scobj_hpath}
-    hsetprop ${scobj_hpath}/state write ${ns}::setValue ${scobj_hpath} noResponse {OUTPUT:STATE }
-    hsetprop ${scobj_hpath}/state noResponse ${ns}::noResponse ${scobj_hpath}
-    hsetprop ${scobj_hpath}/state check ${ns}::checkrange ${scobj_hpath}
-    hsetprop ${scobj_hpath}/state control true
-    hsetprop ${scobj_hpath}/state data true
-    hsetprop ${scobj_hpath}/state mutable true
-    hsetprop ${scobj_hpath}/state nxsave true
-    hsetprop ${scobj_hpath}/state values 0,1
-    hsetprop ${scobj_hpath}/state oldval 0
-    hsetprop ${scobj_hpath}/state klass "parameter"
-    hsetprop ${scobj_hpath}/state sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/state type "part"
-    hsetprop ${scobj_hpath}/state nxalias "${name}_state"
+    hfactory ${scobj_hpath}/amps plain user float
+    hsetprop ${scobj_hpath}/amps read ${ns}::getValue ${scobj_hpath} rdValue {MEASURE:SCALAR:CURRENT:DC?}
+    hsetprop ${scobj_hpath}/amps rdValue ${ns}::rdValue ${scobj_hpath}
+    hsetprop ${scobj_hpath}/amps control true
+    hsetprop ${scobj_hpath}/amps data true
+    hsetprop ${scobj_hpath}/amps mutable true
+    hsetprop ${scobj_hpath}/amps nxsave true
+    hsetprop ${scobj_hpath}/amps units A
+    hsetprop ${scobj_hpath}/amps oldval 0.0
+    hsetprop ${scobj_hpath}/amps klass "parameter"
+    hsetprop ${scobj_hpath}/amps sdsinfo "::nexus::scobj::sdsinfo"
+    hsetprop ${scobj_hpath}/amps type "part"
+    hsetprop ${scobj_hpath}/amps nxalias "${name}_amps"
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/state 2
-      ${sct_controller} write ${scobj_hpath}/state
-      hsetprop ${scobj_hpath}/state simulated false
+      ${sct_controller} poll ${scobj_hpath}/amps 1
+      hsetprop ${scobj_hpath}/amps simulated false
     } else {
       ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
-      hsetprop ${scobj_hpath}/state simulated true
+      hsetprop ${scobj_hpath}/amps simulated true
+    }
+
+    hfactory ${scobj_hpath}/output_enable plain user int
+    hsetprop ${scobj_hpath}/output_enable read ${ns}::getValue ${scobj_hpath} rdValue {OUTPUT:STATE?}
+    hsetprop ${scobj_hpath}/output_enable rdValue ${ns}::rdValue ${scobj_hpath}
+    hsetprop ${scobj_hpath}/output_enable write ${ns}::setValue ${scobj_hpath} noResponse {OUTPUT:STATE }
+    hsetprop ${scobj_hpath}/output_enable noResponse ${ns}::noResponse ${scobj_hpath}
+    hsetprop ${scobj_hpath}/output_enable check ${ns}::checkrange ${scobj_hpath}
+    hsetprop ${scobj_hpath}/output_enable control true
+    hsetprop ${scobj_hpath}/output_enable data true
+    hsetprop ${scobj_hpath}/output_enable mutable true
+    hsetprop ${scobj_hpath}/output_enable nxsave true
+    hsetprop ${scobj_hpath}/output_enable values 0,1
+    hsetprop ${scobj_hpath}/output_enable oldval 0
+    hsetprop ${scobj_hpath}/output_enable klass "parameter"
+    hsetprop ${scobj_hpath}/output_enable sdsinfo "::nexus::scobj::sdsinfo"
+    hsetprop ${scobj_hpath}/output_enable type "part"
+    hsetprop ${scobj_hpath}/output_enable nxalias "${name}_output_enable"
+
+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/output_enable 2
+      ${sct_controller} write ${scobj_hpath}/output_enable
+      hsetprop ${scobj_hpath}/output_enable simulated false
+    } else {
+      ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
+      hsetprop ${scobj_hpath}/output_enable simulated true
+    }
+
+    hfactory ${scobj_hpath}/setpoint plain user float
+    hsetprop ${scobj_hpath}/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {SOURCE:VOLTAGE?}
+    hsetprop ${scobj_hpath}/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
+    hsetprop ${scobj_hpath}/setpoint write ${ns}::setValue ${scobj_hpath} noResponse {SOURCE:VOLTAGE }
+    hsetprop ${scobj_hpath}/setpoint noResponse ${ns}::noResponse ${scobj_hpath}
+    hsetprop ${scobj_hpath}/setpoint check ${ns}::checkrange ${scobj_hpath}
+    hsetprop ${scobj_hpath}/setpoint driving 0
+    hsetprop ${scobj_hpath}/setpoint checklimits ${ns}::checklimits ${scobj_hpath}
+    hsetprop ${scobj_hpath}/setpoint checkstatus ${ns}::checkstatus ${scobj_hpath}
+    hsetprop ${scobj_hpath}/setpoint halt ${ns}::halt ${scobj_hpath}
+    hsetprop ${scobj_hpath}/setpoint driveable setpoint
+    hsetprop ${scobj_hpath}/setpoint control true
+    hsetprop ${scobj_hpath}/setpoint data true
+    hsetprop ${scobj_hpath}/setpoint mutable true
+    hsetprop ${scobj_hpath}/setpoint nxsave true
+    hsetprop ${scobj_hpath}/setpoint lowerlimit 0
+    hsetprop ${scobj_hpath}/setpoint upperlimit 150
+    hsetprop ${scobj_hpath}/setpoint tolerance 1
+    hsetprop ${scobj_hpath}/setpoint units V
+    hsetprop ${scobj_hpath}/setpoint oldval 0.0
+    hsetprop ${scobj_hpath}/setpoint klass "parameter"
+    hsetprop ${scobj_hpath}/setpoint sdsinfo "::nexus::scobj::sdsinfo"
+    hsetprop ${scobj_hpath}/setpoint type "drivable"
+    hsetprop ${scobj_hpath}/setpoint nxalias "${name}_setpoint"
+
+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/setpoint 1
+      ${sct_controller} write ${scobj_hpath}/setpoint
+      hsetprop ${scobj_hpath}/setpoint simulated false
+    } else {
+      ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
+      hsetprop ${scobj_hpath}/setpoint simulated true
+    }
+
+    hfactory ${scobj_hpath}/volts plain user float
+    hsetprop ${scobj_hpath}/volts read ${ns}::getValue ${scobj_hpath} rdValue {MEASURE:SCALAR:VOLTAGE:DC?}
+    hsetprop ${scobj_hpath}/volts rdValue ${ns}::rdValue ${scobj_hpath}
+    hsetprop ${scobj_hpath}/volts control true
+    hsetprop ${scobj_hpath}/volts data true
+    hsetprop ${scobj_hpath}/volts mutable true
+    hsetprop ${scobj_hpath}/volts nxsave true
+    hsetprop ${scobj_hpath}/volts units V
+    hsetprop ${scobj_hpath}/volts oldval 0.0
+    hsetprop ${scobj_hpath}/volts klass "parameter"
+    hsetprop ${scobj_hpath}/volts sdsinfo "::nexus::scobj::sdsinfo"
+    hsetprop ${scobj_hpath}/volts type "part"
+    hsetprop ${scobj_hpath}/volts nxalias "${name}_volts"
+
+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/volts 1
+      hsetprop ${scobj_hpath}/volts simulated false
+    } else {
+      ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
+      hsetprop ${scobj_hpath}/volts simulated true
     }
 
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
+    ansto_makesctdrive ${name}_setpoint ${scobj_hpath}/setpoint ${scobj_hpath}/setpoint ${sct_controller}
 
     hfactory ${scobj_hpath}/current plain spy none
 
-    hfactory ${scobj_hpath}/current/limit plain user float
-    hsetprop ${scobj_hpath}/current/limit read ${ns}::getValue ${scobj_hpath} rdValue {SOURCE:CURRENT:PROTECTION }
-    hsetprop ${scobj_hpath}/current/limit rdValue ${ns}::rdValue ${scobj_hpath}
-    hsetprop ${scobj_hpath}/current/limit write ${ns}::setValue ${scobj_hpath} noResponse {}
-    hsetprop ${scobj_hpath}/current/limit noResponse ${ns}::noResponse ${scobj_hpath}
-    hsetprop ${scobj_hpath}/current/limit check ${ns}::checkrange ${scobj_hpath}
-    hsetprop ${scobj_hpath}/current/limit control true
-    hsetprop ${scobj_hpath}/current/limit data true
-    hsetprop ${scobj_hpath}/current/limit mutable true
-    hsetprop ${scobj_hpath}/current/limit nxsave true
-    hsetprop ${scobj_hpath}/current/limit oldval 0.0
-    hsetprop ${scobj_hpath}/current/limit klass "parameter"
-    hsetprop ${scobj_hpath}/current/limit sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/current/limit type "part"
-    hsetprop ${scobj_hpath}/current/limit nxalias "${name}_current_limit"
+    hfactory ${scobj_hpath}/current/prot_enable plain user int
+    hsetprop ${scobj_hpath}/current/prot_enable read ${ns}::getValue ${scobj_hpath} rdValue {SOURCE:CURRENT:PROTECTION:STATE?}
+    hsetprop ${scobj_hpath}/current/prot_enable rdValue ${ns}::rdValue ${scobj_hpath}
+    hsetprop ${scobj_hpath}/current/prot_enable write ${ns}::setValue ${scobj_hpath} noResponse {SOURCE:CURRENT:PROTECTION:STATE }
+    hsetprop ${scobj_hpath}/current/prot_enable noResponse ${ns}::noResponse ${scobj_hpath}
+    hsetprop ${scobj_hpath}/current/prot_enable check ${ns}::checkrange ${scobj_hpath}
+    hsetprop ${scobj_hpath}/current/prot_enable control true
+    hsetprop ${scobj_hpath}/current/prot_enable data true
+    hsetprop ${scobj_hpath}/current/prot_enable mutable true
+    hsetprop ${scobj_hpath}/current/prot_enable nxsave true
+    hsetprop ${scobj_hpath}/current/prot_enable values 0,1
+    hsetprop ${scobj_hpath}/current/prot_enable oldval 0
+    hsetprop ${scobj_hpath}/current/prot_enable klass "parameter"
+    hsetprop ${scobj_hpath}/current/prot_enable sdsinfo "::nexus::scobj::sdsinfo"
+    hsetprop ${scobj_hpath}/current/prot_enable type "part"
+    hsetprop ${scobj_hpath}/current/prot_enable nxalias "${name}_current_prot_enable"
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/current/limit 1
-      ${sct_controller} write ${scobj_hpath}/current/limit
-      hsetprop ${scobj_hpath}/current/limit simulated false
+      ${sct_controller} poll ${scobj_hpath}/current/prot_enable 1
+      ${sct_controller} write ${scobj_hpath}/current/prot_enable
+      hsetprop ${scobj_hpath}/current/prot_enable simulated false
     } else {
       ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
-      hsetprop ${scobj_hpath}/current/limit simulated true
+      hsetprop ${scobj_hpath}/current/prot_enable simulated true
     }
 
-    hfactory ${scobj_hpath}/current/sensor plain user float
-    hsetprop ${scobj_hpath}/current/sensor read ${ns}::getValue ${scobj_hpath} rdValue {MEASURE:CURRENT }
-    hsetprop ${scobj_hpath}/current/sensor rdValue ${ns}::rdValue ${scobj_hpath}
-    hsetprop ${scobj_hpath}/current/sensor write ${ns}::setValue ${scobj_hpath} noResponse {}
-    hsetprop ${scobj_hpath}/current/sensor noResponse ${ns}::noResponse ${scobj_hpath}
-    hsetprop ${scobj_hpath}/current/sensor check ${ns}::checkrange ${scobj_hpath}
-    hsetprop ${scobj_hpath}/current/sensor control true
-    hsetprop ${scobj_hpath}/current/sensor data true
-    hsetprop ${scobj_hpath}/current/sensor mutable true
-    hsetprop ${scobj_hpath}/current/sensor nxsave true
-    hsetprop ${scobj_hpath}/current/sensor oldval 0.0
-    hsetprop ${scobj_hpath}/current/sensor klass "parameter"
-    hsetprop ${scobj_hpath}/current/sensor sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/current/sensor type "part"
-    hsetprop ${scobj_hpath}/current/sensor nxalias "${name}_current_sensor"
+    hfactory ${scobj_hpath}/current/prot_limit plain user float
+    hsetprop ${scobj_hpath}/current/prot_limit read ${ns}::getValue ${scobj_hpath} rdValue {SOURCE:CURRENT?}
+    hsetprop ${scobj_hpath}/current/prot_limit rdValue ${ns}::rdValue ${scobj_hpath}
+    hsetprop ${scobj_hpath}/current/prot_limit write ${ns}::setValue ${scobj_hpath} noResponse {SOURCE:CURRENT }
+    hsetprop ${scobj_hpath}/current/prot_limit noResponse ${ns}::noResponse ${scobj_hpath}
+    hsetprop ${scobj_hpath}/current/prot_limit check ${ns}::checkrange ${scobj_hpath}
+    hsetprop ${scobj_hpath}/current/prot_limit control true
+    hsetprop ${scobj_hpath}/current/prot_limit data true
+    hsetprop ${scobj_hpath}/current/prot_limit mutable true
+    hsetprop ${scobj_hpath}/current/prot_limit nxsave true
+    hsetprop ${scobj_hpath}/current/prot_limit lowerlimit 0
+    hsetprop ${scobj_hpath}/current/prot_limit upperlimit 22
+    hsetprop ${scobj_hpath}/current/prot_limit units A
+    hsetprop ${scobj_hpath}/current/prot_limit oldval 0.0
+    hsetprop ${scobj_hpath}/current/prot_limit klass "parameter"
+    hsetprop ${scobj_hpath}/current/prot_limit sdsinfo "::nexus::scobj::sdsinfo"
+    hsetprop ${scobj_hpath}/current/prot_limit type "part"
+    hsetprop ${scobj_hpath}/current/prot_limit nxalias "${name}_current_prot_limit"
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/current/sensor 1
-      ${sct_controller} write ${scobj_hpath}/current/sensor
-      hsetprop ${scobj_hpath}/current/sensor simulated false
+      ${sct_controller} poll ${scobj_hpath}/current/prot_limit 1
+      ${sct_controller} write ${scobj_hpath}/current/prot_limit
+      hsetprop ${scobj_hpath}/current/prot_limit simulated false
     } else {
       ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
-      hsetprop ${scobj_hpath}/current/sensor simulated true
-    }
-
-    hfactory ${scobj_hpath}/current/setpoint plain user float
-    hsetprop ${scobj_hpath}/current/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {SOURCE:CURRENT }
-    hsetprop ${scobj_hpath}/current/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
-    hsetprop ${scobj_hpath}/current/setpoint write ${ns}::setValue ${scobj_hpath} noResponse {}
-    hsetprop ${scobj_hpath}/current/setpoint noResponse ${ns}::noResponse ${scobj_hpath}
-    hsetprop ${scobj_hpath}/current/setpoint check ${ns}::checkrange ${scobj_hpath}
-    hsetprop ${scobj_hpath}/current/setpoint control true
-    hsetprop ${scobj_hpath}/current/setpoint data true
-    hsetprop ${scobj_hpath}/current/setpoint mutable true
-    hsetprop ${scobj_hpath}/current/setpoint nxsave true
-    hsetprop ${scobj_hpath}/current/setpoint oldval 0.0
-    hsetprop ${scobj_hpath}/current/setpoint klass "parameter"
-    hsetprop ${scobj_hpath}/current/setpoint sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/current/setpoint type "part"
-    hsetprop ${scobj_hpath}/current/setpoint nxalias "${name}_current_setpoint"
-
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/current/setpoint 1
-      ${sct_controller} write ${scobj_hpath}/current/setpoint
-      hsetprop ${scobj_hpath}/current/setpoint simulated false
-    } else {
-      ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
-      hsetprop ${scobj_hpath}/current/setpoint simulated true
+      hsetprop ${scobj_hpath}/current/prot_limit simulated true
     }
     hsetprop ${scobj_hpath}/current data "true"
     hsetprop ${scobj_hpath}/current klass "@none"
@@ -279,6 +421,26 @@ proc ::scobj::keysight_N8740A::mkDriver { sct_controller name device_class simul
       hsetprop ${scobj_hpath}/system/error simulated true
     }
 
+    hfactory ${scobj_hpath}/system/ident plain user text
+    hsetprop ${scobj_hpath}/system/ident read ${ns}::getValue ${scobj_hpath} rdValue {*IDN?}
+    hsetprop ${scobj_hpath}/system/ident rdValue ${ns}::rdValue ${scobj_hpath}
+    hsetprop ${scobj_hpath}/system/ident control false
+    hsetprop ${scobj_hpath}/system/ident data false
+    hsetprop ${scobj_hpath}/system/ident mutable false
+    hsetprop ${scobj_hpath}/system/ident nxsave false
+    hsetprop ${scobj_hpath}/system/ident oldval UNKNOWN
+    hsetprop ${scobj_hpath}/system/ident sdsinfo "::nexus::scobj::sdsinfo"
+    hsetprop ${scobj_hpath}/system/ident type "part"
+    hsetprop ${scobj_hpath}/system/ident nxalias "${name}_system_ident"
+
+    if {[string equal -nocase "${simulation_flag}" "false"]} {
+      ${sct_controller} poll ${scobj_hpath}/system/ident 15
+      hsetprop ${scobj_hpath}/system/ident simulated false
+    } else {
+      ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
+      hsetprop ${scobj_hpath}/system/ident simulated true
+    }
+
     hfactory ${scobj_hpath}/system/version plain user text
     hsetprop ${scobj_hpath}/system/version read ${ns}::getValue ${scobj_hpath} rdValue {SYSTEM:VERSION?}
     hsetprop ${scobj_hpath}/system/version rdValue ${ns}::rdValue ${scobj_hpath}
@@ -292,7 +454,7 @@ proc ::scobj::keysight_N8740A::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/system/version nxalias "${name}_system_version"
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/system/version 1
+      ${sct_controller} poll ${scobj_hpath}/system/version 15
       hsetprop ${scobj_hpath}/system/version simulated false
     } else {
       ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
@@ -304,79 +466,58 @@ proc ::scobj::keysight_N8740A::mkDriver { sct_controller name device_class simul
 
     hfactory ${scobj_hpath}/voltage plain spy none
 
-    hfactory ${scobj_hpath}/voltage/limit plain user float
-    hsetprop ${scobj_hpath}/voltage/limit read ${ns}::getValue ${scobj_hpath} rdValue {SOURCE:VOLTAGE:PROTECTION }
-    hsetprop ${scobj_hpath}/voltage/limit rdValue ${ns}::rdValue ${scobj_hpath}
-    hsetprop ${scobj_hpath}/voltage/limit write ${ns}::setValue ${scobj_hpath} noResponse {}
-    hsetprop ${scobj_hpath}/voltage/limit noResponse ${ns}::noResponse ${scobj_hpath}
-    hsetprop ${scobj_hpath}/voltage/limit check ${ns}::checkrange ${scobj_hpath}
-    hsetprop ${scobj_hpath}/voltage/limit control true
-    hsetprop ${scobj_hpath}/voltage/limit data true
-    hsetprop ${scobj_hpath}/voltage/limit mutable true
-    hsetprop ${scobj_hpath}/voltage/limit nxsave true
-    hsetprop ${scobj_hpath}/voltage/limit oldval 0.0
-    hsetprop ${scobj_hpath}/voltage/limit klass "parameter"
-    hsetprop ${scobj_hpath}/voltage/limit sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/voltage/limit type "part"
-    hsetprop ${scobj_hpath}/voltage/limit nxalias "${name}_voltage_limit"
+    hfactory ${scobj_hpath}/voltage/hilimit plain user float
+    hsetprop ${scobj_hpath}/voltage/hilimit read ${ns}::getValue ${scobj_hpath} rdValue {SOURCE:VOLTAGE:PROTECTION?}
+    hsetprop ${scobj_hpath}/voltage/hilimit rdValue ${ns}::rdValue ${scobj_hpath}
+    hsetprop ${scobj_hpath}/voltage/hilimit write ${ns}::setValue ${scobj_hpath} noResponse {SOURCE:VOLTAGE:PROTECTION }
+    hsetprop ${scobj_hpath}/voltage/hilimit noResponse ${ns}::noResponse ${scobj_hpath}
+    hsetprop ${scobj_hpath}/voltage/hilimit check ${ns}::checkrange ${scobj_hpath}
+    hsetprop ${scobj_hpath}/voltage/hilimit control true
+    hsetprop ${scobj_hpath}/voltage/hilimit data true
+    hsetprop ${scobj_hpath}/voltage/hilimit mutable true
+    hsetprop ${scobj_hpath}/voltage/hilimit nxsave true
+    hsetprop ${scobj_hpath}/voltage/hilimit lowerlimit 0
+    hsetprop ${scobj_hpath}/voltage/hilimit upperlimit 165
+    hsetprop ${scobj_hpath}/voltage/hilimit units V
+    hsetprop ${scobj_hpath}/voltage/hilimit oldval 0.0
+    hsetprop ${scobj_hpath}/voltage/hilimit klass "parameter"
+    hsetprop ${scobj_hpath}/voltage/hilimit sdsinfo "::nexus::scobj::sdsinfo"
+    hsetprop ${scobj_hpath}/voltage/hilimit type "part"
+    hsetprop ${scobj_hpath}/voltage/hilimit nxalias "${name}_voltage_hilimit"
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/voltage/limit 1
-      ${sct_controller} write ${scobj_hpath}/voltage/limit
-      hsetprop ${scobj_hpath}/voltage/limit simulated false
+      ${sct_controller} poll ${scobj_hpath}/voltage/hilimit 1
+      ${sct_controller} write ${scobj_hpath}/voltage/hilimit
+      hsetprop ${scobj_hpath}/voltage/hilimit simulated false
     } else {
       ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
-      hsetprop ${scobj_hpath}/voltage/limit simulated true
+      hsetprop ${scobj_hpath}/voltage/hilimit simulated true
     }
 
-    hfactory ${scobj_hpath}/voltage/sensor plain user float
-    hsetprop ${scobj_hpath}/voltage/sensor read ${ns}::getValue ${scobj_hpath} rdValue {MEASURE:VOLTAGE }
-    hsetprop ${scobj_hpath}/voltage/sensor rdValue ${ns}::rdValue ${scobj_hpath}
-    hsetprop ${scobj_hpath}/voltage/sensor write ${ns}::setValue ${scobj_hpath} noResponse {}
-    hsetprop ${scobj_hpath}/voltage/sensor noResponse ${ns}::noResponse ${scobj_hpath}
-    hsetprop ${scobj_hpath}/voltage/sensor check ${ns}::checkrange ${scobj_hpath}
-    hsetprop ${scobj_hpath}/voltage/sensor control true
-    hsetprop ${scobj_hpath}/voltage/sensor data true
-    hsetprop ${scobj_hpath}/voltage/sensor mutable true
-    hsetprop ${scobj_hpath}/voltage/sensor nxsave true
-    hsetprop ${scobj_hpath}/voltage/sensor oldval 0.0
-    hsetprop ${scobj_hpath}/voltage/sensor klass "parameter"
-    hsetprop ${scobj_hpath}/voltage/sensor sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/voltage/sensor type "part"
-    hsetprop ${scobj_hpath}/voltage/sensor nxalias "${name}_voltage_sensor"
+    hfactory ${scobj_hpath}/voltage/lolimit plain user float
+    hsetprop ${scobj_hpath}/voltage/lolimit read ${ns}::getValue ${scobj_hpath} rdValue {SOURCE:VOLTAGE:LIMIT:LOW?}
+    hsetprop ${scobj_hpath}/voltage/lolimit rdValue ${ns}::rdValue ${scobj_hpath}
+    hsetprop ${scobj_hpath}/voltage/lolimit write ${ns}::setValue ${scobj_hpath} noResponse {SOURCE:VOLTAGE:LIMIT:LOW }
+    hsetprop ${scobj_hpath}/voltage/lolimit noResponse ${ns}::noResponse ${scobj_hpath}
+    hsetprop ${scobj_hpath}/voltage/lolimit check ${ns}::checkrange ${scobj_hpath}
+    hsetprop ${scobj_hpath}/voltage/lolimit control true
+    hsetprop ${scobj_hpath}/voltage/lolimit data true
+    hsetprop ${scobj_hpath}/voltage/lolimit mutable true
+    hsetprop ${scobj_hpath}/voltage/lolimit nxsave true
+    hsetprop ${scobj_hpath}/voltage/lolimit units V
+    hsetprop ${scobj_hpath}/voltage/lolimit oldval 0.0
+    hsetprop ${scobj_hpath}/voltage/lolimit klass "parameter"
+    hsetprop ${scobj_hpath}/voltage/lolimit sdsinfo "::nexus::scobj::sdsinfo"
+    hsetprop ${scobj_hpath}/voltage/lolimit type "part"
+    hsetprop ${scobj_hpath}/voltage/lolimit nxalias "${name}_voltage_lolimit"
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/voltage/sensor 1
-      ${sct_controller} write ${scobj_hpath}/voltage/sensor
-      hsetprop ${scobj_hpath}/voltage/sensor simulated false
+      ${sct_controller} poll ${scobj_hpath}/voltage/lolimit 1
+      ${sct_controller} write ${scobj_hpath}/voltage/lolimit
+      hsetprop ${scobj_hpath}/voltage/lolimit simulated false
     } else {
       ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
-      hsetprop ${scobj_hpath}/voltage/sensor simulated true
-    }
-
-    hfactory ${scobj_hpath}/voltage/setpoint plain user float
-    hsetprop ${scobj_hpath}/voltage/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {SOURCE:VOLTAGE }
-    hsetprop ${scobj_hpath}/voltage/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
-    hsetprop ${scobj_hpath}/voltage/setpoint write ${ns}::setValue ${scobj_hpath} noResponse {}
-    hsetprop ${scobj_hpath}/voltage/setpoint noResponse ${ns}::noResponse ${scobj_hpath}
-    hsetprop ${scobj_hpath}/voltage/setpoint check ${ns}::checkrange ${scobj_hpath}
-    hsetprop ${scobj_hpath}/voltage/setpoint control true
-    hsetprop ${scobj_hpath}/voltage/setpoint data true
-    hsetprop ${scobj_hpath}/voltage/setpoint mutable true
-    hsetprop ${scobj_hpath}/voltage/setpoint nxsave true
-    hsetprop ${scobj_hpath}/voltage/setpoint oldval 0.0
-    hsetprop ${scobj_hpath}/voltage/setpoint klass "parameter"
-    hsetprop ${scobj_hpath}/voltage/setpoint sdsinfo "::nexus::scobj::sdsinfo"
-    hsetprop ${scobj_hpath}/voltage/setpoint type "part"
-    hsetprop ${scobj_hpath}/voltage/setpoint nxalias "${name}_voltage_setpoint"
-
-    if {[string equal -nocase "${simulation_flag}" "false"]} {
-      ${sct_controller} poll ${scobj_hpath}/voltage/setpoint 1
-      ${sct_controller} write ${scobj_hpath}/voltage/setpoint
-      hsetprop ${scobj_hpath}/voltage/setpoint simulated false
-    } else {
-      ::scobj::keysight_N8740A::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for keysight_N8740A"
-      hsetprop ${scobj_hpath}/voltage/setpoint simulated true
+      hsetprop ${scobj_hpath}/voltage/lolimit simulated true
     }
     hsetprop ${scobj_hpath}/voltage data "true"
     hsetprop ${scobj_hpath}/voltage klass "@none"