Просмотр исходного кода

1, 编码完成测报灯模块的本地RPC接口方法,供外部模块调用(WEBUI); 2, 优化MCU控制板升级逻辑, 避免某些临界情况下丢失和控制板的串口通信, 如升级文件为空时等

niujiuru 1 неделя назад
Родитель
Сommit
609b3a85ad
9 измененных файлов с 215 добавлено и 20 удалено
  1. 1 1
      Makefile
  2. 11 6
      main.go
  3. 1 1
      mcu_ctrl_board/mcu_ctrl_board.go
  4. 1 8
      mcu_ctrl_board/upgrade_mcu.go
  5. 4 4
      mqtt_reporter/config.go
  6. 1 0
      mqtt_reporter/yfkj_handler.go
  7. 119 0
      rpc_handler.go
  8. 31 0
      test.txt
  9. 46 0
      utils/utils.go

+ 1 - 1
Makefile

@@ -36,7 +36,7 @@ LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread
 
 cbd_go_app : libswapi.a libmcu_ctrl_board.a
 	$(GO) mod tidy
-	$(SETGO_ENV) CGO_LDFLAGS="$(LIBS)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./main.go
+	$(SETGO_ENV) CGO_LDFLAGS="$(LIBS)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./*.go
 
 web-ui:
 	mkdir -p ./build

+ 11 - 6
main.go

