|
|
@@ -31,35 +31,46 @@ var (
|
|
|
mu sync.Mutex
|
|
|
)
|
|
|
|
|
|
+func applyCfg() error { // 应用配置项给MCU控制板
|
|
|
+ var verCode baseapp.VersionCode
|
|
|
+ if err := verCode.FromString(CfgParams.Version); err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+
|
|
|
+ mcuCtrlBoard_ConfParameters(
|
|
|
+ uint32(verCode),
|
|
|
+ uint8(CfgParams.CtrlMode),
|
|
|
+ uint8(CfgParams.LightDuration),
|
|
|
+ uint8(CfgParams.StartHour),
|
|
|
+ uint8(CfgParams.EndHour),
|
|
|
+ uint16(CfgParams.TakePhotoInterval),
|
|
|
+ )
|
|
|
+
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
func loadCfgParams() error {
|
|
|
mu.Lock()
|
|
|
defer mu.Unlock()
|
|
|
|
|
|
cfgFile := filepath.Join(baseapp.CFG_DIR, "mcuparams.ini")
|
|
|
+
|
|
|
cfgIni, err := ini.Load(cfgFile)
|
|
|
if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
-
|
|
|
- if cfgIni.HasSection("MCUSchedule") {
|
|
|
- tmpCfgParams := *CfgParams
|
|
|
- if err := cfgIni.Section("MCUSchedule").MapTo(&tmpCfgParams); err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
- *CfgParams = tmpCfgParams
|
|
|
- } else {
|
|
|
- return fmt.Errorf("配置文件\"%s\"缺少\"[MCUSchedule]\"节", cfgFile)
|
|
|
+ return applyCfg()
|
|
|
}
|
|
|
|
|
|
- var verCode baseapp.VersionCode
|
|
|
- err = verCode.FromString(CfgParams.Version)
|
|
|
+ sec, err := cfgIni.GetSection("MCUSchedule")
|
|
|
if err != nil {
|
|
|
- return fmt.Errorf("配置文件\"%s\"的\"MCUSchedule.Version\"值\"%s\"无效", cfgFile, CfgParams.Version)
|
|
|
+ return applyCfg()
|
|
|
}
|
|
|
|
|
|
- mcuCtrlBoard_ConfParameters(uint32(verCode), uint8(CfgParams.CtrlMode), uint8(CfgParams.LightDuration), uint8(CfgParams.StartHour), uint8(CfgParams.EndHour), uint16(CfgParams.TakePhotoInterval))
|
|
|
+ tmp := *CfgParams
|
|
|
+ if err := sec.MapTo(&tmp); err == nil {
|
|
|
+ *CfgParams = tmp
|
|
|
+ }
|
|
|
|
|
|
- return nil
|
|
|
+ return applyCfg()
|
|
|
}
|
|
|
|
|
|
func SaveCfgParams(setParams *Config) error {
|