platform/platform_init.cpp

@@ -14,7 +14,7 @@ int GlobalConfig::LinkStatus_G = 0;
 int GlobalConfig::LinkCount = 0;
 int GlobalConfig::net0Status = 1;
 
-std::string GlobalConfig::Version = "5.6.3";
+std::string GlobalConfig::Version = "5.6.1";
 std::string GlobalConfig::MacAddr_G = "";
 std::string GlobalConfig::MacAddr_G2 = "";
 std::string GlobalConfig::IpAddr_G = "";

scheduler/schedule.cpp

@@ -159,13 +159,6 @@ int SensorScheduler::StartSchedule(int short_addr, int &next_duration) {
             // 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; // 最小15秒
-            }
             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 kScheduleWrongTime;                
         }        
@@ -306,9 +299,9 @@ int SensorScheduler::GetNextDuration(int short_addr) {
     if (duration < 0 || duration > eigen_value_send_interval_) {
         zlog_warn(zct, "[Nxt] exception duration: %d", duration);
         duration = eigen_value_send_interval_;
-    }else if (duration < 15){
+    }else if (duration < 9){
         zlog_warn(zct, "[Nxt] exception duration: %d", duration);
-        duration = 15; // 最小15秒
+        duration = 10;
     }
     
     zlog_warn(zct, "[Nxt] [%d:%x] next duration is %d", id, short_addr, duration);