From 6092bdc4b163977bb5f31df50e6b2a6def28aac5 Mon Sep 17 00:00:00 2001
From: Chernov Dmitriy <cd_work@mail.ru>
Date: 周四, 25 2月 2016 21:53:34 +0800
Subject: [PATCH] start #73

---
 libscpi/src/minimal.c |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/libscpi/src/minimal.c b/libscpi/src/minimal.c
index 7641311..ecfcaf2 100644
--- a/libscpi/src/minimal.c
+++ b/libscpi/src/minimal.c
@@ -77,11 +77,24 @@
  * @return 
  */
 scpi_result_t SCPI_SystemErrorNextQ(scpi_t * context) {
-    int16_t err = SCPI_ErrorPop(context);
+	scpi_error_t error;
+	if(!SCPI_ErrorPopEx(context, &error))return SCPI_RES_ERR;
+	
+    //int16_t err = SCPI_ErrorPop(context);
 
-    SCPI_ResultInt32(context, err);
-    SCPI_ResultText(context, SCPI_ErrorTranslate(err));
+    SCPI_ResultInt32(context, error.error_code);
+    SCPI_ResultText(context, SCPI_ErrorTranslate(error.error_code));
+	
+	size_t info_len=0;
+	if(error.device_dependent_info){
+		info_len=SCPIDEFINE_strnlen(error.device_dependent_info,255);
+		SCPI_ResultCharacters(context, ";", 1);
+		SCPI_ResultText(context, error.device_dependent_info);
+		SCPIDEFINE_free(error.device_dependent_info);		
+	}
+	
 
+	
     return SCPI_RES_OK;
 }
 

--
Gitblit v1.9.1