From 96f23737e877fa29efa1f1d9b03131fbc4ee1667 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 15:54:50 +0800
Subject: [PATCH] Merge branch 'master' into feature/SCPI_99_21_8_Device_dependent_error_information_73
---
libscpi/inc/scpi/error.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libscpi/inc/scpi/error.h b/libscpi/inc/scpi/error.h
index 539ebae..2b15e7c 100644
--- a/libscpi/inc/scpi/error.h
+++ b/libscpi/inc/scpi/error.h
@@ -44,9 +44,10 @@
extern "C" {
#endif
- void SCPI_ErrorInit(scpi_t * context);
+ void SCPI_ErrorInit(scpi_t * context, scpi_error_t * data, int16_t size);
void SCPI_ErrorClear(scpi_t * context);
- int16_t SCPI_ErrorPop(scpi_t * context);
+ scpi_bool_t SCPI_ErrorPop(scpi_t * context, scpi_error_t * error);
+ void SCPI_ErrorPushEx(scpi_t * context, int16_t err, char * info);
void SCPI_ErrorPush(scpi_t * context, int16_t err);
int32_t SCPI_ErrorCount(scpi_t * context);
const char * SCPI_ErrorTranslate(int16_t err);
@@ -164,7 +165,7 @@
XE(SCPI_ERROR_OUT_OF_DEVICE_MEMORY, -321, "Out of memory") \
XE(SCPI_ERROR_SELF_TEST_FAILED, -330, "Self-test failed") \
XE(SCPI_ERROR_CALIBRATION_FAILED, -340, "Calibration failed") \
- XE(SCPI_ERROR_QUEUE_OVERFLOW, -350, "Queue overflow") \
+ X(SCPI_ERROR_QUEUE_OVERFLOW, -350, "Queue overflow") \
XE(SCPI_ERROR_COMMUNICATION_ERROR, -360, "Communication error") \
XE(SCPI_ERROR_PARITY_ERROR_IN_CMD_MSG, -361, "Parity error in program message") \
XE(SCPI_ERROR_FRAMING_ERROR_IN_CMD_MSG, -362, "Framing error in program message") \
--
Gitblit v1.9.1