diff --git a/common/global.hpp b/common/global.hpp index 775fd95..2c2fc61 100644 --- a/common/global.hpp +++ b/common/global.hpp @@ -18,7 +18,7 @@ enum enumZigBeeTransmitStatus { //#define NR5G_MODULE -//#define Q4G_MODULE +#define Q4G_MODULE //#define WIFI_MODULE //#define NR5G_MEIGE diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp index 465d8ab..18ca09c 100644 --- a/scheduler/schedule.cpp +++ b/scheduler/schedule.cpp @@ -147,6 +147,13 @@ int SensorScheduler::StartSchedule(int short_addr, int &next_duration, int &next // 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_; 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; 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; @@ -312,9 +319,9 @@ int SensorScheduler::GetNextDuration(int short_addr, int &next_task_id) { if (duration < 0 || duration > eigen_value_send_interval_) { zlog_warn(zct, "[Nxt] exception duration: %d", duration); duration = eigen_value_send_interval_; - }else if(duration < 9){ + }else if(duration < 15){ 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); return duration;