From cc47c934744c759fa47133fc70b7d23aa4a2d7f1 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周一, 21 4月 2025 19:55:59 +0800
Subject: [PATCH] 修改了一部分的宏定义声明和屏蔽了一些调试时的无效干扰
---
libscpi/inc/scpi/types.h | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 1212ff6..f7dbcf1 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -368,6 +368,20 @@
SCPI_NUM_NINF,
SCPI_NUM_AUTO
};
+
+ enum SCPIRError
+ {
+ RETURN_TRUE = 0,
+ //鍛戒护鏈畾涔�
+ RETURN_UnDefine = -1,
+ //闀垮害婧㈠嚭
+ RETURN_LengthOverFlow = -2,
+ //鍛戒护闈炴硶
+ RETURN_IllegalCommand = -3,
+ //鍥炶皟鍑芥暟娌℃湁鎵惧埌
+ RETURN_NotFind = -4
+
+ };
typedef enum _scpi_special_number_t scpi_special_number_t;
struct _scpi_choice_def_t {
@@ -420,6 +434,7 @@
scpi_command_callback_t reset;
};
+
struct _scpi_t {
//鍛戒护琛ㄧ殑鎸囬拡
const scpi_command_t * cmdlist;
@@ -455,10 +470,12 @@
const char * idn[4];
//鍓╀綑寰呬紶杈撶殑瀛楄妭
size_t arbitrary_remaining;
- //output涓鸿嚜澧炲瓧娈碉紝淇濆瓨杩斿洖缁撴灉,鎻愪緵缁欑▼搴忓搷搴斿唴閮ㄨ緭鍑�
- char outPut[1024];
+
+ int SCPIerror;
};
+
+
enum _scpi_array_format_t {
SCPI_FORMAT_ASCII = 0,
SCPI_FORMAT_NORMAL = 1,
--
Gitblit v1.9.1