From 06b8e466fd5db6f6df344764ac5832587d03c126 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 07 7月 2017 21:03:33 +0800
Subject: [PATCH] Merge pull request #86 from RedPitaya/master
---
libscpi/src/minimal.c | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c
index ec4680d..83ecec7 100644
--- a/libscpi/src/minimal.c
+++ b/libscpi/src/minimal.c
@@ -2,7 +2,7 @@
* Copyright (c) 2012-2013 Jan Breuer,
*
* All Rights Reserved
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,10 +28,10 @@
/**
* @file scpi_minimal.c
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief SCPI minimal implementation
- *
- *
+ *
+ *
*/
@@ -40,11 +40,12 @@
#include "scpi/constants.h"
#include "scpi/error.h"
#include "scpi/ieee488.h"
+#include "utils_private.h"
/**
* Command stub function
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_Stub(scpi_t * context) {
(void) context;
@@ -54,44 +55,45 @@
/**
* Query command stub function
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_StubQ(scpi_t * context) {
- SCPI_ResultString(context, "");
+ SCPI_ResultInt32(context, 0);
return SCPI_RES_OK;
}
/**
* SYSTem:VERSion?
* @param context
- * @return
+ * @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;
}
/**
* SYSTem:ERRor[:NEXT]?
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_SystemErrorNextQ(scpi_t * context) {
- int16_t err = SCPI_ErrorPop(context);
-
- SCPI_ResultInt(context, err);
- SCPI_ResultText(context, SCPI_ErrorTranslate(err));
-
+ scpi_error_t error;
+ SCPI_ErrorPop(context, &error);
+ SCPI_ResultError(context, &error);
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ SCPIDEFINE_free(&context->error_info_heap, error.device_dependent_info, false);
+#endif
return SCPI_RES_OK;
}
/**
* SYSTem:ERRor:COUNt?
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_SystemErrorCountQ(scpi_t * context) {
- SCPI_ResultInt(context, SCPI_ErrorCount(context));
+ SCPI_ResultInt32(context, SCPI_ErrorCount(context));
return SCPI_RES_OK;
}
@@ -99,11 +101,11 @@
/**
* STATus:QUEStionable[:EVENt]?
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_StatusQuestionableEventQ(scpi_t * context) {
/* return value */
- SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUES));
+ SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_QUES));
/* clear register */
SCPI_RegSet(context, SCPI_REG_QUES, 0);
@@ -114,11 +116,11 @@
/**
* STATus:QUEStionable:ENABle?
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_StatusQuestionableEnableQ(scpi_t * context) {
/* return value */
- SCPI_ResultInt(context, SCPI_RegGet(context, SCPI_REG_QUESE));
+ SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_QUESE));
return SCPI_RES_OK;
}
@@ -126,12 +128,12 @@
/**
* STATus:QUEStionable:ENABle
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_StatusQuestionableEnable(scpi_t * context) {
int32_t new_QUESE;
- if (SCPI_ParamInt(context, &new_QUESE, TRUE)) {
- SCPI_RegSet(context, SCPI_REG_QUESE, new_QUESE);
+ if (SCPI_ParamInt32(context, &new_QUESE, TRUE)) {
+ SCPI_RegSet(context, SCPI_REG_QUESE, (scpi_reg_val_t) new_QUESE);
}
return SCPI_RES_OK;
}
@@ -139,7 +141,7 @@
/**
* STATus:PRESet
* @param context
- * @return
+ * @return
*/
scpi_result_t SCPI_StatusPreset(scpi_t * context) {
/* clear STATUS:... */
--
Gitblit v1.9.1