From 29260fd7b727f3e6c17eec6f0a7d712f8127df27 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Wed, 11 Dec 2024 14:04:44 +0800 Subject: [PATCH] fix bugs,version 5.2 --- common/global.hpp | 2 +- platform/platform_init.cpp | 2 +- scheduler/schedule.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/global.hpp b/common/global.hpp index 0cf2043..0defe3f 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/platform/platform_init.cpp b/platform/platform_init.cpp index aae996e..995dc1b 100644 --- a/platform/platform_init.cpp +++ b/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.1"; +std::string GlobalConfig::Version = "5.2"; std::string GlobalConfig::MacAddr_G = ""; std::string GlobalConfig::MacAddr_G2 = ""; std::string GlobalConfig::IpAddr_G = ""; diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp index be09236..38c98eb 100644 --- a/scheduler/schedule.cpp +++ b/scheduler/schedule.cpp @@ -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_; }