diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp index 3e755b0..ba2ecdb 100644 --- a/scheduler/schedule.cpp +++ b/scheduler/schedule.cpp @@ -441,6 +441,17 @@ int SensorScheduler::CalcAvailableSlice(int eigen_value_send_interval, int wave_ return 0; } +int SensorScheduler::GetScheduleConfig(int &eigen_value_send_interval, int &wave_form_send_interval, + int &eigen_value_send_duration, int &wave_form_send_duration, + int &max_sensor_num) { + eigen_value_send_interval = eigen_value_send_interval_; + wave_form_send_interval = wave_form_send_interval_; + eigen_value_send_duration = eigen_value_send_duration_; + wave_form_send_duration = wave_form_send_duration_; + max_sensor_num = max_sensor_num_; + return 0; +} + int SensorScheduler::UpdateSensorConfig(int short_addr) { int id = 0; auto iter = short_addr_map_.find(short_addr); diff --git a/scheduler/schedule.hpp b/scheduler/schedule.hpp index e4a1db9..918a215 100644 --- a/scheduler/schedule.hpp +++ b/scheduler/schedule.hpp @@ -75,8 +75,10 @@ public: int eigen_value_send_duration, int wave_form_send_duration, int max_sensor_num, int &available_slice, int &free_slice); - void GetSensorTs(int short_addr, long &eigen_ts, long &wave_ts); - + + int GetScheduleConfig(int &eigen_value_send_interval, int &wave_form_send_interval, + int &eigen_value_send_duration, int &wave_form_send_duration, + int &max_sensor_num); // ======schedule.json操作开始====== // 无线网关程序重启时 // void ReadScheduleCfg(); @@ -95,7 +97,6 @@ public: private: void UpdateUpgradeInfo(int id); - void UpdateUpgradeFile(); // user config int eigen_value_send_interval_;