From 11f2f2e329ef404d0e9c022cb2f9fbbb45bae285 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周日, 27 4月 2025 17:33:31 +0800
Subject: [PATCH] 完成了SCPI命令语法分析器的完整规则
---
libscpi/inc/scpi/error.h | 74 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/libscpi/inc/scpi/error.h b/libscpi/inc/scpi/error.h
index e9892fb..d931e4f 100644
--- a/libscpi/inc/scpi/error.h
+++ b/libscpi/inc/scpi/error.h
@@ -1,28 +1,29 @@
/*-
- * Copyright (c) 2012-2013 Jan Breuer,
+ * BSD 2-Clause License
*
- * All Rights Reserved
+ * Copyright (c) 2012-2018, Jan Breuer
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * modification, are permitted provided that the following conditions are met:
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
@@ -44,21 +45,23 @@
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, size_t info_len);
void SCPI_ErrorPush(scpi_t * context, int16_t err);
int32_t SCPI_ErrorCount(scpi_t * context);
const char * SCPI_ErrorTranslate(int16_t err);
-/* Using X-Macro technique to define everything once
- * http://en.wikipedia.org/wiki/X_Macro
- *
- * X macro is for minimal set of errors for library itself
- * XE macro is for full set of SCPI errors available to user application
- */
+ /* Using X-Macro technique to define everything once
+ * http://en.wikipedia.org/wiki/X_Macro
+ *
+ * X macro is for minimal set of errors for library itself
+ * XE macro is for full set of SCPI errors available to user application
+ */
#define LIST_OF_ERRORS \
+ X(SCPI_ERROR_NO_ERROR, 0, "No error") \
XE(SCPI_ERROR_COMMAND, -100, "Command error") \
X(SCPI_ERROR_INVALID_CHARACTER, -101, "Invalid character") \
XE(SCPI_ERROR_SYNTAX, -102, "Syntax error") \
@@ -102,7 +105,7 @@
X(SCPI_ERROR_EXECUTION_ERROR, -200, "Execution error") \
XE(SCPI_ERROR_INVAL_WHILE_IN_LOCAL, -201, "Invalid while in local") \
XE(SCPI_ERROR_SETTINGS_LOST_DUE_TO_RTL, -202, "Settings lost due to rtl") \
- XE(SCPI_ERROR_COMMAND_PROTECTED, -203, "Command protected TK024") \
+ XE(SCPI_ERROR_COMMAND_PROTECTED, -203, "Command protected") \
XE(SCPI_ERROR_TRIGGER_ERROR, -210, "Trigger error") \
XE(SCPI_ERROR_TRIGGER_IGNORED, -211, "Trigger ignored") \
XE(SCPI_ERROR_ARM_IGNORED, -212, "Arm ignored") \
@@ -164,11 +167,11 @@
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") \
- XE(SCPI_ERROR_INPUT_BUFFER_OVERRUN, -363, "Input buffer overrun") \
+ X(SCPI_ERROR_INPUT_BUFFER_OVERRUN, -363, "Input buffer overrun") \
XE(SCPI_ERROR_TIME_OUT, -365, "Time out error") \
XE(SCPI_ERROR_QUERY_ERROR, -400, "Query error") \
XE(SCPI_ERROR_QUERY_INTERRUPTED, -410, "Query INTERRUPTED") \
@@ -180,21 +183,22 @@
XE(SCPI_ERROR_REQUEST_CONTROL, -700, "Request control") \
XE(SCPI_ERROR_OPERATION_COMPLETE, -800, "Operation complete") \
-enum {
+
+ enum {
#define X(def, val, str) def = val,
#if USE_FULL_ERROR_LIST
#define XE X
#else
#define XE(def, val, str)
#endif
-LIST_OF_ERRORS
+ LIST_OF_ERRORS
#if USE_USER_ERROR_LIST
-LIST_OF_USER_ERRORS
+ LIST_OF_USER_ERRORS
#endif
#undef X
#undef XE
-};
+ };
#ifdef __cplusplus
}
--
Gitblit v1.9.1