From 3044205b9aeabb90757c6030f2dc4bcfd1c322bf Mon Sep 17 00:00:00 2001
From: Justin Fichtner <justin.fichtner@lakeshore.com>
Date: ćšć, 30 11æ 2017 08:16:06 +0800
Subject: [PATCH] Implement condition register in Questionable register set
---
libscpi/test/test_parser.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/libscpi/test/test_parser.c b/libscpi/test/test_parser.c
index 0910731..4ca3ef8 100644
--- a/libscpi/test/test_parser.c
+++ b/libscpi/test/test_parser.c
@@ -78,6 +78,7 @@
{ .pattern = "SYSTem:VERSion?", .callback = SCPI_SystemVersionQ,},
{ .pattern = "STATus:QUEStionable[:EVENt]?", .callback = SCPI_StatusQuestionableEventQ,},
+ { .pattern = "STATus:QUEStionable:CONDition?", .callback = SCPI_Status_QuestionableConditionQ,},
{ .pattern = "STATus:QUEStionable:ENABle", .callback = SCPI_StatusQuestionableEnable,},
{ .pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},
@@ -439,6 +440,12 @@
TEST_IEEE4882("STATus:QUEStionable:ENABle 2\r\n", "");
TEST_IEEE4882_REG(SCPI_REG_QUESE, 2);
+ EST_IEEE4882("STATus:QUEStionable:CONDition?\r\n", "0\r\n");
+ TEST_IEEE4882_REG_SET(SCPI_REG_QUESC, 1);
+ TEST_IEEE4882("STATus:QUEStionable:CONDition?\r\n", "1\r\n");
+ TEST_IEEE4882("STATus:QUEStionable:EVENt?\r\n", "1\r\n");
+ TEST_IEEE4882_REG_SET(SCPI_REG_QUESC, 0);
+ TEST_IEEE4882("STATus:QUEStionable:CONDition?\r\n", "0\r\n");
TEST_IEEE4882("STATus:QUEStionable:EVENt?\r\n", "0\r\n");
TEST_IEEE4882_REG_SET(SCPI_REG_QUES, 1);
TEST_IEEE4882("STATus:QUEStionable:EVENt?\r\n", "1\r\n");
@@ -454,7 +461,6 @@
TEST_IEEE4882("STATus:OPERation:CONDition?\r\n", "0\r\n");
TEST_IEEE4882_REG_SET(SCPI_REG_OPERC, 1);
TEST_IEEE4882("STATus:OPERation:CONDition?\r\n", "1\r\n");
- TEST_IEEE4882_REG(SCPI_REG_OPERC, 1);
TEST_IEEE4882("STATus:OPERation:EVENt?\r\n", "1\r\n");
TEST_IEEE4882_REG_SET(SCPI_REG_OPERC, 0);
TEST_IEEE4882("STATus:OPERation:CONDition?\r\n", "0\r\n");
--
Gitblit v1.9.1