Przeglądaj źródła

优化HMI MCU RTU升级代码,通过MQTT客户端订阅可以监控升级过程和得到升级结果

niujiuru 1 tydzień temu
rodzic
commit
e479dc41fd

+ 14 - 19
mcu_ctrl_board/upgrade_hmi.go

@@ -19,7 +19,7 @@ const (
 )
 )
 
 
 // 开始HMI屏幕固件升级(异步协程执行)
 // 开始HMI屏幕固件升级(异步协程执行)
-func StartHMIUpgrade(filePath string, onSuccess func(any), callbackArg any) error {
+func StartHMIUpgrade(filePath string, completeCallback func(any, error), callbackArg any) error {
 	if !Board.upgradeMu.TryLock() {
 	if !Board.upgradeMu.TryLock() {
 		return fmt.Errorf("upgrade busy")
 		return fmt.Errorf("upgrade busy")
 	}
 	}
@@ -30,36 +30,31 @@ func StartHMIUpgrade(filePath string, onSuccess func(any), callbackArg any) erro
 			Board.upgradeMu.Unlock()
 			Board.upgradeMu.Unlock()
 		}()
 		}()
 
 
-		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
-			"startupdate.wav")) //// 播报开始升级语音
+		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices", /// 播报升级开始语音
+			"startupdate.wav"))
 
 
 		startTime := time.Now()
 		startTime := time.Now()
 		baseapp.Logger.Warnf("##########################################################")
 		baseapp.Logger.Warnf("##########################################################")
 		baseapp.Logger.Warnf("#############   HMI FIRMWARE UPGRADE START   #############")
 		baseapp.Logger.Warnf("#############   HMI FIRMWARE UPGRADE START   #############")
 		baseapp.Logger.Warnf("##########################################################")
 		baseapp.Logger.Warnf("##########################################################")
 
 
-		if err := startHMIUpgrade(filePath); err != nil {
-			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
-				"updatefailed.wav")) // 播报升级失败语音
-			baseapp.Logger.Errorf("!!!![ HMI UPGRADE FAILED ]!!!!, %v", err)
-			return
+		err := startHMIUpgrade(filePath)
+		if err == nil {
+			err = sendFilePackets(filePath)
 		}
 		}
 
 
-		if err := sendFilePackets(filePath); err != nil {
+		if err != nil {
 			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
-				"updatefailed.wav")) // 播报升级失败语音
+				"updatefailed.wav")) /// 播报升级失败语音
 			baseapp.Logger.Errorf("!!!![ HMI UPGRADE FAILED ]!!!!, %v", err)
 			baseapp.Logger.Errorf("!!!![ HMI UPGRADE FAILED ]!!!!, %v", err)
-			return
+		} else {
+			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+				"updatesuccess.wav")) // 播报升级成功语音
+			baseapp.Logger.Warnf("====[ HMI UPGRADE SUCCESS ]====, 用时: %v", time.Since(startTime))
 		}
 		}
 
 
-		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
-			"updatesuccess.wav")) /// 播报升级成功语音
-
-		elapsed := time.Since(startTime)
-		baseapp.Logger.Warnf("====[ HMI UPGRADE SUCCESS ]====, 用时: %v", elapsed) //成功
-
-		if onSuccess != nil {
-			onSuccess(callbackArg)
+		if completeCallback != nil {
+			go completeCallback(callbackArg, err)
 		}
 		}
 	}()
 	}()
 
 

+ 70 - 28
mcu_ctrl_board/upgrade_mcu.go

