diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp index 93a2345..bfb14fb 100644 --- a/scheduler/schedule.cpp +++ b/scheduler/schedule.cpp @@ -271,7 +271,8 @@ int SensorScheduler::StartSchedule(int short_addr, int &next_duration) { } else { nth_wave_slice_ = (seconds_in_current_eigen_slice_ - eigen_value_slice_total_seconds_ + 3) / seconds_per_wave_slice_; } - zlog_debug(zct, "[%d] current utc:%s, nth eigen_value slice:%d, seconds in eigen slice:%d, eigen slice:%d", id, GetUTCTime(current_ts_).c_str(), nth_eigen_value_slice_+1, seconds_in_current_eigen_slice_, ts_in_eigen_slice_); + zlog_debug(zct, "[%d] current utc:%s, nth eigen_value slice:%d, seconds in eigen slice:%d, eigen slice:%d", + id, GetUTCTime(current_ts_).c_str(), nth_eigen_value_slice_+1, seconds_in_current_eigen_slice_, ts_in_eigen_slice_); if (ts_in_eigen_slice_) { if (id == nth_eigen_slice_ + 1) { // 传感器需要执行上送特征值任务, 如果有配置需要下发的话,下发配置 @@ -301,7 +302,7 @@ int SensorScheduler::StartSchedule(int short_addr, int &next_duration) { return kScheduleWrongTime; } } else { - int nth_wave_slice = nth_eigen_value_slice_ * wave_slice_num_per_eigen_interval_ + nth_wave_slice_; + int nth_wave_slice = nth_eigen_value_slice_ * wave_slice_num_per_eigen_interval_ + nth_wave_slice_ + 1; auto wave_slice_iter = sensor_id_nth_slice_.find(id); if (wave_slice_iter == sensor_id_nth_slice_.end()) { zlog_error(zct, "[%d]invaild id, not find wave slice id, need to check further", id);