From dea80bc7bae4566f646bf3673988f0064eb62196 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 06 3月 2013 21:37:14 +0800
Subject: [PATCH] ADD LwIP example
---
examples/test-LwIP-netconn/scpi_server.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++++++++
examples/common/scpi-def.c | 12 +
2 files changed, 378 insertions(+), 4 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index 1908484..16711c3 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -47,16 +47,20 @@
// read first parameter if present
if (SCPI_ParamNumber(context, ¶m1, false)) {
- SCPI_NumberToStr(context, ¶m1, bf, 15);
- fprintf(stderr, "\tP1=%s\r\n", bf);
}
// read second paraeter if present
if (SCPI_ParamNumber(context, ¶m2, false)) {
- SCPI_NumberToStr(context, ¶m2, bf, 15);
- fprintf(stderr, "\tP2=%s\r\n", bf);
}
+
+ SCPI_NumberToStr(context, ¶m1, bf, 15);
+ fprintf(stderr, "\tP1=%s\r\n", bf);
+
+
+ SCPI_NumberToStr(context, ¶m2, bf, 15);
+ fprintf(stderr, "\tP2=%s\r\n", bf);
+
SCPI_ResultDouble(context, 0);
return SCPI_RES_OK;
diff --git a/examples/test-LwIP-netconn/scpi_server.c b/examples/test-LwIP-netconn/scpi_server.c
new file mode 100644
index 0000000..adce100
--- /dev/null
+++ b/examples/test-LwIP-netconn/scpi_server.c
@@ -0,0 +1,370 @@
+/*-
+ * 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:
+ * 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.
+ */
+
+/**
+ * @file scpi_server.c
+ * @date Thu Nov 15 10:58:45 UTC 2012
+ *
+ * @brief TCP/IP SCPI Server
+ *
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#include "scpi/scpi.h"
+#include "scpi-def.h"
+
+#include "lwip/tcpip.h"
+#include "FreeRTOS.h"
+#include "task.h"
+#include "lwip/tcp.h"
+#include "lwip/inet.h"
+
+
+#define DEVICE_PORT 5025
+#define CONTROL_PORT 5026
+
+#define SCPI_THREAD_PRIO (tskIDLE_PRIORITY + 2)
+
+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;
+} user_data_t;
+
+user_data_t user_data = {
+ .io_listen = 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);
+ if (u->io) {
+ return (netconn_write(u->io, data, len, NETCONN_NOCOPY) == ERR_OK) ? len : 0;
+ }
+ }
+ return 0;
+}
+
+scpi_result_t SCPI_Flush(scpi_t * context) {
+ if (context->user_context != NULL) {
+ user_data_t * u = (user_data_t *)(context->user_context);
+ if (u->io) {
+ /* flush not implemented */
+ return SCPI_RES_OK;
+ }
+ }
+ return SCPI_RES_OK;
+}
+
+int SCPI_Error(scpi_t * context, int_fast16_t err) {
+ (void) context;
+ // BEEP
+ iprintf("**ERROR: %ld, \"%s\"\r\n", (int32_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) {
+ char b[16];
+
+ if (SCPI_CTRL_SRQ == ctrl) {
+ iprintf("**SRQ: 0x%X (%d)\r\n", val, val);
+ } 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);
+ if (u->control_io) {
+ 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;
+}
+
+scpi_result_t SCPI_Reset(scpi_t * context) {
+ (void) context;
+ iprintf("**Reset\r\n");
+ return SCPI_RES_OK;
+}
+
+scpi_result_t SCPI_SystemCommTcpipControlQ(scpi_t * context) {
+ SCPI_ResultInt(context, CONTROL_PORT);
+ return SCPI_RES_OK;
+}
+
+
+#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
+
+void scpi_netconn_callback(struct netconn * conn, enum netconn_evt evt, u16_t len) {
+ uint32_t msg;
+ (void) len;
+
+
+ if (evt == NETCONN_EVT_RCVPLUS) {
+ msg = SCPI_MSG_TEST;
+ if (conn == user_data.io) {
+ msg = SCPI_MSG_IO;
+ } else if (conn == user_data.io_listen) {
+ msg = SCPI_MSG_IO_LISTEN;
+ } else if (conn == user_data.control_io) {
+ msg = SCPI_MSG_CONTROL_IO;
+ } else if (conn == user_data.control_io_listen) {
+ msg = SCPI_MSG_CONTROL_IO_LISTEN;
+ }
+ xQueueSend(user_data.evtQueue, &msg, 1000);
+ }
+}
+
+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;
+
+ /* 5s timeout */
+ if (xQueueReceive(user_data->evtQueue, &rc, 5000 * portTICK_RATE_MS) != pdPASS) {
+ rc = 0;
+ }
+
+ 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
+ netconn_close(newconn);
+ netconn_delete(newconn);
+ } else {
+ // 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
+ 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
+ netconn_close(user_data->io);
+ netconn_delete(user_data->io);
+ user_data->io = NULL;
+ iprintf("***Connection closed\r\n");
+}
+
+static void closeSrqIo(user_data_t * user_data) {
+ // 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");
+}
+
+static int processIo(user_data_t * user_data) {
+ struct netbuf *inbuf;
+ char* buf;
+ u16_t buflen;
+
+ if (netconn_recv(user_data->io, &inbuf) != ERR_OK) {
+ goto fail1;
+ }
+ 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;
+ }
+
+ 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;
+
+ if (netconn_recv(user_data->control_io, &inbuf) != ERR_OK) {
+ goto fail1;
+ }
+ if (netconn_err(user_data->control_io) != ERR_OK) {
+ goto fail2;
+ }
+
+ netbuf_data(inbuf, (void**) &buf, &buflen);
+
+ if (buflen > 0) {
+ // TODO process control
+ } else {
+ //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;
+
+ (void)arg;
+
+ user_data.evtQueue = xQueueCreate(10, sizeof(uint32_t));
+
+ // user_context will be pointer to socket
+ 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;
+ }
+
+ if (rc == 0) { // timeout
+ SCPI_Input(&scpi_context, NULL, 0);
+ }
+
+ if ((user_data.io_listen != NULL) && (rc == SCPI_MSG_IO_LISTEN)) {
+ processIoListen(&user_data);
+ }
+
+ if ((user_data.control_io_listen != NULL) && (rc == SCPI_MSG_CONTROL_IO_LISTEN)) {
+ processSrqIoListen(&user_data);
+ }
+
+ if ((user_data.io != NULL) && (rc == SCPI_MSG_IO)) {
+ processIo(&user_data);
+ }
+
+ if ((user_data.control_io != NULL) && (rc == SCPI_MSG_CONTROL_IO)) {
+ processSrqIo(&user_data);
+ }
+
+ }
+
+ 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