@@ -1,6 +1,8 @@
 package mcu_ctrl_board
 package mcu_ctrl_board
 
 
 import (
 import (
+	"context"
+	"errors"
 	"fmt"
 	"fmt"
 	"os"
 	"os"
 	"path/filepath"
 	"path/filepath"
@@ -11,62 +13,103 @@ import (
 	"hnyfkj.com.cn/rtu/linux/ymodem"
 	"hnyfkj.com.cn/rtu/linux/ymodem"
 )
 )
 
 
+var (
+	ErrMCUComInitFailed = errors.New("打开与MCU控制板通信的串口失败")
+	mcuUpgradeResultCh  = make(chan error, 1)
+)
+
+func WaitMCUUpgradeResult(ctx context.Context) error {
+	select {
+	case err := <-mcuUpgradeResultCh:
+		return err
+	case <-ctx.Done():
+		return ctx.Err()
+	}
+}
+
+func sendMCUUpgradeResult(err error) {
+	select {
+	case mcuUpgradeResultCh <- err:
+		return
+	default:
+	}
+
+	select {
+	case <-mcuUpgradeResultCh:
+	default:
+	}
+
+	select {
+	case mcuUpgradeResultCh <- err:
+	default:
+	}
+}
+
 func StartMCUUpgrade(filePath string) error {
 func StartMCUUpgrade(filePath string) error {
 	if !Board.upgradeMu.TryLock() {
 	if !Board.upgradeMu.TryLock() {
 		return fmt.Errorf("upgrade busy")
 		return fmt.Errorf("upgrade busy")
 	}
 	}
 
 
 	go func() {
 	go func() {
+		var upgradeErr error
 		defer func() {
 		defer func() {
 			os.Remove(filePath) // 升级完成后删除文件
 			os.Remove(filePath) // 升级完成后删除文件
+			sendMCUUpgradeResult(upgradeErr)
 			Board.upgradeMu.Unlock()
 			Board.upgradeMu.Unlock()
 		}()
 		}()
 
 
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
-			"startupdate.wav")) //// 播报开始升级语音
+			"startupdate.wav")) //// 播报升级开始语音
 
 
 		startTime := time.Now()
 		startTime := time.Now()
 		baseapp.Logger.Warnf("##########################################################")
 		baseapp.Logger.Warnf("##########################################################")
 		baseapp.Logger.Warnf("#############   MCU FIRMWARE UPGRADE START   #############")
 		baseapp.Logger.Warnf("#############   MCU FIRMWARE UPGRADE START   #############")
 		baseapp.Logger.Warnf("##########################################################")
 		baseapp.Logger.Warnf("##########################################################")
 
 
-		info, err := os.Stat(filePath)
-		if err != nil {
-			baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, %v", err)
-			return
-		}
-		if !info.Mode().IsRegular() {
-			baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, 升级文件无效: %s", filePath)
-			return
+		info, upgradeErr := os.Stat(filePath)
+		if upgradeErr == nil && !info.Mode().IsRegular() {
+			upgradeErr = fmt.Errorf("升级文件无效: %s", filePath)
 		}
 		}
-		if info.Size() <= 0 {
-			baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, 升级文件为空: %s", filePath)
-			return
+		if upgradeErr == nil && info.Size() <= 0 {
+			upgradeErr = fmt.Errorf("升级文件为空: %s", filePath)
 		}
 		}
 
 
-		fileSize := info.Size()
-		baseapp.Logger.Warnf("====[ MCU UPGRADE FILE ]====, file=%s, size=%dBytes", filePath, fileSize)
+		needComInit := false
+		if upgradeErr == nil {
+			fileSize := info.Size()
+			baseapp.Logger.Warnf("====[ MCU UPGRADE FILE ]====, file=%s, size=%dBytes", filePath, fileSize)
 
 
-		Board.uartUseMu.Lock()
-		defer Board.uartUseMu.Unlock()
+			Board.uartUseMu.Lock()
+			defer Board.uartUseMu.Unlock()
 
 
-		time.Sleep(100 * time.Millisecond)
-		mcuCtrlBoard_ComExit() /////////////// 1-关闭与控制板的串口通信
-		time.Sleep(100 * time.Millisecond)
+			time.Sleep(100 * time.Millisecond)
+			mcuCtrlBoard_ComExit()
+			needComInit = true
+			time.Sleep(100 * time.Millisecond)
 
 
-		baseapp.Logger.Warn("====[ MCU UPGRADING... ]====")
-		size := ymodem.Send_file(filePath) /// 2-使用ymodem发送升级文件
-		if size <= 0 || size != int(fileSize) {
+			baseapp.Logger.Warn("====[ MCU UPGRADING... ]====")
+			size := ymodem.Send_file(filePath)
+			if size <= 0 || size != int(fileSize) {
+				upgradeErr = fmt.Errorf("MCU升级文件发送失败, written=%dBytes, expect=%dBytes", size, fileSize)
+			}
+		}
+
+		if upgradeErr != nil {
 			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 				"updatefailed.wav")) /// 播报升级失败语音
 				"updatefailed.wav")) /// 播报升级失败语音
