Procházet zdrojové kódy

删除无用的.go文件,合并代码

niujiuru před 1 měsícem
rodič
revize
4e74451072
2 změnil soubory, kde provedl 51 přidání a 58 odebrání
  1. 0 58
      mcu_ctrl_board/mcu_config.go
  2. 51 0
      mcu_ctrl_board/mcu_ctrl_board.go

+ 0 - 58
mcu_ctrl_board/mcu_config.go

@@ -1,58 +0,0 @@
-package mcu_ctrl_board
-
-import (
-	"encoding/json"
-	"errors"
-	"os"
-	"path/filepath"
-
-	"hnyfkj.com.cn/rtu/linux/baseapp"
-)
-
-// 保存控制板的配置参数
-func SaveMCUConfig(data []byte) error {
-	path := filepath.Join(baseapp.CFG_DIR, "mcu_param.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_param.json")
-
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-
-	if !json.Valid(data) {
-		return nil, errors.New("invalid mcu param json")
-	}
-
-	return data, nil
-}

+ 51 - 0
mcu_ctrl_board/mcu_ctrl_board.go

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