From 94ccbc305cac38eb9c54384b9f47d3da6527299b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周六, 25 4月 2015 22:29:42 +0800
Subject: [PATCH] Solve #16 Multiple Identical Capabilities
---
examples/common/scpi-def.c | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index 3a863c9..19c66df 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -40,7 +40,7 @@
#include "scpi/scpi.h"
#include "scpi-def.h"
-scpi_result_t DMM_MeasureVoltageDcQ(scpi_t * context) {
+static scpi_result_t DMM_MeasureVoltageDcQ(scpi_t * context) {
scpi_number_t param1, param2;
char bf[15];
fprintf(stderr, "meas:volt:dc\r\n"); // debug command name
@@ -69,7 +69,7 @@
}
-scpi_result_t DMM_MeasureVoltageAcQ(scpi_t * context) {
+static scpi_result_t DMM_MeasureVoltageAcQ(scpi_t * context) {
scpi_number_t param1, param2;
char bf[15];
fprintf(stderr, "meas:volt:ac\r\n"); // debug command name
@@ -97,7 +97,7 @@
return SCPI_RES_OK;
}
-scpi_result_t DMM_ConfigureVoltageDc(scpi_t * context) {
+static scpi_result_t DMM_ConfigureVoltageDc(scpi_t * context) {
double param1, param2;
fprintf(stderr, "conf:volt:dc\r\n"); // debug command name
@@ -117,7 +117,7 @@
return SCPI_RES_OK;
}
-scpi_result_t TEST_Bool(scpi_t * context) {
+static scpi_result_t TEST_Bool(scpi_t * context) {
scpi_bool_t param1;
fprintf(stderr, "TEST:BOOL\r\n"); // debug command name
@@ -139,7 +139,7 @@
};
-scpi_result_t TEST_ChoiceQ(scpi_t * context) {
+static scpi_result_t TEST_ChoiceQ(scpi_t * context) {
int32_t param;
@@ -147,14 +147,26 @@
return SCPI_RES_ERR;
}
- fprintf(stderr, "\tP1=%s (%d)\r\n", trigger_source[param], param);
+ fprintf(stderr, "\tP1=%s (%ld)\r\n", trigger_source[param], (long int)param);
SCPI_ResultInt(context, param);
return SCPI_RES_OK;
}
+static scpi_result_t TEST_Numbers(scpi_t * context) {
+ int32_t numbers[2];
+
+ SCPI_CommandNumbers(context, numbers, 2);
+
+ fprintf(stderr, "TEST numbers %d %d\r\n", numbers[0], numbers[1]);
+
+ return SCPI_RES_OK;
+}
+
static const scpi_command_t scpi_commands[] = {
+ /* { .pattern = "pattern", .callback = callback}, */
+
/* IEEE Mandated Commands (SCPI std V1999.0 4.1.1) */
{ .pattern = "*CLS", .callback = SCPI_CoreCls,},
{ .pattern = "*ESE", .callback = SCPI_CoreEse,},
@@ -204,6 +216,7 @@
{.pattern = "TEST:BOOL", .callback = TEST_Bool,},
{.pattern = "TEST:CHOice?", .callback = TEST_ChoiceQ,},
+ {.pattern = "TEST#:NUMbers#", .callback = TEST_Numbers,},
SCPI_CMD_LIST_END
};
@@ -235,3 +248,4 @@
.special_numbers = scpi_special_numbers_def,
.idn = {"MANUFACTURE", "INSTR2013", NULL, "01-02"},
};
+
--
Gitblit v1.9.1