-			baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, written=%dBytes, expect=%dBytes", size, fileSize)
+			baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, %v", upgradeErr)
 		} else {
 		} else {
 			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 				"updatesuccess.wav")) // 播报升级成功语音
 				"updatesuccess.wav")) // 播报升级成功语音
-			baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, 用时: %v", time.Since(startTime)) ////////// 成功
+			baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, 用时: %v", time.Since(startTime))
+		}
+
+		if !needComInit {
+			return
 		}
 		}
 
 
-		for range 3 { ////////// 3-升级结束后,重新打开与控制板的串口通信
+		var err error
+		for range 3 {
 			_, err = mcuCtrlBoard_ComInit()
 			_, err = mcuCtrlBoard_ComInit()
 			if err == nil {
 			if err == nil {
 				return
 				return
@@ -76,9 +119,8 @@ func StartMCUUpgrade(filePath string) error {
 			time.Sleep(time.Second)
 			time.Sleep(time.Second)
 		}
 		}
 
 
-		baseapp.Logger.Errorf("[%s] 打开与MCU控制板通信的串口失败: %v!!",
-			MODULE_NAME, err)
-		os.Exit(1)
+		comErr := fmt.Errorf("%w: %v", ErrMCUComInitFailed, err)
+		upgradeErr = errors.Join(upgradeErr, comErr)
 	}()
 	}()
 
 
 	return nil
 	return nil

+ 1 - 1
mcu_ctrl_board/workstate.go

@@ -7,7 +7,7 @@ type WorkState uint32
 
 
 const (
 const (
 	Idle            WorkState = 0      // 空闲(默认)
 	Idle            WorkState = 0      // 空闲(默认)
-	BitmapCapturing WorkState = 1 << 0 // 当前相机图像-拍照中
+	BitmapCapturing WorkState = 1 << 0 // 图像采集(拍照)中
 )
 )
 
 
 // RTU数据板的工作状态管理器
 // RTU数据板的工作状态管理器

+ 57 - 19
mqtt_reporter/yfkj_handler.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"encoding/json"
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
+	"os"
 	"path/filepath"
 	"path/filepath"
 
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	mqtt "github.com/eclipse/paho.mqtt.golang"
@@ -99,40 +100,48 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 	case "update": // MCU控制板升级指令, 先下载固件, 成功后再透传给控制板
 	case "update": // MCU控制板升级指令, 先下载固件, 成功后再透传给控制板
 		url := reporter.config.GetUpgradeURL("mcu", "cbd")
 		url := reporter.config.GetUpgradeURL("mcu", "cbd")
 		if url == "" {
 		if url == "" {
-			baseapp.Logger.Warnf("[%s] 未找到有效的升级配置", MODULE_NAME)
-			return nil
+			err := errors.New("未找到有效的升级配置")
+			yfkj_notifyUpgradeResult(client, "mcu", err)
+			return err
 		}
 		}
 		filePath := filepath.Join(baseapp.VAR_DIR, "MCUUpgrade.rbl")
 		filePath := filepath.Join(baseapp.VAR_DIR, "MCUUpgrade.rbl")
 		err := utils.DownloadUpgradeFile(url, filePath)
 		err := utils.DownloadUpgradeFile(url, filePath)
 		if err != nil {
 		if err != nil {
+			yfkj_notifyUpgradeResult(client, "mcu", err)
 			return err
 			return err
 		}
 		}
 
 
 		if err := mcu_ctrl_board.Board.WriteDataToUart(
 		if err := mcu_ctrl_board.Board.WriteDataToUart(
 			msg.Payload()); err != nil {
 			msg.Payload()); err != nil {
+			yfkj_notifyUpgradeResult(client, "mcu", err)
 			return err
 			return err
 		}
 		}
 
 
-		data, _ := json.Marshal(map[string]string{"result": "mcu will upgrade !"})
+		data, _ := json.Marshal(map[string]string{"result": "mcu start upgrading..."})
 		yfkj_sendResponse(client, string(data))
 		yfkj_sendResponse(client, string(data))
+
+		go yfkj_waitMCUUpgradeFinish(client) // 启动协程等待MCU升级的结果
 	case "hmi_update": //串口屏升级指令, 先下载固件, 成功后再开始执行升级
 	case "hmi_update": //串口屏升级指令, 先下载固件, 成功后再开始执行升级
 		url := reporter.config.GetUpgradeURL("hmi", "cbd")
 		url := reporter.config.GetUpgradeURL("hmi", "cbd")
 		if url == "" {
 		if url == "" {
-			baseapp.Logger.Warnf("[%s] 未找到有效的升级配置", MODULE_NAME)
-			return nil
+			err := errors.New("未找到有效的升级配置")
+			yfkj_notifyUpgradeResult(client, "hmi", err)
+			return err
 		}
 		}
 		filePath := filepath.Join(baseapp.VAR_DIR, "HMIUpgrade.zip")
 		filePath := filepath.Join(baseapp.VAR_DIR, "HMIUpgrade.zip")
 		err := utils.DownloadUpgradeFile(url, filePath)
 		err := utils.DownloadUpgradeFile(url, filePath)
 		if err != nil {
 		if err != nil {
+			yfkj_notifyUpgradeResult(client, "hmi", err)
 			return err
 			return err
 		}
 		}
 
 
 		if err := mcu_ctrl_board.StartHMIUpgrade(
 		if err := mcu_ctrl_board.StartHMIUpgrade(
-			filePath, yfkj_onHMIUpgradeSuccess, client); err != nil {
+			filePath, yfkj_onHMIUpgradeComplete, client); err != nil {
+			yfkj_notifyUpgradeResult(client, "hmi", err)
 			return err
 			return err
 		}
 		}
 
 
-		data, _ := json.Marshal(map[string]string{"result": "hmi will upgrade !"})
+		data, _ := json.Marshal(map[string]string{"result": "hmi start upgrading..."})
 		yfkj_sendResponse(client, string(data))
 		yfkj_sendResponse(client, string(data))
 	case "dtu_reboot": ///////////////// 重启RTU(历史原因, 也叫DTU)设备
 	case "dtu_reboot": ///////////////// 重启RTU(历史原因, 也叫DTU)设备
 		data, _ := json.Marshal(map[string]string{"result": "system will reboot"})
 		data, _ := json.Marshal(map[string]string{"result": "system will reboot"})
@@ -143,30 +152,34 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 	case "dtu_update": //// 升级RTU(历史原因, 也叫DTU)设备, 先下载后升级
 	case "dtu_update": //// 升级RTU(历史原因, 也叫DTU)设备, 先下载后升级
 		url := reporter.config.GetUpgradeURL("rtu", "cbd")
 		url := reporter.config.GetUpgradeURL("rtu", "cbd")
 		if url == "" {
 		if url == "" {
-			baseapp.Logger.Warnf("[%s] 未找到有效的升级配置", MODULE_NAME)
-			return nil
+			err := errors.New("未找到有效的升级配置")
+			yfkj_notifyUpgradeResult(client, "rtu", err)
+			return err
 		}
 		}
 		filePath := filepath.Join(baseapp.VAR_DIR, "RTUUpgrade.tgz")
 		filePath := filepath.Join(baseapp.VAR_DIR, "RTUUpgrade.tgz")
 		err := utils.DownloadUpgradeFile(url, filePath)
 		err := utils.DownloadUpgradeFile(url, filePath)
 		if err != nil {
 		if err != nil {
+			yfkj_notifyUpgradeResult(client, "rtu", err)
 			return err
 			return err
 		}
 		}
 
 
+		data, _ := json.Marshal(map[string]string{"result": "rtu start upgrading..."})
+		yfkj_sendResponse(client, string(data))
+
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
-			"startupdate.wav")) ///// 播报开始升级语音
+			"startupdate.wav")) ////// 播报开始升级语音
 
 
 		cmd := "tar xzf " + filePath + " -C " + baseapp.EXEC_DIR
 		cmd := "tar xzf " + filePath + " -C " + baseapp.EXEC_DIR
 		if err := utils.ExecShell(cmd); err != nil {
 		if err := utils.ExecShell(cmd); err != nil {
 			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
 			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
-				"updatefailed.wav")) // 播报升级失败语音
+				"updatefailed.wav")) /// 播报升级失败语音
+			yfkj_notifyUpgradeResult(client, "rtu", err)
 			return err
 			return err
