From 768c674aa885a34fcb08609b5bb29f875d9fb164 Mon Sep 17 00:00:00 2001
From: zolliker <zolliker>
Date: Thu, 26 Apr 2007 14:47:42 +0000
Subject: [PATCH] updates for SeaServer

---
 ease.h       | 2 +-
 ipsdriv.c    | 2 +-
 lsc370driv.c | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ease.h b/ease.h
index 184bb4f..888c353 100644
--- a/ease.h
+++ b/ease.h
@@ -40,7 +40,7 @@ typedef struct {
   EaseState state;
   time_t cmdtime;
   int syntax; /* not used in ease, may be used by the driver. used by oxinst.c */
-  char cmd[32];
+  char cmd[64];
   char ans[64];
   char version[64];
   char msg[256];
diff --git a/ipsdriv.c b/ipsdriv.c
index c10a60a..df067d9 100644
--- a/ipsdriv.c
+++ b/ipsdriv.c
@@ -403,7 +403,7 @@ static long IpsChangeField(long pc, void *object) {
     EaseWrite(eab, "R9"); /* read back ramp rate (may be sweep limited) */
   return __LINE__; case __LINE__: /**********************************/
     ramp=OxiGet(eab, 3, NULL, drv->ramp);
-    step=ramp/20; /* step = ramp * 3sec */
+    step=ramp/6; /* step = ramp * 10 sec */
     if (step < 0.001) step=0.001;
     if (drv->d.targetValue > drv->current + step) {
       fld=drv->current + step;
diff --git a/lsc370driv.c b/lsc370driv.c
index a8617d1..d41b3a6 100644
--- a/lsc370driv.c
+++ b/lsc370driv.c
@@ -35,6 +35,7 @@ typedef struct {
   float t;
   float htr;
   float set;
+  float res;
 } Lsc370;
 
 static ParClass lsc370Class = { "LSC370", sizeof(Lsc370) };
@@ -53,6 +54,9 @@ static void Lsc370ParDef(void *object) {
   ParName("htr"); ParTail("%");
   ParFloat(&drv->htr, PAR_NAN);
 
+  ParName("res"); ParTail("Ohm");
+  ParFloat(&drv->res, PAR_NAN);
+
   EaseBasePar(drv);
   EaseSendPar(drv);
   EaseDrivPar(drv, "%.5g", "K");
@@ -68,6 +72,9 @@ static long Lsc370Read(long pc, void *object) {
     EaseWrite(eab, "RDGK?1");
   return __LINE__; case __LINE__: /**********************************/
     drv->t = atof(eab->ans);
+    EaseWrite(eab, "RDGR?1");
+  return __LINE__; case __LINE__: /**********************************/
+    drv->res = atof(eab->ans);
     EaseWrite(eab, "HTR?");
   return __LINE__; case __LINE__: /**********************************/
     drv->htr = atof(eab->ans);