From ed07df16da675c4c123e02a996822daf13d69c63 Mon Sep 17 00:00:00 2001
From: lhoerl <coder@lolux.de>
Date: 周一, 03 8月 2015 22:42:07 +0800
Subject: [PATCH] added full SCPI error messages added list for device dependent error messages some minor changes to get rid of compiler warnings added support for Keil ARM compiler added support for National Instruments CVI compiler removed bug if(c = '\0')...
---
libscpi/src/minimal.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c
index c133fe6..6727008 100644
--- a/libscpi/src/minimal.c
+++ b/libscpi/src/minimal.c
@@ -57,7 +57,7 @@
* @return
*/
scpi_result_t SCPI_StubQ(scpi_t * context) {
- SCPI_ResultString(context, "");
+ SCPI_ResultInt(context, 0);
return SCPI_RES_OK;
}
@@ -67,7 +67,7 @@
* @return
*/
scpi_result_t SCPI_SystemVersionQ(scpi_t * context) {
- SCPI_ResultString(context, SCPI_DEV_VERSION);
+ SCPI_ResultMnemonic(context, SCPI_STD_VERSION_REVISION);
return SCPI_RES_OK;
}
@@ -102,10 +102,10 @@
* @return
*/
scpi_result_t SCPI_StatusQuestionableEventQ(scpi_t * context) {
- // return value
+ /* return value */
SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUES));
- // clear register
+ /* clear register */
SCPI_RegSet(context, SCPI_REG_QUES, 0);
return SCPI_RES_OK;
@@ -117,7 +117,7 @@
* @return
*/
scpi_result_t SCPI_StatusQuestionableEnableQ(scpi_t * context) {
- // return value
+ /* return value */
SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUESE));
return SCPI_RES_OK;
@@ -142,7 +142,7 @@
* @return
*/
scpi_result_t SCPI_StatusPreset(scpi_t * context) {
- // clear STATUS:...
+ /* clear STATUS:... */
SCPI_RegSet(context, SCPI_REG_QUES, 0);
return SCPI_RES_OK;
}
--
Gitblit v1.9.1