+		} else {
+			utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
+				"updatesuccess.wav")) // 播报升级成功语音
+			yfkj_notifyUpgradeResult(client, "rtu", nil)
 		}
 		}
-
-		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
-			"updatesuccess.wav")) /// 播报升级成功语音
-
-		data, _ := json.Marshal(map[string]string{"result": "rtu upgrade success"})
-		yfkj_sendResponse(client, string(data))
 	default:
 	default:
 		return errors.New("command not supported")
 		return errors.New("command not supported")
 	}
 	}
@@ -213,12 +226,37 @@ func yfkj_sendResponse(client *Client, payload string) {
 	}
 	}
 }
 }
 
 
-func yfkj_onHMIUpgradeSuccess(arg any) {
+func yfkj_waitMCUUpgradeFinish(arg any) {
+	client, ok := arg.(*Client)
+	if !ok || client == nil {
+		return
+	}
+
+	err := mcu_ctrl_board.WaitMCUUpgradeResult(client.ctx)
+	yfkj_notifyUpgradeResult(client, "mcu", err)
+
+	if errors.Is(err, mcu_ctrl_board.ErrMCUComInitFailed) {
+		baseapp.Logger.Errorf("[%s] %v!!", MODULE_NAME, err)
+		os.Exit(1) // 恢复与MCU控制板的串口通信失败, 直接退出程序
+		// , 让守护进程重新启动本程序, 以便尝试重新初始化打开串口/
+	}
+}
+
+func yfkj_onHMIUpgradeComplete(arg any, err error) {
 	client, ok := arg.(*Client)
 	client, ok := arg.(*Client)
 	if !ok || client == nil {
 	if !ok || client == nil {
 		return
 		return
 	}
 	}
 
 
-	data, _ := json.Marshal(map[string]string{"result": "hmi upgrade success"})
+	yfkj_notifyUpgradeResult(client, "hmi", err)
+}
+
+func yfkj_notifyUpgradeResult(client *Client, name string, err error) {
+	result := name + " upgrade success"
+	if err != nil {
+		result = name + " upgrade failed: " + err.Error()
+	}
+
+	data, _ := json.Marshal(map[string]string{"result": result})
 	yfkj_sendResponse(client, string(data))
 	yfkj_sendResponse(client, string(data))
 }
 }