From b0326fb63170801353cbc4d53b80846381de82f4 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 08 11月 2013 02:14:38 +0800
Subject: [PATCH] Implement compose compound command functionality
---
libscpi/src/parser.c | 24 +++++---
libscpi/test/test_scpi_utils.c | 35 +++++++++++
libscpi/src/utils.h | 3
libscpi/inc/scpi/parser.h | 2
libscpi/src/utils.c | 82 ++++++++++++++++++++++++++-
examples/common/scpi-def.c | 30 +++++++++
6 files changed, 160 insertions(+), 16 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index 6a53644..b84cdd9 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -69,6 +69,34 @@
}
+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
+
+ // read first parameter if present
+ if (!SCPI_ParamNumber(context, ¶m1, false)) {
+ // do something, if parameter not present
+ }
+
+ // read second paraeter if present
+ if (!SCPI_ParamNumber(context, ¶m2, false)) {
+ // do something, if parameter not present
+ }
+
+
+ SCPI_NumberToStr(context, ¶m1, bf, 15);
+ fprintf(stderr, "\tP1=%s\r\n", bf);
+
+
+ SCPI_NumberToStr(context, ¶m2, 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) {
double param1, param2;
fprintf(stderr, "conf:volt:dc\r\n"); // debug command name
@@ -164,7 +192,7 @@
{.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:VOLTage:AC?", .callback = DMM_MeasureVoltageAcQ,},
{.pattern = "MEASure:CURRent:DC?", .callback = SCPI_StubQ,},
{.pattern = "MEASure:CURRent:AC?", .callback = SCPI_StubQ,},
{.pattern = "MEASure:RESistance?", .callback = SCPI_StubQ,},
diff --git a/libscpi/inc/scpi/parser.h b/libscpi/inc/scpi/parser.h
index feeca23..9e1678f 100644
--- a/libscpi/inc/scpi/parser.h
+++ b/libscpi/inc/scpi/parser.h
@@ -47,7 +47,7 @@
void SCPI_Init(scpi_t * context);
int SCPI_Input(scpi_t * context, const char * data, size_t len);
- int SCPI_Parse(scpi_t * context, const char * data, size_t len);
+ int SCPI_Parse(scpi_t * context, char * data, size_t len);
size_t SCPI_ResultString(scpi_t * context, const char * data);
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index feecbf4..d5728af 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -48,7 +48,7 @@
static size_t cmdlineSeparatorPos(const char * cmd, size_t len);
static const char * cmdlineSeparator(const char * cmd, size_t len);
static const char * cmdlineTerminator(const char * cmd, size_t len);
-static const char * cmdlineNext(const char * cmd, size_t len);
+static size_t skipCmdLine(const char * cmd, size_t len);
static void paramSkipBytes(scpi_t * context, size_t num);
static void paramSkipWhitespace(scpi_t * context);
@@ -126,14 +126,14 @@
* Find next part of command
* @param cmd - input command
* @param len - max search length
- * @return Pointer to next part of command
+ * @return number of characters to be skipped
*/
-const char * cmdlineNext(const char * cmd, size_t len) {
+size_t skipCmdLine(const char * cmd, size_t len) {
const char * separator = cmdlineSeparator(cmd, len);
if (separator == NULL) {
- return cmd + len;
+ return len;
} else {
- return separator + 1;
+ return separator + 1 - cmd;
}
}
@@ -249,12 +249,14 @@
* @param len - command line length
* @return 1 if the last evaluated command was found
*/
-int SCPI_Parse(scpi_t * context, const char * data, size_t len) {
+int SCPI_Parse(scpi_t * context, char * data, size_t len) {
int result = 0;
const char * cmdline_end = data + len;
- const char * cmdline_ptr = data;
+ char * cmdline_ptr = data;
size_t cmd_len;
size_t cmdline_len;
+ char * cmdline_ptr_prev = NULL;
+ size_t cmd_len_prev = 0;
if (context == NULL) {
return -1;
@@ -263,16 +265,20 @@
while (cmdline_ptr < cmdline_end) {
result = 0;
cmd_len = cmdTerminatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
- cmdline_len = cmdlineSeparatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
if (cmd_len > 0) {
+ composeCompoundCommand(cmdline_ptr_prev, cmd_len_prev,
+ &cmdline_ptr, &cmd_len);
+ cmdline_len = cmdlineSeparatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
if(findCommand(context, cmdline_ptr, cmdline_len, cmd_len)) {
processCommand(context);
result = 1;
+ cmdline_ptr_prev = cmdline_ptr;
+ cmd_len_prev = cmd_len;
} else {
SCPI_ErrorPush(context, SCPI_ERROR_UNDEFINED_HEADER);
}
}
- cmdline_ptr = cmdlineNext(cmdline_ptr, cmdline_end - cmdline_ptr);
+ cmdline_ptr += skipCmdLine(cmdline_ptr, cmdline_end - cmdline_ptr);
cmdline_ptr += skipWhitespace(cmdline_ptr, cmdline_end - cmdline_ptr);
}
return result;
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 5498cf2..6a41e54 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -54,7 +54,7 @@
* @param set
* @return
*/
-char * strnpbrk(const char *str, size_t size, const char *set) {
+const char * strnpbrk(const char *str, size_t size, const char *set) {
const char *scanp;
long c, sc;
const char * strend = str + size;
@@ -62,7 +62,7 @@
while ((strend != str) && ((c = *str++) != 0)) {
for (scanp = set; (sc = *scanp++) != '\0';)
if (sc == c)
- return ((char *) (str - 1));
+ return str - 1;
}
return (NULL);
}
@@ -401,7 +401,7 @@
*/
size_t patternSeparatorPos(const char * pattern, size_t len) {
- char * separator = strnpbrk(pattern, len, "?:[]");
+ const char * separator = strnpbrk(pattern, len, "?:[]");
if (separator == NULL) {
return len;
} else {
@@ -416,7 +416,7 @@
* @return position of separator or len
*/
size_t cmdSeparatorPos(const char * cmd, size_t len) {
- char * separator = strnpbrk(cmd, len, ":?");
+ const char * separator = strnpbrk(cmd, len, ":?");
size_t result;
if (separator == NULL) {
result = len;
@@ -573,6 +573,80 @@
return result;
}
+/**
+ * Compose command from previsou command anc current command
+ *
+ * @param ptr_prev pointer to previous command
+ * @param len_prev length of previous command
+ * @param pptr pointer to pointer of current command
+ * @param plen pointer to length of current command
+ *
+ * ptr_prev and ptr should be in the same memory buffer
+ *
+ * Function will add part of previous command prior to ptr_prev
+ *
+ * char * cmd = "meas:volt:dc?;ac?"
+ * char * ptr_prev = cmd;
+ * size_t len_prev = 13;
+ * char * ptr = cmd + 14;
+ * size_t len = 3;
+ *
+ * composeCompoundCommand(ptr_prev, len_prev, &ptr, &len);
+ *
+ * after calling this
+ *
+ *
+ *
+ */
+bool_t composeCompoundCommand(char * ptr_prev, size_t len_prev,
+ char ** pptr, size_t * plen) {
+ char * ptr;
+ size_t len;
+ size_t i;
+
+ /* Invalid input */
+ if (pptr == NULL || plen == NULL)
+ return FALSE;
+
+ /* no previous command - nothing to do*/
+ if (ptr_prev == NULL || len_prev == 0)
+ return TRUE;
+
+ ptr = *pptr;
+ len = *plen;
+
+ /* No current command */
+ if (len == 0 || ptr == NULL)
+ return FALSE;
+
+ /* Common command or command root - nothing to do */
+ if (ptr[0] == '*' || ptr[0] == ':')
+ return TRUE;
+
+ /* Previsou command was common command - nothing to do */
+ if (ptr_prev[0] == '*')
+ return TRUE;
+
+ /* Find last occurence of ':' */
+ for (i = len_prev; i > 0; i--) {
+ if (ptr_prev[i-1] == ':') {
+ break;
+ }
+ }
+
+ /* Previous command was simple command - nothing to do*/
+ if (i == 0)
+ return TRUE;
+
+ ptr -= i;
+ len += i;
+ memmove(ptr, ptr_prev, i);
+ *plen = len;
+ *pptr = ptr;
+ return TRUE;
+}
+
+
#if !HAVE_STRNLEN
/* use FreeBSD strnlen */
diff --git a/libscpi/src/utils.h b/libscpi/src/utils.h
index 2ad3f5d..0969ce7 100644
--- a/libscpi/src/utils.h
+++ b/libscpi/src/utils.h
@@ -51,7 +51,7 @@
#define LOCAL
#endif
- char * strnpbrk(const char *str, size_t size, const char *set) LOCAL;
+ const char * strnpbrk(const char *str, size_t size, const char *set) LOCAL;
bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) LOCAL;
size_t longToStr(int32_t val, char * str, size_t len) LOCAL;
size_t doubleToStr(double val, char * str, size_t len) LOCAL;
@@ -63,6 +63,7 @@
size_t skipColon(const char * cmd, size_t len) LOCAL;
bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) LOCAL;
bool_t matchCommand(const char * pattern, const char * cmd, size_t len) LOCAL;
+ bool_t composeCompoundCommand(char * ptr_prev, size_t len_prev, char ** pptr, size_t * plen);
#if !HAVE_STRNLEN
size_t BSD_strnlen(const char *s, size_t maxlen);
diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index f6fd46f..43f3339 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -389,6 +389,40 @@
TEST_MATCH_COMMAND("*IDN?", ":*idn?", FALSE); // common command
}
+void test_composeCompoundCommand(void) {
+
+#define TEST_COMPOSE_COMMAND(b, c1_len, c2_pos, c2_len, c2_final, r) \
+ { \
+ char buffer[100]; \
+ char * cmd_prev = buffer; \
+ char * cmd = buffer + c2_pos; \
+ size_t len_prev = c1_len; \
+ size_t len = c2_len; \
+ bool_t res; \
+ \
+ strcpy(buffer, b); \
+ res = composeCompoundCommand(cmd_prev, len_prev, &cmd, &len); \
+ CU_ASSERT_EQUAL(res, r); \
+ CU_ASSERT_EQUAL(len, strlen(c2_final)); \
+ CU_ASSERT_STRING_EQUAL(cmd, c2_final); \
+ }\
+
+ TEST_COMPOSE_COMMAND("A:B;C", 3, 4, 1, "A:C", TRUE);
+ TEST_COMPOSE_COMMAND("A:B;DD", 3, 4, 2, "A:DD", TRUE);
+ TEST_COMPOSE_COMMAND("A:B", 0, 0, 3, "A:B", TRUE);
+ TEST_COMPOSE_COMMAND("*IDN? ; ABC", 5, 8, 3, "ABC", TRUE);
+ TEST_COMPOSE_COMMAND("A:B;*IDN?", 3, 4, 5, "*IDN?", TRUE);
+ TEST_COMPOSE_COMMAND("A:B;:C", 3, 4, 2, ":C", TRUE);
+ TEST_COMPOSE_COMMAND("B;C", 1, 2, 1, "C", TRUE);
+ TEST_COMPOSE_COMMAND("A:B;C:D", 3, 4, 3, "A:C:D", TRUE);
+ TEST_COMPOSE_COMMAND(":A:B;C", 4, 5, 1, ":A:C", TRUE);
+ TEST_COMPOSE_COMMAND(":A:B;:C", 4, 5, 2, ":C", TRUE);
+ TEST_COMPOSE_COMMAND(":A;C", 2, 3, 1, ":C", TRUE);
+
+ bool_t composeCompoundCommand(char * ptr_prev, size_t len_prev, char ** pptr, size_t * plen);
+
+}
+
int main() {
CU_pSuite pSuite = NULL;
@@ -415,6 +449,7 @@
|| (NULL == CU_add_test(pSuite, "locateStr", test_locateStr))
|| (NULL == CU_add_test(pSuite, "matchPattern", test_matchPattern))
|| (NULL == CU_add_test(pSuite, "matchCommand", test_matchCommand))
+ || (NULL == CU_add_test(pSuite, "composeCompoundCommand", test_composeCompoundCommand))
) {
CU_cleanup_registry();
return CU_get_error();
--
Gitblit v1.9.1