From a79e3f82d6c19f9991327444ea156380801bffda Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 14 2月 2016 00:25:03 +0800
Subject: [PATCH] Emit also queue overflow error (issue #66)
---
examples/test-parser/main.c | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/examples/test-parser/main.c b/examples/test-parser/main.c
index d5e3553..e5badb1 100644
--- a/examples/test-parser/main.c
+++ b/examples/test-parser/main.c
@@ -2,7 +2,7 @@
* Copyright (c) 2012-2013 Jan Breuer,
*
* All Rights Reserved
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,10 +28,10 @@
/**
* @file main.c
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief SCPI parser test
- *
- *
+ *
+ *
*/
#include <stdio.h>
@@ -45,38 +45,58 @@
return fwrite(data, 1, len, stdout);
}
-int SCPI_Error(scpi_t * context, int_fast16_t err) {
+scpi_result_t SCPI_Flush(scpi_t * context) {
(void) context;
- fprintf(stderr, "**ERROR: %d, \"%s\"\r\n", (int32_t) err, SCPI_ErrorTranslate(err));
- return 0;
-}
-
-scpi_result_t SCPI_Srq(scpi_t * context) {
- scpi_reg_val_t stb = SCPI_RegGet(context, SCPI_REG_STB);
- fprintf(stderr, "**SRQ: 0x%X (%d)\r\n", stb, stb);
return SCPI_RES_OK;
}
-scpi_result_t SCPI_Test(scpi_t * context) {
- fprintf(stderr, "**Test\r\n");
+int SCPI_Error(scpi_t * context, int_fast16_t err) {
+ (void) context;
+
+ fprintf(stderr, "**ERROR: %d, \"%s\"\r\n", (int16_t) err, SCPI_ErrorTranslate(err));
+ return 0;
+}
+
+scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val) {
+ (void) context;
+
+ if (SCPI_CTRL_SRQ == ctrl) {
+ fprintf(stderr, "**SRQ: 0x%X (%d)\r\n", val, val);
+ } else {
+ fprintf(stderr, "**CTRL %02x: 0x%X (%d)\r\n", ctrl, val, val);
+ }
return SCPI_RES_OK;
}
scpi_result_t SCPI_Reset(scpi_t * context) {
+ (void) context;
+
fprintf(stderr, "**Reset\r\n");
return SCPI_RES_OK;
}
+scpi_result_t SCPI_SystemCommTcpipControlQ(scpi_t * context) {
+ (void) context;
+
+ return SCPI_RES_ERR;
+}
+
/*
- *
+ *
*/
int main(int argc, char** argv) {
(void) argc;
(void) argv;
int result;
- SCPI_Init(&scpi_context);
+ SCPI_Init(&scpi_context,
+ scpi_commands,
+ &scpi_interface,
+ scpi_units_def,
+ SCPI_IDN1, SCPI_IDN2, SCPI_IDN3, SCPI_IDN4,
+ scpi_input_buffer, SCPI_INPUT_BUFFER_LENGTH,
+ scpi_error_queue_data, SCPI_ERROR_QUEUE_SIZE);
#define TEST_SCPI_INPUT(cmd) result = SCPI_Input(&scpi_context, cmd, strlen(cmd))
@@ -90,10 +110,10 @@
TEST_SCPI_INPUT(""); // emulate command timeout
TEST_SCPI_INPUT("*ESE\r\n"); // cause error -109, missing parameter
- TEST_SCPI_INPUT("*ESE 0x20\r\n");
+ TEST_SCPI_INPUT("*ESE #H20\r\n");
- TEST_SCPI_INPUT("*SRE 0xFF\r\n");
-
+ TEST_SCPI_INPUT("*SRE #HFF\r\n");
+
TEST_SCPI_INPUT("IDN?\r\n"); // cause error -113, undefined header
TEST_SCPI_INPUT("SYST:ERR?\r\n");
@@ -107,7 +127,10 @@
TEST_SCPI_INPUT("meas:volt:dc? def, 0.00001\r\n");
TEST_SCPI_INPUT("meas:volt:dc? 0.00001\r\n");
-
+ TEST_SCPI_INPUT("test:text 'a'\r\n");
+ TEST_SCPI_INPUT("test:text 'a a'\r\n");
+ TEST_SCPI_INPUT("test:text 'aa a'\r\n");
+ TEST_SCPI_INPUT("test:text 'aaa aaaa'\r\n");
//printf("%.*s %s\r\n", 3, "asdadasdasdasdas", "b");
// interactive demo
//char smbuffer[10];
--
Gitblit v1.9.1