Ver código fonte

代码优化

niujiuru 1 mês atrás
pai
commit
3c3ffd1f9e

+ 9 - 8
mcu_ctrl_board/bridge.go

@@ -28,16 +28,17 @@ func mcuCtrlBoard_ComExit() (int, error) {
 	return 0, nil
 }
 
-// 主动的发送指令给MCU控制板
-func McuCtrlBoard_SendCmd(cmd string) error {
-	cstr := C.CString(cmd)
-	defer C.free(unsafe.Pointer(cstr)) // C.CString()分配的堆内存Go侧自己释放
-
-	ret := int(C.MCU_ComSendCmd(cstr))
+// 向MCU控制板主动的写入数据
+func McuCtrlBoard_Write(data []byte) (int, error) {
+	var p *C.uchar
+	if len(data) > 0 { // 避免访问空切片导致异常
+		p = (*C.uchar)(unsafe.Pointer(&data[0]))
+	}
+	ret := int(C.MCU_SendRaw(p, C.int(len(data))))
 	if ret != 0 {
-		return fmt.Errorf("an error occurred while calling the  C.MCU_ComSendCmd()  function(%d)", ret)
+		return ret, fmt.Errorf("an error occurred while calling the C.MCU_SendRaw() function(%d)", ret)
 	}
-	return nil
+	return ret, nil
 }
 
 //export go_handle_serial_json_info

+ 11 - 10
mcu_ctrl_board/mcu_ctrl_board.c

@@ -266,17 +266,18 @@ int MCU_ComExit()
   return 0;
 }
 
-// 主动的发送指令给MCU控制板, 返回: 发送字节数/失败
-int MCU_ComSendCmd(const char *cmd)
+// 向MCU控制板主动的发送数据, 返回: 发送字节数/失败
+int MCU_SendRaw(const unsigned char *data, int len)
 {
-  if(!s_myCom.h || !cmd) return -1;
-  int nBytes = strlen(cmd);
-  int ret = serial_send_data(s_myCom.h, (const unsigned char *)cmd, nBytes);
-  if(ret != nBytes)
+  if (!s_myCom.h || !data || len <= 0) return -1;
+
+  int ret = serial_send_data(s_myCom.h, data, len);
+  if (ret != len)
   {
-    sw_log_error("[%s] failed to send a command(%d bytes, ret=%d): %s!!", MODULE_NAME, nBytes, ret, cmd);
-    return -2; 
+    sw_log_error("[%s] failed to send data(%d bytes, ret=%d)", MODULE_NAME, len, ret);
+    return -2;
   }
-  sw_log_debug("[%s] sent a command(%d bytes): %s", MODULE_NAME, nBytes, cmd);
-  return nBytes;
+
+  sw_log_debug("[%s] sent data(%d bytes)", MODULE_NAME, len);
+  return ret;
 }

+ 2 - 2
mcu_ctrl_board/mcu_ctrl_board.h

@@ -17,8 +17,8 @@ int MCU_ComInit();
 // 关闭与MCU控制板的串口通讯, 返回: 0成功, <0时失败
 int MCU_ComExit();
 
-// 主动的发送指令给MCU控制板, 返回: 发送字节数/失败
-int MCU_ComSendCmd(const char *cmd);
+// 向MCU控制板主动的发送数据, 返回: 发送字节数/失败
+int MCU_SendRaw(const unsigned char *data, int len);
 
 #ifdef __cplusplus
 }