From 8f977bb98ff5c5e052e394b18f5d5e7d95a75526 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Thu, 13 Nov 2014 14:18:45 +1100 Subject: [PATCH] Realign SCT drivers with R3.2 --- .../config/environment/temperature/julabo_lh45.sct | 2 +- .../instrument/config/environment/temperature/ls340.sct | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct b/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct index 06661609..6d490b51 100644 --- a/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct +++ b/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct @@ -8,7 +8,7 @@ driver julabo_lh45_gen = { simulation_group = environment_simulation add_args = '{id 1} {ctrl_sensor "bath"} {tol 5.0}'; make_args = 'id ctrl_sensor tol'; - protocol_args = '{terminator "\r"}'; + protocol_args = '{terminator \r}'; # # Unnamed group has variables at device level # diff --git a/site_ansto/instrument/config/environment/temperature/ls340.sct b/site_ansto/instrument/config/environment/temperature/ls340.sct index 6ac3fcdf..bd7e4de2 100644 --- a/site_ansto/instrument/config/environment/temperature/ls340.sct +++ b/site_ansto/instrument/config/environment/temperature/ls340.sct @@ -1,10 +1,11 @@ # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent nocindent driver ls340 = { - protocol = std + protocol = std; class = environment simulation_group = environment_simulation add_args = 'id datype {tol1 1.0} {tol2 1.0}' - make_args = 'id datype tol1 tol2' + make_args = 'id datype {tol1 1.0} {tol2 1.0}' + protocol_args = '{terminator \r\n}' code mkDriver = {%% ::scobj::ls340::mk_sct_lakeshore_340 $sct_controller environment $name $id $datype $tol1 $tol2 0 %%}