fix wave resend bug.
This commit is contained in:
parent
2c19d5b71c
commit
cece021ef8
@ -256,14 +256,14 @@ long SensorScheduler::CalcNextTimestamp(int id, uint16_t short_addr, bool &z, in
|
|||||||
return GetDebugUpgradeNextTS(short_addr);
|
return GetDebugUpgradeNextTS(short_addr);
|
||||||
} else {
|
} else {
|
||||||
// 计算升级是否在后面的波形时间窗口中
|
// 计算升级是否在后面的波形时间窗口中
|
||||||
int nth_wave_slice = nth_eigen_value_slice_ * wave_slice_num_per_eigen_interval_ + 1;
|
// 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) {
|
// 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) {
|
// 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;
|
// 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;
|
// next_task_id = kScheduleUpgrade;
|
||||||
return nxt_ts;
|
// return nxt_ts;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
next_task_id = kScheduleEigenValue;
|
next_task_id = kScheduleEigenValue;
|
||||||
return GetDebugUpgradeNextTS(short_addr);
|
return GetDebugUpgradeNextTS(short_addr);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user