3 change to DG102

common/common_func.cpp

@@ -127,7 +127,6 @@ int InitGpio(unsigned int gpioN, unsigned int inout) {
     close(fd);
     sleep(1);
 //闂傚倸鍊烽悞锕€<E99495>?<3F>?Ο鑲╃煋闁割偅娲橀崑<E6A980>?<3F>堟煕閻<E78595>?彃鍘o闂傚倷绀侀幖<E4BE80>?<3F>﹀磹婵犳艾绠犻柟鎹愵嚙缁犳牠鏌ㄩ悤鍌涘<E98D8C>?
-#ifdef G2UL_GATEWAY
     char tmp2[100] = {0};
     if (gpioN == 507)
         memcpy(tmp2, "P18_3", 5);
@@ -161,10 +160,6 @@ int InitGpio(unsigned int gpioN, unsigned int inout) {
         memcpy(tmp2, "P16_1", 5);
 
     sprintf(tmp, "/sys/class/gpio/%s/direction", tmp2);
-#endif
-#ifdef IMX6UL_GATEWAY
-    sprintf(tmp, "/sys/class/gpio/gpio%d/direction", gpioN);
-#endif
 
     zlog_info(zbt, "open GPIO = %s", tmp);
     fd = open(tmp, O_WRONLY);
@@ -196,7 +191,6 @@ int InitGpio(unsigned int gpioN, unsigned int inout) {
 int gpio_set(unsigned int gpioN, char x) {
     int fd = 0;
     char tmp[100] = {0};
-#ifdef G2UL_GATEWAY
     char tmp2[100] = {0};
     if (gpioN == 507)
         memcpy(tmp2, "P18_3", 5);
@@ -229,10 +223,7 @@ int gpio_set(unsigned int gpioN, char x) {
     else if (gpioN == 489)
         memcpy(tmp2, "P16_1", 5);
     sprintf(tmp, "/sys/class/gpio/%s/value", tmp2);
-#endif
+
-#ifdef IMX6UL_GATEWAY
-    sprintf(tmp, "/sys/class/gpio/gpio%d/value", gpioN);
-#endif
 
     //闂傚倷鑳堕幊鎾绘倶濮樿泛绠伴柛婵<E69F9B>?劜椤洟鏌熸潏鈺佲偓宄 value闂傚倷绀侀幖<E4BE80>?<3F>﹀磹缁<E7A3B9>?５娲晲閸涱亝鐎婚梺璺ㄥ櫐閹凤拷
     fd = open(tmp, O_WRONLY);
@@ -265,7 +256,6 @@ int gpio_read(unsigned int gpioN) {
 
     char tmp[100] = {0};
 
-#ifdef G2UL_GATEWAY
     char tmp2[100] = {0};
     if (gpioN == 507)
         memcpy(tmp2, "P18_3", 5);
@@ -298,10 +288,7 @@ int gpio_read(unsigned int gpioN) {
     else if (gpioN == 489)
         memcpy(tmp2, "P16_1", 5);
     sprintf(tmp, "/sys/class/gpio/%s/value", tmp2);
-#endif
+
-#ifdef IMX6UL_GATEWAY
-    sprintf(tmp, "/sys/class/gpio/gpio%d/value", gpioN);
-#endif
     //闂傚倷鑳堕幊鎾绘倶濮樿泛绠伴柛婵<E69F9B>?劜椤洟鏌熸潏鈺佲偓宄 value闂傚倷绀侀幖<E4BE80>?<3F>﹀磹缁<E7A3B9>?５娲晲閸涱亝鐎婚梺璺ㄥ櫐閹凤拷
     fd = open(tmp, O_RDONLY);
     if (-1 == fd) {
@@ -1099,16 +1086,8 @@ std::string GetSysStatus() {
     char rateHardUse[32];
     char chRes[100];
     memset(chRes, 0, 100);
-#ifdef IMX6UL_GATEWAY
-    char hardName[32];
-    char hardUse[32];
-    const char *getEmmcInfo = "df -h | grep /opt";
-    system_custom(getEmmcInfo, chRes);
-    sscanf(chRes, "%s%s%s%s%s", hardName, hardTotal, hardUse, hardFree, rateHardUse);
-#endif
-#ifdef G2UL_GATEWAY
     getDiskInfo(hardTotal, hardFree);
-#endif
+
 
     std::string strhardTotal(hardTotal);
     std::string strhardFree(hardFree);

common/global.hpp

@@ -21,8 +21,7 @@ enum enumZigBeeTransmitStatus {
 //#define Q4G_MODULE
 //#define WIFI_MODULE
 //#define NR5G_MEIGE
-//#define	G2UL_GATEWAY
+
-#define IMX6UL_GATEWAY
 
 class GlobalConfig
 {
@@ -57,14 +56,10 @@ public :
 
 };
 
-#ifdef IMX6UL_GATEWAY
+
-#define SAVE_COUNT	4320 
-#define	OneWeek	432000              //5天
-#endif
-#ifdef G2UL_GATEWAY
 #define SAVE_COUNT	4800*4
 #define	OneWeek	604800*7
-#endif
+
 
 //按8  取整
 #define Length_(len)  do{  \

jsonparse/web_cmd_parse.cpp

@@ -539,10 +539,6 @@ std::string JsonData::JsonCmd_Cgi_25(Param_25 &param) {
         bFlag4 = true;
     }
     zlog_info(zct, "bFlag1 = %d,bFlag2 = %d,bFlag3 = %d,bFlag4 = %d", bFlag1, bFlag2, bFlag3, bFlag4);
-#ifdef IMX6UL_GATEWAY
-    strNet = param.mNet;
-    param.mNet = "Net";
-#endif
     if (0 == param.mMode && (bFlag1 && bFlag2 && bFlag3 && bFlag4) && param.mNetworkPortStatus == "STATIC") {
         WriteStr2Config(NETWORKCONFIG, param.mNet, "dnsName", param.mDnsName);
         WriteStr2Config(NETWORKCONFIG, param.mNet, "networkPortStatus", param.mNetworkPortStatus);
@@ -551,12 +547,6 @@ std::string JsonData::JsonCmd_Cgi_25(Param_25 &param) {
         WriteStr2Config(NETWORKCONFIG, param.mNet, "ipAddress", param.mIp);
         WriteStr2Config(NETWORKCONFIG, param.mNet, "hostName", param.mHostName);
 
-#ifdef IMX6UL_GATEWAY
-        char GateWay[100] = {0x00};
-        sprintf(GateWay, "sed -i '7c route add default gw %s' /etc/init.d/S90start_userapp.sh", param.mGateway.c_str());
-        zlog_info(zct, "GateWay = %s", GateWay);
-        system(GateWay);
-#endif
         PlatformInit::EquipIpInit(param.mNet);
 
     } else if (0 == param.mMode && param.mNetworkPortStatus == "DHCP") {
@@ -567,9 +557,6 @@ std::string JsonData::JsonCmd_Cgi_25(Param_25 &param) {
         WriteStr2Config(NETWORKCONFIG, param.mNet, "ipAddress", "");
         WriteStr2Config(NETWORKCONFIG, param.mNet, "hostName", "");
 
-#ifdef IMX6UL_GATEWAY
-        system("sed -i '7c udhcpc -i eth0  > /dev/null &' /etc/init.d/S90start_userapp.sh");
-#endif
         PlatformInit::EquipIpInit(param.mNet);
 
     } else if (0 == param.mMode && (!bFlag1 || !bFlag2 || !bFlag3 || !bFlag4) && param.mNetworkPortStatus == "STATIC") {
@@ -585,7 +572,6 @@ std::string JsonData::JsonCmd_Cgi_25(Param_25 &param) {
     jsonVal["content"]["eth0"] = jsonValnet;
     jsonVal["content"]["gatewaytype"] = 0;
 
-#ifdef G2UL_GATEWAY
     jsonValnet["dnsName"] = ReadStrByOpt(NETWORKCONFIG, "eth1", "dnsName");
     jsonValnet["networkPortStatus"] = ReadStrByOpt(NETWORKCONFIG, "eth1", "networkPortStatus");
     jsonValnet["gateway"] = ReadStrByOpt(NETWORKCONFIG, "eth1", "gateway");
@@ -594,6 +580,6 @@ std::string JsonData::JsonCmd_Cgi_25(Param_25 &param) {
     jsonValnet["hostName"] = ReadStrByOpt(NETWORKCONFIG, "eth1", "hostName");
     jsonVal["content"]["eth1"] = jsonValnet;
     jsonVal["content"]["gatewaytype"] = 1;
-#endif
+
     return show_value_.write(jsonVal);
 }

jsonparse/web_cmd_parse2.cpp

@@ -190,7 +190,6 @@ std::string JsonData::JsonCmd_Cgi_54(Param_54 &param) {
     jsBody["ServerConfig"] = jsSystemSetting;
     jsonVal["content"] = jsBody;
 
-#ifdef G2UL_GATEWAY
     jsonValnet1["dnsName"] = ReadStrByOpt(NETWORKCONFIG, "eth1", "dnsName");
     jsonValnet1["networkPortStatus"] = ReadStrByOpt(NETWORKCONFIG, "eth1", "networkPortStatus");
     jsonValnet1["gateway"] = ReadStrByOpt(NETWORKCONFIG, "eth1", "gateway");
@@ -199,7 +198,7 @@ std::string JsonData::JsonCmd_Cgi_54(Param_54 &param) {
     jsonValnet1["hostName"] = ReadStrByOpt(NETWORKCONFIG, "eth1", "hostName");
     jsonVal["content"]["eth1"] = jsonValnet1;
     jsonVal["content"]["gatewaytype"] = 1;
-#endif
+
 
     jsSystemInfo["GateWayVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "GateWayVersion");
     jsSystemInfo["SystemVersion"] = ReadStrByOpt(SYSTEMINFOFILE, "Version", "SystemVersion");

mqttclient/mqtt_client.cpp

@@ -115,22 +115,14 @@ void my_disconnect_callback(struct mosquitto *mosq, void *obj, int result) {
 #ifdef WIFI_MODULE
     char buf[128] = {0};
     std::string wpa_state = "";
-#ifdef G2UL_GATEWAY
     wpa_state = "/usr/sbin/wpa_cli status|grep wpa_state | cut -f 2 -d '='";
-#endif
 
-#ifdef IMX6UL_GATEWAY
-    wpa_state = "/opt/Cidn/wpa_cli status|grep wpa_state | cut -f 2 -d '='";
-#endif
     system_custom(wpa_state.c_str(), buf);
     std::string state = std::string(buf);
     std::string RSSI_cmd = "";
-#ifdef G2UL_GATEWAY
+
     RSSI_cmd = "/usr/sbin/wpa_cli signal_poll|grep RSSI | cut -f 2 -d '='";
-#endif
+
-#ifdef IMX6UL_GATEWAY
-    RSSI_cmd = "/opt/Cidn/wpa_cli signal_poll|grep RSSI | cut -f 2 -d '='";
-#endif
     system_custom(RSSI_cmd.c_str(), buf);
     std::string RSSI = std::string(buf);
 

platform/platform_init.cpp

@@ -79,7 +79,6 @@ void PlatformInit::Init() {
             strMac.insert(14, ":");
             ModifyMac((char*)strMac.c_str());
         }
-#ifdef G2UL_GATEWAY
         std::string strMac2 = sqlite_db_ctrl::instance().GetData("t_gateway_info", "MAC2", NULL);
         if (strMac2 == "60294D208518") {
             char szUpdateSql[100] = {0x00};
@@ -94,7 +93,7 @@ void PlatformInit::Init() {
             strMac2.insert(14, ":");
             ModifyMac((char*)strMac2.c_str());
         }
-#endif
+
     } catch (...) {
         zlog_error(zbt, "PlatFormInit exception happend.");
         std::string errorinfo = "系统初始化异常";
@@ -176,7 +175,7 @@ void PlatformInit::Sqlite3Init() {
 }
 
 void PlatformInit::GPIOInit() {
-#ifdef G2UL_GATEWAY
+
     GlobalConfig::GPIO_G.zigAckrep = 507;
     GlobalConfig::GPIO_G.zigAckreset = 499;
     GlobalConfig::GPIO_G.zigReset = 496;
@@ -190,16 +189,6 @@ void PlatformInit::GPIOInit() {
     GlobalConfig::GPIO_G.runLed = 409;
     GlobalConfig::GPIO_G.errorLed = 410;
     GlobalConfig::GPIO_G.netResetNet0 = 489;
-#endif
-#ifdef IMX6UL_GATEWAY
-    GlobalConfig::GPIO_G.zigAckrep = 119;
-    GlobalConfig::GPIO_G.zigAckreset = 120;
-    GlobalConfig::GPIO_G.zigReset = 116;
-    GlobalConfig::GPIO_G.wifiReset = 8;
-    GlobalConfig::GPIO_G.commRest = 8;
-    GlobalConfig::GPIO_G.power = 9;
-    GlobalConfig::GPIO_G.errorLed = 130;
-#endif
 }
 
 void PlatformInit::SystemInfoInit() {
@@ -264,14 +253,6 @@ void PlatformInit::EquipIpInit(std::string eth) {
     if (0 == networkPortStatus.compare("DHCP")) {
         zlog_info(zbt, "dhcp config\n");
         std::string cmd = "";
-#ifdef IMX6UL_GATEWAY
-        system("sed -i '17c auto eth0' /etc/network/interfaces");
-        system("sed -i '18c iface eth0 inet dhcp' /etc/network/interfaces");
-        system("sed -i '20c                     ' /etc/network/interfaces");
-        system("sed -i '21c                     ' /etc/network/interfaces");
-        system("sed -i '22c                     ' /etc/network/interfaces");
-#endif
-#ifdef G2UL_GATEWAY
         if (eth == "eth0") {
             system("sed -i '5c DHCP=ipv4' /etc/systemd/network/static/10-eth0-static.network");
             system("sed -i '6c          ' /etc/systemd/network/static/10-eth0-static.network");
@@ -281,38 +262,10 @@ void PlatformInit::EquipIpInit(std::string eth) {
             system("sed -i '6c          ' /etc/systemd/network/dynamic/20-eth1-dynamic.network");
             system("sed -i '7c          ' /etc/systemd/network/dynamic/20-eth1-dynamic.network");
         }
-#endif
-//        flag = 0;
     }
     if (0 == networkPortStatus.compare("STATIC")) {
         std::string cmd = "";
-#ifdef IMX6UL_GATEWAY
-        system("sed -i '18c iface eth0 inet static' /etc/network/interfaces");
-        if (dataWatchIpAddress.length() > 0) {
-            cmd = "sed -i '20c address " + dataWatchIpAddress + "' /etc/network/interfaces";
-        } else {
-            cmd = "sed -i '20c address 0.0.0.0' /etc/network/interfaces";
-        }
-        system(cmd.c_str());
-        cmd.clear();
 
-        if (subnetMask.length() > 0) {
-            cmd = "sed -i '21c netmask " + subnetMask + "' /etc/network/interfaces";
-        } else {
-            cmd = "sed -i '21c netmask 255.255.255.0' /etc/network/interfaces";
-        }
-        system(cmd.c_str());
-        cmd.clear();
-
-        if (gateway.length() > 0) {
-            cmd = "sed -i '22c gateway " + gateway + "' /etc/network/interfaces";
-        } else {
-            cmd = "sed -i '22c gateway 0.0.0.0' /etc/network/interfaces";
-        }
-        system(cmd.c_str());
-        cmd.clear();
-#endif
-#ifdef G2UL_GATEWAY
         if (eth == "eth0") {
             cmd = "sed -i '5c Address=" + dataWatchIpAddress + "' /etc/systemd/network/static/10-eth0-static.network";
             system(cmd.c_str());
@@ -328,19 +281,10 @@ void PlatformInit::EquipIpInit(std::string eth) {
             cmd = "sed -i '7c Gateway=" + gateway + "' /etc/systemd/network/dynamic/20-eth1-dynamic.network";
             system(cmd.c_str());
         }
-#endif
+
-//        flag = 1;
     }
-#ifdef IMX6UL_GATEWAY
-    zlog_info(zbt, "system reboot by reboot system call");
-    system("sync");
-    sleep(1);
-    system("reboot");
 
-
-#endif
-#ifdef G2UL_GATEWAY
     zlog_info(zbt, "network restart by systemctl call");
     system("systemctl restart systemd-networkd.service");
-#endif
+
 }

threadfunc/check_thread.cpp

@@ -39,14 +39,6 @@ void CheckThread() {
         if (10 == heart_count) {
             if (GlobalConfig::LinkCount > 30) {
                 zlog_error(zct, "MQTT connect failed ");
-#ifdef IMX6UL_GATEWAY
-                char connect[10] = {0x00};
-                readStringValue("config", "connect", connect, (char *)GlobalConfig::Config_G.c_str());
-                if (atoi(connect)) {
-                    zlog_error(zct, "MQTT connect failed,reboot");
-                    exit(0);
-                }
-#endif
             }
             std::string ipTemp = IpAddrInit();
             GlobalConfig::IpAddr_G = ipTemp;            
@@ -67,27 +59,7 @@ void CheckThread() {
             iRet = data_publish(str2.c_str(), GlobalConfig::Topic_G.mPubCmd.c_str());
             if (iRet != 0) {
                 zlog_error(zct, "MQTT connect failed ,time check");
-#ifdef IMX6UL_GATEWAY
-                char connect[10] = {0x00};
-                readStringValue("config", "connect", connect, (char *)GlobalConfig::Config_G.c_str());
-                if (atoi(connect)) {
-                    zlog_error(zct, "MQTT connect failed,time check ,reboot");
-                    exit(0);
-                }
-#endif
 #ifdef NR5G_MODULE
-#ifdef IMX6UL_GATEWAY
-                dial.closePort();
-                gpio_set(GlobalConfig::GPIO_G.commRest, 0);
-                zlog_warn(zct, "GPIO 8 start");
-                sleep(2);
-                gpio_set(GlobalConfig::GPIO_G.commRest, 1);
-                zlog_warn(zct, "GPIO 8 End");
-                sleep(20);
-                dial.openPort("/dev/ttyUSB2");
-                dial.setState();
-#endif
-#ifdef G2UL_GATEWAY
                 dial.closePort();
                 gpio_set(GlobalConfig::GPIO_G.commPower, 0);
                 zlog_warn(zct, "commPower start");
@@ -100,30 +72,12 @@ void CheckThread() {
                     zlog_error(zct, "5G reset error ,reboot!");
                     system("reboot");
                 }
-#ifndef NR5G_MEIGE
                 dial.openPort("/dev/ttyUSB2");
                 dial.setState();
-#else
+
-                char szquectel[100] = {0x00};
-                std::string strAPN = ReadStrByOpt(SERVERCONFIG, "Server", "APN");
-                sprintf(szquectel, "/opt/quectel-CM/Meig-CM -s %s &", strAPN.c_str());
-                system(szquectel);
-#endif
-#endif
 #endif
 #ifdef WIFI_MODULE
                 zlog_warn(zct, "WiFi reset!");
-#ifdef IMX6UL_GATEWAY
-                gpio_set(GlobalConfig::GPIO_G.wifiReset, 0);
-                sleep(5);
-                gpio_set(GlobalConfig::GPIO_G.wifiReset, 1);
-                sleep(5);
-                wifi::WPAClient wpa;
-                wpa.ReconnectWiFi();
-                system("/etc/init.d/wpa_restart");
-                system("udhcpc -i wlan2 &");
-#endif
-#ifdef G2UL_GATEWAY
                 system("/etc/init.d/wpa_restart");
                 sleep(5);
                 string strip = GetGwIp_("wlan0");
@@ -140,7 +94,7 @@ void CheckThread() {
                     sleep(5);
                     system("udhcpc -b -i wlan0 &");
                 }
-#endif
+
 #endif
             }
          }
@@ -243,12 +197,7 @@ void CheckThread() {
             char localtimestamp[32] = {0};
             GetTimeNet(localtimestamp, 1);
             char whereCon[1024] = {0};
-#ifdef G2UL_GATEWAY
             sprintf(whereCon, " timestamp < '%ld' ", atol(localtimestamp) - 2592000 * 2); //删除2个月前的数据
-#endif
-#ifdef IMX6UL_GATEWAY
-            sprintf(whereCon, " timestamp < '%ld' ", atol(localtimestamp) - 2592000); //删除1个月前的数据
-#endif
             sqlite_db_ctrl::instance().DeleteTableData(" t_battery_history ", whereCon);
 
             sqlite_db_ctrl::instance().DeleteTableData(" receive_wave_status ", whereCon);
@@ -268,13 +217,7 @@ void CheckThread() {
                 if (currentssid.length() > 0) {
                     char buf[64] = {0};
                     std::string rssiSend = "";
-#ifdef G2UL_GATEWAY
                     rssiSend = "/usr/sbin/wpa_cli signal_poll|grep RSSI | cut -f 2 -d '='";
-#endif
-
-#ifdef IMX6UL_GATEWAY
-                    rssiSend = "/opt/Cidn/wpa_cli signal_poll|grep RSSI | cut -f 2 -d '='";
-#endif
                     system_custom(rssiSend.c_str(), buf);
                     std::string Rssi = std::string(buf);
 

uart/uart.cpp

@@ -36,9 +36,7 @@ int Uart::UartRecv(int fd, char srcshow, char *buffer) {
     int offSize = 0;
     int timeoutflag = 0;
     char head[] = {0xAA, 0x55, 0xAA};
-#ifdef G2UL_GATEWAY
     char szbuffer[BUF_LENGTH] = {0x00};
-#endif
     while (1) {
         if (now_task == WAVE_CMD) {
             memset(buff, 0, sizeof(buff));
@@ -79,23 +77,6 @@ int Uart::UartRecv(int fd, char srcshow, char *buffer) {
             }
 
         } else {
-#ifdef IMX6UL_GATEWAY
-            memset(buff, 0, sizeof(buff));
-            ret = read_data(fd, buff, BUF_LENGTH, 50);
-            if (ret <= 0) {
-                continue;
-            }
-            if (srcshow) {
-                zlog_info(zct, "0x8888 ===str_recv===,ret = %d", ret);
-                for (int i = 0; i < ret; i++) {
-                    printf("[%02x]", buff[i] & 0xff);
-                }
-                printf("\n");
-                FindRecvPackage(ret, buff, head);
-            }
-#endif
-
-#ifdef G2UL_GATEWAY
             memset(buff, 0x00, sizeof(buff));
             ret = read_data(fd, buff, BUF_LENGTH, 50);
             if (ret <= 0) {
@@ -120,7 +101,6 @@ int Uart::UartRecv(int fd, char srcshow, char *buffer) {
                 memcpy(szbuffer + offSize, buff, ret);
                 offSize = offSize + ret;
             }
-#endif
         }
     }
 }
@@ -157,12 +137,8 @@ Uart::~Uart() {
 }
 
 void Uart::InitUart(speed_t speed) {
-#ifdef G2UL_GATEWAY
     fd = config_uart("/dev/ttySC2", speed);
-#endif
+
-#ifdef IMX6UL_GATEWAY
-    fd = config_uart("/dev/ttymxc4", speed);
-#endif
     zlog_info(zct, "InitUart fd = %d", fd);
     if (fd < 0) {
         zlog_error(zct, "config_uart error");