zhangsheng/WLG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dg102_feature_new_process' of http://192.168.1.212:3000/zhangsheng/WLG into dg102_feature_new_process

Browse Source
This commit is contained in:
zhangsheng 2026-03-20 14:13:10 +08:00
commit bee48984b0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scheduler/schedule.cpp
View File

@ -244,9 +244,11 @@ long SensorScheduler::CalcNextTimestamp(int id, uint16_t short_addr, bool &z, in
long nxt_ts = current_wave_start_ts_ + nth_eigen_value_slice_ * eigen_value_send_interval_ + 60 + (i-nth_wave_slice)*60;
next_task_id = kScheduleWaveForm;
z = true;
zlog_debug(zbt, "[%d:%x] debug wave", id, short_addr);
return nxt_ts;
}
}
zlog_debug(zbt, "[%d:%x] check wave_slice_num_per_eigen_interval_:%d, nth_wave_slice:%d", id, short_addr, wave_slice_num_per_eigen_interval_, nth_wave_slice);
next_task_id = kScheduleEigenValue;
return GetDebugUpgradeNextTS(short_addr);
}
@ -1320,6 +1322,7 @@ void SensorScheduler::GenerateDebugSchedule(std::vector<uint16_t> short_addr_lis
}
if (debug_size == 1) { // 只有一个传感器的话，两分钟一次波形
zlog_debug(zbt, "one sensor debug");
int j = 0;
for (int i = previous_wave_slice+1; i < previous_wave_slice+1+available_slice_; i = i + 3) {
j = i % available_slice_;
@ -1329,6 +1332,7 @@ void SensorScheduler::GenerateDebugSchedule(std::vector<uint16_t> short_addr_lis
debug_slice_sensor_id_[j] = short_addr_list[0];
}
} else {
zlog_debug(zbt, "%d sensor debug", debug_list_.size());
int j = 0;
int k = 0;
for (int i = previous_wave_slice+1; i < previous_wave_slice+1+available_slice_; ++i) {