modify bugs
This commit is contained in:
parent
56993a4014
commit
2e163aff26
@ -260,14 +260,14 @@ 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_ + 1;
|
||||
// for (int i = nth_wave_slice; i <= nth_wave_slice + wave_slice_num_per_eigen_interval_; ++i) {
|
||||
// if (upgrade_slice_sensor_id_[i] == short_addr) {
|
||||
// long nxt_ts = current_wave_start_ts_ + nth_eigen_value_slice_ * eigen_value_send_interval_ + 60 + (i-nth_wave_slice)*60;
|
||||
// next_task_id = kScheduleUpgrade;
|
||||
// return nxt_ts;
|
||||
// }
|
||||
// }
|
||||
int nth_wave_slice = nth_eigen_value_slice_ * wave_slice_num_per_eigen_interval_ + 1;
|
||||
for (int i = nth_wave_slice; i <= nth_wave_slice + wave_slice_num_per_eigen_interval_; ++i) {
|
||||
if (upgrade_slice_sensor_id_[i] == short_addr) {
|
||||
long nxt_ts = current_wave_start_ts_ + nth_eigen_value_slice_ * eigen_value_send_interval_ + 60 + (i-nth_wave_slice)*60;
|
||||
next_task_id = kScheduleUpgrade;
|
||||
return nxt_ts;
|
||||
}
|
||||
}
|
||||
next_task_id = kScheduleEigenValue;
|
||||
return GetDebugUpgradeNextTS(short_addr);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user