From 59d4618036c85dafc9026d0f84ab00fcb900acc9 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 23 10月 2013 21:46:41 +0800
Subject: [PATCH] merge functionality from 'master' branch

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

diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index 782445a..cdfee2d 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -89,7 +89,7 @@
     return SCPI_RES_OK;
 }
 
-scpi_result_t SCPI_TestBool(scpi_t * context) {
+scpi_result_t TEST_Bool(scpi_t * context) {
     scpi_parameter_t param1;
     fprintf(stderr, "TEST:BOOL\r\n"); // debug command name   
 
@@ -103,6 +103,30 @@
     return SCPI_RES_OK;
 }
 
+const char * trigger_source[] = {
+    "BUS",
+    "IMMediate",
+    "EXTernal",
+    NULL /* termination of option list */
+};
+
+
+scpi_result_t TEST_ChoiceQ(scpi_t * context) {
+    scpi_parameter_t param1;
+    int32_t result;
+
+    if (!SCPI_Parameter(context, &param1, true)) {
+        return SCPI_RES_ERR;
+    }
+
+    result = SCPI_ParamGetChoiceVal(context, &param1, trigger_source);
+
+    fprintf(stderr, "\tP1=%s (%d)\r\n", result >= 0 ? trigger_source[result] : "", result);
+
+    SCPI_ResultInt(context, result);
+
+    return SCPI_RES_OK;
+}
 
 static const scpi_command_t scpi_commands[] = {
     /* IEEE Mandated Commands (SCPI std V1999.0 4.1.1) */
@@ -149,10 +173,11 @@
     {.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,},
+
+    {.pattern = "TEST:BOOL", .callback = TEST_Bool,},
+    {.pattern = "TEST:CHOice?", .callback = TEST_ChoiceQ,},
 
     SCPI_CMD_LIST_END
 };
@@ -182,4 +207,5 @@
     .registers = scpi_regs,
     .units = scpi_units_def,
     .special_numbers = scpi_special_numbers_def,
+    .idn = {"MANUFACTURE", "INSTR2013", NULL, "01-02"},
 };

--
Gitblit v1.9.1