From 161de09562e32c2823822a6a3b839b00e61d309e Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Mon, 18 Nov 2024 19:28:20 +0800
Subject: [PATCH] modify log info

---
 .cproject              |  2 +-
 scheduler/schedule.cpp |  3 ++-
 uart/uart.cpp          | 16 ++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.cproject b/.cproject
index 887db3b..ee8f790 100644
--- a/.cproject
+++ b/.cproject
@@ -101,7 +101,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.cross.exe.release.770635657" name="Release" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="" postbuildStep="cp WLG Cidn-SH;arm-linux-gnueabihf-strip Cidn-SH" preannouncebuildStep="" prebuildStep="">
+				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.cross.exe.release.770635657" name="Release" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="" postbuildStep="cp WirelessGateway Cidn-SH;arm-linux-gnueabihf-strip Cidn-SH" preannouncebuildStep="" prebuildStep="">
 					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.release.770635657." name="/" resourcePath="">
 						<toolChain errorParsers="" id="cdt.managedbuild.toolchain.gnu.cross.exe.release.1737804687" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.release">
 							<option id="cdt.managedbuild.option.gnu.cross.prefix.1625525504" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" useByScannerDiscovery="false" value="arm-linux-gnueabihf-" valueType="string"/>
diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp
index 0f7b78e..fc86fb2 100644
--- a/scheduler/schedule.cpp
+++ b/scheduler/schedule.cpp
@@ -643,7 +643,8 @@ void SensorScheduler::ClearScheduleCfg(int short_addr) {
 
 void SensorScheduler::CleanIdleOccupiedSet() {
 	int min_num = 0;
-    while (free_slice_ocuppied_.size() > free_slice_ && free_slice_ > min_num) {
+	size_t free_slice = (size_t)free_slice_;
+    while (free_slice_ocuppied_.size() > free_slice && free_slice_ > min_num) {
         free_slice_ocuppied_.pop_front();
     }    
 }
diff --git a/uart/uart.cpp b/uart/uart.cpp
index 1bc81d1..8eb8693 100644
--- a/uart/uart.cpp
+++ b/uart/uart.cpp
@@ -226,7 +226,7 @@ int Uart::ZigbeeTest() {
 }
 
 void Uart::WriteToUart(const char *strSend, int pLen) {
-    if (bUpdate) 
+    if (!bUpdate) 
     {
         printf( "Write To Uart Start:\n");
         for (int i = 0; i < pLen; i++) {
@@ -1136,13 +1136,13 @@ int Uart::FindRecvPackage(int bytesRead, char *mUartRecvBuf, char *head) {
                         zlog_warn(zct, "CheckCrc error  ShortAddr :%s command = %d ", strShortAddr.c_str(), command);
                         break;
                     }
-                    char tmp[23] = {0x00};
-                    char tmp2[23] = {0x00};
-                    for (int j = 0; j < 23; j++) {
-                        sprintf(tmp, "%02x ", UartRecvBuf[i + j] & 0xff);
-                        strcat(tmp2, tmp);
-                    }
-                    zlog_info(zct, "str = %s", tmp2);
+//                    char tmp[23] = {0x00};
+//                    char tmp2[23] = {0x00};
+//                    for (int j = 0; j < 23; j++) {
+//                        sprintf(tmp, "%02x ", UartRecvBuf[i + j] & 0xff);
+//                        strcat(tmp2, tmp);
+//                    }
+//                    zlog_info(zct, "str = %s", tmp2);
                     DealRecvData(RecvBuf);
                 }  else if (command == 35) {
                     char signalNode[10] = {0x00};