From fd04eafd808355465a67b3e1aa046ae732dadd61 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 18 1月 2015 16:27:26 +0800
Subject: [PATCH] Merge pull request #18 from luizrenault/master
---
libscpi/src/ieee488.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/libscpi/src/ieee488.c b/libscpi/src/ieee488.c
index 2dc0662..1c80801 100644
--- a/libscpi/src/ieee488.c
+++ b/libscpi/src/ieee488.c
@@ -98,7 +98,7 @@
* @param val - new value
*/
void SCPI_RegSet(scpi_t * context, scpi_reg_name_t name, scpi_reg_val_t val) {
- bool_t srq = FALSE;
+ scpi_bool_t srq = FALSE;
scpi_reg_val_t mask;
scpi_reg_val_t old_val;
@@ -240,13 +240,20 @@
/**
* *IDN?
+ *
+ * field1: MANUFACTURE
+ * field2: MODEL
+ * field4: SUBSYSTEMS REVISIONS
+ *
+ * example: MANUFACTURE,MODEL,0,01-02-01
* @param context
* @return
*/
scpi_result_t SCPI_CoreIdnQ(scpi_t * context) {
- SCPI_ResultString(context, SCPI_MANUFACTURE);
- SCPI_ResultString(context, SCPI_DEV_NAME);
- SCPI_ResultString(context, SCPI_DEV_VERSION);
+ SCPI_ResultString(context, context->idn[0]);
+ SCPI_ResultString(context, context->idn[1]);
+ SCPI_ResultString(context, context->idn[2]);
+ SCPI_ResultString(context, context->idn[3]);
return SCPI_RES_OK;
}
@@ -324,7 +331,7 @@
scpi_result_t SCPI_CoreTstQ(scpi_t * context) {
int result = 0;
if (context && context->interface && context->interface->test) {
- result = context->interface->test(context);
+ result = context->interface->test(context)==SCPI_RES_ERR;
}
SCPI_ResultInt(context, result);
return SCPI_RES_OK;
--
Gitblit v1.9.1