浏览代码

优化代码

niujiuru 1 月之前
父节点
当前提交
457621c780
共有 4 个文件被更改,包括 60 次插入 和 45 次删除
  1. 10 1
      mcu_ctrl_board/bridge.go
  2. 2 1
      mcu_ctrl_board/mcu_ctrl_board.c
  3. 46 36
      mcu_ctrl_board/mcu_ctrl_board.go
  4. 2 7
      mcu_ctrl_board/proc_rpc2.go

+ 10 - 1
mcu_ctrl_board/bridge.go

@@ -30,7 +30,7 @@ func mcuCtrlBoard_ComExit() (int, error) {
 }
 
 // 向MCU控制板主动的写入数据
-func McuCtrlBoard_Write(data []byte) (int, error) {
+func mcuCtrlBoard_Write(data []byte) (int, error) {
 	var p *C.uchar
 	if len(data) > 0 { // 避免访问空切片导致异常
 		p = (*C.uchar)(unsafe.Pointer(&data[0]))
@@ -58,6 +58,10 @@ func detectJsonType(jsonStr string) string {
 
 //export go_handle_serial_json_info
 func go_handle_serial_json_info(jsonStr *C.char) *C.char {
+	if Board == nil {
+		return nil
+	}
+
 	s := C.GoString(jsonStr)
 
 	t := detectJsonType(s)
@@ -73,6 +77,11 @@ func go_handle_serial_json_info(jsonStr *C.char) *C.char {
 
 //export go_handle_serial_text_info
 func go_handle_serial_text_info(textStr *C.char) *C.char {
+	if Board == nil {
+		return nil
+	}
+
 	s := C.GoString(textStr)
+
 	return processText(s)
 }

+ 2 - 1
mcu_ctrl_board/mcu_ctrl_board.c

@@ -12,7 +12,8 @@
 static const char MODULE_NAME[] = "MCUCtrlBoard";
 
 // 串口接收空闲超时毫秒
-#define RECV_IDLE_TIMEOUT 100
+#define RECV_IDLE_TIMEOUT 100 // 如果在超时到来前连续收到多条TEXT指令,会被当做一条指
+                              // 令来处理(老版协议设计缺陷, 粘包无法处理, 但影响不大)
 
 // 判断是否为可打印字符
 #define xisprint(c) ((c) >= 0x20 && (c) <= 0x7E)

+ 46 - 36
mcu_ctrl_board/mcu_ctrl_board.go

@@ -1,6 +1,7 @@
 package mcu_ctrl_board
 
 import (
+	"errors"
 	"sync"
 	"time"
 
@@ -46,9 +47,10 @@ func ModuleInit() bool {
 	}
 	if err != nil {
 		baseapp.Logger.Errorf("[%s] 打开与控制板通信的串口失败: %v!!", MODULE_NAME, err)
+		return false
 	}
 
-	StartUartWriter()
+	Board.StartUartWriter()
 
 	return true
 }
@@ -59,71 +61,79 @@ func ModuleExit() {
 }
 
 // 写入发往服务器的数据
-func WriteDataToMqtt(data []byte) int {
-	if Board == nil || Board.DataToMqttCh == nil || data == nil {
-		return -1
+func (b *MCUCtrlBoard) WriteDataToMqtt(data []byte) error {
+	if len(data) == 0 {
+		return errors.New("data is empty")
 	}
 
 	dataCopy := append([]byte(nil), data...)
 
 	select {
-	case Board.DataToMqttCh <- dataCopy:
+	case b.DataToMqttCh <- dataCopy:
+		return nil
+	default:
+	}
+
+	select {
+	case old := <-b.DataToMqttCh:
+		baseapp.Logger.Warnf("[%s] DataToMqtt 通道满, 丢弃一条老数据! : %q", MODULE_NAME, old)
 	default:
-		select {
-		case old := <-Board.DataToMqttCh:
-			baseapp.Logger.Warnf("[%s] DataToMqtt 通道满, 丢弃一条老数据: %s!", MODULE_NAME, string(old))
-		default:
-		}
-		Board.DataToMqttCh <- dataCopy
 	}
 
-	return 0
+	select {
+	case b.DataToMqttCh <- dataCopy:
+		return nil
+	default:
+		return errors.New("channel is full")
+	}
 }
 
 // 写入发往控制板的数据
-func WriteDataToUart(data []byte) int {
-	if Board == nil || Board.DataToUartCh == nil || data == nil {
-		return -1
+func (b *MCUCtrlBoard) WriteDataToUart(data []byte) error {
+	if len(data) == 0 {
+		return errors.New("data is empty")
 	}
 
 	dataCopy := append([]byte(nil), data...)
 
 	select {
-	case Board.DataToUartCh <- dataCopy:
+	case b.DataToUartCh <- dataCopy:
+		return nil
 	default:
-		select {
-		case old := <-Board.DataToUartCh:
-			baseapp.Logger.Warnf("[%s] DataToUart 通道满, 丢弃一条老数据: %s!", MODULE_NAME, string(old))
-		default:
-		}
-		Board.DataToUartCh <- dataCopy
 	}
 
-	return 0
-}
+	select {
+	case old := <-b.DataToUartCh:
+		baseapp.Logger.Warnf("[%s] DataToUart 通道满, 丢弃一条老数据! : %q", MODULE_NAME, old)
+	default:
+	}
 
-// 请求执行一次相机拍照
-func RequestPhoto() int {
-	if Board == nil || Board.RequestPhotoCh == nil {
-		return -1
+	select {
+	case b.DataToUartCh <- dataCopy:
+		return nil
+	default:
+		return errors.New("channel is full")
 	}
+}
 
+// 请求执行一次相机拍照
+func (b *MCUCtrlBoard) RequestPhoto() error {
 	select {
-	case Board.RequestPhotoCh <- struct{}{}:
+	case b.RequestPhotoCh <- struct{}{}:
+		return nil
 	default:
 		baseapp.Logger.Warnf("[%s] RequestPhoto 通道满, 丢弃一次拍照请求!", MODULE_NAME)
+		return errors.New("channel is full")
 	}
-
-	return 0
 }
 
-// 启动串口数据发送携程
-func StartUartWriter() {
+// 启动串口数据发送协程
+func (b *MCUCtrlBoard) StartUartWriter() {
 	go func() {
 		for {
-			data := <-Board.DataToUartCh
-			if _, err := McuCtrlBoard_Write(data); err != nil {
-				baseapp.Logger.Errorf("[%s] 向MCU控制板发送数据失败: %v", MODULE_NAME, err)
+			data := <-b.DataToUartCh
+			if _, err := mcuCtrlBoard_Write(data); err != nil {
+				baseapp.Logger.Errorf("[%s] 写入MCU控制板数据失败: %v!!", MODULE_NAME, err)
 			}
 		}
 	}()

+ 2 - 7
mcu_ctrl_board/proc_rpc2.go

@@ -52,12 +52,7 @@ func SendRPC2Notify(req *jsonrpc2.Request) error {
 		return err
 	}
 
-	_, err = McuCtrlBoard_Write([]byte(jsonStr))
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return Board.WriteDataToUart([]byte(jsonStr))
 }
 
 // 发送请求, 并等待应答
@@ -76,7 +71,7 @@ func SendRPC2Request(req *jsonrpc2.Request, timeout int /*单位: ms*/) (*jsonrp
 		return nil, err
 	}
 
-	_, err = McuCtrlBoard_Write([]byte(jsonStr))
+	err = Board.WriteDataToUart([]byte(jsonStr))
 	if err != nil {
 		return nil, err
 	}