From 323ec66d62f19673e66762fe25585746d3b2a5e0 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 18 3月 2015 17:09:30 +0800
Subject: [PATCH] Add new AUTO special value, resolve #20
---
libscpi/inc/scpi/types.h | 105 ++++++++++++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 44 deletions(-)
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index 2b24cb5..ee0d0b9 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -1,5 +1,7 @@
/*-
- * Copyright (c) 2012-2013 Jan Breuer,
+ * Copyright (c) 2013 Jan Breuer
+ * Richard.hmm
+ * Copyright (c) 2012 Jan Breuer
*
* All Rights Reserved
*
@@ -45,46 +47,50 @@
extern "C" {
#endif
-#define FALSE false
-#define TRUE true
+#ifndef FALSE
+ #define FALSE 0
+#endif
+#ifndef TRUE
+ #define TRUE (!FALSE)
+#endif
/* basic data types */
- typedef bool bool_t;
- //typedef enum { FALSE = 0, TRUE } bool_t;
+ typedef bool scpi_bool_t;
+ /* typedef enum { FALSE = 0, TRUE } scpi_bool_t; */
/* IEEE 488.2 registers */
enum _scpi_reg_name_t {
- SCPI_REG_STB = 0, // Status Byte
- SCPI_REG_SRE, // Service Request Enable Register
- SCPI_REG_ESR, // Standard Event Status Register (ESR, SESR)
- SCPI_REG_ESE, // Event Status Enable Register
- SCPI_REG_OPER, // OPERation Status Register
- SCPI_REG_OPERE, // OPERation Status Enable Register
- SCPI_REG_QUES, // QUEStionable status register
- SCPI_REG_QUESE, // QUEStionable status Enable Register
+ SCPI_REG_STB = 0, /* Status Byte */
+ SCPI_REG_SRE, /* Service Request Enable Register */
+ SCPI_REG_ESR, /* Standard Event Status Register (ESR, SESR) */
+ SCPI_REG_ESE, /* Event Status Enable Register */
+ SCPI_REG_OPER, /* OPERation Status Register */
+ SCPI_REG_OPERE, /* OPERation Status Enable Register */
+ SCPI_REG_QUES, /* QUEStionable status register */
+ SCPI_REG_QUESE, /* QUEStionable status Enable Register */
/* last definition - number of registers */
- SCPI_REG_COUNT,
+ SCPI_REG_COUNT
};
typedef enum _scpi_reg_name_t scpi_reg_name_t;
enum _scpi_ctrl_name_t {
- SCPI_CTRL_SRQ = 1, // service request
- SCPI_CTRL_GTL, // Go to local
- SCPI_CTRL_SDC, // Selected device clear
- SCPI_CTRL_PPC, // Parallel poll configure
- SCPI_CTRL_GET, // Group execute trigger
- SCPI_CTRL_TCT, // Take control
- SCPI_CTRL_LLO, // Device clear
- SCPI_CTRL_DCL, // Local lockout
- SCPI_CTRL_PPU, // Parallel poll unconfigure
- SCPI_CTRL_SPE, // Serial poll enable
- SCPI_CTRL_SPD, // Serial poll disable
- SCPI_CTRL_MLA, // My local address
- SCPI_CTRL_UNL, // Unlisten
- SCPI_CTRL_MTA, // My talk address
- SCPI_CTRL_UNT, // Untalk
- SCPI_CTRL_MSA, // My secondary address
+ SCPI_CTRL_SRQ = 1, /* service request */
+ SCPI_CTRL_GTL, /* Go to local */
+ SCPI_CTRL_SDC, /* Selected device clear */
+ SCPI_CTRL_PPC, /* Parallel poll configure */
+ SCPI_CTRL_GET, /* Group execute trigger */
+ SCPI_CTRL_TCT, /* Take control */
+ SCPI_CTRL_LLO, /* Device clear */
+ SCPI_CTRL_DCL, /* Local lockout */
+ SCPI_CTRL_PPU, /* Parallel poll unconfigure */
+ SCPI_CTRL_SPE, /* Serial poll enable */
+ SCPI_CTRL_SPD, /* Serial poll disable */
+ SCPI_CTRL_MLA, /* My local address */
+ SCPI_CTRL_UNL, /* Unlisten */
+ SCPI_CTRL_MTA, /* My talk address */
+ SCPI_CTRL_UNT, /* Untalk */
+ SCPI_CTRL_MSA /* My secondary address */
};
typedef enum _scpi_ctrl_name_t scpi_ctrl_name_t;
@@ -93,23 +99,11 @@
/* scpi commands */
enum _scpi_result_t {
SCPI_RES_OK = 1,
- SCPI_RES_ERR = -1,
+ SCPI_RES_ERR = -1
};
typedef enum _scpi_result_t scpi_result_t;
typedef struct _scpi_command_t scpi_command_t;
-
- struct _scpi_param_list_t {
- const scpi_command_t * cmd;
- const char * parameters;
- size_t length;
- };
- #define SCPI_CMD_LIST_END {NULL, NULL, }
- typedef struct _scpi_param_list_t scpi_param_list_t;
-
- /* scpi interface */
- typedef struct _scpi_t scpi_t;
- typedef struct _scpi_interface_t scpi_interface_t;
struct _scpi_buffer_t {
size_t length;
@@ -117,6 +111,26 @@
char * data;
};
typedef struct _scpi_buffer_t scpi_buffer_t;
+
+ struct _scpi_const_buffer_t {
+ size_t length;
+ size_t position;
+ const char * data;
+ };
+ typedef struct _scpi_const_buffer_t scpi_const_buffer_t;
+
+ struct _scpi_param_list_t {
+ const scpi_command_t * cmd;
+ const char * parameters;
+ size_t length;
+ scpi_const_buffer_t cmd_raw;
+ };
+ #define SCPI_CMD_LIST_END {NULL, NULL, }
+ typedef struct _scpi_param_list_t scpi_param_list_t;
+
+ /* scpi interface */
+ typedef struct _scpi_t scpi_t;
+ typedef struct _scpi_interface_t scpi_interface_t;
typedef size_t(*scpi_write_t)(scpi_t * context, const char * data, size_t len);
typedef scpi_result_t(*scpi_write_control_t)(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val);
@@ -136,6 +150,7 @@
SCPI_UNIT_HERTZ,
SCPI_UNIT_CELSIUS,
SCPI_UNIT_SECONDS,
+ SCPI_UNIT_DISTANCE
};
typedef enum _scpi_unit_t scpi_unit_t;
@@ -157,6 +172,7 @@
SCPI_NUM_NAN,
SCPI_NUM_INF,
SCPI_NUM_NINF,
+ SCPI_NUM_AUTO
};
typedef enum _scpi_special_number_t scpi_special_number_t;
@@ -195,12 +211,13 @@
scpi_interface_t * interface;
int_fast16_t output_count;
int_fast16_t input_count;
- bool_t cmd_error;
+ scpi_bool_t cmd_error;
scpi_error_queue_t error_queue;
scpi_reg_val_t * registers;
const scpi_unit_def_t * units;
const scpi_special_number_def_t * special_numbers;
void * user_context;
+ const char * idn[4];
};
#ifdef __cplusplus
--
Gitblit v1.9.1