niujiuru 1 месяц назад
Родитель
Сommit
95f08a5f5c
2 измененных файлов с 51 добавлено и 51 удалено
  1. 0 51
      mcu_ctrl_board/mcu_ctrl_board.go
  2. 51 0
      mcu_ctrl_board/proc_rpc2.go

+ 0 - 51
mcu_ctrl_board/mcu_ctrl_board.go

@@ -1,10 +1,7 @@
 package mcu_ctrl_board
 
 import (
-	"encoding/json"
 	"errors"
-	"os"
-	"path/filepath"
 	"sync"
 	"time"
 
@@ -142,51 +139,3 @@ func (b *MCUCtrlBoard) StartUartWriter() {
 		}
 	}()
 }
-
-// 保存控制板的配置参数
-func saveMCUConfig(data []byte) error {
-	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
-}
-
-// 读取控制板的配置参数
-func loadMCUConfig() ([]byte, error) {
-	path := filepath.Join(baseapp.CFG_DIR, "mcu_config.json")
-
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-
-	if !json.Valid(data) {
-		return nil, errors.New("无效的MCU配置文件")
-	}
-
-	return data, nil
-}

+ 51 - 0
mcu_ctrl_board/proc_rpc2.go

@@ -7,7 +7,10 @@ import "C"
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
+	"os"
+	"path/filepath"
 	"sync"
 	"time"
 
@@ -181,3 +184,51 @@ func test_echo(r *jsonrpc2.Request) (*jsonrpc2.Response, error) {
 
 	return jsonrpc2.BuildResult(r, r.Params)
 }
+
+// 保存控制板的配置参数
+func saveMCUConfig(data []byte) error {
+	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
+}
+
+// 读取控制板的配置参数
+func loadMCUConfig() ([]byte, error) {
+	path := filepath.Join(baseapp.CFG_DIR, "mcu_config.json")
+
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+
+	if !json.Valid(data) {
+		return nil, errors.New("无效的MCU配置文件")
+	}
+
+	return data, nil
+}