From 4925f462dc0eeb608d7adba379dd04771f92eb51 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 24 6月 2013 21:51:20 +0800
Subject: [PATCH] Add support for optional command header part
---
examples/common/scpi-def.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index d35ddf7..9f1926a 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -106,8 +106,7 @@
{ .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 +116,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,},
--
Gitblit v1.9.1