Browse Source

优化修改加载MCU运行配置参数的逻辑, 配置文件不在时, 使用默认配置

niujiuru 8 months ago
parent
commit
7f073e0a81
3 changed files with 29 additions and 17 deletions
  1. 1 0
      mcu_ctrl_board/mcu_ctrl_board.go
  2. 27 16
      mcu_ctrl_board/params_cfg.go
  3. 1 1
      reporter/reporter.go

+ 1 - 0
mcu_ctrl_board/mcu_ctrl_board.go

@@ -68,6 +68,7 @@ func ModuleInit() bool {
 	err := loadCfgParams()
 	if err != nil {
 		baseapp.Logger.Errorf("[%s] 加载MCU运行参数配置项失败: %v!!", MODULE_NAME, err)
+		return false
 	}
 
 	var ret int

+ 27 - 16
mcu_ctrl_board/params_cfg.go

@@ -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 {

+ 1 - 1
reporter/reporter.go

@@ -459,7 +459,7 @@ func (r *MQTTReporter) execOneCmd(msg mqtt.Message) {
 		resp = buildResp(req, map[string]string{"filename": rf}, err)
 	// Call-6: 升级RTU固件, 升级后程序会自动退出, 靠守护进程重新拉起, 替换新程序
 	case "upgradeApp":
-		func() { // 使用闭包, 避免defer影响范围扩大
+		func() { ////// 使用闭包, 避免defer影响范围扩大, 升级过程中, 切勿突然断电
 			mcu.MCBSetMNTStateBit(mcu.AppUpgrading)
 			defer mcu.MCBSetMNTStateBit(mcu.Idle)