Sfoglia il codice sorgente

优化HMI和MCU升级代码

niujiuru 4 settimane fa
parent
commit
fa033f82b6

+ 5 - 7
mcu_ctrl_board/mcu_ctrl_board.go

@@ -20,7 +20,8 @@ type MCUCtrlBoard struct {
 	DataToMqttCh   chan []byte   // 数据转发给服务器
 	DataToUartCh   chan []byte   // 数据转发给控制板
 	RequestPhotoCh chan struct{} // 请求相机开始拍照
-	uartMu         sync.Mutex    // 串口占用的互斥锁
+	upgradeMu      sync.Mutex    // 固件升级的互斥锁
+	uartUseMu      sync.Mutex    // 串口访问的互斥锁
 	extInfo        InitInfo      // 控制板初始化信息
 }
 
@@ -41,10 +42,7 @@ func ModuleInit(info InitInfo) bool {
 	}
 
 	var err error
-	for range 5 {
-		if baseapp.IsExit1() {
-			return false
-		}
+	for range 3 {
 		_, err = mcuCtrlBoard_ComInit()
 		if err == nil {
 			break
@@ -141,9 +139,9 @@ func (b *MCUCtrlBoard) StartUartWriter() {
 		for {
 			data := <-b.DataToUartCh
 
-			b.uartMu.Lock()
+			b.uartUseMu.Lock()
 			_, err := mcuCtrlBoard_Write(data)
-			b.uartMu.Unlock()
+			b.uartUseMu.Unlock()
 
 			logData := utils.FormatCompactJSON(data)
 			if err == nil {

+ 11 - 10
mcu_ctrl_board/upgrade_hmi.go

@@ -2,11 +2,9 @@ package mcu_ctrl_board
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"os"
-	"sync"
 	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
@@ -18,18 +16,16 @@ const (
 	UPGRADE_PACKET_TIMEOUT = 10 * time.Second
 )
 
-var hmiUpgradeLock sync.Mutex /// 升级互斥锁
-
 // 开始HMI屏幕固件升级(异步协程执行)
-func StartHMIUpgrade(filePath string) {
-	if !hmiUpgradeLock.TryLock() {
-		return
+func StartHMIUpgrade(filePath string) error {
+	if !Board.upgradeMu.TryLock() {
+		return fmt.Errorf("upgrade busy")
 	}
 
 	go func() {
 		defer func() {
 			os.Remove(filePath) // 升级完成后删除升级文件
-			hmiUpgradeLock.Unlock()
+			Board.upgradeMu.Unlock()
 		}()
 
 		startTime := time.Now()
@@ -51,6 +47,8 @@ func StartHMIUpgrade(filePath string) {
 		elapsed := time.Since(startTime)
 		baseapp.Logger.Warnf("====[ HMI UPGRADE SUCCESS ]====, 用时: %v", elapsed) //成功
 	}()
+
+	return nil
 }
 
 // 向MCU控制板发送开始固件升级的请求
@@ -59,9 +57,12 @@ func startHMIUpgrade(filePath string) error {
 	if err != nil {
 		return err
 	}
+	if !info.Mode().IsRegular() {
+		return fmt.Errorf("升级文件无效: %s", filePath)
+	}
 	total := info.Size()
 	if total <= 0 {
-		return errors.New("升级文件为空")
+		return fmt.Errorf("升级文件为空: %s", filePath)
 	}
 
 	// 1-请求: {"jsonrpc":"2.0","method":"upgradehmi","params":{"fs":文件大小},"id":请求ID}
@@ -162,7 +163,7 @@ func sendFilePackets(filePath string) error {
 
 		if err == io.EOF { //////////////////////////////////////////////// 文件读取完成
 			if offset != fileSize { //升级过程中文件发生了变化, 设计中不应该出现, 预防性编程/
-				return errors.New("升级文件读取不完整")
+				return fmt.Errorf("升级文件读取不完整")
 			}
 			return nil
 		}

+ 16 - 25
mcu_ctrl_board/upgrade_mcu.go

@@ -11,6 +11,11 @@ import (
 )
 
 func StartMCUUpgrade() error {
+	if !Board.upgradeMu.TryLock() {
+		return fmt.Errorf("upgrade busy")
+	}
+	defer Board.upgradeMu.Unlock()
+
 	filePath := filepath.Join(baseapp.VAR_DIR, "mcu_firmware.rbl")
 	defer os.Remove(filePath) //升级完成后删除升级文件
 
@@ -19,20 +24,18 @@ func StartMCUUpgrade() error {
 		return err
 	}
 	if !info.Mode().IsRegular() {
-		return fmt.Errorf("固件文件无效: %s", filePath)
+		return fmt.Errorf("升级文件无效: %s", filePath)
 	}
 	if info.Size() <= 0 {
-		return fmt.Errorf("固件文件为空: %s", filePath)
+		return fmt.Errorf("升级文件为空: %s", filePath)
 	}
 
 	fileSize := info.Size()
 	startTime := time.Now()
-	upgradeOK := false
 
-	Board.uartMu.Lock()
-	defer Board.uartMu.Unlock()
+	Board.uartUseMu.Lock()
+	defer Board.uartUseMu.Unlock()
 
-	baseapp.Logger.Warnf("====[ MCU UPGRADE PREPARE ]==== [%s] stop MCU communication success", MODULE_NAME)
 	mcuCtrlBoard_ComExit() /////////////// 1-关闭与控制板的串口通信
 	time.Sleep(100 * time.Millisecond)
 
@@ -41,28 +44,16 @@ func StartMCUUpgrade() error {
 	baseapp.Logger.Warnf("##########################################################")
 	baseapp.Logger.Warnf("====[ MCU UPGRADE FILE ]====, file=%s, size=%dBytes", filePath, fileSize)
 
-	bytes := ymodem.Send_file(filePath) // 2-使用ymodem发送升级文件
-	if bytes > 0 && bytes == int(fileSize) {
-		upgradeOK = true
-	}
-
-	elapsed := time.Since(startTime)
-
-	if !upgradeOK {
-		baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, written=%dBytes, expect=%dBytes", bytes, fileSize)
-		return fmt.Errorf("MCU firmware upgrade failed, written=%dBytes, expect=%dBytes", bytes, fileSize)
+	size := ymodem.Send_file(filePath) // 2-使用ymodem发送升级文件
+	if size <= 0 || size != int(fileSize) {
+		baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, written=%dBytes, expect=%dBytes", size, fileSize)
+	} else {
+		baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, 用时: %v", time.Since(startTime)) ////////// 成功
 	}
 
-	baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, 用时: %v", elapsed) //成功
-
-	for range 5 { ////////// 3-升级结束后,重新打开与控制板的串口通信
-		if baseapp.IsExit1() {
-			return nil
-		}
-
+	for range 3 { ////////// 3-升级结束后,重新打开与控制板的串口通信
 		_, err = mcuCtrlBoard_ComInit()
 		if err == nil {
-			baseapp.Logger.Warnf("====[ MCU UPGRADE DONE ]==== [%s] restart MCU communication success", MODULE_NAME)
 			return nil
 		}
 
@@ -70,5 +61,5 @@ func StartMCUUpgrade() error {
 		time.Sleep(time.Second)
 	}
 
-	return fmt.Errorf("failed to reopen MCU communication port: %w", err)
+	return fmt.Errorf("failed to reopen MCU serial port: %w", err)
 }