From 5a5250218db5ecf87ff03106b7575419865d07ba Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周三, 16 4月 2025 18:59:28 +0800
Subject: [PATCH] scpi修改
---
libscpi/inc/scpi/scpi-def.h | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/libscpi/inc/scpi/scpi-def.h b/libscpi/inc/scpi/scpi-def.h
index 471c9a9..46e5f94 100644
--- a/libscpi/inc/scpi/scpi-def.h
+++ b/libscpi/inc/scpi/scpi-def.h
@@ -28,20 +28,28 @@
#ifndef __SCPI_DEF_H_
#define __SCPI_DEF_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
+
#include "scpi/scpi.h"
+
+/*
+ SCPI_IDN1
+ SCPI_IDN2
+ SCPI_IDN3
+ SCPI_IDN4
+ 杩欏嚑涓弬鏁版槸鐢ㄦ潵娉ㄥ唽鏃惰〃绀轰俊鎭�
+ 瀵瑰簲*IDN? 鏌ヨ鍛戒护鐨勮繑鍥炲唴瀹癸紙璁惧鏍囪瘑鏌ヨ鍛戒护锛�
+ 鍏蜂綋鍐呭涓猴紙鍒堕�犲晢,鍨嬪彿,搴忓垪鍙�,鍥轰欢鐗堟湰锛�
+ 濡傛灉浣跨敤CPP鐗堟湰鐨勮瘽浣跨敤scpi-def.h 鍜宻cpi-def.cpp
+ 杩欎釜鎻愪緵浜咰PP鐗堟湰鐨勬敮鎸侊紝.c鐨勭増鏈负鏃ф爣鍑嗙増鐗堟湰
+*/
#define SCPI_INPUT_BUFFER_LENGTH 256
#define SCPI_ERROR_QUEUE_SIZE 17
-
-
-#define SCPI_IDN1 "MANUFACTURE"
-#define SCPI_IDN2 "INSTR2013"
+#define SCPI_IDN1 "MANUFACTURE\n"
+#define SCPI_IDN2 "INSTR2013\n"
#define SCPI_IDN3 NULL
-#define SCPI_IDN4 "01-02"
+#define SCPI_IDN4 "01-02\n"
extern const scpi_command_t scpi_commands[];
extern scpi_interface_t scpi_interface;
@@ -58,8 +66,5 @@
scpi_result_t SCPI_SystemCommTcpipControlQ(scpi_t * context);
-#ifdef __cplusplus
-}
-#endif
#endif /* __SCPI_DEF_H_ */
--
Gitblit v1.9.1