fix bugs,version 5.2
This commit is contained in:
parent
2d82fd3d9f
commit
29260fd7b7
@ -18,7 +18,7 @@ enum enumZigBeeTransmitStatus {
|
||||
|
||||
|
||||
//#define NR5G_MODULE
|
||||
//#define Q4G_MODULE
|
||||
#define Q4G_MODULE
|
||||
//#define WIFI_MODULE
|
||||
//#define NR5G_MEIGE
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ int GlobalConfig::LinkStatus_G = 0;
|
||||
int GlobalConfig::LinkCount = 0;
|
||||
int GlobalConfig::net0Status = 1;
|
||||
|
||||
std::string GlobalConfig::Version = "5.1";
|
||||
std::string GlobalConfig::Version = "5.2";
|
||||
std::string GlobalConfig::MacAddr_G = "";
|
||||
std::string GlobalConfig::MacAddr_G2 = "";
|
||||
std::string GlobalConfig::IpAddr_G = "";
|
||||
|
||||
@ -207,7 +207,7 @@ int SensorScheduler::GetNextDuration(int short_addr) {
|
||||
long current_ts = GetLocalTs();
|
||||
long next_ts = CalcNextTimestamp(id, short_addr);
|
||||
int duration = next_ts - current_ts;
|
||||
if (duration <= 0 || duration > eigen_value_send_interval_) {
|
||||
if (duration <= 10 || duration > eigen_value_send_interval_) {
|
||||
zlog_warn(zct, "[Nxt] exception duration: %d", duration);
|
||||
duration = eigen_value_send_interval_;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user