From b2047704ad359447958203810784f4e2f3deeff5 Mon Sep 17 00:00:00 2001
From: Howard Li <bighorn@pursuitofchallenge.com>
Date: 周三, 29 4月 2020 03:23:49 +0800
Subject: [PATCH] Avoid directly clearing STB
---
examples/test-LwIP-netconn/scpi_server.c | 293 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 168 insertions(+), 125 deletions(-)
diff --git a/examples/test-LwIP-netconn/scpi_server.c b/examples/test-LwIP-netconn/scpi_server.c
index adce100..5145167 100644
--- a/examples/test-LwIP-netconn/scpi_server.c
+++ b/examples/test-LwIP-netconn/scpi_server.c
@@ -1,37 +1,38 @@
/*-
- * Copyright (c) 2012-2013 Jan Breuer,
+ * BSD 2-Clause License
*
- * All Rights Reserved
- *
+ * Copyright (c) 2012-2018, 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:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 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
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* @file scpi_server.c
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief TCP/IP SCPI Server
- *
- *
+ *
+ *
*/
#include <stdio.h>
@@ -54,28 +55,44 @@
#define SCPI_THREAD_PRIO (tskIDLE_PRIORITY + 2)
+#define SCPI_MSG_TIMEOUT 0
+#define SCPI_MSG_TEST 1
+#define SCPI_MSG_IO_LISTEN 2
+#define SCPI_MSG_CONTROL_IO_LISTEN 3
+#define SCPI_MSG_IO 4
+#define SCPI_MSG_CONTROL_IO 5
+#define SCPI_MSG_SET_ESE_REQ 6
+#define SCPI_MSG_SET_ERROR 7
+
typedef struct {
struct netconn *io_listen;
struct netconn *control_io_listen;
struct netconn *io;
struct netconn *control_io;
xQueueHandle evtQueue;
- //FILE * fio;
- //fd_set fds;
+ /* FILE * fio; */
+ /* fd_set fds; */
} user_data_t;
+
+struct _queue_event_t {
+ uint8_t cmd;
+ uint8_t param1;
+ int16_t param2;
+} __attribute__((__packed__));
+typedef struct _queue_event_t queue_event_t;
+
user_data_t user_data = {
.io_listen = NULL,
- .io = NULL,
+ .io = NULL,
.control_io_listen = NULL,
.control_io = NULL,
.evtQueue = 0,
-};
-
+};
size_t SCPI_Write(scpi_t * context, const char * data, size_t len) {
if (context->user_context != NULL) {
- user_data_t * u = (user_data_t *)(context->user_context);
+ user_data_t * u = (user_data_t *) (context->user_context);
if (u->io) {
return (netconn_write(u->io, data, len, NETCONN_NOCOPY) == ERR_OK) ? len : 0;
}
@@ -83,9 +100,9 @@
return 0;
}
-scpi_result_t SCPI_Flush(scpi_t * context) {
+scpi_result_t SCPI_Flush(scpi_t * context) {
if (context->user_context != NULL) {
- user_data_t * u = (user_data_t *)(context->user_context);
+ user_data_t * u = (user_data_t *) (context->user_context);
if (u->io) {
/* flush not implemented */
return SCPI_RES_OK;
@@ -96,11 +113,18 @@
int SCPI_Error(scpi_t * context, int_fast16_t err) {
(void) context;
- // BEEP
+ /* BEEP */
iprintf("**ERROR: %ld, \"%s\"\r\n", (int32_t) err, SCPI_ErrorTranslate(err));
+ if (err != 0) {
+ /* New error */
+ /* Beep */
+ /* Error LED ON */
+ } else {
+ /* No more errors in the queue */
+ /* Error LED OFF */
+ }
return 0;
}
-
scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val) {
char b[16];
@@ -110,20 +134,14 @@
} else {
iprintf("**CTRL %02x: 0x%X (%d)\r\n", ctrl, val, val);
}
-
+
if (context->user_context != NULL) {
- user_data_t * u = (user_data_t *)(context->user_context);
+ user_data_t * u = (user_data_t *) (context->user_context);
if (u->control_io) {
- snprintf(b, sizeof(b), "SRQ%d\r\n", val);
+ snprintf(b, sizeof (b), "SRQ%d\r\n", val);
return netconn_write(u->control_io, b, strlen(b), NETCONN_NOCOPY) == ERR_OK ? SCPI_RES_OK : SCPI_RES_ERR;
}
- }
- return SCPI_RES_OK;
-}
-
-scpi_result_t SCPI_Test(scpi_t * context) {
- (void) context;
- iprintf("**Test\r\n");
+ }
return SCPI_RES_OK;
}
@@ -138,28 +156,50 @@
return SCPI_RES_OK;
}
+static void setEseReq(void) {
+ SCPI_RegSetBits(&scpi_context, SCPI_REG_ESR, ESR_REQ);
+}
-#define SCPI_MSG_TEST 1
-#define SCPI_MSG_IO_LISTEN 2
-#define SCPI_MSG_CONTROL_IO_LISTEN 3
-#define SCPI_MSG_IO 4
-#define SCPI_MSG_CONTROL_IO 5
+static void setError(int16_t err) {
+ SCPI_ErrorPush(&scpi_context, err);
+}
+
+void SCPI_RequestControl(void) {
+ queue_event_t msg;
+ msg.cmd = SCPI_MSG_SET_ESE_REQ;
+
+ /* Avoid sending evtQueue message if ESR_REQ is already set
+ if((SCPI_RegGet(&scpi_context, SCPI_REG_ESR) & ESR_REQ) == 0) {
+ xQueueSend(user_data.evtQueue, &msg, 1000);
+ }
+ */
+
+ xQueueSend(user_data.evtQueue, &msg, 1000);
+}
+
+void SCPI_AddError(int16_t err) {
+ queue_event_t msg;
+ msg.cmd = SCPI_MSG_SET_ERROR;
+ msg.param2 = err;
+
+ xQueueSend(user_data.evtQueue, &msg, 1000);
+}
void scpi_netconn_callback(struct netconn * conn, enum netconn_evt evt, u16_t len) {
- uint32_t msg;
+ queue_event_t msg;
(void) len;
-
-
+
+
if (evt == NETCONN_EVT_RCVPLUS) {
- msg = SCPI_MSG_TEST;
+ msg.cmd = SCPI_MSG_TEST;
if (conn == user_data.io) {
- msg = SCPI_MSG_IO;
+ msg.cmd = SCPI_MSG_IO;
} else if (conn == user_data.io_listen) {
- msg = SCPI_MSG_IO_LISTEN;
+ msg.cmd = SCPI_MSG_IO_LISTEN;
} else if (conn == user_data.control_io) {
- msg = SCPI_MSG_CONTROL_IO;
+ msg.cmd = SCPI_MSG_CONTROL_IO;
} else if (conn == user_data.control_io_listen) {
- msg = SCPI_MSG_CONTROL_IO_LISTEN;
+ msg.cmd = SCPI_MSG_CONTROL_IO_LISTEN;
}
xQueueSend(user_data.evtQueue, &msg, 1000);
}
@@ -168,74 +208,68 @@
static struct netconn * createServer(int port) {
struct netconn * conn;
err_t err;
-
+
conn = netconn_new_with_callback(NETCONN_TCP, scpi_netconn_callback);
if (conn == NULL) {
return NULL;
}
-
+
err = netconn_bind(conn, NULL, port);
if (err != ERR_OK) {
netconn_delete(conn);
return NULL;
}
-
+
netconn_listen(conn);
-
+
return conn;
}
-static int waitServer(user_data_t * user_data) {
-
- uint32_t rc;
-
+static void waitServer(user_data_t * user_data, queue_event_t * evt) {
/* 5s timeout */
- if (xQueueReceive(user_data->evtQueue, &rc, 5000 * portTICK_RATE_MS) != pdPASS) {
- rc = 0;
+ if (xQueueReceive(user_data->evtQueue, evt, 5000 * portTICK_RATE_MS) != pdPASS) {
+ evt->cmd = SCPI_MSG_TIMEOUT;
}
-
- return rc;
}
-
static int processIoListen(user_data_t * user_data) {
struct netconn *newconn;
-
+
if (netconn_accept(user_data->io_listen, &newconn) == ERR_OK) {
if (user_data->io) {
- // Close unwanted connection
+ /* Close unwanted connection */
netconn_close(newconn);
netconn_delete(newconn);
} else {
- // connection established
+ /* connection established */
iprintf("***Connection established %s\r\n", inet_ntoa(newconn->pcb.ip->remote_ip));
user_data->io = newconn;
}
- }
-
+ }
+
return 0;
}
static int processSrqIoListen(user_data_t * user_data) {
struct netconn *newconn;
-
+
if (netconn_accept(user_data->control_io_listen, &newconn) == ERR_OK) {
if (user_data->control_io) {
netconn_close(newconn);
netconn_delete(newconn);
} else {
- // control connection established
+ /* control connection established */
iprintf("***Control Connection established %s\r\n", inet_ntoa(newconn->pcb.ip->remote_ip));
user_data->control_io = newconn;
}
- }
-
+ }
+
return 0;
}
static void closeIo(user_data_t * user_data) {
- // connection closed
+ /* connection closed */
netconn_close(user_data->io);
netconn_delete(user_data->io);
user_data->io = NULL;
@@ -243,17 +277,17 @@
}
static void closeSrqIo(user_data_t * user_data) {
- // control connection closed
+ /* control connection closed */
netconn_close(user_data->control_io);
netconn_delete(user_data->control_io);
user_data->control_io = NULL;
- iprintf("***Control Connection closed\r\n");
+ iprintf("***Control Connection closed\r\n");
}
static int processIo(user_data_t * user_data) {
struct netbuf *inbuf;
char* buf;
- u16_t buflen;
+ u16_t buflen;
if (netconn_recv(user_data->io, &inbuf) != ERR_OK) {
goto fail1;
@@ -261,31 +295,31 @@
if (netconn_err(user_data->io) != ERR_OK) {
goto fail2;
}
-
+
netbuf_data(inbuf, (void**) &buf, &buflen);
if (buflen > 0) {
SCPI_Input(&scpi_context, buf, buflen);
} else {
- //goto fail2;
+ /* goto fail2; */
}
-
+
netbuf_delete(inbuf);
-
+
return 0;
-
+
fail2:
netbuf_delete(inbuf);
fail1:
closeIo(user_data);
-
+
return 0;
}
static int processSrqIo(user_data_t * user_data) {
struct netbuf *inbuf;
char* buf;
- u16_t buflen;
+ u16_t buflen;
if (netconn_recv(user_data->control_io, &inbuf) != ERR_OK) {
goto fail1;
@@ -293,78 +327,87 @@
if (netconn_err(user_data->control_io) != ERR_OK) {
goto fail2;
}
-
+
netbuf_data(inbuf, (void**) &buf, &buflen);
if (buflen > 0) {
- // TODO process control
+ /* TODO process control */
} else {
- //goto fail2;
+ /* goto fail2; */
}
-
+
netbuf_delete(inbuf);
return 0;
-
+
fail2:
netbuf_delete(inbuf);
fail1:
closeSrqIo(user_data);
-
+
return 0;
}
/*
- *
+ *
*/
static void scpi_server_thread(void *arg) {
- int rc;
+ queue_event_t evt;
- (void)arg;
+ (void) arg;
- user_data.evtQueue = xQueueCreate(10, sizeof(uint32_t));
-
- // user_context will be pointer to socket
+ user_data.evtQueue = xQueueCreate(10, sizeof (queue_event_t));
+
+ /* user_context will be pointer to socket */
+ 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);
+
scpi_context.user_context = &user_data;
-
- SCPI_Init(&scpi_context);
user_data.io_listen = createServer(DEVICE_PORT);
user_data.control_io_listen = createServer(CONTROL_PORT);
-
- while(1) {
- rc = waitServer(&user_data);
-
- if (rc < 0) { // failed
- iprintf("select failed");
- break;
+
+ while (1) {
+ waitServer(&user_data, &evt);
+
+ if (evt.cmd == SCPI_MSG_TIMEOUT) { /* timeout */
+ SCPI_Input(&scpi_context, NULL, 0);
}
- if (rc == 0) { // timeout
- SCPI_Input(&scpi_context, NULL, 0);
- }
-
- if ((user_data.io_listen != NULL) && (rc == SCPI_MSG_IO_LISTEN)) {
+ if ((user_data.io_listen != NULL) && (evt.cmd == SCPI_MSG_IO_LISTEN)) {
processIoListen(&user_data);
}
- if ((user_data.control_io_listen != NULL) && (rc == SCPI_MSG_CONTROL_IO_LISTEN)) {
+ if ((user_data.control_io_listen != NULL) && (evt.cmd == SCPI_MSG_CONTROL_IO_LISTEN)) {
processSrqIoListen(&user_data);
}
-
- if ((user_data.io != NULL) && (rc == SCPI_MSG_IO)) {
+
+ if ((user_data.io != NULL) && (evt.cmd == SCPI_MSG_IO)) {
processIo(&user_data);
}
-
- if ((user_data.control_io != NULL) && (rc == SCPI_MSG_CONTROL_IO)) {
+
+ if ((user_data.control_io != NULL) && (evt.cmd == SCPI_MSG_CONTROL_IO)) {
processSrqIo(&user_data);
}
-
+
+ if (evt.cmd == SCPI_MSG_SET_ESE_REQ) {
+ setEseReq();
+ }
+
+ if (evt.cmd == SCPI_MSG_SET_ERROR) {
+ setError(evt.param2);
+ }
+
}
-
+
vTaskDelete(NULL);
}
void scpi_server_init(void) {
sys_thread_new("SCPI", scpi_server_thread, NULL, 2 * DEFAULT_THREAD_STACKSIZE, SCPI_THREAD_PRIO);
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1