From 90f9c5a84c9e4c281cd665bcb41dc6b2d2abb550 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 18 1月 2015 16:49:17 +0800
Subject: [PATCH] Correct type of *TST? callback function
---
examples/test-parser/main.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/examples/test-parser/main.c b/examples/test-parser/main.c
index 0ab2b2a..c4b3155 100644
--- a/examples/test-parser/main.c
+++ b/examples/test-parser/main.c
@@ -65,9 +65,16 @@
return SCPI_RES_OK;
}
-scpi_result_t SCPI_Test(scpi_t * context) {
+/**
+ * Callback for *TST? command
+ *
+ * It returns directly the result of the test
+ * @param context
+ * @return 0 means "test was OK", other values means, that some error bits are set
+ */
+int32_t SCPI_Test(scpi_t * context) {
fprintf(stderr, "**Test\r\n");
- return SCPI_RES_OK;
+ return 0;
}
scpi_result_t SCPI_Reset(scpi_t * context) {
@@ -101,9 +108,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
--
Gitblit v1.9.1