Bladeren bron

优化控制板的YMODEM升级代码

niujiuru 1 maand geleden
bovenliggende
commit
42ce08bdc5
3 gewijzigde bestanden met toevoegingen van 43 en 25 verwijderingen
  1. 21 15
      mcu_ctrl_board/mcu_ctrl_board.go
  2. 1 1
      mcu_ctrl_board/proc_json.go
  3. 21 9
      mcu_ctrl_board/upgrade_mcu.go

+ 21 - 15
mcu_ctrl_board/mcu_ctrl_board.go

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

+ 1 - 1
mcu_ctrl_board/proc_json.go

@@ -95,7 +95,7 @@ func getSyncData() SyncData {
 			Gps:      gpsSta,
 			Lat:      lat,
 			Lng:      lng,
-			Dver:     Board.ExtInfo.Version,
+			Dver:     Board.extInfo.Version,
 			Net:      netSta,
 			Iccid:    iccid,
 			Datetime: utils.GetCurrentDateTime(),

+ 21 - 9
mcu_ctrl_board/upgrade_mcu.go

@@ -1,7 +1,6 @@
 package mcu_ctrl_board
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -30,24 +29,23 @@ func StartMCUUpgrade() error {
 	startTime := time.Now()
 	upgradeOK := false
 
+	Board.uartMu.Lock()
+	defer Board.uartMu.Unlock()
+
 	baseapp.Logger.Warnf("====[ MCU UPGRADE PREPARE ]==== [%s] stop MCU communication", MODULE_NAME)
-	ModuleExit()                       // 关闭与MCU控制板的串口
-	time.Sleep(100 * time.Millisecond) /// 延时等待串口安全关闭
+	mcuCtrlBoard_ComExit() /////////////// 1-关闭与控制板的串口通信
+	time.Sleep(100 * time.Millisecond)
 
 	baseapp.Logger.Warnf("##########################################################")
 	baseapp.Logger.Warnf("#############   MCU FIRMWARE UPGRADE START   #############")
 	baseapp.Logger.Warnf("##########################################################")
 	baseapp.Logger.Warnf("====[ MCU UPGRADE FILE ]====, file=%s, size=%dBytes", filePath, fileSize)
 
-	bytes := ymodem.Send_file(filePath) // 使用ymodem发送升级文件
+	bytes := ymodem.Send_file(filePath) // 2-使用ymodem发送升级文件
 	if bytes > 0 && bytes == int(fileSize) {
 		upgradeOK = true
 	}
 
-	if ok := ModuleInit(Board.ExtInfo); !ok { /// 重新打开串口
-		return errors.New("mcu serial open failed")
-	}
-
 	elapsed := time.Since(startTime)
 
 	if !upgradeOK {
@@ -57,5 +55,19 @@ func StartMCUUpgrade() error {
 
 	baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, 用时: %v", elapsed) //成功
 
-	return nil
+	for range 5 { ////////// 3-升级结束后,重新打开与控制板的串口通信
+		if baseapp.IsExit1() {
+			return nil
+		}
+
+		_, err = mcuCtrlBoard_ComInit()
+		if err == nil {
+			return nil
+		}
+
+		mcuCtrlBoard_ComExit()
+		time.Sleep(time.Second)
+	}
+
+	return fmt.Errorf("failed to reopen MCU communication port: %w", err)
 }