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