niujiuru 1 месяц назад
Родитель
Сommit
a5b8d5c3dd
2 измененных файлов с 16 добавлено и 7 удалено
  1. 4 1
      mcu_ctrl_board/upgrade_hmi.go
  2. 12 6
      mcu_ctrl_board/upgrade_mcu.go

+ 4 - 1
mcu_ctrl_board/upgrade_hmi.go

@@ -27,7 +27,10 @@ func StartHMIUpgrade(path string) {
 	}
 	}
 
 
 	go func() {
 	go func() {
-		defer hmiUpgradeLock.Unlock()
+		defer func() {
+			os.Remove(path)
+			hmiUpgradeLock.Unlock()
+		}()
 
 
 		startTime := time.Now()
 		startTime := time.Now()
 		baseapp.Logger.Warnf("====[ HMI UPGRADE PREPARE ]==== [%s]", MODULE_NAME)
 		baseapp.Logger.Warnf("====[ HMI UPGRADE PREPARE ]==== [%s]", MODULE_NAME)

+ 12 - 6
mcu_ctrl_board/upgrade_mcu.go

@@ -17,6 +17,7 @@ const (
 
 
 func StartMCUUpgrade() error {
 func StartMCUUpgrade() error {
 	fwPath := filepath.Join(baseapp.VAR_DIR, DefaultSendFileName)
 	fwPath := filepath.Join(baseapp.VAR_DIR, DefaultSendFileName)
+	defer os.Remove(fwPath)
 
 
 	info, err := os.Stat(fwPath)
 	info, err := os.Stat(fwPath)
 	if err != nil {
 	if err != nil {
@@ -31,6 +32,7 @@ func StartMCUUpgrade() error {
 
 
 	fwSize := info.Size()
 	fwSize := info.Size()
 	startTime := time.Now()
 	startTime := time.Now()
+	upgradeOK := false
 
 
 	baseapp.Logger.Warnf("====[ MCU UPGRADE PREPARE ]==== [%s] stop MCU communication", MODULE_NAME)
 	baseapp.Logger.Warnf("====[ MCU UPGRADE PREPARE ]==== [%s] stop MCU communication", MODULE_NAME)
 	ModuleExit()                       // 先退出MCU控制板的通信
 	ModuleExit()                       // 先退出MCU控制板的通信
@@ -43,17 +45,21 @@ func StartMCUUpgrade() error {
 
 
 	bytes := ymodem.Send_file(fwPath) // 使用ymodem发送升级文件
 	bytes := ymodem.Send_file(fwPath) // 使用ymodem发送升级文件
 	if bytes > 0 && bytes == int(fwSize) {
 	if bytes > 0 && bytes == int(fwSize) {
-		baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, %d bytes written", bytes)
-	} else {
-		baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, written=%dBytes, expect=%dBytes", bytes, fwSize)
+		upgradeOK = true
+	}
+
+	if ok := ModuleInit(Board.ExtInfo); !ok { /// 重新打开串口
+		return errors.New("mcu serial open failed")
 	}
 	}
 
 
 	elapsed := time.Since(startTime)
 	elapsed := time.Since(startTime)
-	baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, 用时: %v", elapsed) // 成功
 
 
-	if ok := ModuleInit(Board.ExtInfo); !ok {
-		return errors.New("mcu serial open failed")
+	if !upgradeOK {
+		baseapp.Logger.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, written=%dBytes, expect=%dBytes", bytes, fwSize)
+		return fmt.Errorf("MCU firmware upgrade failed, written=%dBytes, expect=%dBytes", bytes, fwSize)
 	}
 	}
 
 
+	baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, 用时: %v", elapsed) //成功
+
 	return nil
 	return nil
 }
 }