WebSVN – f9daq – Diff – //cvi/instr/K617/K617.c

 #include <utility.h>
 #include <gpib.h>
+#include "prologix.h"
 #include "K617.h"
 K617STATUS K617Stat;
+static int K617_Interface,K617_Port,K617_Gdev;
-static int gdev,iret;
+static int iret;
 void GpibError(char *msg) {
   printf ("%s\n", msg);
   printf ("ibcntl = %ld\n", ibcntl);
   printf ("\n");
   /* Call ibonl to take the device and interface offline */
-  ibonl (gdev,0);
+  ibonl (K617_Gdev,0);
   exit(1);
+}
-void _VI_FUNC K617_open (int interface, int primary_addr, int secondary_addr,
+void _VI_FUNC K617_open (int interface, int port, int primary_addr,
-                         int timeout)
+                         int secondary_addr, int timeout)
+{
+  char cmd[100];
 /*
-  gdev = OpenDev ("GPIB0", "");
+  K617_Gdev = OpenDev ("GPIB0", "");
-  if (ibsta & ERR) GpibError("OpenDev Error");
-  iret = ibpad (gdev, 0);
   if (ibsta & ERR) GpibError("OpenDev Error");
-  iret = ibsad (gdev, NO_SAD);
-  iret = ibtmo (gdev, T10s);
-  iret = ibeot (gdev, 1);
-  iret = ibeos (gdev, 0);
+  iret = ibpad (K617_Gdev, 0);
-*/
-  gdev = ibdev(interface,primary_addr,secondary_addr,timeout,1,0);
   if (ibsta & ERR) GpibError("OpenDev Error");
+  iret = ibsad (K617_Gdev, NO_SAD);
+  iret = ibtmo (K617_Gdev, T10s);
+  iret = ibeot (K617_Gdev, 1);
+  iret = ibeos (K617_Gdev, 0);
+*/
+  K617_Interface=interface;
+  K617_Port=port;
+  switch (K617_Interface){
+    case 1:
+      PROLOGIX_Open (K617_Port);
+      sprintf(cmd,"++addr %0d",primary_addr);
+      PROLOGIX_Send (cmd);
+      PROLOGIX_Send ("++auto 0");
+      PROLOGIX_Send ("++eoi 1");
+      PROLOGIX_Send ("++eot_enable 0");
+      PROLOGIX_Send ("++read_tmo_ms 1000");
+      break;
+    default:
+      K617_Gdev = ibdev(K617_Port,primary_addr,secondary_addr,timeout,1,0);
+      if (ibsta & ERR) GpibError("OpenDev Error");
+  }
   Delay(GDELAY);
   return;
 }
 void _VI_FUNC K617_clear (void)
 {
+  switch (K617_Interface){
+    case 1:
+      PROLOGIX_Send("++clr");
+      break;
+    default:
-  iret = ibclr (gdev);                 /* Clear the device                        */
+      iret = ibclr (K617_Gdev); // Clear the device
-  if (ibsta & ERR) GpibError("OpenDev Error");
+      if (ibsta & ERR) GpibError("OpenDev Error");
+  }
-  Delay(GDELAY);
+//  Delay(GDELAY);
+  Delay(2.);
   return;
 }
 void _VI_FUNC K617_send (char *cmd, int len)
+{
+  switch (K617_Interface){
+    case 1:
+      PROLOGIX_Send(cmd);
+      break;
+    default:
-  iret = ibwrt (gdev, cmd, len);
+      iret = ibwrt (K617_Gdev, cmd, len);
-  if (ibsta & ERR) GpibError("OpenDev Error");
+      if (ibsta & ERR) GpibError("OpenDev Error");
+  }
   Delay(GDELAY);
   return;
 }
 int _VI_FUNC K617_receive (char *response, int maxbyt)
 {
+  switch (K617_Interface){
+    case 1:
+      PROLOGIX_Send("++read eoi");
+      return PROLOGIX_Receive (response,maxbyt);
+      break;
+    default:
-  iret = ibrd (gdev, response, maxbyt);
+      iret = ibrd (K617_Gdev, response, maxbyt);
-  if (ibsta & ERR) GpibError("OpenDev Error");
+      if (ibsta & ERR) GpibError("OpenDev Error");
-  response[ibcntl]=0;
+      response[ibcntl]=0;
-  return ibcntl;
+      return ibcntl;
+  }
+}
 void _VI_FUNC K617_status (void)
