|
|
@@ -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)
|
|
|
}
|
|
|
}
|
|
|
}()
|