From c8c00d2032c12f79df352d4eb573c228099b30cf Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 31 5月 2016 18:15:28 +0800
Subject: [PATCH] Add channel list example call
---
examples/common/scpi-def.c | 83 ++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index dde9217..a3e08af 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -2,7 +2,7 @@
* Copyright (c) 2012-2013 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:
@@ -11,7 +11,7 @@
* 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.
- *
+ *
* 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
@@ -28,10 +28,10 @@
/**
* @file scpi-def.c
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief SCPI parser test
- *
- *
+ *
+ *
*/
#include <stdio.h>
@@ -43,7 +43,7 @@
static scpi_result_t DMM_MeasureVoltageDcQ(scpi_t * context) {
scpi_number_t param1, param2;
char bf[15];
- fprintf(stderr, "meas:volt:dc\r\n"); // debug command name
+ fprintf(stderr, "meas:volt:dc\r\n"); // debug command name
// read first parameter if present
if (!SCPI_ParamNumber(context, scpi_special_numbers_def, ¶m1, FALSE)) {
@@ -71,7 +71,7 @@
static scpi_result_t DMM_MeasureVoltageAcQ(scpi_t * context) {
scpi_number_t param1, param2;
char bf[15];
- fprintf(stderr, "meas:volt:ac\r\n"); // debug command name
+ fprintf(stderr, "meas:volt:ac\r\n"); // debug command name
// read first parameter if present
if (!SCPI_ParamNumber(context, scpi_special_numbers_def, ¶m1, FALSE)) {
@@ -98,7 +98,7 @@
static scpi_result_t DMM_ConfigureVoltageDc(scpi_t * context) {
double param1, param2;
- fprintf(stderr, "conf:volt:dc\r\n"); // debug command name
+ fprintf(stderr, "conf:volt:dc\r\n"); // debug command name
// read first parameter if present
if (!SCPI_ParamDouble(context, ¶m1, TRUE)) {
@@ -118,7 +118,7 @@
static scpi_result_t TEST_Bool(scpi_t * context) {
scpi_bool_t param1;
- fprintf(stderr, "TEST:BOOL\r\n"); // debug command name
+ fprintf(stderr, "TEST:BOOL\r\n"); // debug command name
// read first parameter if present
if (!SCPI_ParamBool(context, ¶m1, TRUE)) {
@@ -181,9 +181,9 @@
const char * data;
size_t len;
- SCPI_ParamArbitraryBlock(context, &data, &len, FALSE);
-
- SCPI_ResultArbitraryBlock(context, data, len);
+ if (SCPI_ParamArbitraryBlock(context, &data, &len, FALSE)) {
+ SCPI_ResultArbitraryBlock(context, data, len);
+ }
return SCPI_RES_OK;
}
@@ -195,22 +195,22 @@
typedef struct _scpi_channel_value_t scpi_channel_value_t;
/**
- * @brief
+ * @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)
+#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)
@@ -219,8 +219,8 @@
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];
+ 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
@@ -251,9 +251,11 @@
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
+ if (arr_idx >= MAXROW * MAXCOL) {
+ return SCPI_RES_ERR;
+ }
} else if (is_range == true) {
if (values_from[0] > values_to[0]) {
dir_row = -1; //we have to decrement from values_from
@@ -283,6 +285,9 @@
array[arr_idx].row = n;
array[arr_idx].col = m;
arr_idx++;
+ if (arr_idx >= MAXROW * MAXCOL) {
+ return SCPI_RES_ERR;
+ }
if (m == (size_t)values_to[1]) {
//endpoint reached, stop column for-loop
for_stop_col = true;
@@ -297,6 +302,9 @@
array[arr_idx].row = n;
array[arr_idx].col = 0;
arr_idx++;
+ if (arr_idx >= MAXROW * MAXCOL) {
+ return SCPI_RES_ERR;
+ }
}
if (n == (size_t)values_to[0]) {
//endpoint reached, stop row for-loop
@@ -307,7 +315,6 @@
} else {
return SCPI_RES_ERR;
- break;
}
//increase index
chanlst_idx++;
@@ -315,10 +322,10 @@
//while checks, whether incremented index is valid
}
//do something at the end if needed
- array[arr_idx].row = 0;
- array[arr_idx].col = 0;
+ //array[arr_idx].row = 0;
+ //array[arr_idx].col = 0;
}
-
+
{
size_t i;
fprintf(stderr, "TEST_Chanlst: ");
@@ -345,7 +352,7 @@
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,},
@@ -403,7 +410,7 @@
SCPI_CMD_LIST_END
};
-static scpi_interface_t scpi_interface = {
+scpi_interface_t scpi_interface = {
.error = SCPI_Error,
.write = SCPI_Write,
.control = SCPI_Control,
@@ -411,23 +418,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];
+scpi_error_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