From 4c11ea0639b923a171e72a47b8006734ba184b3e Mon Sep 17 00:00:00 2001 From: nancy.liao <huihui.liao@greentest.com.cn> Date: 周二, 15 4月 2025 18:47:46 +0800 Subject: [PATCH] 同步修改前的原SCPI库 --- libscpi/inc/scpi/types.h | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h index eb9b215..0e9bc30 100644 --- a/libscpi/inc/scpi/types.h +++ b/libscpi/inc/scpi/types.h @@ -40,8 +40,7 @@ #include <stddef.h> #include <stdint.h> -#include "scpi/config.h" - +#include <scpi/config.h> #if HAVE_STDBOOL #include <stdbool.h> #endif @@ -422,23 +421,39 @@ }; struct _scpi_t { + //鍛戒护琛ㄧ殑鎸囬拡 const scpi_command_t * cmdlist; + //杈撳叆鐨勬暟鎹� scpi_buffer_t buffer; + //瑙f瀽鍛戒护鐨勫弬鏁板垪琛� scpi_param_list_t param_list; + //SCPI鐨勭‖浠舵帴鍙o紝鍒锋柊 閲嶇疆 鍐欏叆 鎶ラ敊 scpi_interface_t * interface; + //杈撳嚭鏁版嵁鐨勪釜鏁� int_fast16_t output_count; + //杈撳叆鏁版嵁鐨勪釜鏁� 鐢ㄤ簬妫�楠屽弬鏁版槸鍚﹀悎娉� int_fast16_t input_count; + //鏄惁涓虹涓�涓緭鍑洪」 scpi_bool_t first_output; + //鍛戒护鏄惁鍑洪敊 scpi_bool_t cmd_error; + //閿欒淇℃伅闃熷垪 scpi_fifo_t error_queue; #if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE + //璇︾粏閿欒淇℃伅 scpi_error_info_heap_t error_info_heap; #endif + //SCPI瀵勫瓨鍣� scpi_reg_val_t registers[SCPI_REG_COUNT]; + //鍗曚綅琛ㄧ殑鎸囬拡 const scpi_unit_def_t * units; + void * user_context; + //瑙f瀽鍣ㄧ殑鐘舵�� scpi_parser_state_t parser_state; + //*IDN?鏌ヨ鐨勫搷搴斿瓧娈� const char * idn[4]; + //鍓╀綑寰呬紶杈撶殑瀛楄妭 size_t arbitrary_remaining; }; -- Gitblit v1.9.1