From a33ff736ce59346bc75799949f2eb7d66be065e5 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 24 6月 2013 20:45:25 +0800
Subject: [PATCH] Merge test_scpi_utils.c from master

---
 examples/common/scpi-def.c |   49 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index 0b9bfbd..d35ddf7 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -41,24 +41,51 @@
 #include "scpi-def.h"
 
 scpi_result_t DMM_MeasureVoltageDcQ(scpi_t * context) {
-    scpi_number_t param1, param2;
+    scpi_parameter_t param1, param2;
     char bf[15];
     fprintf(stderr, "meas:volt:dc\r\n"); // debug command name   
 
     // read first parameter if present
-    if (SCPI_ParamNumber(context, &param1, false)) {
-        SCPI_NumberToStr(context, &param1, bf, 15);
-        fprintf(stderr, "\tP1=%s\r\n", bf);
+    if (SCPI_Parameter(context, &param1, false)) {
+        SCPI_ParamTranslateNumberVal(context, &param1);
     }
 
     // read second paraeter if present
-    if (SCPI_ParamNumber(context, &param2, false)) {
-        SCPI_NumberToStr(context, &param2, bf, 15);
-        fprintf(stderr, "\tP2=%s\r\n", bf);
+    if (SCPI_Parameter(context, &param2, false)) {
+        SCPI_ParamTranslateNumberVal(context, &param2);
     }
+
+    
+    SCPI_NumberToStr(context, &param1.number, bf, 15);
+    fprintf(stderr, "\tP1=%s\r\n", bf);
+
+    
+    SCPI_NumberToStr(context, &param2.number, bf, 15);
+    fprintf(stderr, "\tP2=%s\r\n", bf);
 
     SCPI_ResultDouble(context, 0);
     
+    return SCPI_RES_OK;
+}
+
+
+scpi_result_t DMM_ConfigureVoltageDc(scpi_t * context) {
+    scpi_parameter_t param1, param2;
+    fprintf(stderr, "conf:volt:dc\r\n"); // debug command name   
+
+    // read first parameter if present
+    if (!SCPI_Parameter(context, &param1, true)) {
+        return SCPI_RES_ERR;
+    }
+
+    // read second paraeter if present
+    if (!SCPI_Parameter(context, &param2, false)) {
+        // do something, if parameter not present
+    }
+
+    fprintf(stderr, "\tP1=%lf\r\n", SCPI_ParamGetDoubleVal(context, &param1));
+    fprintf(stderr, "\tP2=%lf\r\n", SCPI_ParamGetDoubleVal(context, &param2));
+
     return SCPI_RES_OK;
 }
 
@@ -100,6 +127,7 @@
 
     /* DMM */
     {.pattern = "MEASure:VOLTage:DC?", .callback = DMM_MeasureVoltageDcQ,},
+    {.pattern = "CONFigure:VOLTage:DC", .callback = DMM_ConfigureVoltageDc,},
     {.pattern = "MEASure:VOLTage:DC:RATio?", .callback = SCPI_StubQ,},
     {.pattern = "MEASure:VOLTage:AC?", .callback = SCPI_StubQ,},
     {.pattern = "MEASure:CURRent:DC?", .callback = SCPI_StubQ,},
@@ -108,16 +136,19 @@
     {.pattern = "MEASure:FRESistance?", .callback = SCPI_StubQ,},
     {.pattern = "MEASure:FREQuency?", .callback = SCPI_StubQ,},
     {.pattern = "MEASure:PERiod?", .callback = SCPI_StubQ,},
+    
+    {.pattern = "SYSTem:COMMunication:TCPIP:CONTROL?", .callback = SCPI_SystemCommTcpipControlQ,},
 
     SCPI_CMD_LIST_END
 };
 
 static scpi_interface_t scpi_interface = {
-    .write = SCPI_Write,
     .error = SCPI_Error,
+    .write = SCPI_Write,
+    .control = SCPI_Control,
+    .flush = SCPI_Flush,
     .reset = SCPI_Reset,
     .test = SCPI_Test,
-    .srq = SCPI_Srq,
 };
 
 #define SCPI_INPUT_BUFFER_LENGTH 256

--
Gitblit v1.9.1