+{
   int len;
          &K617Stat.function,&K617Stat.range,&K617Stat.zero_check,
          &K617Stat.zero_correct,&K617Stat.suppress,&K617Stat.trigger,
          &K617Stat.vsource_operate,&K617Stat.read_mode,
          &K617Stat.data_prefix,&K617Stat.display,
          &K617Stat.data_store,&K617Stat.srq,&K617Stat.eoi,K617Stat.terminator);
+//  printf("617FRRCZNTOBGDQMMKYY\n");
+//  printf("%s\n",cres);
-  K617_send ("X", 1);
+//  K617_send ("X", 1);
   return;
+}
 void _VI_FUNC K617_data_format (int mode)
 {
   int len;
   char cmd[100];
   len=sprintf(cmd,"G%0dX",mode);
   K617_send (cmd, len);
     *loc=-1;
     sscanf(cres,"%4c%lg,%d",prefix, &value, loc);
     prefix[4]=0;
   } else {
     sscanf(cres,"%*4c%lg,%*d",&value);
   }
   return value;
+}
 void _VI_FUNC K617_current_mode (int range)
+{
+{
   int len;
   char cmd[100];
   len=sprintf(cmd,"B%0dX",mode);
   K617_send (cmd, len);
   return;
+}
 void _VI_FUNC K617_vsource_set (float value)
+{
   int len;
   K617_reading_mode (4);
   value = K617_get (NULL, NULL);
   K617_reading_mode (0);
   return value;
 }
 void _VI_FUNC K617_vsource_operate (int operate)
 {
   if (operate)
     K617_send ("O1X", 3);
    else
     K617_send ("O0X", 3);
   return;
+}
 void _VI_FUNC K617_close (void)
+{
-//  iret = CloseDev (gdev);
+//  iret = CloseDev (K617_Gdev);
+  switch (K617_Interface){
+    case 1:
+      PROLOGIX_Close();
+      break;
+    default:
-  iret = ibonl(gdev, 0);              /* Take the device offline                 */
+     iret = ibonl(K617_Gdev, 0);// Take the device offline
-  if (ibsta & ERR) GpibError("OpenDev Error");
+     if (ibsta & ERR) GpibError("OpenDev Error");
+  }
   return;
+}
 #ifdef K617_MAIN
   double value;
   char cres[100];
   if (InitCVIRTE (hInstance, 0, 0) == 0) return -1;    /* out of memory */
-  K617_open (0, 3, 0, 13);
+  K617_open (1,5,3,0,13);
-/*
   K617_clear ();
   K617_current_mode (4);
   K617_zero_correct (1);
   K617_data_format (0);
-  K617_trigger_mode (0);
+  K617_trigger_mode (1);
   K617_vsource_set (-100.);
   K617_vsource_operate (1);
-*/
-  K617_status ();
+  K617_status();
-  value=K617_get(cres, &i);
+  value=K617_get(cres,&i);
+  printf("%s, %lg, %d\n",cres,value,i);
+  value=K617_vsource_get();
+  printf("%lg\n",value);
+  value=K617_get(cres,&i);
   printf("%s, %lg, %d\n",cres,value,i);
-  value=K617_vsource_get();
+  value=K617_get(cres,&i);
   printf("%s, %lg, %d\n",cres,value,i);
+  value=K617_get(cres,&i);
+  printf("%s, %lg, %d\n",cres,value,i);
-  value=K617_get(cres, &i);
+  value=K617_get(cres,&i);
   printf("%s, %lg, %d\n",cres,value,i);
   Delay(5);
-//  K617_vsource_operate (0);
+  K617_vsource_operate (0);
-  K617_close ();
+  K617_close();
   return 0;
+}
 #endif

Subversion Repositories f9daq

(root)//cvi/instr/K617/K617.c – Rev 185 → 256