niujiuru 2 недель назад
Родитель
Сommit
707c453b8c
3 измененных файлов с 6 добавлено и 6 удалено
  1. 3 3
      mcu_ctrl_board/bridge.go
  2. 1 1
      mcu_ctrl_board/mcb_test.c
  3. 2 2
      mcu_ctrl_board/mcu_ctrl_board.c

+ 3 - 3
mcu_ctrl_board/bridge.go

@@ -87,9 +87,9 @@ func (mgr *WorkStateMgr) Has(s WorkState) bool {
 	return mgr.state&s != 0
 }
 
-//export RTU_ProcessCommand
-func RTU_ProcessCommand(request *C.char) *C.char {
-	r, err := jsonrpc2.ParseRequest(C.GoString(request))
+//export RTU_ProcessJsonString
+func RTU_ProcessJsonString(s *C.char) *C.char {
+	r, err := jsonrpc2.ParseRequest(C.GoString(s))
 	var w *jsonrpc2.Response
 
 	call := func(f func(*jsonrpc2.Request) (*jsonrpc2.Response, error)) *jsonrpc2.Response {

+ 1 - 1
mcu_ctrl_board/mcb_test.c

@@ -2,7 +2,7 @@
 
 #include "mcu_ctrl_board.h"
 
-char *RTU_ProcessCommand(const char *request)
+char *RTU_ProcessJsonString(const char *request)
 {
   char *response = (char *)malloc(MAX_LINE_CHARS);
   if (!response) return NULL;

+ 2 - 2
mcu_ctrl_board/mcu_ctrl_board.c

@@ -16,7 +16,7 @@ typedef struct
 static SMCBCom s_myCom = { 0 };
 
 // 声明Go中处理串口请求并返回应答结果的函数(供C调用)
-extern char *RTU_ProcessCommand(const char *request);
+extern char *RTU_ProcessJsonString(const char *s);
 
 // 接收处理来自MCU控制板的数据报文帧, 串口-数据回调
 static int comio_data_recv_proc(unsigned long wParam/*传递打开的串口句柄*/, unsigned long lParam/*保留暂未使用*/)
@@ -39,7 +39,7 @@ static int comio_data_recv_proc(unsigned long wParam/*传递打开的串口句
     break;
   case lwjsonSTREAMDONE:          // 4, 解析已完成
     sw_log_debug("[%s] %s received a request(%d bytes): %s", MODULE_NAME, log_prefix, nRecvBytes, pRecvBuf);
-    char *pResponse = RTU_ProcessCommand((const char *)pRecvBuf);
+    char *pResponse = RTU_ProcessJsonString((const char *)pRecvBuf);
     if(pResponse)
     {
       int nRspBytes = strlen(pResponse);