From b75a3a17c2bb7ce46af4815ae588e263dbab944e Mon Sep 17 00:00:00 2001
From: Justin Fichtner <Justin.Fichtner@lakeshore.com>
Date: 周二, 15 8月 2017 00:20:06 +0800
Subject: [PATCH] Fix another bug in tests
---
libscpi/inc/scpi/types.h | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index c8ddf2e..3584936 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -74,6 +74,7 @@
SCPI_REG_ESE, /* Event Status Enable Register */
SCPI_REG_OPER, /* OPERation Status Register */
SCPI_REG_OPERE, /* OPERation Status Enable Register */
+ SCPI_REG_OPERC, /* OPERation Status Condition Register */
SCPI_REG_QUES, /* QUEStionable status register */
SCPI_REG_QUESE, /* QUEStionable status Enable Register */
@@ -113,7 +114,12 @@
typedef struct _scpi_command_t scpi_command_t;
-#define SCPI_CMD_LIST_END {NULL, NULL, 0}
+#if USE_COMMAND_TAGS
+ #define SCPI_CMD_LIST_END {NULL, NULL, 0}
+#else
+ #define SCPI_CMD_LIST_END {NULL, NULL}
+#endif
+
/* scpi interface */
typedef struct _scpi_t scpi_t;
@@ -203,7 +209,7 @@
struct _scpi_error_info_heap_t {
size_t wr;
- //size_t rd;
+ /* size_t rd; */
size_t count;
size_t size;
char * data;
@@ -276,7 +282,7 @@
SCPI_UNIT_BAR,
SCPI_UNIT_DECIBEL,
SCPI_UNIT_UNITLESS,
- SCPI_UNIT_FAGRENHEIT,
+ SCPI_UNIT_FAHRENHEIT,
SCPI_UNIT_KELVIN,
SCPI_UNIT_DAY,
SCPI_UNIT_YEAR,
@@ -328,7 +334,7 @@
union {
double value;
int32_t tag;
- };
+ } content;
scpi_unit_t unit;
int8_t base;
};
--
Gitblit v1.9.1