Przeglądaj źródła

统一优化变量名称,使得代码更易读

niujiuru 1 miesiąc temu
rodzic
commit
4086861b10

+ 4 - 30
mcu_ctrl_board/proc_rpc2.go

@@ -217,34 +217,8 @@ func saveMCUConfig(data []byte) error {
 		return errors.New("invalid params")
 	}
 
-	path := filepath.Join(baseapp.CFG_DIR, "mcu_config.json")
-	tmpPath := path + ".tmp"
-
-	f, err := os.Create(tmpPath)
-	if err != nil {
-		return err
-	}
-
-	if _, err = f.Write(data); err != nil {
-		f.Close()
-		return err
-	}
-
-	if err = f.Sync(); err != nil {
-		f.Close()
-		return err
-	}
-
-	if err = f.Close(); err != nil {
-		return err
-	}
-
-	if err = os.Rename(tmpPath, path); err != nil {
-		_ = os.Remove(tmpPath)
-		return err
-	}
-
-	return nil
+	filePath := filepath.Join(baseapp.CFG_DIR, "mcu_config.json")
+	return utils.WriteFileAtomic(filePath, data)
 }
 
 // 读取控制板的配置参数
@@ -258,9 +232,9 @@ func recoverParam(req *jsonrpc2.Request) (*jsonrpc2.Response, error) {
 }
 
 func loadMCUConfig() ([]byte, error) {
-	path := filepath.Join(baseapp.CFG_DIR, "mcu_config.json")
+	filePath := filepath.Join(baseapp.CFG_DIR, "mcu_config.json")
 
-	data, err := os.ReadFile(path)
+	data, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, err
 	}

+ 16 - 16
mcu_ctrl_board/upgrade_hmi.go

