From 173867689a0b328947c12e45a863145ec20c7628 Mon Sep 17 00:00:00 2001
From: Andrey Nakin <andrey.nakin@gmail.com>
Date: 周一, 23 3月 2015 20:36:11 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/j123b567/scpi-parser
---
examples/test-parser/main.c | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/examples/test-parser/main.c b/examples/test-parser/main.c
index d5e3553..69a7f20 100644
--- a/examples/test-parser/main.c
+++ b/examples/test-parser/main.c
@@ -45,6 +45,10 @@
return fwrite(data, 1, len, stdout);
}
+scpi_result_t SCPI_Flush(scpi_t * context) {
+ return SCPI_RES_OK;
+}
+
int SCPI_Error(scpi_t * context, int_fast16_t err) {
(void) context;
@@ -52,15 +56,21 @@
return 0;
}
-scpi_result_t SCPI_Srq(scpi_t * context) {
- scpi_reg_val_t stb = SCPI_RegGet(context, SCPI_REG_STB);
- fprintf(stderr, "**SRQ: 0x%X (%d)\r\n", stb, stb);
+scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val) {
+ if (SCPI_CTRL_SRQ == ctrl) {
+ fprintf(stderr, "**SRQ: 0x%X (%d)\r\n", val, val);
+ } else {
+ fprintf(stderr, "**CTRL %02x: 0x%X (%d)\r\n", ctrl, val, val);
+ }
return SCPI_RES_OK;
}
+/**
+ * Return 0 as OK and other number as error
+ */
scpi_result_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) {
@@ -68,6 +78,10 @@
return SCPI_RES_OK;
}
+scpi_result_t SCPI_SystemCommTcpipControlQ(scpi_t * context) {
+ return SCPI_RES_ERR;
+}
+
/*
*
*/
--
Gitblit v1.9.1