From d5c06b6b13458364657b32835f25db1e7082855e Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 01 5月 2013 18:31:23 +0800
Subject: [PATCH] Contributed patch: handling c++, non GCC compiler

---
 examples/common/scpi-def.c |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index 16711c3..485cd85 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -46,11 +46,13 @@
     fprintf(stderr, "meas:volt:dc\r\n"); // debug command name   
 
     // read first parameter if present
-    if (SCPI_ParamNumber(context, &param1, false)) {
+    if (!SCPI_ParamNumber(context, &param1, false)) {
+        // do something, if parameter not present
     }
 
     // read second paraeter if present
-    if (SCPI_ParamNumber(context, &param2, false)) {
+    if (!SCPI_ParamNumber(context, &param2, false)) {
+        // do something, if parameter not present
     }
 
     
@@ -63,6 +65,27 @@
 
     SCPI_ResultDouble(context, 0);
     
+    return SCPI_RES_OK;
+}
+
+
+scpi_result_t DMM_ConfigureVoltageDc(scpi_t * context) {
+    double param1, param2;
+    fprintf(stderr, "conf:volt:dc\r\n"); // debug command name   
+
+    // read first parameter if present
+    if (!SCPI_ParamDouble(context, &param1, true)) {
+        return SCPI_RES_ERR;
+    }
+
+    // read second paraeter if present
+    if (!SCPI_ParamDouble(context, &param2, false)) {
+        // do something, if parameter not present
+    }
+
+    fprintf(stderr, "\tP1=%lf\r\n", param1);
+    fprintf(stderr, "\tP2=%lf\r\n", param2);
+
     return SCPI_RES_OK;
 }
 
@@ -104,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,},
@@ -119,12 +143,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