From f420b5945a24b298194cc1a3267986fd0f36b932 Mon Sep 17 00:00:00 2001 From: pandx Date: Mon, 23 Mar 2026 09:33:35 +0800 Subject: [PATCH] add codes. --- scheduler/schedule.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp index f741a7f..55b203b 100644 --- a/scheduler/schedule.cpp +++ b/scheduler/schedule.cpp @@ -419,15 +419,15 @@ long SensorScheduler::CalcNextTimestamp(int id, uint16_t short_addr, bool &z, in return GetDebugUpgradeNextTS(short_addr); } else { // 计算发送波形是否在后面的波形时间窗口中 - int nth_wave_slice = nth_eigen_value_slice_ * wave_slice_num_per_eigen_interval_ + nth_wave_slice_ + 2; - for (int i = nth_wave_slice; i <= nth_wave_slice + wave_slice_num_per_eigen_interval_; ++i) { - if (debug_slice_sensor_id_[i] == short_addr) { - long nxt_ts = current_wave_start_ts_ + nth_eigen_value_slice_ * eigen_value_send_interval_ + 60 + (i-nth_eigen_value_slice_ * wave_slice_num_per_eigen_interval_-1)*60; - next_task_id = kScheduleWaveForm; - z = true; - return nxt_ts; - } - } + // int nth_wave_slice = nth_eigen_value_slice_ * wave_slice_num_per_eigen_interval_ + nth_wave_slice_ + 2; + // for (int i = nth_wave_slice; i <= nth_wave_slice + wave_slice_num_per_eigen_interval_; ++i) { + // if (debug_slice_sensor_id_[i] == short_addr) { + // long nxt_ts = current_wave_start_ts_ + nth_eigen_value_slice_ * eigen_value_send_interval_ + 60 + (i-nth_eigen_value_slice_ * wave_slice_num_per_eigen_interval_-1)*60; + // next_task_id = kScheduleWaveForm; + // z = true; + // return nxt_ts; + // } + // } next_task_id = kScheduleEigenValue; return GetDebugUpgradeNextTS(short_addr); } @@ -484,7 +484,8 @@ int SensorScheduler::GetNextDuration(uint16_t short_addr, bool &z, int &next_tas if (seconds_in_current_eigen_slice_ < 60 - 3) { ts_in_eigen_slice_ = true; } - + zlog_debug(zbt, "[%d:%x] ts:%ld, current utc:%s, nth eigen_value slice:%d, seconds in eigen slice:%d, eigen slice:%d", + id, short_addr, current_ts_, GetUTCTime(current_ts_).c_str(), nth_eigen_value_slice_+1, seconds_in_current_eigen_slice_, ts_in_eigen_slice_); // long current_ts = GetLocalTs(); long next_ts = CalcNextTimestamp(id, short_addr, z, next_task_id); int duration = next_ts - current_ts_;