3.2.5 G2UL 4G

common/SH_global.h

@@ -21,11 +21,11 @@ enum enumZigBeeTransmitStatus {
 
 
 //#define NR5G_MODULE
-//#define Q4G_MODULE
+#define Q4G_MODULE
 //#define WIFI_MODULE
 //#define NR5G_MEIGE
-//#define	G2UL_GATEWAY
+#define	G2UL_GATEWAY
-#define IMX6UL_GATEWAY
+//#define IMX6UL_GATEWAY
 
 class GlobalConfig
 {

jsonparse/SH_JsonCmd.cpp

@@ -607,7 +607,7 @@ void JsonData::DataNodeStatusCheck()
 				}
             }
         }
-		if (count == nSize && nodeOnline)
+		if (count == nSize && nodeOnline && count != 0)
 		{
 			LOG_ERROR("ALL Node offline,count = %d\n",count);
 			exit(0);

main.cpp

@@ -65,6 +65,7 @@ int main(int argc, char *argv[])
 //    boost::thread InitModuleReadTh(InitModule);
 //    InitModuleReadTh.detach();
 
+    InitModule();
     // 休眠2秒，等待串口线程初始化完毕
     sleep(2);
 

threadfunc/SH_ThreadFunc.cpp

@@ -697,6 +697,8 @@ void InitModule()
 	std::string strAPN = ReadStrByOpt(SERVERCONFIG, "Server", "APN");
 	sprintf(szquectel,"/opt/quectel-CM/quectel-CM -s %s &",strAPN.c_str());
 	system(szquectel);
+	sleep(2);
+	system("/opt/Cidn/daemon_CM &");
 #endif
 #endif
 #ifdef WIFI_MODULE

uart/SH_Uart.cpp

@@ -4481,6 +4481,7 @@ int Uart::CheckZigbeeACK()
 			iRet = 0;
 			break;
 		}
+		time += 1;
 		mssleep(10000);
 	}while(time < 150);
 	return iRet;