From da9c3c9f74c0a7eef863798770c24ac955d770de Mon Sep 17 00:00:00 2001 From: Jan Breuer <jan.breuer@jaybee.cz> Date: 周日, 04 10月 2015 18:25:40 +0800 Subject: [PATCH] Resolve #3: Chanel lists parsing --- examples/test-parser/main.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/examples/test-parser/main.c b/examples/test-parser/main.c index 0ab2b2a..7c562ee 100644 --- a/examples/test-parser/main.c +++ b/examples/test-parser/main.c @@ -52,7 +52,7 @@ 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,9 +96,9 @@ 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 @@ -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