From 96f23737e877fa29efa1f1d9b03131fbc4ee1667 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 15:54:50 +0800
Subject: [PATCH] Merge branch 'master' into feature/SCPI_99_21_8_Device_dependent_error_information_73
---
examples/common/scpi-def.c | 200 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 164 insertions(+), 36 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index e1089cc..809fb1e 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -55,19 +55,18 @@
// do something, if parameter not present
}
-
+
SCPI_NumberToStr(context, scpi_special_numbers_def, ¶m1, bf, 15);
fprintf(stderr, "\tP1=%s\r\n", bf);
-
+
SCPI_NumberToStr(context, scpi_special_numbers_def, ¶m2, bf, 15);
fprintf(stderr, "\tP2=%s\r\n", bf);
SCPI_ResultDouble(context, 0);
-
+
return SCPI_RES_OK;
}
-
static scpi_result_t DMM_MeasureVoltageAcQ(scpi_t * context) {
scpi_number_t param1, param2;
@@ -84,16 +83,16 @@
// do something, if parameter not present
}
-
+
SCPI_NumberToStr(context, scpi_special_numbers_def, ¶m1, bf, 15);
fprintf(stderr, "\tP1=%s\r\n", bf);
-
+
SCPI_NumberToStr(context, scpi_special_numbers_def, ¶m2, bf, 15);
fprintf(stderr, "\tP2=%s\r\n", bf);
SCPI_ResultDouble(context, 0);
-
+
return SCPI_RES_OK;
}
@@ -138,20 +137,19 @@
SCPI_CHOICE_LIST_END /* termination of option list */
};
-
static scpi_result_t TEST_ChoiceQ(scpi_t * context) {
int32_t param;
const char * name;
-
+
if (!SCPI_ParamChoice(context, trigger_source, ¶m, TRUE)) {
return SCPI_RES_ERR;
}
-
+
SCPI_ChoiceToName(trigger_source, param, &name);
- fprintf(stderr, "\tP1=%s (%ld)\r\n", name, (long int)param);
-
- SCPI_ResultInt(context, param);
+ fprintf(stderr, "\tP1=%s (%ld)\r\n", name, (long int) param);
+
+ SCPI_ResultInt32(context, param);
return SCPI_RES_OK;
}
@@ -159,7 +157,7 @@
static scpi_result_t TEST_Numbers(scpi_t * context) {
int32_t numbers[2];
- SCPI_CommandNumbers(context, numbers, 2);
+ SCPI_CommandNumbers(context, numbers, 2, 1);
fprintf(stderr, "TEST numbers %d %d\r\n", numbers[0], numbers[1]);
@@ -170,8 +168,9 @@
char buffer[100];
size_t copy_len;
- buffer[0] = 0;
- SCPI_ParamCopyText(context, buffer, 100, ©_len, FALSE);
+ if (!SCPI_ParamCopyText(context, buffer, sizeof (buffer), ©_len, FALSE)) {
+ buffer[0] = '\0';
+ }
fprintf(stderr, "TEXT: ***%s***\r\n", buffer);
@@ -189,6 +188,148 @@
return SCPI_RES_OK;
}
+struct _scpi_channel_value_t {
+ int32_t row;
+ int32_t col;
+};
+typedef struct _scpi_channel_value_t scpi_channel_value_t;
+
+/**
+ * @brief
+ * parses lists
+ * channel numbers > 0.
+ * no checks yet.
+ * valid: (@1), (@3!1:1!3), ...
+ * (@1!1:3!2) would be 1!1, 1!2, 2!1, 2!2, 3!1, 3!2.
+ * (@3!1:1!3) would be 3!1, 3!2, 3!3, 2!1, 2!2, 2!3, ... 1!3.
+ *
+ * @param channel_list channel list, compare to SCPI99 Vol 1 Ch. 8.3.2
+ */
+static scpi_result_t TEST_Chanlst(scpi_t *context) {
+ scpi_parameter_t channel_list_param;
+#define maxrow 2 //maximum number of rows
+#define maxcol 6 //maximum number of columns
+#define maxdim 2 //maximum number of dimensions
+ scpi_channel_value_t array[maxrow * maxcol]; //array which holds values in order (2D)
+ size_t chanlst_idx; //index for channel list
+ size_t arr_idx = 0; //index for array
+ size_t n, m = 1; //counters for row (n) and columns (m)
+
+ // get channel list
+ if (SCPI_Parameter(context, &channel_list_param, TRUE)) {
+ scpi_expr_result_t res;
+ scpi_bool_t is_range;
+ int32_t values_from[maxdim];
+ int32_t values_to[maxdim];
+ size_t dimensions;
+
+ bool for_stop_row = false; //true if iteration for rows has to stop
+ bool for_stop_col = false; //true if iteration for columns has to stop
+ int32_t dir_row = 1; //direction of counter for rows, +/-1
+ int32_t dir_col = 1; //direction of counter for columns, +/-1
+
+ // the next statement is valid usage and it gets only real number of dimensions for the first item (index 0)
+ if (!SCPI_ExprChannelListEntry(context, &channel_list_param, 0, &is_range, NULL, NULL, 0, &dimensions)) {
+ chanlst_idx = 0; //call first index
+ arr_idx = 0; //set arr_idx to 0
+ do { //if valid, iterate over channel_list_param index while res == valid (do-while cause we have to do it once)
+ res = SCPI_ExprChannelListEntry(context, &channel_list_param, chanlst_idx, &is_range, values_from, values_to, 4, &dimensions);
+ if (is_range == false) { //still can have multiple dimensions
+ if (dimensions == 1) {
+ //here we have our values
+ //row == values_from[0]
+ //col == 0 (fixed number)
+ //call a function or something
+ array[arr_idx].row = values_from[0];
+ array[arr_idx].col = 0;
+ } else if (dimensions == 2) {
+ //here we have our values
+ //row == values_fom[0]
+ //col == values_from[1]
+ //call a function or something
+ array[arr_idx].row = values_from[0];
+ array[arr_idx].col = values_from[1];
+ } else {
+ return SCPI_RES_ERR;
+ break;
+ }
+ arr_idx++; //inkrement array where we want to save our values to, not neccessary otherwise
+ } else if (is_range == true) {
+ if (values_from[0] > values_to[0]) {
+ dir_row = -1; //we have to decrement from values_from
+ } else { //if (values_from[0] < values_to[0])
+ dir_row = +1; //default, we increment from values_from
+ }
+
+ //iterating over rows, do it once -> set for_stop_row = false
+ //needed if there is channel list index isn't at end yet
+ for_stop_row = false;
+ for (n = values_from[0]; for_stop_row == false; n += dir_row) {
+ //usual case for ranges, 2 dimensions
+ if (dimensions == 2) {
+ if (values_from[1] > values_to[1]) {
+ dir_col = -1;
+ } else if (values_from[1] < values_to[1]) {
+ dir_col = +1;
+ }
+ //iterating over columns, do it at least once -> set for_stop_col = false
+ //needed if there is channel list index isn't at end yet
+ for_stop_col = false;
+ for (m = values_from[1]; for_stop_col == false; m += dir_col) {
+ //here we have our values
+ //row == n
+ //col == m
+ //call a function or something
+ array[arr_idx].row = n;
+ array[arr_idx].col = m;
+ arr_idx++;
+ if (m == (size_t)values_to[1]) {
+ //endpoint reached, stop column for-loop
+ for_stop_col = true;
+ }
+ }
+ //special case for range, example: (@2!1)
+ } else if (dimensions == 1) {
+ //here we have values
+ //row == n
+ //col == 0 (fixed number)
+ //call function or sth.
+ array[arr_idx].row = n;
+ array[arr_idx].col = 0;
+ arr_idx++;
+ }
+ if (n == (size_t)values_to[0]) {
+ //endpoint reached, stop row for-loop
+ for_stop_row = true;
+ }
+ }
+
+
+ } else {
+ return SCPI_RES_ERR;
+ break;
+ }
+ //increase index
+ chanlst_idx++;
+ } while (SCPI_EXPR_OK == SCPI_ExprChannelListEntry(context, &channel_list_param, chanlst_idx, &is_range, values_from, values_to, 4, &dimensions));
+ //while checks, whether incremented index is valid
+ }
+ //do something at the end if needed
+ array[arr_idx].row = 0;
+ array[arr_idx].col = 0;
+ }
+
+ {
+ size_t i;
+ fprintf(stderr, "TEST_Chanlst: ");
+ for (i = 0; i< arr_idx; i++) {
+ fprintf(stderr, "%d!%d, ", array[i].row, array[i].col);
+ }
+ fprintf(stderr, "\r\n");
+ }
+ return SCPI_RES_OK;
+}
+
/**
* Reimplement IEEE488.2 *TST?
*
@@ -199,12 +340,12 @@
*/
static scpi_result_t My_CoreTstQ(scpi_t * context) {
- SCPI_ResultInt(context, 0);
+ SCPI_ResultInt32(context, 0);
return SCPI_RES_OK;
}
-static const scpi_command_t scpi_commands[] = {
+const scpi_command_t scpi_commands[] = {
/* IEEE Mandated Commands (SCPI std V1999.0 4.1.1) */
{ .pattern = "*CLS", .callback = SCPI_CoreCls,},
{ .pattern = "*ESE", .callback = SCPI_CoreEse,},
@@ -257,11 +398,12 @@
{.pattern = "TEST#:NUMbers#", .callback = TEST_Numbers,},
{.pattern = "TEST:TEXT", .callback = TEST_Text,},
{.pattern = "TEST:ARBitrary?", .callback = TEST_ArbQ,},
+ {.pattern = "TEST:CHANnellist", .callback = TEST_Chanlst,},
SCPI_CMD_LIST_END
};
-static scpi_interface_t scpi_interface = {
+scpi_interface_t scpi_interface = {
.error = SCPI_Error,
.write = SCPI_Write,
.control = SCPI_Control,
@@ -269,21 +411,7 @@
.reset = SCPI_Reset,
};
-#define SCPI_INPUT_BUFFER_LENGTH 256
-static char scpi_input_buffer[SCPI_INPUT_BUFFER_LENGTH];
+char scpi_input_buffer[SCPI_INPUT_BUFFER_LENGTH];
+int16_t scpi_error_queue_data[SCPI_ERROR_QUEUE_SIZE];
-static scpi_reg_val_t scpi_regs[SCPI_REG_COUNT];
-
-
-scpi_t scpi_context = {
- .cmdlist = scpi_commands,
- .buffer = {
- .length = SCPI_INPUT_BUFFER_LENGTH,
- .data = scpi_input_buffer,
- },
- .interface = &scpi_interface,
- .registers = scpi_regs,
- .units = scpi_units_def,
- .idn = {"MANUFACTURE", "INSTR2013", NULL, "01-02"},
-};
-
+scpi_t scpi_context;
--
Gitblit v1.9.1