Subversion Repositories f9daq

Compare Revisions

Regard whitespace Rev 309 → Rev 310

/cvi/instr/K2231A/2230-30-1 Guide.pdf
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: instr/K2231A/2231A-30-3_ReferenceManual.pdf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/instr/K2231A/2231A-30-3_ReferenceManual.pdf
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: instr/K2231A/K2231A-ctrl.h
===================================================================
--- instr/K2231A/K2231A-ctrl.h (revision 309)
+++ instr/K2231A/K2231A-ctrl.h (revision 310)
@@ -33,16 +33,18 @@
#define P1_IMON_1 18 /* control type: numeric, callback function: (none) */
#define P1_VMON_1 19 /* control type: numeric, callback function: (none) */
#define P1_TIMERON 20 /* control type: binary, callback function: TimerOnOffCB */
-#define P1_LOG 21 /* control type: radioButton, callback function: LogToFileCB */
-#define P1_CVCC_3 22 /* control type: LED, callback function: (none) */
-#define P1_CVCC_2 23 /* control type: LED, callback function: (none) */
-#define P1_CVCC_1 24 /* control type: LED, callback function: (none) */
-#define P1_TIMER 25 /* control type: timer, callback function: TimerCB */
-#define P1_ONOFF 26 /* control type: binary, callback function: SwitchOnOffCB */
-#define P1_TINTERVAL 27 /* control type: numeric, callback function: SetIntervalCB */
-#define P1_PRESET 28 /* control type: numeric, callback function: SetPresetCB */
-#define P1_GRAPH_IMON 29 /* control type: strip, callback function: (none) */
-#define P1_GRAPH_VMON 30 /* control type: strip, callback function: (none) */
+#define P1_DEBUG 21 /* control type: radioButton, callback function: DebugCB */
+#define P1_LOG 22 /* control type: radioButton, callback function: LogToFileCB */
+#define P1_CVCC_3 23 /* control type: LED, callback function: (none) */
+#define P1_CVCC_2 24 /* control type: LED, callback function: (none) */
+#define P1_ONOFFLED 25 /* control type: LED, callback function: (none) */
+#define P1_CVCC_1 26 /* control type: LED, callback function: (none) */
+#define P1_TIMER 27 /* control type: timer, callback function: TimerCB */
+#define P1_ONOFF 28 /* control type: binary, callback function: SwitchOnOffCB */
+#define P1_TINTERVAL 29 /* control type: numeric, callback function: SetIntervalCB */
+#define P1_PRESET 30 /* control type: numeric, callback function: SetPresetCB */
+#define P1_GRAPH_IMON 31 /* control type: strip, callback function: (none) */
+#define P1_GRAPH_VMON 32 /* control type: strip, callback function: (none) */
/* Control Arrays: */
@@ -57,6 +59,7 @@
/* Callback Prototypes: */
+int CVICALLBACK DebugCB(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
int CVICALLBACK ExitCB(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
int CVICALLBACK LogToFileCB(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
int CVICALLBACK ReadCB(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);
/cvi/instr/K2231A/K2231A-ctrl.uir
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/cvi/instr/K2231A/K2231A.c
4,35 → 4,125
#include <stdio.h>
#include <windows.h>
#include <visa.h>
//#include <K2231A.h>
 
 
static int debug = 0;
static ViStatus istat;
static ViSession RedPHandle,RMHandle;
int K2231A_DeviceId=0;
static ViSession DeviceHandle,RMHandle;
 
char response[0xFF]= {0};
 
 
int K2231A_Write(const char *format, ... )
{
char cmd[0xFF];
va_list aptr;
va_start(aptr, format);
vsprintf(cmd, format, aptr);
va_end(aptr);
char str[0xFF];
sprintf(str, "%s\r\n",cmd);
int istat = viPrintf (DeviceHandle, str);
if (debug) printf("K2231A_Write %s\n", cmd);
return istat;
}
 
const char * K2231A_Read(const char *format, ... )
{
char cmd[0xFF];
va_list aptr;
va_start(aptr, format);
vsprintf(cmd, format, aptr);
va_end(aptr);
char str[0xFF];
int istat=0;
 
sprintf(str, "%s\n",cmd);
istat = viPrintf (DeviceHandle, str);
 
int nb=0;
istat = viRead (DeviceHandle, response, 0xFF, &nb);
 
if (nb>0) response[nb-1]=0;
if (debug) printf("K2231A_Read %s : %s\n", cmd, response);
if (istat) return NULL;
 
return response;
}
 
int K2231A_QueryInt(const char *format, ... )
{
char cmd[0xFF];
va_list aptr;
va_start(aptr, format);
vsprintf(cmd, format, aptr);
va_end(aptr);
return atoi(K2231A_Read(cmd ));
}
 
 
 
double K2231A_QueryDouble(const char *format, ...) {
char cmd[0xFF];
va_list aptr;
va_start(aptr, format);
vsprintf(cmd, format, aptr);
va_end(aptr);
return atof(K2231A_Read(cmd ));
}
 
int K2231A_Initialize()
{
istat = viOpenDefaultRM (&RMHandle);
if (RMHandle) istat = viOpen (RMHandle, "ASRL5::INSTR", VI_NULL, VI_NULL, &DeviceHandle);
if (DeviceHandle)
{
 
istat = viSetAttribute (DeviceHandle, VI_ATTR_TERMCHAR, '\n');
istat = viSetAttribute (DeviceHandle, VI_ATTR_TERMCHAR_EN, VI_TRUE);
istat = viSetAttribute (DeviceHandle, VI_ATTR_TMO_VALUE, 5000);
 
 
printf("\n");
}
else
{
MessagePopup("Error","Cannot open handle");
}
 
 
return 0;
}
 
 
 
 
int K2231A_Test()
{
char str[0xFF];
printf("K2231A_ModelNameQ %s\n",str);
char response[0xFF]= {0};
int i;
for ( i=0; i<255; i++) response[i]=0;
 
K2231A_Read("*IDN?");
K2231A_Read("SYSTem:VERSion?");
K2231A_Read("VOLT?");
K2231A_Read("CURR?");
K2231A_Read("MEAS:VOLT?");
K2231A_Read("MEAS:CURR?");
K2231A_Read("FETC:VOLT?");
K2231A_Read("FETC:CURR?");
K2231A_Write("SYSTem:BEEPer");
return TRUE;
}
 
int K2231A_Close()
{
K2231A_Write("syst:loc");
return 0;
}
 
39,21 → 129,66
int K2231A_Open()
{
K2231A_Initialize();
K2231A_Write("syst:rem");
return TRUE;
}
 
int K2231A_OpenHandle(char * dev, char * usb ){
int K2231A_RecallFromMemory(int preset){
return K2231A_Write("*rcl %d",preset);
}
K2231A_DeviceId = 0;
return K2231A_DeviceId;
double K2231A_GetSetCurrent(){
return K2231A_QueryDouble("CURR?");
}
 
double K2231A_GetSetVoltage(){
return K2231A_QueryDouble("VOLT?");
}
 
double K2231A_SetCurrent(double x){
return K2231A_QueryDouble("CURR %f", x);
}
 
double K2231A_SetVoltage(double x){
return K2231A_QueryDouble("VOLT %f", x);
}
 
/****************TOKOVI (potek, kako se spreminjajo tokovi s casom)****************/
double K2231A_GetCurrentMonitor(){
return K2231A_QueryDouble("MEAS:CURR?");
}
 
void K2231A_ReadCurrent(double * I , double * V, unsigned char * mode, unsigned char *onoff){
double K2231A_GetVoltageMonitor(){
return K2231A_QueryDouble("MEAS:VOLT?");
}
 
 
int K2231A_SelectChannel(int ch){
return K2231A_Write( "INST CH%d",ch);
}
 
 
int K2231A_GetOperationMode(){
/*
//cv_cc = K2231A_QueryInt("Stat:ques:inst?");
sprintf(cmd, "Stat:ques:inst:isum%d?",ch+1);
*/
return K2231A_QueryInt("Stat:ques:inst?");
}
 
 
int K2231A_SetSwitch(int state){
K2231A_Write("Outp:enab %d",state);
K2231A_Write("Outp %d",state);
return 0;
}
int K2231A_GetSwitch(){
return K2231A_QueryInt("CHAN:OUTP?");
}
 
 
 
void K2231A_ReadMonitorValues(double * I , double * V, unsigned char * mode, unsigned char *onoff)
{
int iRet;
char ch=0;
double Voltage;
60,32 → 195,53
double Current;
char cv_cc;
for (ch=0; ch<3; ch++)
{
//iRet = K2231A_TimeOut(K2231A_DeviceId, 1);
//iRet = K2231A_Refresh(K2231A_DeviceId);
 
K2231A_SelectChannel(ch+1);
cv_cc = K2231A_GetOperationMode();
I[ch]= K2231A_GetCurrentMonitor();
V[ch]= K2231A_GetVoltageMonitor();
int onoff=K2231A_QueryInt("OUTP?");
if (debug) printf("[%d] %g V %g A CVCC %d ONOFF %d\t",ch, V[ch], I[ch], cv_cc, onoff );
//iRet = K2231A_MainOutput(K2231A_DeviceId, Output);
//iRet = K2231A_MainOutputQ(K2231A_DeviceId, &Output);
for (ch=0;ch<3;ch++){
//iRet = K2231A_MoniDataQ(K2231A_DeviceId, ch+1, &Voltage, &Current, &cv_cc);
//if (debug) printf("[%d] %g V %g A CVCC %d\t",ch, Voltage, Current, cv_cc );
I[ch]= Current; //s tem definiras kaj sta I in V.
V[ch]= Voltage;
}
 
return;
 
 
}
//if (debug) printf("\n");
void K2231A_ReadSetValues(double * I , double * V, unsigned char *onoff)
{
int iRet;
char ch=0;
double Voltage;
double Current;
char cv_cc;
return;
for (ch=0; ch<3; ch++)
{
 
K2231A_SelectChannel(ch+1);
cv_cc = K2231A_GetOperationMode();
I[ch]= K2231A_GetSetCurrent();
V[ch]= K2231A_GetSetVoltage();
int onoff=K2231A_GetSwitch();
if (debug) printf("[%d] %g V %g A CVCC %d ONOFF %d\t",ch, V[ch], I[ch], cv_cc, onoff );
 
}
 
return;
}
 
 
#ifdef MAIN
 
#include <ansi_c.h>
111,42 → 267,31
int main (int argc, char *argv[])
{
int DeviceId=0;
unsigned char MainOutput, preset;
double Voltage, Current, tinterval;
unsigned char MainOutput=0, preset=0;
double Voltage=0, Current=0, tinterval=1;
char str[0xFF];
int i=0;
char response[0xFF];
if (InitCVIRTE (0, argv, 0) == 0)
return -1; /* out of memory */
SetStdioPort (CVI_STDIO_WINDOW);
SetStdioWindowOptions (1000, 0, 0);
SetStdioWindowOptions (1000, 1, 0);
SetStdioWindowSize (150, 600);
SetStdioWindowPosition (825, 20);
 
istat = viOpenDefaultRM (&RMHandle);
if (RMHandle) istat = viOpen (RMHandle, "TCPIP0::178.172.43.91::5000::SOCKET", VI_NULL, VI_NULL, &RedPHandle);
if (RedPHandle){
istat = viSetAttribute (RedPHandle, VI_ATTR_TCPIP_KEEPALIVE, VI_TRUE);
istat = viSetAttribute (RedPHandle, VI_ATTR_TCPIP_NODELAY, VI_TRUE);
istat = viSetAttribute (RedPHandle, VI_ATTR_TERMCHAR, '\n');
istat = viSetAttribute (RedPHandle, VI_ATTR_TERMCHAR_EN, VI_TRUE);
istat = viSetAttribute (RedPHandle, VI_ATTR_TMO_VALUE, 1000);
}
if ((pnl = LoadPanel (0, "K2231A-ctrl.uir", P1)) < 0) return -1;
 
if (K2231A_Open()== 0) MessagePopup("Error","Cannot open USB device");
//DeviceId = K2231A_OpenHandle ("PW-A","USB:1:1");
 
if (K2231A_Test() == 0 )MessagePopup("DLL error","Dll Error");
if (DeviceId < 0) MessagePopup("Error","Not Connected");
printf("TMI device ID %d\n",K2231A_DeviceId);
//K2231A_MainOutputQ(K2231A_DeviceId, &MainOutput);
 
 
SetCtrlVal(pnl, P1_ONOFF, MainOutput);
GetCtrlVal(pnl, P1_TINTERVAL, &tinterval);
SetCtrlAttribute (pnl, P1_TIMER, ATTR_INTERVAL, tinterval);
//K2231A_PresetQ(K2231A_DeviceId, &preset);
 
SetCtrlVal(pnl, P1_PRESET, preset);
SetTraceAttributeEx (pnl, P1_GRAPH_IMON, 1, ATTR_TRACE_LG_TEXT, "CH 30V");
SetTraceAttributeEx (pnl, P1_GRAPH_IMON, 2, ATTR_TRACE_LG_TEXT, "CH 30V");
155,14 → 300,23
SetTraceAttributeEx (pnl, P1_GRAPH_VMON, 1, ATTR_TRACE_LG_TEXT, "CH 30V");
SetTraceAttributeEx (pnl, P1_GRAPH_VMON, 2, ATTR_TRACE_LG_TEXT, "CH 30V");
SetTraceAttributeEx (pnl, P1_GRAPH_VMON, 3, ATTR_TRACE_LG_TEXT, "CH 5V");
for (unsigned char ch=0;ch<4;ch++){
int ison;
//K2231A_VoltageQ(K2231A_DeviceId, ch+1, preset, &Voltage);
//K2231A_CurrentQ(K2231A_DeviceId, ch+1, preset, &Current);
for (unsigned char ch=0; ch<3; ch++)
{
 
K2231A_SelectChannel(ch+1);
 
Voltage =K2231A_GetSetVoltage();
Current =K2231A_GetSetCurrent();
ison =K2231A_GetSwitch();
 
 
 
SetCtrlVal(pnl, vset[ch], Voltage);
SetCtrlVal(pnl, iset[ch], Current);
GetCtrlVal(pnl, radiob[ch], &ison);
if (ison) SETREG(gMask,(1<<ch)); else RSTREG(gMask,(1<<ch));
SetCtrlVal(pnl, radiob[ch], ison);
if (ison) SETREG(gMask,(1<<ch));
else RSTREG(gMask,(1<<ch));
}
DisplayPanel (pnl);
185,7 → 339,10
{
case EVENT_COMMIT:
GetCtrlVal(panel, control, &state);
//K2231A_MainOutput(K2231A_DeviceId, state);
 
 
K2231A_SetSwitch(state);
break;
}
return 0;
198,25 → 355,33
switch (event)
{
case EVENT_COMMIT:{
unsigned char preset;
//K2231A_PresetQ(K2231A_DeviceId, &preset);
case EVENT_COMMIT:
{
unsigned char preset=0;
SetCtrlVal(pnl, P1_PRESET, preset);
for (unsigned char ch = 0; ch<3;ch++){
for (unsigned char ch = 0; ch<3; ch++)
{
//printf("ch %d %x\n", ch, gMask);
if (gMask & (1<<ch)){
if (gMask & (1<<ch))
{
double Voltage;
double Current;
GetCtrlVal(panel, vset[ch], &Voltage);
GetCtrlVal(panel, iset[ch], &Current);
//printf("->ch %d VSet %g Iset %g\n", ch, Voltage, Current);
//K2231A_Voltage(K2231A_DeviceId, ch+1, preset, Voltage);
//K2231A_VoltageQ(K2231A_DeviceId, ch+1, preset, &Voltage);
//K2231A_Current(K2231A_DeviceId, ch+1, preset, Current);
//K2231A_CurrentQ(K2231A_DeviceId, ch+1, preset, &Current);
//printf("<-ch %d VSet %g Iset %g\n", ch, Voltage, Current);
 
char cmd[0xFF];
K2231A_SelectChannel(ch+1);
 
Voltage =K2231A_GetVoltageMonitor();
Current =K2231A_GetCurrentMonitor();
 
 
printf("<-ch %d VSet %g Iset %g\n", ch, Voltage, Current);
 
}
}
}
231,18 → 396,25
int iRet;
char ch=0;
double Voltage;
double Current;
char cv_cc;
double Voltage=0;
double Current=0;
char cv_cc=0;
switch (event)
{
case EVENT_COMMIT:
for (ch = 0; ch<3;ch++){
if (gMask & (1<<ch)){
//iRet = K2231A_TimeOut(K2231A_DeviceId, 1);
//iRet = K2231A_Refresh(K2231A_DeviceId);
//iRet = K2231A_MoniDataQ(K2231A_DeviceId, ch+1, &Voltage, &Current, &cv_cc);
//printf("ch %d VSet %g Iset %g\n", ch, Voltage, Current);
 
for (ch = 0; ch<3; ch++)
{
if (gMask & (1<<ch))
{
K2231A_SelectChannel(ch+1);
 
Voltage =K2231A_GetVoltageMonitor();
Current =K2231A_GetCurrentMonitor();
cv_cc = K2231A_GetOperationMode();
printf("ch %d VSet %g Iset %g\n", ch, Voltage, Current);
SetCtrlVal(panel, vmon[ch], Voltage);
SetCtrlVal(panel, imon[ch], Current);
SetCtrlVal(panel, cvcc[ch], cv_cc);
254,9 → 426,11
}
 
int CVICALLBACK SetIntervalCB (int panel, int control, int event,
void *callbackData, int eventData1, int eventData2) {
void *callbackData, int eventData1, int eventData2)
{
double tinterval;
switch (event) {
switch (event)
{
case EVENT_COMMIT:
GetCtrlVal(panel, control, &tinterval);
SetCtrlAttribute (panel, P1_TIMER, ATTR_INTERVAL, tinterval);
273,9 → 447,13
{
case EVENT_COMMIT:
GetCtrlVal(panel, control, &state);
if (state){
if (state)
{
SetCtrlAttribute (panel, P1_TIMER, ATTR_ENABLED, 1);
ResumeTimerCallbacks();
} else {
}
else
{
SuspendTimerCallbacks ();
printf ("Disabling timer....\n");
}
298,7 → 476,8
 
int CVICALLBACK SetMaskCB (int panel, int control, int event,
void *callbackData, int eventData1, int eventData2)
{ int ison;
{
int ison;
switch (event)
{
int i=0;
305,7 → 484,8
case EVENT_COMMIT:
GetCtrlVal(panel, control, &ison);
for (i=0;i<3;i++) if (control == radiob[i]) break;
if (ison) SETREG(gMask,(1<<i)); else RSTREG(gMask,(1<<i));
if (ison) SETREG(gMask,(1<<i));
else RSTREG(gMask,(1<<i));
break;
}
return 0;
332,20 → 512,32
{
unsigned char ch;
double current[3];
double voltage[3];
char cv_cc;
double current[3]= {0,0,0};
double voltage[3]= {0,0,0};
char cv_cc=0;
case EVENT_TIMER_TICK:
for (ch = 0; ch<3;ch++){
if (gMask & (1<<ch)){
//K2231A_TimeOut(K2231A_DeviceId, 1);
//K2231A_Refresh(K2231A_DeviceId);
//K2231A_MoniDataQ(K2231A_DeviceId, ch+1, &voltage[ch], &current[ch], &cv_cc);
for (ch = 0; ch<3; ch++)
{
if (gMask & (1<<ch))
{
K2231A_SelectChannel(ch+1);
 
voltage[ch] =K2231A_GetVoltageMonitor();
current[ch] =K2231A_GetCurrentMonitor();
cv_cc = K2231A_GetOperationMode();
int onoff=K2231A_GetSwitch();
 
SetCtrlVal(panel, vmon[ch], voltage[ch]);
SetCtrlVal(panel, imon[ch], current[ch]);
SetCtrlVal(panel, cvcc[ch], cv_cc);
if (gLogToFile){
if (!gFp) {
SetCtrlVal(panel, P1_ONOFFLED, onoff);
if (gLogToFile)
{
if (!gFp)
{
gFp= fopen("pw18-1.8aq.log","w");
fprintf(gFp,"#time\tch\tU\tI\tCV_CC\n");
}
361,23 → 553,31
}
 
int CVICALLBACK SetPresetCB (int panel, int control, int event,
void *callbackData, int eventData1, int eventData2) {
 
switch (event) {
case EVENT_COMMIT:{
void *callbackData, int eventData1, int eventData2)
{
char cmd[0xFF];
switch (event)
{
case EVENT_COMMIT:
{
unsigned char preset;
double Voltage, Current;
GetCtrlVal(panel, control, &preset);
//K2231A_Preset(K2231A_DeviceId, preset);
for (unsigned char ch=0;ch<3;ch++){
K2231A_RecallFromMemory(preset);
for (unsigned char ch=0; ch<3; ch++)
{
int ison;
//K2231A_VoltageQ(K2231A_DeviceId, ch+1, preset, &Voltage);
//K2231A_CurrentQ(K2231A_DeviceId, ch+1, preset, &Current);
K2231A_SelectChannel(ch+1);
Voltage =K2231A_GetSetVoltage();
Current =K2231A_GetSetCurrent();
ison =K2231A_GetSwitch();
 
SetCtrlVal(pnl, vset[ch], Voltage);
SetCtrlVal(pnl, iset[ch], Current);
GetCtrlVal(pnl, radiob[ch], &ison);
if (ison) SETREG(gMask,(1<<ch)); else RSTREG(gMask,(1<<ch));
if (ison) SETREG(gMask,(1<<ch));
else RSTREG(gMask,(1<<ch));
}
break;
}
385,6 → 585,18
return 0;
}
 
int CVICALLBACK DebugCB (int panel, int control, int event,
void *callbackData, int eventData1, int eventData2)
{
switch (event)
{
case EVENT_COMMIT:
GetCtrlVal(panel, control, &debug);
break;
}
return 0;
}
 
 
#endif MAIN
 
/cvi/instr/K2231A/K2231A.cws
1,22 → 1,22
[Workspace Header]
Version = 1302
Pathname = "/c/home/CVI/instr/K2231A/K2231A.cws"
CVI Dir = "/c/program files/national instruments/cvi2013"
CVI Shared Dir = "/C/Program Files/National Instruments/Shared/CVI"
Pathname = "/c/home/cvi/instr/K2231A/K2231A.cws"
CVI Dir = "/c/program files (x86)/national instruments/cvi2013"
CVI Shared Dir = "/C/Program Files (x86)/National Instruments/Shared/CVI"
CVI Pub Local Dir = "/C/ProgramData/National Instruments/CVI2013"
CVI Pub Global Dir = "/C/ProgramData/National Instruments/CVI"
IVI Standard Root Dir = "/C/Program Files/IVI Foundation/IVI"
IVI Standard Root Dir = "/C/Program Files (x86)/IVI Foundation/IVI"
IVI Standard Root 64-bit Dir = "/C/Program Files/IVI Foundation/IVI"
VXIplug&play Framework Dir = "/C/Program Files/IVI Foundation/VISA/winnt"
VXIplug&play Framework Dir = "/C/Program Files (x86)/IVI Foundation/VISA/winnt"
VXIplug&play Framework 64-bit Dir = "/C/Program Files/IVI Foundation/VISA/win64"
Number of Projects = 1
Active Project = 1
Project 0001 = "K2231A.prj"
Drag Bar Left = 257
Window Top = 145
Window Left = 186
Window Bottom = 1124
Window Right = 1656
Drag Bar Left = 224
Window Top = 144
Window Left = 137
Window Bottom = 914
Window Right = 1324
Maximized = False
Maximized Children = True
Max32 Number Of Errors = 20
30,9 → 30,9
Hide Windows = False
Break At First Statement = False
Sort Type = "File Name"
Number of Opened Files = 4
Number of Opened Files = 12
Window Confinement Region Enabled = True
MainColumnWidth = 240
MainColumnWidth = 207
FileDateColumnWidth = 70
FileSizeColumnWidth = 70
 
46,51 → 46,96
Batch Build Debug = False
 
[File 0001]
Path = "/c/home/CVI/instr/K2231A/K2231A.c"
Path = "/c/home/cvi/instr/K2231A/K2231A.fp"
File Type = "Function Panel"
Disk Date = 3615319268
In Projects = ""
Window Top = 64
Window Left = 26
Window Height = 321
Window Width = 400
Window Z-Order = 1
 
[File 0002]
Path = "/c/home/cvi/instr/K2231A/K2231A.c"
File Type = "CSource"
Disk Date = 3609320762
Disk Date = 3615319183
In Projects = "1,"
Window Top = 219
Window Left = 106
Window Z-Order = 1
Source Window State = "1,124,124,124,46,47,46,0,0,147,0,390,0,390,0,48,100,0,122,26,349,683,1,0,"
Window Z-Order = 2
Source Window State = "1,233,233,233,33,40,33,0,0,80,0,574,0,574,0,25,222,0,237,27,349,683,1,0,"
 
[File 0002]
Path = "/c/home/CVI/instr/pw18-1.8aq/pw18-1.8aq.c"
[File 0003]
Path = "/c/home/cvi/instr/pw18-1.8aq/pw18-1.8aq.c"
File Type = "CSource"
Disk Date = 3607489935
Disk Date = 3608161617
In Projects = ""
Window Top = 250
Window Left = 122
Window Z-Order = 3
Window Z-Order = 7
Source Window State = "1,0,620,0,0,0,0,0,3,80,0,0,0,0,0,25,574,0,620,0,349,683,1,0,"
 
[File 0003]
Path = "/c/home/CVI/instr/K2231A/K2231A-ctrl.uir"
[File 0004]
Path = "/c/home/cvi/instr/K2231A/K2231A-ctrl.uir"
File Type = "User Interface Resource"
Disk Date = 3609316520
In Projects = ""
Disk Date = 3615311667
In Projects = "1,"
Window Top = 281
Window Left = 138
Window Height = 349
Window Width = 683
Window Z-Order = 4
Window Z-Order = 6
 
[File 0004]
Path = "/c/home/CVI/apps/RedPitaya/RedPitaya.c"
[File 0005]
Path = "/c/home/cvi/apps/RedPitaya/RedPitaya.c"
File Type = "CSource"
Disk Date = 3609320451
Disk Date = 3606850803
In Projects = ""
Window Top = 95
Window Left = 42
Window Z-Order = 2
Source Window State = "1,46,47,46,0,39,0,0,3,80,0,0,0,0,0,25,6,0,47,39,349,683,1,0,"
Window Z-Order = 8
Source Window State = "1,218,218,218,1,76,76,0,3,80,0,0,0,0,0,25,205,0,218,1,349,683,1,0,"
 
[File 0006]
Path = "//f9lab12/c/home/rok/arich_daq/sa02_daq/cvi/sa02_CVI.c"
File Type = "CSource"
Disk Date = 3602853194
In Projects = ""
Window Top = 126
Window Left = 58
Window Z-Order = 4
Source Window State = "1,219,219,219,0,19,19,0,3,80,0,0,0,0,0,16,215,0,219,0,232,683,1,0,"
 
[File 0007]
Path = "//f9lab12/c/home/rok/arich_daq/sa02_daq/sa02lib.c"
File Type = "CSource"
Disk Date = 3594196876
In Projects = ""
Window Top = 157
Window Left = 74
Window Z-Order = 5
Source Window State = "1,346,346,346,29,31,31,0,0,80,0,0,0,0,0,16,316,0,334,39,232,683,1,0,"
 
[File 0008]
Path = "/c/home/cvi/instr/K2231A/K2231A.h"
File Type = "Include"
Disk Date = 3615317453
In Projects = ""
Window Top = 33
Window Left = 10
Window Z-Order = 3
Source Window State = "1,23,23,23,0,73,73,0,0,80,0,26,0,26,0,16,0,0,23,21,232,683,1,0,"
 
[Tab Order]
Tab 0001 = "/c/home/CVI/instr/K2231A/K2231A.c"
Tab 0002 = "/c/home/CVI/instr/pw18-1.8aq/pw18-1.8aq.c"
Tab 0003 = "/c/home/CVI/instr/K2231A/K2231A-ctrl.uir"
Tab 0004 = "/c/home/CVI/apps/RedPitaya/RedPitaya.c"
Tab 0001 = "/c/home/cvi/instr/K2231A/K2231A.c"
Tab 0002 = "/c/home/cvi/instr/pw18-1.8aq/pw18-1.8aq.c"
Tab 0003 = "/c/home/cvi/instr/K2231A/K2231A-ctrl.uir"
Tab 0004 = "/c/home/cvi/apps/RedPitaya/RedPitaya.c"
Tab 0005 = "//f9lab12/c/home/rok/arich_daq/sa02_daq/cvi/sa02_CVI.c"
Tab 0006 = "//f9lab12/c/home/rok/arich_daq/sa02_daq/sa02lib.c"
Tab 0007 = "/c/home/cvi/instr/K2231A/K2231A.h"
Tab 0008 = "/c/home/cvi/instr/K2231A/K2231A.fp"
 
[Default Build Config 0001 Debug]
Generate Browse Info = True
/cvi/instr/K2231A/K2231A.fp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: instr/K2231A/K2231A.h
===================================================================
--- instr/K2231A/K2231A.h (nonexistent)
+++ instr/K2231A/K2231A.h (revision 310)
@@ -0,0 +1,26 @@
+#ifndef K2231A_H_
+#define K2231A_H_
+int K2231A_Write(const char *format, ... );
+const char * K2231A_Read(const char *format, ... );
+int K2231A_QueryInt(const char *format, ... );
+double K2231A_QueryDouble(const char *format, ...);
+int K2231A_Initialize();
+int K2231A_Test();
+int K2231A_Close();
+int K2231A_Open();
+int K2231A_RecallFromMemory(int preset);
+double K2231A_GetSetCurrent();
+double K2231A_GetSetVoltage();
+double K2231A_SetCurrent(double x);
+double K2231A_SetVoltage(double x);
+double K2231A_GetCurrentMonitor();
+double K2231A_GetVoltageMonitor();
+int K2231A_SelectChannel(int ch);
+int K2231A_GetOperationMode();
+int K2231A_SetSwitch(int state);
+int K2231A_GetSwitch();
+
+void K2231A_ReadMonitorValues(double * I , double * V, unsigned char * mode, unsigned char *onoff);
+void K2231A_ReadSetValues(double * I , double * V, unsigned char *onoff);
+
+#endif
Index: instr/K2231A/K2231A.prj
===================================================================
--- instr/K2231A/K2231A.prj (revision 309)
+++ instr/K2231A/K2231A.prj (revision 310)
@@ -1,15 +1,15 @@
[Project Header]
Version = 1302
-Pathname = "/c/home/CVI/instr/K2231A/K2231A.prj"
-CVI Dir = "/c/program files/national instruments/cvi2013"
-CVI Shared Dir = "/C/Program Files/National Instruments/Shared/CVI"
+Pathname = "/c/home/cvi/instr/K2231A/K2231A.prj"
+CVI Dir = "/c/program files (x86)/national instruments/cvi2013"
+CVI Shared Dir = "/C/Program Files (x86)/National Instruments/Shared/CVI"
CVI Pub Local Dir = "/C/ProgramData/National Instruments/CVI2013"
CVI Pub Global Dir = "/C/ProgramData/National Instruments/CVI"
-IVI Standard Root Dir = "/C/Program Files/IVI Foundation/IVI"
-VXIplug&play Framework Dir = "/C/Program Files/IVI Foundation/VISA/winnt"
+IVI Standard Root Dir = "/C/Program Files (x86)/IVI Foundation/IVI"
+VXIplug&play Framework Dir = "/C/Program Files (x86)/IVI Foundation/VISA/winnt"
IVI Standard Root 64-bit Dir = "/C/Program Files/IVI Foundation/IVI"
VXIplug&play Framework 64-bit Dir = "/C/Program Files/IVI Foundation/VISA/win64"
-Number of Files = 1
+Number of Files = 2
Target Type = "Executable"
Flags = 2064
Copied From Locked InstrDrv Directory = False
@@ -19,11 +19,12 @@
[Folders]
Include Files Folder Not Added Yet = True
-User Interface Files Folder Not Added Yet = True
Instrument Files Folder Not Added Yet = True
Library Files Folder Not Added Yet = True
Folder 0 = "Source Files"
FolderEx 0 = "Source Files"
+Folder 1 = "User Interface Files"
+FolderEx 1 = "User Interface Files"
[File 0001]
File Type = "CSource"
@@ -31,7 +32,7 @@
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "K2231A.c"
-Path = "/c/home/CVI/instr/K2231A/K2231A.c"
+Path = "/c/home/cvi/instr/K2231A/K2231A.c"
Exclude = False
Compile Into Object File = False
Project Flags = 0
@@ -38,6 +39,18 @@
Folder = "Source Files"
Folder Id = 0
+[File 0002]
+File Type = "User Interface Resource"
+Res Id = 2
+Path Is Rel = True
+Path Rel To = "Project"
+Path Rel Path = "K2231A-ctrl.uir"
+Path = "/c/home/cvi/instr/K2231A/K2231A-ctrl.uir"
+Exclude = False
+Project Flags = 0
+Folder = "User Interface Files"
+Folder Id = 1
+
[Custom Build Configs]
Num Custom Build Configs = 0
@@ -330,19 +343,19 @@
Executable File_Debug Is Rel = True
Executable File_Debug Rel To = "Project"
Executable File_Debug Rel Path = "K2231A.exe"
-Executable File_Debug = "/c/home/CVI/instr/K2231A/K2231A.exe"
+Executable File_Debug = "/c/home/cvi/instr/K2231A/K2231A.exe"
Executable File_Release Is Rel = True
Executable File_Release Rel To = "Project"
Executable File_Release Rel Path = "K2231A.exe"
-Executable File_Release = "/c/home/CVI/instr/K2231A/K2231A.exe"
+Executable File_Release = "/c/home/cvi/instr/K2231A/K2231A.exe"
Executable File_Debug64 Is Rel = True
Executable File_Debug64 Rel To = "Project"
Executable File_Debug64 Rel Path = "K2231A.exe"
-Executable File_Debug64 = "/c/home/CVI/instr/K2231A/K2231A.exe"
+Executable File_Debug64 = "/c/home/cvi/instr/K2231A/K2231A.exe"
Executable File_Release64 Is Rel = True
Executable File_Release64 Rel To = "Project"
Executable File_Release64 Rel Path = "K2231A.exe"
-Executable File_Release64 = "/c/home/CVI/instr/K2231A/K2231A.exe"
+Executable File_Release64 = "/c/home/cvi/instr/K2231A/K2231A.exe"
Icon File Is Rel = False
Icon File = ""
Application Title = ""