- bug fixes and improvements

ighdriv.c

@@ -271,8 +271,12 @@ static void IghParDef(void *object)
     vList[l] = '\0';
     ParPrintf(NULL, eValue, "open valves:%s", vList);
   }
+
   EaseBasePar(drv);
   EaseSendPar(drv);
+  if (eab->syntax != OLDIGH) {
+    EaseDrivPar(drv, "%.5g", "K");
+  }
   ParStdDef();
   EaseMsgPar(eab);
 }
@@ -324,12 +328,14 @@ void IghStatus(Igh * drv)
       drv->e = ans[20] - '0';
     }
   }
+/*
   if (ans[5] != '3' && drv->remote == 2) {
     ParPrintf(drv, eError, "IGH switched to local");
     *code = EASE_FAULT;
     drv->remote = 1;
     return;
   }
+*/
 }
 
 /*----------------------------------------------------------------------------*/
@@ -710,6 +716,9 @@ static long IghSet(long pc, void *object)
     if (drv->mixP > 0) {
       drv->e = IghPower2Range(drv->mixP);
       mp = drv->mixP / IghRange2Max(drv->e) * 2000;
+      if (mp < 2001 && mp > 1999) {
+        mp = 1999;
+      }
     } else {
       mp = 0;                   /* range unchanged for external heater signal */
     }
@@ -727,10 +736,6 @@ static long IghSet(long pc, void *object)
   case __LINE__:                 /**********************************/
     goto loop;
 
-    EaseWrite(eab, "A1");
-    return __LINE__;
-  case __LINE__:                 /**********************************/
-
   set_max_pow:
     if (drv->e == 0)
       goto seta0;
@@ -738,10 +743,11 @@ static long IghSet(long pc, void *object)
     EaseWrite(eab, buf);
     return __LINE__;
   case __LINE__:                 /**********************************/
-    EaseWrite(eab, "M0");
+    if (drv->a == 2) goto loop;
+    EaseWrite(eab, "A1");
     return __LINE__;
   case __LINE__:                 /**********************************/
-    EaseWrite(eab, "A1");
+    EaseWrite(eab, "M0");
     return __LINE__;
   case __LINE__:                 /**********************************/
     goto loop;
@@ -760,6 +766,7 @@ static long IghSet(long pc, void *object)
       drv->d.targetValue = 0;
     if (drv->d.targetValue > 1.999)
       drv->d.targetValue = 1.999;
+    drv->setT = drv->d.targetValue;
     OxiSet(eab, "T", drv->d.targetValue, 4);
     return __LINE__;
   case __LINE__:                 /**********************************/