Bläddra i källkod

接收大数据平台的MCU和HMI升级指令,完成控制板和串口屏的升级

niujiuru 3 veckor sedan
förälder
incheckning
0552436016
2 ändrade filer med 29 tillägg och 1 borttagningar
  1. 1 1
      mcu_ctrl_board/proc_json.go
  2. 28 0
      mqtt_reporter/yfkj_handler.go

+ 1 - 1
mcu_ctrl_board/proc_json.go

@@ -143,7 +143,7 @@ func processJson(jsonStr string) *C.char {
 	switch req.Cmd {
 	case "data", "warn":
 		if strings.Contains(jsonStr, "system will update") { ////// MCU控制板YMODEM升级
-			filePath := filepath.Join(baseapp.VAR_DIR, "mcu_firmware.rbl")
+			filePath := filepath.Join(baseapp.VAR_DIR, "MCUUpgrade.rbl")
 			err = StartMCUUpgrade(filePath)
 			break
 		}

+ 28 - 0
mqtt_reporter/yfkj_handler.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"path/filepath"
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"hnyfkj.com.cn/rtu/linux/baseapp"
@@ -96,7 +97,34 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 			return err
 		}
 	case "update": // MCU控制板升级指令, 先下载固件, 成功后再透传给控制板
+		url := reporter.config.GetUpgradeURL("mcu", "cbd")
+		if url == "" {
+			baseapp.Logger.Warnf("[%s] 未找到有效的升级配置", MODULE_NAME)
+			return nil
+		}
+		filePath := filepath.Join(baseapp.VAR_DIR, "MCUUpgrade.rbl")
+		err := utils.DownloadFile(url, filePath)
+		if err != nil {
+			return err
+		}
+		if err := mcu_ctrl_board.Board.WriteDataToUart(
+			msg.Payload()); err != nil {
+			return err
+		}
 	case "hmi_update": //串口屏升级指令, 先下载固件, 成功后再开始执行升级
+		url := reporter.config.GetUpgradeURL("hmi", "cbd")
+		if url == "" {
+			baseapp.Logger.Warnf("[%s] 未找到有效的升级配置", MODULE_NAME)
+			return nil
+		}
+		filePath := filepath.Join(baseapp.VAR_DIR, "HMIUpgrade.zip")
+		err := utils.DownloadFile(url, filePath)
+		if err != nil {
+			return err
+		}
+		if err := mcu_ctrl_board.StartHMIUpgrade(filePath); err != nil {
+			return err
+		}
 	case "dtu_reboot": ///////////////// 重启RTU(历史原因, 也叫DTU)设备
 		data, _ := json.Marshal(map[string]string{"result": "system will reboot"})
 		yfkj_sendResponse(client, string(data))