Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Questionable Condition register #96

Merged
merged 3 commits into from
Nov 30, 2017
Merged

Add Questionable Condition register #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3044205
Implement condition register in Questionable register set
jfichtner Nov 30, 2017
e73964b
Re-add test line that I had thought was useless, but isn't
jfichtner Nov 30, 2017
3a4f333
Fix typos in tests
jfichtner Nov 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libscpi/inc/scpi/minimal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ extern "C" {
scpi_result_t SCPI_SystemErrorNextQ(scpi_t * context);
scpi_result_t SCPI_SystemErrorCountQ(scpi_t * context);
scpi_result_t SCPI_StatusQuestionableEventQ(scpi_t * context);
scpi_result_t SCPI_StatusQuestionableConditionQ(scpi_t * context);
scpi_result_t SCPI_StatusQuestionableEnableQ(scpi_t * context);
scpi_result_t SCPI_StatusQuestionableEnable(scpi_t * context);
scpi_result_t SCPI_StatusOperationConditionQ(scpi_t * context);
Expand Down
1 change: 1 addition & 0 deletions libscpi/inc/scpi/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ extern "C" {
SCPI_REG_OPERC, /* OPERation Status Condition Register */
SCPI_REG_QUES, /* QUEStionable status register */
SCPI_REG_QUESE, /* QUEStionable status Enable Register */
SCPI_REG_QUESC, /* QUEStionable status Condition Register

/* last definition - number of registers */
SCPI_REG_COUNT
Expand Down
3 changes: 3 additions & 0 deletions libscpi/src/ieee488.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ void SCPI_RegSet(scpi_t * context, scpi_reg_name_t name, scpi_reg_val_t val) {
case SCPI_REG_QUESE:
regUpdate(context, SCPI_REG_QUES);
break;
case SCPI_REG_QUESC:
regUpdateEvent(context, old_val, val, SCPI_REG_QUES);
break;
case SCPI_REG_OPER:
regUpdateSTB(context, val, SCPI_REG_OPERE, STB_OPS);
break;
Expand Down
12 changes: 12 additions & 0 deletions libscpi/src/minimal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,18 @@ scpi_result_t SCPI_SystemErrorCountQ(scpi_t * context) {
return SCPI_RES_OK;
}

/**
* STATus:QUEStionable:CONDition?
* @param context
* @return
*/
scpi_result_t SCPI_StatusQuestionableConditionQ(scpi_t * context) {
/* return value */
SCPI_ResultInt32(context, SCPI_RegGet(context, SCPI_REG_QUESC));

return SCPI_RES_OK;
}

/**
* STATus:QUEStionable[:EVENt]?
* @param context
Expand Down
8 changes: 8 additions & 0 deletions libscpi/test/test_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ static const scpi_command_t scpi_commands[] = {
{ .pattern = "SYSTem:VERSion?", .callback = SCPI_SystemVersionQ,},

{ .pattern = "STATus:QUEStionable[:EVENt]?", .callback = SCPI_StatusQuestionableEventQ,},
{ .pattern = "STATus:QUEStionable:CONDition?", .callback = SCPI_StatusQuestionableConditionQ,},
{ .pattern = "STATus:QUEStionable:ENABle", .callback = SCPI_StatusQuestionableEnable,},
{ .pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},

Expand Down Expand Up @@ -439,6 +440,13 @@ static void testIEEE4882(void) {
TEST_IEEE4882("STATus:QUEStionable:ENABle 2\r\n", "");
TEST_IEEE4882_REG(SCPI_REG_QUESE, 2);

TEST_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_REG(SCPI_REG_QUESC, 1);
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");
Expand Down