@@ -69,17 +69,22 @@ func (p *program) Start(s service.Service) error {
 
 	methods := make(jsonrpc2.MethodMap)
 
-	//////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////
 	_getBuildVer := servicelib.MakeGetBuildVer(
 		Version, BuildTime)
-	methods["basic.getBuildVer"] = _getBuildVer // 获取软件版本
+	methods["basic.getBuildVer"] = _getBuildVer // 获取软件版本//
 	_getLogLevel := servicelib.GetLogLevel
-	methods["basic.getLogLevel"] = _getLogLevel // 获取日志级别
+	methods["basic.getLogLevel"] = _getLogLevel // 获取日志级别//
 	_setLogLevel := servicelib.SetLogLevel
-	methods["basic.setLogLevel"] = _setLogLevel // 设置日志级别
+	methods["basic.setLogLevel"] = _setLogLevel // 设置日志级别//
 	_saveLogConf := servicelib.SaveLogConf
-	methods["basic.saveLogConf"] = _saveLogConf // 保存日志设置
-	//////////////////////////////////////////////////////////
+	methods["basic.saveLogConf"] = _saveLogConf // 保存日志设置//
+	////////////////////////////////////////////////////////////
+	methods["core.getServerCfg"] = getServerCfg // 获取服务器配置
+	methods["core.setServerCfg"] = setServerCfg // 设置服务器配置
+	methods["core.doHMIUpgrade"] = doHMIUpgrade // 执行串口屏升级
+	methods["core.doMCUUpgrade"] = doMCUUpgrade // 执行控制板升级
+	methods["core.writeMCUData"] = writeMCUData // 发数据给控制板
 
 	err = p.core_server.RegisterMethods(methods)
 	if err != nil {

+ 1 - 1
mcu_ctrl_board/mcu_ctrl_board.go

@@ -43,11 +43,11 @@ func ModuleInit(info InitInfo) bool {
 
 	var err error
 	for range 3 {
+		mcuCtrlBoard_ComExit()
 		_, err = mcuCtrlBoard_ComInit()
 		if err == nil {
 			break
 		}
-		mcuCtrlBoard_ComExit()
 		time.Sleep(time.Second)
 	}
 	if err != nil {

+ 1 - 8
mcu_ctrl_board/upgrade_mcu.go

@@ -75,7 +75,6 @@ func StartMCUUpgrade(filePath string) error {
 			upgradeErr = fmt.Errorf("升级文件为空: %s", filePath)
 		}
 
-		needComInit := false
 		if upgradeErr == nil {
 			fileSize := info.Size()
 			baseapp.Logger.Warnf("====[ MCU UPGRADE FILE ]====, file=%s, size=%dBytes", filePath, fileSize)
@@ -85,7 +84,6 @@ func StartMCUUpgrade(filePath string) error {
 
 			time.Sleep(100 * time.Millisecond)
 			mcuCtrlBoard_ComExit()
-			needComInit = true
 			time.Sleep(100 * time.Millisecond)
 
 			baseapp.Logger.Warn("====[ MCU UPGRADING... ]====")
@@ -105,18 +103,13 @@ func StartMCUUpgrade(filePath string) error {
 			baseapp.Logger.Warnf("====[ MCU UPGRADE SUCCESS ]====, 用时: %v", time.Since(startTime))
 		}
 
-		if !needComInit {
-			return
-		}
-
 		var err error
 		for range 3 {
+			mcuCtrlBoard_ComExit()
 			_, err = mcuCtrlBoard_ComInit()
 			if err == nil {
 				return
 			}
-
-			mcuCtrlBoard_ComExit()
 			time.Sleep(time.Second)
 		}
 

+ 4 - 4
mqtt_reporter/config.go

@@ -51,7 +51,7 @@ type UpgrServer struct {
 	GetURL string `json:"getUrl"`
 }
 
-type configFile struct {
+type ConfigFile struct {
 	MQTTServers []MQTTServer `json:"mqttServers"`
 	ImagServers []ImagServer `json:"imagServers"`
 	UpgrServers []UpgrServer `json:"upgrServers"`
@@ -116,7 +116,7 @@ func LoadServerConfig(filePath, deviceID string) (*ServerConfig, error) {
 		return nil, err
 	}
 
-	var cfg configFile
+	var cfg ConfigFile
 	if !useDefault {
 		if err := json.Unmarshal(data, &cfg); err != nil {
 			baseapp.Logger.Warnf("[%s] 解析配置文件 %s 失败,使用默认配置: %v!", MODULE_NAME, filePath, err)
@@ -206,7 +206,7 @@ func (c *ServerConfig) Save(filePath string) error {
 	c.mu.RLock()
 	defer c.mu.RUnlock()
 
-	data, err := json.MarshalIndent(configFile{
+	data, err := json.MarshalIndent(ConfigFile{
 		MQTTServers: c.mqttServers,
 		ImagServers: c.imagServers,
 		UpgrServers: c.upgrServers,
@@ -312,7 +312,7 @@ func (c *ServerConfig) GetUpgradeURL(hwType, sfType string) string {
 }
 
 func (c *ServerConfig) String() string {
-	data, err := json.Marshal(configFile{
+	data, err := json.Marshal(ConfigFile{
 		MQTTServers: c.GetMQTTServers(),
 		ImagServers: c.GetImagServers(),
 		UpgrServers: c.GetUpgrServers(),

+ 1 - 0
mqtt_reporter/yfkj_handler.go

@@ -170,6 +170,7 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 			yfkj_notifyUpgradeResult(client, "rtu", err)
 			return err
 		}
+		defer os.Remove(filePath)
 
 		data, _ := json.Marshal(map[string]string{"result": "rtu start upgrading..."})
 		yfkj_sendResponse(client, string(data))

+ 119 - 0
rpc_handler.go

@@ -1 +1,120 @@
 package main
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"hnyfkj.com.cn/rtu/linux/baseapp"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/mqtt_reporter"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
+	"hnyfkj.com.cn/rtu/linux/utils/jsonrpc2"
+)
+
+func getServerCfg(ctx context.Context, req *jsonrpc2.Request) *jsonrpc2.Response {
+	data, err := os.ReadFile(filepath.Join(baseapp.CFG_DIR, "servers.json"))
+	if err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInternal, err.Error())
+	}
+
+	var result json.RawMessage
+	if err := json.Unmarshal(data, &result); err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInternal, err.Error())
+	}
+
+	return jsonrpc2.BuildResponse(req, result, nil)
+}
+
+func setServerCfg(ctx context.Context, req *jsonrpc2.Request) *jsonrpc2.Response {
+	var cfg mqtt_reporter.ConfigFile
+	if err := json.Unmarshal(req.Params, &cfg); err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInvalidParams, err.Error())
+	}
+
+	err := utils.WriteFileAtomic(filepath.Join(baseapp.CFG_DIR, "servers.json"), req.Params)
+	if err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInternal, err.Error())
+	}
+
+	return jsonrpc2.BuildResponse(req, "success", nil)
+}
+
+func doHMIUpgrade(ctx context.Context, req *jsonrpc2.Request) *jsonrpc2.Response {
+	var params struct {
+		FilePath string `json:"filePath"`
+	}
+	if err := json.Unmarshal(req.Params, &params); err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInvalidParams, err.Error())
+	}
+
+	filePath := params.FilePath
+	info, err := os.Stat(filePath)
+	if err == nil && !info.Mode().IsRegular() {
+		err = fmt.Errorf("升级文件无效: %s", filePath)
+	}
+	if err == nil && info.Size() <= 0 {
+		err = fmt.Errorf("升级文件为空: %s", filePath)
+	}
+	if err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInternal, err.Error())
+	}
+
+	if err := mcu_ctrl_board.StartHMIUpgrade(params.FilePath, nil, nil); err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInternal, err.Error())
+	}
+
+	return jsonrpc2.BuildResponse(req, "success", nil)
+}
+
+func doMCUUpgrade(ctx context.Context, req *jsonrpc2.Request) *jsonrpc2.Response {
+	var params struct {
+		FilePath string `json:"filePath"`
+	}
+	if err := json.Unmarshal(req.Params, &params); err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInvalidParams, err.Error())
+	}
+
+	filePath := filepath.Join(baseapp.VAR_DIR, "MCUUpgrade.rbl")
+	if err := utils.MoveFile(params.FilePath, filePath); err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInternal, err.Error())
+	}
+
+	info, err := os.Stat(filePath)
+	if err == nil && !info.Mode().IsRegular() {
+		err = fmt.Errorf("升级文件无效: %s", filePath)
+	}
+	if err == nil && info.Size() <= 0 {
+		err = fmt.Errorf("升级文件为空: %s", filePath)
+	}
+	if err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInternal, err.Error())
+	}
+
+	if err := mcu_ctrl_board.Board.WriteDataToUart([]byte(`{"cmd":"update"}`)); err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInternal, err.Error())
+	}
+
+	go func() {
+		err := mcu_ctrl_board.WaitMCUUpgradeResult(ctx)
+		if errors.Is(err, mcu_ctrl_board.ErrMCUComInitFailed) {
+			baseapp.Logger.Errorf("[%s] %v!!", "CBD_GO_APP", err)
+			os.Exit(1) // 恢复与MCU控制板的串口通信失败, 直接退出程序
+			// , 让守护进程重新启动本程序, 以便尝试重新初始化打开串口/
+		}
+	}()
+
+	return jsonrpc2.BuildResponse(req, "success", nil)
+}
+
+func writeMCUData(ctx context.Context, req *jsonrpc2.Request) *jsonrpc2.Response {
+	err := mcu_ctrl_board.Board.WriteDataToUart(req.Params)
+	if err != nil {
+		return jsonrpc2.BuildError(req, jsonrpc2.ErrInternal, err.Error())
+	}
+
+	return jsonrpc2.BuildResponse(req, "success", nil)
+}

