diff --git a/common/global.hpp b/common/global.hpp index 3567c20..bd0d244 100644 --- a/common/global.hpp +++ b/common/global.hpp @@ -17,7 +17,7 @@ enum enumZigBeeTransmitStatus { }; -//#define NR5G_MODULE +#define NR5G_MODULE //#define Q4G_MODULE //#define WIFI_MODULE //#define NR5G_MEIGE diff --git a/main.cpp b/main.cpp index 1d82559..eaeec2b 100644 --- a/main.cpp +++ b/main.cpp @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) { #ifdef NR5G_MODULE - print_info("NR5G_MODULE \n"); + zlog_info(zbt,"NR5G_MODULE \n"); // 5G boost::thread startCSQ(GetCSQ); startCSQ.detach(); diff --git a/threadfunc/check_thread.cpp b/threadfunc/check_thread.cpp index b8c1edd..9e673a8 100644 --- a/threadfunc/check_thread.cpp +++ b/threadfunc/check_thread.cpp @@ -17,7 +17,11 @@ extern zlog_category_t *zct; extern zlog_category_t *zbt; +#ifdef NR5G_MODULE +#include "wifi_5g/dial.h" +int fd = -1; +#endif void CheckThread() { zlog_info(zbt, "ENTER CHECK THREAD "); @@ -34,6 +38,7 @@ void CheckThread() { int mqttresend = 0; int checkNet0 = 0; int wifi_reconnect_count = 0; + int connectCount = 0; while (GlobalConfig::QuitFlag_G) { GlobalConfig::threadStatus = 1; sleep(1); @@ -83,6 +88,7 @@ void CheckThread() { } #endif #ifdef NR5G_MODULE + Dial dial; dial.closePort(); gpio_set(GlobalConfig::GPIO_G.commPower, 0); zlog_warn(zct, "commPower start");