|
|
@@ -4,6 +4,7 @@ import (
|
|
|
"encoding/json"
|
|
|
"errors"
|
|
|
"fmt"
|
|
|
+ "os"
|
|
|
"path/filepath"
|
|
|
|
|
|
mqtt "github.com/eclipse/paho.mqtt.golang"
|
|
|
@@ -99,40 +100,48 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
|
|
|
case "update": // MCU控制板升级指令, 先下载固件, 成功后再透传给控制板
|
|
|
url := reporter.config.GetUpgradeURL("mcu", "cbd")
|
|
|
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")
|
|
|
err := utils.DownloadUpgradeFile(url, filePath)
|
|
|
if err != nil {
|
|
|
+ yfkj_notifyUpgradeResult(client, "mcu", err)
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
if err := mcu_ctrl_board.Board.WriteDataToUart(
|
|
|
msg.Payload()); err != nil {
|
|
|
+ yfkj_notifyUpgradeResult(client, "mcu", 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))
|
|
|
+
|
|
|
+ go yfkj_waitMCUUpgradeFinish(client) // 启动协程等待MCU升级的结果
|
|
|
case "hmi_update": //串口屏升级指令, 先下载固件, 成功后再开始执行升级
|
|
|
url := reporter.config.GetUpgradeURL("hmi", "cbd")
|
|
|
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")
|
|
|
err := utils.DownloadUpgradeFile(url, filePath)
|
|
|
if err != nil {
|
|
|
+ yfkj_notifyUpgradeResult(client, "hmi", err)
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
|
- 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))
|
|
|
case "dtu_reboot": ///////////////// 重启RTU(历史原因, 也叫DTU)设备
|
|
|
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)设备, 先下载后升级
|
|
|
url := reporter.config.GetUpgradeURL("rtu", "cbd")
|
|
|
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")
|
|
|
err := utils.DownloadUpgradeFile(url, filePath)
|
|
|
if err != nil {
|
|
|
+ yfkj_notifyUpgradeResult(client, "rtu", 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",
|
|
|
- "startupdate.wav")) ///// 播报开始升级语音
|
|
|
+ "startupdate.wav")) ////// 播报开始升级语音
|
|
|
|
|
|
cmd := "tar xzf " + filePath + " -C " + baseapp.EXEC_DIR
|
|
|
if err := utils.ExecShell(cmd); err != nil {
|
|
|
utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
|
|
|
- "updatefailed.wav")) // 播报升级失败语音
|
|
|
+ "updatefailed.wav")) /// 播报升级失败语音
|
|
|
+ yfkj_notifyUpgradeResult(client, "rtu", 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:
|
|
|
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)
|
|
|
if !ok || client == nil {
|
|
|
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))
|
|
|
}
|