From 23d91ad453f5feafeb1e871bd243e01049faec5b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 05 8月 2015 02:52:30 +0800
Subject: [PATCH] Merge lhoerl changes
---
examples/common/scpi-def.c | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index 359fdc4..4666123 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -40,7 +40,7 @@
#include "scpi/scpi.h"
#include "scpi-def.h"
-scpi_result_t DMM_MeasureVoltageDcQ(scpi_t * context) {
+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
@@ -69,7 +69,7 @@
}
-scpi_result_t DMM_MeasureVoltageAcQ(scpi_t * context) {
+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
@@ -97,7 +97,7 @@
return SCPI_RES_OK;
}
-scpi_result_t DMM_ConfigureVoltageDc(scpi_t * context) {
+static scpi_result_t DMM_ConfigureVoltageDc(scpi_t * context) {
double param1, param2;
fprintf(stderr, "conf:volt:dc\r\n"); // debug command name
@@ -117,7 +117,7 @@
return SCPI_RES_OK;
}
-scpi_result_t TEST_Bool(scpi_t * context) {
+static scpi_result_t TEST_Bool(scpi_t * context) {
scpi_bool_t param1;
fprintf(stderr, "TEST:BOOL\r\n"); // debug command name
@@ -139,7 +139,7 @@
};
-scpi_result_t TEST_ChoiceQ(scpi_t * context) {
+static scpi_result_t TEST_ChoiceQ(scpi_t * context) {
int32_t param;
const char * name;
@@ -149,21 +149,24 @@
}
SCPI_ChoiceToName(trigger_source, param, &name);
- fprintf(stderr, "\tP1=%s (%d)\r\n", name, param);
+ fprintf(stderr, "\tP1=%s (%ld)\r\n", name, (long int)param);
SCPI_ResultInt(context, param);
return SCPI_RES_OK;
}
-scpi_result_t TEST_Numbers(scpi_t * context) {
+static scpi_result_t TEST_Numbers(scpi_t * context) {
+ int32_t numbers[2];
- fprintf(stderr, "RAW CMD %.*s\r\n", (int)context->param_list.cmd_raw.length, context->param_list.cmd_raw.data);
+ SCPI_CommandNumbers(context, numbers, 2);
+
+ fprintf(stderr, "TEST numbers %d %d\r\n", numbers[0], numbers[1]);
return SCPI_RES_OK;
}
-scpi_result_t TEST_Text(scpi_t * context) {
+static scpi_result_t TEST_Text(scpi_t * context) {
char buffer[100];
size_t copy_len;
@@ -175,7 +178,7 @@
return SCPI_RES_OK;
}
-scpi_result_t TEST_ArbQ(scpi_t * context) {
+static scpi_result_t TEST_ArbQ(scpi_t * context) {
const char * data;
size_t len;
@@ -194,7 +197,7 @@
*
* Return SCPI_RES_OK
*/
-scpi_result_t My_CoreTstQ(scpi_t * context) {
+static scpi_result_t My_CoreTstQ(scpi_t * context) {
SCPI_ResultInt(context, 0);
@@ -283,3 +286,4 @@
.units = scpi_units_def,
.idn = {"MANUFACTURE", "INSTR2013", NULL, "01-02"},
};
+
--
Gitblit v1.9.1