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

fix bugs

Browse Source
This commit is contained in:
zhangsheng 2025-07-23 22:34:01 +08:00
parent 100375db5f
commit c9fa570064
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/global.hpp
View File

@ -18,10 +18,10 @@ enum enumZigBeeTransmitStatus {
//#define NR5G_MODULE //#define NR5G_MODULE
//#define Q4G_MODULE #define Q4G_MODULE
//#define WIFI_MODULE //#define WIFI_MODULE
//#define NR5G_MEIGE //#define NR5G_MEIGE
#define BLUETEETH_MODULE //#define BLUETEETH_MODULE
class GlobalConfig class GlobalConfig

11
scheduler/schedule.cpp
View File

@ -147,6 +147,13 @@ int SensorScheduler::StartSchedule(int short_addr, int &next_duration, int &next
// wrong time to come // wrong time to come
long available_ts = current_wave_start_ts_ + (nth_eigen_value_slice_ + 1) * eigen_value_send_interval_ + (id - 1) * eigen_value_send_duration_; long available_ts = current_wave_start_ts_ + (nth_eigen_value_slice_ + 1) * eigen_value_send_interval_ + (id - 1) * eigen_value_send_duration_;
next_duration = available_ts - current_ts_; next_duration = available_ts - current_ts_;
if (next_duration < 0 || next_duration > eigen_value_send_interval_) {
zlog_warn(zct, "[Nxt] exception duration: %d", next_duration);
next_duration = eigen_value_send_interval_;
}else if(next_duration < 15){
zlog_warn(zct, "[Nxt] exception duration: %d", next_duration);
next_duration = 15;
}
next_task_id = kScheduleEigenValue; next_task_id = kScheduleEigenValue;
zlog_warn(zct, "[%d:%x] wrong time in wave slice, next feature send utc time:[%s], duration:%d", id, short_addr, GetUTCTime(available_ts).c_str(), next_duration); zlog_warn(zct, "[%d:%x] wrong time in wave slice, next feature send utc time:[%s], duration:%d", id, short_addr, GetUTCTime(available_ts).c_str(), next_duration);
return kScheduleResultNone; return kScheduleResultNone;
@ -312,9 +319,9 @@ int SensorScheduler::GetNextDuration(int short_addr, int &next_task_id) {
if (duration < 0 || duration > eigen_value_send_interval_) { if (duration < 0 || duration > eigen_value_send_interval_) {
zlog_warn(zct, "[Nxt] exception duration: %d", duration); zlog_warn(zct, "[Nxt] exception duration: %d", duration);
duration = eigen_value_send_interval_; duration = eigen_value_send_interval_;
}else if(duration < 9){ }else if(duration < 15){
zlog_warn(zct, "[Nxt] exception duration: %d", duration); zlog_warn(zct, "[Nxt] exception duration: %d", duration);
duration = 10; duration = 15;
} }
zlog_warn(zct, "[Nxt] [%d:%x] next duration: %d, taskid: %d", id, short_addr, duration, next_task_id); zlog_warn(zct, "[Nxt] [%d:%x] next duration: %d, taskid: %d", id, short_addr, duration, next_task_id);
return duration; return duration;