From 94ccbeebf69d856effb7ba0dc2dd7e4b13ba3a06 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 03 10月 2013 21:51:46 +0800
Subject: [PATCH] Add support for Boolean program data

---
 examples/common/scpi-def.c |   72 +++++++++++++++++++++++++++++------
 1 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index 0b9bfbd..782445a 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -41,26 +41,68 @@
 #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;
+}
+
+scpi_result_t SCPI_TestBool(scpi_t * context) {
+    scpi_parameter_t param1;
+    fprintf(stderr, "TEST:BOOL\r\n"); // debug command name   
+
+    // read first parameter if present
+    if (!SCPI_Parameter(context, &param1, true)) {
+        return SCPI_RES_ERR;
+    }
+
+    fprintf(stderr, "\tP1=%d\r\n", SCPI_ParamGetBoolVal(context, &param1));
+
+    return SCPI_RES_OK;
+}
+
 
 static const scpi_command_t scpi_commands[] = {
     /* IEEE Mandated Commands (SCPI std V1999.0 4.1.1) */
@@ -79,8 +121,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,},
 
@@ -90,8 +131,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,},
@@ -100,6 +140,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 +149,21 @@
     {.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,},
+    
+    {.pattern = "TEST:BOOL", .callback = SCPI_TestBool,},
 
     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