From 06ca0ab8991fe36731ae715a072fb12cc22abcca Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 24 6月 2013 22:19:34 +0800
Subject: [PATCH] Update documentation

---
 examples/common/scpi-def.c |   36 +++++++++++++++++-------------------
 1 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index c49eb44..9f1926a 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -41,26 +41,26 @@
 #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)) {
-        // do something, if parameter not present
+    if (SCPI_Parameter(context, &param1, false)) {
+        SCPI_ParamTranslateNumberVal(context, &param1);
     }
 
     // read second paraeter if present
-    if (!SCPI_ParamNumber(context, &param2, false)) {
-        // do something, if parameter not present
+    if (SCPI_Parameter(context, &param2, false)) {
+        SCPI_ParamTranslateNumberVal(context, &param2);
     }
 
     
-    SCPI_NumberToStr(context, &param1, bf, 15);
+    SCPI_NumberToStr(context, &param1.number, bf, 15);
     fprintf(stderr, "\tP1=%s\r\n", bf);
 
     
-    SCPI_NumberToStr(context, &param2, bf, 15);
+    SCPI_NumberToStr(context, &param2.number, bf, 15);
     fprintf(stderr, "\tP2=%s\r\n", bf);
 
     SCPI_ResultDouble(context, 0);
@@ -70,21 +70,21 @@
 
 
 scpi_result_t DMM_ConfigureVoltageDc(scpi_t * context) {
-    double param1, param2;
+    scpi_parameter_t param1, param2;
     fprintf(stderr, "conf:volt:dc\r\n"); // debug command name   
 
     // read first parameter if present
-    if (!SCPI_ParamDouble(context, &param1, true)) {
+    if (!SCPI_Parameter(context, &param1, true)) {
         return SCPI_RES_ERR;
     }
 
     // read second paraeter if present
-    if (!SCPI_ParamDouble(context, &param2, false)) {
+    if (!SCPI_Parameter(context, &param2, false)) {
         // do something, if parameter not present
     }
 
-    fprintf(stderr, "\tP1=%lf\r\n", param1);
-    fprintf(stderr, "\tP2=%lf\r\n", param2);
+    fprintf(stderr, "\tP1=%lf\r\n", SCPI_ParamGetDoubleVal(context, &param1));
+    fprintf(stderr, "\tP2=%lf\r\n", SCPI_ParamGetDoubleVal(context, &param2));
 
     return SCPI_RES_OK;
 }
@@ -106,8 +106,7 @@
     { .pattern = "*WAI", .callback = SCPI_CoreWai,},
 
     /* Required SCPI commands (SCPI std V1999.0 4.2.1) */
-    {.pattern = "SYSTem:ERRor?", .callback = SCPI_SystemErrorNextQ,},
-    {.pattern = "SYSTem:ERRor:NEXT?", .callback = SCPI_SystemErrorNextQ,},
+    {.pattern = "SYSTem:ERRor[:NEXT]?", .callback = SCPI_SystemErrorNextQ,},
     {.pattern = "SYSTem:ERRor:COUNt?", .callback = SCPI_SystemErrorCountQ,},
     {.pattern = "SYSTem:VERSion?", .callback = SCPI_SystemVersionQ,},
 
@@ -117,8 +116,7 @@
     //{.pattern = "STATus:OPERation:ENABle", .callback = scpi_stub_callback,},
     //{.pattern = "STATus:OPERation:ENABle?", .callback = scpi_stub_callback,},
 
-    {.pattern = "STATus:QUEStionable?", .callback = SCPI_StatusQuestionableEventQ,},
-    {.pattern = "STATus:QUEStionable:EVENt?", .callback = SCPI_StatusQuestionableEventQ,},
+    {.pattern = "STATus:QUEStionable[:EVENt]?", .callback = SCPI_StatusQuestionableEventQ,},
     //{.pattern = "STATus:QUEStionable:CONDition?", .callback = scpi_stub_callback,},
     {.pattern = "STATus:QUEStionable:ENABle", .callback = SCPI_StatusQuestionableEnable,},
     {.pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},
@@ -143,12 +141,12 @@
 };
 
 static scpi_interface_t scpi_interface = {
-    .write = SCPI_Write,
     .error = SCPI_Error,
-    .reset = SCPI_Reset,
-    .test = SCPI_Test,
+    .write = SCPI_Write,
     .control = SCPI_Control,
     .flush = SCPI_Flush,
+    .reset = SCPI_Reset,
+    .test = SCPI_Test,
 };
 
 #define SCPI_INPUT_BUFFER_LENGTH 256

--
Gitblit v1.9.1