@@ -21,14 +21,14 @@ const (
 var hmiUpgradeLock sync.Mutex /// 升级互斥锁
 
 // 开始HMI屏幕固件升级(异步协程执行)
-func StartHMIUpgrade(path string) {
+func StartHMIUpgrade(filePath string) {
 	if !hmiUpgradeLock.TryLock() {
 		return
 	}
 
 	go func() {
 		defer func() {
-			os.Remove(path) // 升级完成后删除升级文件
+			os.Remove(filePath) // 升级完成后删除升级文件
 			hmiUpgradeLock.Unlock()
 		}()
 
@@ -38,12 +38,12 @@ func StartHMIUpgrade(path string) {
 		baseapp.Logger.Warnf("#############   HMI FIRMWARE UPGRADE START   #############")
 		baseapp.Logger.Warnf("##########################################################")
 
-		if err := startHMIUpgrade(path); err != nil {
+		if err := startHMIUpgrade(filePath); err != nil {
 			baseapp.Logger.Errorf("!!!![ HMI UPGRADE FAILED ]!!!!, %v", err)
 			return
 		}
 
-		if err := sendFilePackets(path); err != nil {
+		if err := sendFilePackets(filePath); err != nil {
 			baseapp.Logger.Errorf("!!!![ HMI UPGRADE FAILED ]!!!!, %v", err)
 			return
 		}
@@ -54,8 +54,8 @@ func StartHMIUpgrade(path string) {
 }
 
 // 向MCU控制板发送开始固件升级的请求
-func startHMIUpgrade(path string) error {
-	info, err := os.Stat(path)
+func startHMIUpgrade(filePath string) error {
+	info, err := os.Stat(filePath)
 	if err != nil {
 		return err
 	}
@@ -94,14 +94,14 @@ func startHMIUpgrade(path string) error {
 		return fmt.Errorf("控制板拒绝开始升级")
 	}
 
-	baseapp.Logger.Warnf("====[ HMI UPGRADE FILE ]====, file=%s, size=%dBytes", path, total)
+	baseapp.Logger.Warnf("====[ HMI UPGRADE FILE ]====, file=%s, size=%dBytes", filePath, total)
 
 	return nil
 }
 
 // 向MCU控制板发送屏幕固件升级数据包
-func sendFilePackets(path string) error {
-	file, err := os.Open(path)
+func sendFilePackets(filePath string) error {
+	file, err := os.Open(filePath)
 	if err != nil {
 		return err
 	}
@@ -112,7 +112,7 @@ func sendFilePackets(path string) error {
 		return err
 	}
 
-	total := info.Size()
+	fileSize := info.Size()
 	var offset int64 /////// 已发送文件字节数
 	buf := make([]byte, UPGRADE_PACKET_SIZE)
 
@@ -150,24 +150,24 @@ func sendFilePackets(path string) error {
 				return err
 			}
 
-			if result.Total != total || result.Received != offset { // 收发端传输过程校检
+			if result.Total != fileSize || result.Received != offset { // 收发传输过程校检
 				return fmt.Errorf("upgrade progress mismatch: sender=%d/%d receiver=%d/%d",
-					offset, total, result.Received, result.Total)
+					offset, fileSize, result.Received, result.Total)
 			}
 
-			progress := int(result.Received * 100 / total) ////// 自己计算升级进度的百分比
+			progress := int(result.Received * 100 / fileSize) //// 自己计算升级进度的百分比
 			baseapp.Logger.Debugf("====[ HMI UPGRADE PROGRESS ]====: %d%% (%d/%d)",
 				progress, result.Received, result.Total)
 		}
 
-		if err == io.EOF { /////////////////////////////////////////////// 文件读取完成
-			if offset != total { //升级过程中文件发生了变化, 设计中不应该出现, 防御性代码保护
+		if err == io.EOF { //////////////////////////////////////////////// 文件读取完成
+			if offset != fileSize { //升级过程中文件发生了变化, 设计中不应该出现, 预防性编程/
 				return errors.New("升级文件读取不完整")
 			}
 			return nil
 		}
 
-		if err != nil { ////////////////////////////////////////////////// 文件读取错误
+		if err != nil { /////////////////////////////////////////////////// 文件读取错误
 			return err
 		}
 	}

+ 11 - 11
mcu_ctrl_board/upgrade_mcu.go

@@ -12,21 +12,21 @@ import (
 )
 
 func StartMCUUpgrade() error {
-	fwPath := filepath.Join(baseapp.VAR_DIR, "mcu_firmware.rbl")
-	defer os.Remove(fwPath) //升级完成后删除升级文件
+	filePath := filepath.Join(baseapp.VAR_DIR, "mcu_firmware.rbl")
+	defer os.Remove(filePath) //升级完成后删除升级文件
 
-	info, err := os.Stat(fwPath)
+	info, err := os.Stat(filePath)
 	if err != nil {
 		return err
 	}
 	if !info.Mode().IsRegular() {
-		return fmt.Errorf("固件文件无效: %s", fwPath)
+		return fmt.Errorf("固件文件无效: %s", filePath)
 	}
 	if info.Size() <= 0 {
-		return fmt.Errorf("固件文件为空: %s", fwPath)
+		return fmt.Errorf("固件文件为空: %s", filePath)
 	}
 
-	fwSize := info.Size()
+	fileSize := info.Size()
 	startTime := time.Now()
 	upgradeOK := false
 
@@ -37,10 +37,10 @@ func StartMCUUpgrade() error {
 	baseapp.Logger.Warnf("##########################################################")
 	baseapp.Logger.Warnf("#############   MCU FIRMWARE UPGRADE START   #############")
 	baseapp.Logger.Warnf("##########################################################")
-	baseapp.Logger.Warnf("====[ MCU UPGRADE FILE ]====, file=%s, size=%dBytes", fwPath, fwSize)
+	baseapp.Logger.Warnf("====[ MCU UPGRADE FILE ]====, file=%s, size=%dBytes", filePath, fileSize)
 
-	bytes := ymodem.Send_file(fwPath) // 使用ymodem发送升级文件
-	if bytes > 0 && bytes == int(fwSize) {
+	bytes := ymodem.Send_file(filePath) // 使用ymodem发送升级文件
+	if bytes > 0 && bytes == int(fileSize) {
 		upgradeOK = true
 	}
 
@@ -51,8 +51,8 @@ func StartMCUUpgrade() error {
 	elapsed := time.Since(startTime)
 
 	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.Errorf("!!!![ MCU UPGRADE FAILED ]!!!!, written=%dBytes, expect=%dBytes", bytes, fileSize)
+		return fmt.Errorf("MCU firmware upgrade failed, written=%dBytes, expect=%dBytes", bytes, fileSize)
 	}
 
 	baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, 用时: %v", elapsed) //成功