From b9c30cdba636faf528b4599b62628857303ef583 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 15 3月 2021 15:59:34 +0800
Subject: [PATCH] Merge pull request #121 from ferdymercury/patch-1
---
examples/test-LwIP-netconn/scpi_server.c | 117 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 47 deletions(-)
diff --git a/examples/test-LwIP-netconn/scpi_server.c b/examples/test-LwIP-netconn/scpi_server.c
index 191a8e9..309dd38 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>
@@ -69,8 +70,8 @@
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 {
@@ -112,7 +113,7 @@
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 */
@@ -164,27 +165,34 @@
}
void SCPI_RequestControl(void) {
+ BaseType_t xReturned;
queue_event_t msg;
msg.cmd = SCPI_MSG_SET_ESE_REQ;
- /* Avoid sending evtQueue message if ESR_REQ is already set
+ /* 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);
+ xReturned = xQueueSend(user_data.evtQueue, &msg, 1000);
+ /* @fixme: replace by real error handling code */
+ LWIP_ASSERT("SCPI_RequestControl failed", xReturned == pdPASS);
}
void SCPI_AddError(int16_t err) {
+ BaseType_t xReturned;
queue_event_t msg;
msg.cmd = SCPI_MSG_SET_ERROR;
msg.param2 = err;
- xQueueSend(user_data.evtQueue, &msg, 1000);
+ xReturned = xQueueSend(user_data.evtQueue, &msg, 1000);
+ /* @fixme: replace by real error handling code */
+ LWIP_ASSERT("SCPI_AddError failed", xReturned == pdPASS);
}
void scpi_netconn_callback(struct netconn * conn, enum netconn_evt evt, u16_t len) {
+ BaseType_t xReturned;
queue_event_t msg;
(void) len;
@@ -200,7 +208,9 @@
} else if (conn == user_data.control_io_listen) {
msg.cmd = SCPI_MSG_CONTROL_IO_LISTEN;
}
- xQueueSend(user_data.evtQueue, &msg, 1000);
+ xReturned = xQueueSend(user_data.evtQueue, &msg, 1000);
+ /* @fixme: replace by real error handling code */
+ LWIP_ASSERT("scpi_netconn_callback failed", xReturned == pdPASS);
}
}
@@ -237,11 +247,11 @@
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;
}
@@ -258,7 +268,7 @@
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;
}
@@ -268,7 +278,7 @@
}
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;
@@ -276,7 +286,7 @@
}
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;
@@ -300,7 +310,7 @@
if (buflen > 0) {
SCPI_Input(&scpi_context, buf, buflen);
} else {
- //goto fail2;
+ /* goto fail2; */
}
netbuf_delete(inbuf);
@@ -330,9 +340,9 @@
netbuf_data(inbuf, (void**) &buf, &buflen);
if (buflen > 0) {
- // TODO process control
+ /* TODO process control */
} else {
- //goto fail2;
+ /* goto fail2; */
}
netbuf_delete(inbuf);
@@ -348,7 +358,7 @@
}
/*
- *
+ *
*/
static void scpi_server_thread(void *arg) {
queue_event_t evt;
@@ -356,19 +366,29 @@
(void) arg;
user_data.evtQueue = xQueueCreate(10, sizeof (queue_event_t));
+ LWIP_ASSERT("user_data.evtQueue != NULL", user_data.evtQueue != NULL);
- // user_context will be pointer to socket
+ /* 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);
+ LWIP_ASSERT("user_data.io_listen != NULL", user_data.io_listen != NULL);
+
user_data.control_io_listen = createServer(CONTROL_PORT);
+ LWIP_ASSERT("user_data.control_io_listen != NULL", user_data.control_io_listen != NULL);
while (1) {
waitServer(&user_data, &evt);
- if (evt.cmd == SCPI_MSG_TIMEOUT) { // timeout
+ if (evt.cmd == SCPI_MSG_TIMEOUT) { /* timeout */
SCPI_Input(&scpi_context, NULL, 0);
}
@@ -402,5 +422,8 @@
}
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
+ TaskHandle_t xHandle = NULL;
+ BaseType_t xReturned;
+ xReturned = xTaskCreate(scpi_server_thread, "SCPI", DEFAULT_THREAD_STACKSIZE, NULL, SCPI_THREAD_PRIO, &xHandle);
+ LWIP_ASSERT("scpi_server_init failed", xReturned == pdPASS);
+}
--
Gitblit v1.9.1