From 6e5e3e0e3fc450eaf53feee059824ad85c4f270d Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: ćšć, 06 8æ 2015 22:32:35 +0800
Subject: [PATCH] Resolve #38 Error queue not empty bit
---
examples/common/scpi-def.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 138 insertions(+), 19 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index c49eb44..e1089cc 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -40,27 +40,27 @@
#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
// read first parameter if present
- if (!SCPI_ParamNumber(context, ¶m1, false)) {
+ if (!SCPI_ParamNumber(context, scpi_special_numbers_def, ¶m1, FALSE)) {
// do something, if parameter not present
}
// read second paraeter if present
- if (!SCPI_ParamNumber(context, ¶m2, false)) {
+ if (!SCPI_ParamNumber(context, scpi_special_numbers_def, ¶m2, FALSE)) {
// do something, if parameter not present
}
- SCPI_NumberToStr(context, ¶m1, bf, 15);
+ SCPI_NumberToStr(context, scpi_special_numbers_def, ¶m1, bf, 15);
fprintf(stderr, "\tP1=%s\r\n", bf);
- SCPI_NumberToStr(context, ¶m2, bf, 15);
+ SCPI_NumberToStr(context, scpi_special_numbers_def, ¶m2, bf, 15);
fprintf(stderr, "\tP2=%s\r\n", bf);
SCPI_ResultDouble(context, 0);
@@ -69,22 +69,137 @@
}
-scpi_result_t DMM_ConfigureVoltageDc(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
+
+ // read first parameter if present
+ if (!SCPI_ParamNumber(context, scpi_special_numbers_def, ¶m1, FALSE)) {
+ // do something, if parameter not present
+ }
+
+ // read second paraeter if present
+ if (!SCPI_ParamNumber(context, scpi_special_numbers_def, ¶m2, FALSE)) {
+ // 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_ConfigureVoltageDc(scpi_t * context) {
double param1, param2;
fprintf(stderr, "conf:volt:dc\r\n"); // debug command name
// read first parameter if present
- if (!SCPI_ParamDouble(context, ¶m1, true)) {
+ if (!SCPI_ParamDouble(context, ¶m1, TRUE)) {
return SCPI_RES_ERR;
}
// read second paraeter if present
- if (!SCPI_ParamDouble(context, ¶m2, false)) {
+ if (!SCPI_ParamDouble(context, ¶m2, FALSE)) {
// do something, if parameter not present
}
fprintf(stderr, "\tP1=%lf\r\n", param1);
fprintf(stderr, "\tP2=%lf\r\n", param2);
+
+ return SCPI_RES_OK;
+}
+
+static scpi_result_t TEST_Bool(scpi_t * context) {
+ scpi_bool_t param1;
+ fprintf(stderr, "TEST:BOOL\r\n"); // debug command name
+
+ // read first parameter if present
+ if (!SCPI_ParamBool(context, ¶m1, TRUE)) {
+ return SCPI_RES_ERR;
+ }
+
+ fprintf(stderr, "\tP1=%d\r\n", param1);
+
+ return SCPI_RES_OK;
+}
+
+scpi_choice_def_t trigger_source[] = {
+ {"BUS", 5},
+ {"IMMediate", 6},
+ {"EXTernal", 7},
+ 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);
+
+ return SCPI_RES_OK;
+}
+
+static scpi_result_t TEST_Numbers(scpi_t * context) {
+ int32_t numbers[2];
+
+ SCPI_CommandNumbers(context, numbers, 2);
+
+ fprintf(stderr, "TEST numbers %d %d\r\n", numbers[0], numbers[1]);
+
+ return SCPI_RES_OK;
+}
+
+static scpi_result_t TEST_Text(scpi_t * context) {
+ char buffer[100];
+ size_t copy_len;
+
+ buffer[0] = 0;
+ SCPI_ParamCopyText(context, buffer, 100, ©_len, FALSE);
+
+ fprintf(stderr, "TEXT: ***%s***\r\n", buffer);
+
+ return SCPI_RES_OK;
+}
+
+static scpi_result_t TEST_ArbQ(scpi_t * context) {
+ const char * data;
+ size_t len;
+
+ SCPI_ParamArbitraryBlock(context, &data, &len, FALSE);
+
+ SCPI_ResultArbitraryBlock(context, data, len);
+
+ return SCPI_RES_OK;
+}
+
+/**
+ * Reimplement IEEE488.2 *TST?
+ *
+ * Result should be 0 if everything is ok
+ * Result should be 1 if something goes wrong
+ *
+ * Return SCPI_RES_OK
+ */
+static scpi_result_t My_CoreTstQ(scpi_t * context) {
+
+ SCPI_ResultInt(context, 0);
return SCPI_RES_OK;
}
@@ -102,12 +217,11 @@
{ .pattern = "*SRE", .callback = SCPI_CoreSre,},
{ .pattern = "*SRE?", .callback = SCPI_CoreSreQ,},
{ .pattern = "*STB?", .callback = SCPI_CoreStbQ,},
- { .pattern = "*TST?", .callback = SCPI_CoreTstQ,},
+ { .pattern = "*TST?", .callback = My_CoreTstQ,},
{ .pattern = "*WAI", .callback = SCPI_CoreWai,},
/* Required SCPI commands (SCPI std V1999.0 4.2.1) */
- {.pattern = "SYSTem:ERRor?", .callback = SCPI_SystemErrorNextQ,},
- {.pattern = "SYSTem:ERRor:NEXT?", .callback = SCPI_SystemErrorNextQ,},
+ {.pattern = "SYSTem:ERRor[:NEXT]?", .callback = SCPI_SystemErrorNextQ,},
{.pattern = "SYSTem:ERRor:COUNt?", .callback = SCPI_SystemErrorCountQ,},
{.pattern = "SYSTem:VERSion?", .callback = SCPI_SystemVersionQ,},
@@ -117,8 +231,7 @@
//{.pattern = "STATus:OPERation:ENABle", .callback = scpi_stub_callback,},
//{.pattern = "STATus:OPERation:ENABle?", .callback = scpi_stub_callback,},
- {.pattern = "STATus:QUEStionable?", .callback = SCPI_StatusQuestionableEventQ,},
- {.pattern = "STATus:QUEStionable:EVENt?", .callback = SCPI_StatusQuestionableEventQ,},
+ {.pattern = "STATus:QUEStionable[:EVENt]?", .callback = SCPI_StatusQuestionableEventQ,},
//{.pattern = "STATus:QUEStionable:CONDition?", .callback = scpi_stub_callback,},
{.pattern = "STATus:QUEStionable:ENABle", .callback = SCPI_StatusQuestionableEnable,},
{.pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},
@@ -129,26 +242,31 @@
{.pattern = "MEASure:VOLTage:DC?", .callback = DMM_MeasureVoltageDcQ,},
{.pattern = "CONFigure:VOLTage:DC", .callback = DMM_ConfigureVoltageDc,},
{.pattern = "MEASure:VOLTage:DC:RATio?", .callback = SCPI_StubQ,},
- {.pattern = "MEASure:VOLTage:AC?", .callback = SCPI_StubQ,},
+ {.pattern = "MEASure:VOLTage:AC?", .callback = DMM_MeasureVoltageAcQ,},
{.pattern = "MEASure:CURRent:DC?", .callback = SCPI_StubQ,},
{.pattern = "MEASure:CURRent:AC?", .callback = SCPI_StubQ,},
{.pattern = "MEASure:RESistance?", .callback = SCPI_StubQ,},
{.pattern = "MEASure:FRESistance?", .callback = SCPI_StubQ,},
{.pattern = "MEASure:FREQuency?", .callback = SCPI_StubQ,},
{.pattern = "MEASure:PERiod?", .callback = SCPI_StubQ,},
-
+
{.pattern = "SYSTem:COMMunication:TCPIP:CONTROL?", .callback = SCPI_SystemCommTcpipControlQ,},
+
+ {.pattern = "TEST:BOOL", .callback = TEST_Bool,},
+ {.pattern = "TEST:CHOice?", .callback = TEST_ChoiceQ,},
+ {.pattern = "TEST#:NUMbers#", .callback = TEST_Numbers,},
+ {.pattern = "TEST:TEXT", .callback = TEST_Text,},
+ {.pattern = "TEST:ARBitrary?", .callback = TEST_ArbQ,},
SCPI_CMD_LIST_END
};
static scpi_interface_t scpi_interface = {
- .write = SCPI_Write,
.error = SCPI_Error,
- .reset = SCPI_Reset,
- .test = SCPI_Test,
+ .write = SCPI_Write,
.control = SCPI_Control,
.flush = SCPI_Flush,
+ .reset = SCPI_Reset,
};
#define SCPI_INPUT_BUFFER_LENGTH 256
@@ -166,5 +284,6 @@
.interface = &scpi_interface,
.registers = scpi_regs,
.units = scpi_units_def,
- .special_numbers = scpi_special_numbers_def,
+ .idn = {"MANUFACTURE", "INSTR2013", NULL, "01-02"},
};
+
--
Gitblit v1.9.1