This commit is contained in:
zhangsheng 2025-05-06 11:29:38 +08:00
parent 921ff037e2
commit 0e325e5314
3 changed files with 6 additions and 2 deletions

View File

@ -18,7 +18,7 @@ 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

View File

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

View File

@ -299,7 +299,11 @@ int SensorScheduler::GetNextDuration(int short_addr) {
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){
zlog_warn(zct, "[Nxt] exception duration: %d", duration);
duration = 10;
} }
zlog_warn(zct, "[Nxt] [%d:%x] next duration is %d", id, short_addr, duration); zlog_warn(zct, "[Nxt] [%d:%x] next duration is %d", id, short_addr, duration);
return duration; return duration;
} }