+ 31 - 0
test.txt

@@ -0,0 +1,31 @@
+接口测试:
+
+// ping联通测试//
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"ping","params":{},"id":1}'
+
+// 获取软件版本//
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"basic.getBuildVer","params":{},"id":2}'
+
+// 获取日志级别//
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"basic.getLogLevel","params":{},"id":3}'
+
+// 设置日志级别//
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"basic.setLogLevel","params":{"log_level":"trace"},"id":4}'
+
+// 保存日志设置//
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"basic.saveLogConf","params":{},"id":5}'
+
+// 获取服务器配置
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"core.getServerCfg","params":{},"id":6}'
+
+// 设置服务器配置
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"core.setServerCfg","params":{"mqttServers":[],"imagServers":[],"upgrServers":[]},"id":7}'
+
+// 串口屏固件升级
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"core.doHMIUpgrade","params":{"filePath":"/tmp/HMIUpgrade.bin"},"id":8}'
+
+// 控制板固件升级
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"core.doMCUUpgrade","params":{"filePath":"/tmp/MCUUpgrade.rbl"},"id":9}'
+
+// 发数据给控制板
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"core.writeMCUData","params":{"cmd": "takephoto"},"id":10}'

+ 46 - 0
utils/utils.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net/url"
 	"os"
 	"os/exec"
@@ -326,3 +327,48 @@ func GetSortedFiles(ctx context.Context, dir, ext string, reverse bool) ([]strin
 
 	return paths, nil
 }
+
+func CopyFile(src, dst string) error {
+	srcInfo, err := os.Stat(src)
+	if err != nil {
+		return err
+	}
+
+	if dstInfo, err := os.Stat(dst); err == nil && os.SameFile(srcInfo, dstInfo) {
+		return nil
+	}
+
+	srcFile, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer srcFile.Close()
+
+	dstFile, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+
+	_, err = io.Copy(dstFile, srcFile)
+	closeErr := dstFile.Close()
+	if err != nil {
+		return err
+	}
+	return closeErr
+}
+
+func MoveFile(src, dst string) error {
+	srcInfo, err := os.Stat(src)
+	if err != nil {
+		return err
+	}
+
+	if dstInfo, err := os.Stat(dst); err == nil && os.SameFile(srcInfo, dstInfo) {
+		return nil
+	}
+
+	if err := CopyFile(src, dst); err != nil {
+		return err
+	}
+	return os.Remove(src)
+}