From a2e83e5ff635f040cffe4c12cfdaa60fa320c3de Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 22 4月 2015 01:59:50 +0800
Subject: [PATCH] Make public SCPI_LongToStr, SCPI_DoubleToStr
---
examples/common/scpi-def.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index b84cdd9..075f792 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -118,7 +118,7 @@
}
scpi_result_t TEST_Bool(scpi_t * context) {
- bool_t param1;
+ scpi_bool_t param1;
fprintf(stderr, "TEST:BOOL\r\n"); // debug command name
// read first parameter if present
@@ -147,14 +147,23 @@
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;
}
+scpi_result_t TEST_Numbers(scpi_t * context) {
+
+ fprintf(stderr, "RAW CMD %.*s\r\n", (int)context->paramlist.cmd_raw.length, context->paramlist.cmd_raw.data);
+
+ 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 +213,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 +245,4 @@
.special_numbers = scpi_special_numbers_def,
.idn = {"MANUFACTURE", "INSTR2013", NULL, "01-02"},
};
+
--
Gitblit v1.9.1