|
|
@@ -12,7 +12,6 @@ const MODULE_NAME = "MCUCtrlBoard"
|
|
|
|
|
|
var (
|
|
|
Board *MCUCtrlBoard
|
|
|
- once sync.Once
|
|
|
)
|
|
|
|
|
|
// MCU 控制板对象
|
|
|
@@ -20,7 +19,8 @@ type MCUCtrlBoard struct {
|
|
|
DataToMqttCh chan []byte // 数据转发给服务器
|
|
|
DataToUartCh chan []byte // 数据转发给控制板
|
|
|
RequestPhotoCh chan struct{} // 请求相机开始拍照
|
|
|
- ExtInfo InitInfo // 控制板初始化信息
|
|
|
+ uartMu sync.Mutex // 串口占用的互斥锁
|
|
|
+ extInfo InitInfo // 控制板初始化信息
|
|
|
}
|
|
|
|
|
|
type InitInfo struct {
|
|
|
@@ -29,13 +29,15 @@ type InitInfo struct {
|
|
|
|
|
|
// 初始化控制板通信串口
|
|
|
func ModuleInit(info InitInfo) bool {
|
|
|
- once.Do(func() { //////////// 只允许创建单一实例
|
|
|
- Board = &MCUCtrlBoard{
|
|
|
- DataToMqttCh: make(chan []byte, 1),
|
|
|
- DataToUartCh: make(chan []byte, 1), RequestPhotoCh: make(chan struct{}, 1),
|
|
|
- ExtInfo: info,
|
|
|
- }
|
|
|
- })
|
|
|
+ if Board != nil {
|
|
|
+ return true
|
|
|
+ }
|
|
|
+
|
|
|
+ board := &MCUCtrlBoard{
|
|
|
+ DataToMqttCh: make(chan []byte, 1),
|
|
|
+ DataToUartCh: make(chan []byte, 1), RequestPhotoCh: make(chan struct{}, 1),
|
|
|
+ extInfo: info,
|
|
|
+ }
|
|
|
|
|
|
var err error
|
|
|
for range 5 {
|
|
|
@@ -43,19 +45,18 @@ func ModuleInit(info InitInfo) bool {
|
|
|
return false
|
|
|
}
|
|
|
_, err = mcuCtrlBoard_ComInit()
|
|
|
- if err != nil {
|
|
|
- mcuCtrlBoard_ComExit()
|
|
|
- time.Sleep(1 * time.Second)
|
|
|
- continue
|
|
|
- } else {
|
|
|
+ if err == nil {
|
|
|
break
|
|
|
}
|
|
|
+ mcuCtrlBoard_ComExit()
|
|
|
+ time.Sleep(time.Second)
|
|
|
}
|
|
|
if err != nil {
|
|
|
baseapp.Logger.Errorf("[%s] 打开与控制板通信的串口失败: %v!!", MODULE_NAME, err)
|
|
|
return false
|
|
|
}
|
|
|
|
|
|
+ Board = board
|
|
|
Board.StartUartWriter()
|
|
|
|
|
|
return true
|
|
|
@@ -138,7 +139,12 @@ func (b *MCUCtrlBoard) StartUartWriter() {
|
|
|
go func() {
|
|
|
for {
|
|
|
data := <-b.DataToUartCh
|
|
|
- if _, err := mcuCtrlBoard_Write(data); err != nil {
|
|
|
+
|
|
|
+ b.uartMu.Lock()
|
|
|
+ _, err := mcuCtrlBoard_Write(data)
|
|
|
+ b.uartMu.Unlock()
|
|
|
+
|
|
|
+ if err != nil {
|
|
|
baseapp.Logger.Errorf("[%s] 写入MCU控制板数据失败: %v!!", MODULE_NAME, err)
|
|
|
}
|
|
|
}
|