From a2e83e5ff635f040cffe4c12cfdaa60fa320c3de Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 22 4月 2015 01:59:50 +0800
Subject: [PATCH] Make public SCPI_LongToStr, SCPI_DoubleToStr
---
examples/test-interactive/main.c | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/examples/test-interactive/main.c b/examples/test-interactive/main.c
index 6fd1d71..2aabd1a 100644
--- a/examples/test-interactive/main.c
+++ b/examples/test-interactive/main.c
@@ -45,16 +45,23 @@
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;
- 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;
}
-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;
}
@@ -68,6 +75,9 @@
return SCPI_RES_OK;
}
+scpi_result_t SCPI_SystemCommTcpipControlQ(scpi_t * context) {
+ return SCPI_RES_ERR;
+}
/*
*
*/
@@ -82,7 +92,9 @@
printf("SCPI Interactive demo\r\n");
char smbuffer[10];
while (1) {
- fgets(smbuffer, 10, stdin);
+ if (NULL == fgets(smbuffer, 10, stdin)) {
+ break;
+ }
SCPI_Input(&scpi_context, smbuffer, strlen(smbuffer));
}
--
Gitblit v1.9.1