From 42841c3008c6cf585d6110263d4ca1a8671da982 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 09 11月 2021 21:30:05 +0800
Subject: [PATCH] Merge branch 'master' into keep-alive

---
 examples/test-LwIP-netconn/scpi_server.h |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/examples/test-LwIP-netconn/scpi_server.h b/examples/test-LwIP-netconn/scpi_server.h
index b9900ef..dedc158 100644
--- a/examples/test-LwIP-netconn/scpi_server.h
+++ b/examples/test-LwIP-netconn/scpi_server.h
@@ -28,17 +28,35 @@
 
 #ifndef _SCPI_SERVER_H_
 #define _SCPI_SERVER_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define SCPI_KEEP_IDLE    2000 // (ms) keepalive quiet time after last TCP packet
 #define SCPI_KEEP_INTVL   1000 // (ms) keepalive repeat interval
 #define SCPI_KEEP_CNT        4 // Retry count before terminating connection (SCPI_KEEP_INTVL * SCPI_KEEP_INTVL (ms)).
 
+#define SCPI_DEVICE_PORT  5025 // scpi-raw standard port
+#define SCPI_CONTROL_PORT 5026 // libscpi control port (not part of the standard)
+
 #include <stdint.h>
+#include "lwip/api.h"
+#include "scpi/types.h"
 
 void scpi_server_init(void);
 
 void SCPI_AddError(int16_t err);
 void SCPI_RequestControl(void);
 
+// optional event handlers
+void SCPI_Event_DeviceConnected(scpi_t * context, struct netconn * conn);
+void SCPI_Event_DeviceDisconnected(scpi_t * context, struct netconn * conn);
+void SCPI_Event_ControlConnected(scpi_t * context, struct netconn * conn);
+void SCPI_Event_ControlDisconnected(scpi_t * context, struct netconn * conn);
+void SCPI_Event_ErrorIndicatorOn(scpi_t * context, int_fast16_t err);
+void SCPI_Event_ErrorIndicatorOff(scpi_t * context, int_fast16_t err);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* _SCPI_SERVER_H_ */

--
Gitblit v1.9.1