From ee12be8250ef185d24281f35fbd8541de240ece1 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 13 10月 2015 01:08:52 +0800
Subject: [PATCH] Resolve #55: SCPI_ExprChannelListEntry example
---
examples/test-parser/main.c | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/examples/test-parser/main.c b/examples/test-parser/main.c
index 0ab2b2a..4b71ff2 100644
--- a/examples/test-parser/main.c
+++ b/examples/test-parser/main.c
@@ -45,14 +45,14 @@
return fwrite(data, 1, len, stdout);
}
-scpi_result_t SCPI_Flush(scpi_t * context) {
+scpi_result_t SCPI_Flush(scpi_t * context) {
return SCPI_RES_OK;
}
int SCPI_Error(scpi_t * context, int_fast16_t err) {
(void) context;
- fprintf(stderr, "**ERROR: %d, \"%s\"\r\n", (int32_t) err, SCPI_ErrorTranslate(err));
+ fprintf(stderr, "**ERROR: %d, \"%s\"\r\n", (int16_t) err, SCPI_ErrorTranslate(err));
return 0;
}
@@ -62,11 +62,6 @@
} else {
fprintf(stderr, "**CTRL %02x: 0x%X (%d)\r\n", ctrl, val, val);
}
- return SCPI_RES_OK;
-}
-
-scpi_result_t SCPI_Test(scpi_t * context) {
- fprintf(stderr, "**Test\r\n");
return SCPI_RES_OK;
}
@@ -101,10 +96,10 @@
TEST_SCPI_INPUT(""); // emulate command timeout
TEST_SCPI_INPUT("*ESE\r\n"); // cause error -109, missing parameter
- TEST_SCPI_INPUT("*ESE 0x20\r\n");
+ TEST_SCPI_INPUT("*ESE #H20\r\n");
- TEST_SCPI_INPUT("*SRE 0xFF\r\n");
-
+ TEST_SCPI_INPUT("*SRE #HFF\r\n");
+
TEST_SCPI_INPUT("IDN?\r\n"); // cause error -113, undefined header
TEST_SCPI_INPUT("SYST:ERR?\r\n");
@@ -118,7 +113,10 @@
TEST_SCPI_INPUT("meas:volt:dc? def, 0.00001\r\n");
TEST_SCPI_INPUT("meas:volt:dc? 0.00001\r\n");
-
+ TEST_SCPI_INPUT("test:text 'a'\r\n");
+ TEST_SCPI_INPUT("test:text 'a a'\r\n");
+ TEST_SCPI_INPUT("test:text 'aa a'\r\n");
+ TEST_SCPI_INPUT("test:text 'aaa aaaa'\r\n");
//printf("%.*s %s\r\n", 3, "asdadasdasdasdas", "b");
// interactive demo
//char smbuffer[10];
--
Gitblit v1.9.1