From 52016d2fb8621b24fa0e12b9b3b47fe5930c112b Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Mon, 2 Dec 2024 20:11:58 +0800 Subject: [PATCH 1/7] 4G Version 5.1 --- common/global.hpp | 2 +- main.cpp | 2 +- threadfunc/thread_func.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/global.hpp b/common/global.hpp index ac03d9a..2ff7763 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/main.cpp b/main.cpp index c7b2909..61bf74f 100644 --- a/main.cpp +++ b/main.cpp @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) { #ifdef Q4G_MODULE boost::thread startCSQ(GetCSQ); startCSQ.detach(); - print_info("4G_MODULE \n"); + zlog_info(zbt, "4G_MODULE"); #endif #ifdef WIFI_MODULE diff --git a/threadfunc/thread_func.cpp b/threadfunc/thread_func.cpp index 8854ff9..41c0b70 100644 --- a/threadfunc/thread_func.cpp +++ b/threadfunc/thread_func.cpp @@ -126,7 +126,7 @@ open4G: if (ret <= 0) { timeoutflag++; if (timeoutflag > 5) { - zlog_info("timeoutflag = %d\n", timeoutflag); + zlog_info(zbt,"timeoutflag = %d\n", timeoutflag); timeoutflag = 0; const char *str2 = "+QENG: "; char csq[128] = {0}; @@ -135,7 +135,7 @@ open4G: strncpy(csq, pdata + 7, sizeof(csq)); GlobalConfig::NetStatus = GetOneContent(csq, 1, ","); - string signal = GetOneContent(csq, 13, ","); + std::string signal = GetOneContent(csq, 13, ","); GlobalConfig::NetSignal = atoi(signal.c_str()); GlobalConfig::NetType = GetOneContent(csq, 2, ","); zlog_info(zct, "NetStatus = %s,NetSignal = %d", GlobalConfig::NetStatus.c_str(), GlobalConfig::NetSignal); From 5d7f92966d1d16ba7df834037ec11e7041f504cb Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Mon, 9 Dec 2024 10:28:22 +0800 Subject: [PATCH 2/7] fix bugs,Version 5.1 --- common/global.hpp | 2 +- common/parameter_defination.hpp | 2 +- jsonparse/mqtt_cmd_parse.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/global.hpp b/common/global.hpp index 2ff7763..ac03d9a 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/common/parameter_defination.hpp b/common/parameter_defination.hpp index ab70834..5e3c660 100644 --- a/common/parameter_defination.hpp +++ b/common/parameter_defination.hpp @@ -159,7 +159,7 @@ struct Param_41 { int ZigbeePower; int ZigbeeRetry; std::string nodeWaveSend; - Param_41() : mdataNodeName(""), mdataNodeNo(""), mMeasurementID(""),mShortAddr("") ,mfeatureInterVal(0), mwaveInterVal(0), msamplingRate(0), mrange(0), + Param_41() : mdataNodeName(""), mdataNodeNo(""), mMeasurementID(""),mShortAddr("") ,mfeatureInterVal(5), mwaveInterVal(120), msamplingRate(0), mrange(0), mAccSampleTime(0), mstartBrands(""), mstopBrands(""), menvelopeBandPass(""), mviff(0), mfaultFrequency(""), nodeWaveSend{""} {}; }; diff --git a/jsonparse/mqtt_cmd_parse.cpp b/jsonparse/mqtt_cmd_parse.cpp index 5a1ffe4..82e2281 100644 --- a/jsonparse/mqtt_cmd_parse.cpp +++ b/jsonparse/mqtt_cmd_parse.cpp @@ -715,7 +715,7 @@ void JsonData::DataNodeStatusCheck() { } if (count == nSize && nodeOnline && count != 0) { zlog_error(zct, "ALL Node offline,count = %d", count); - char whereCon[64]={0}; + char whereCon[100]={0}; sprintf(whereCon,"DATE(timestamp, 'unixepoch') = DATE('now') ORDER BY timeStamp DESC limit 0,1"); std::string strCount = sqlite_db_ctrl::instance().GetData(" reboot_record ", "count", whereCon); if (atoi(strCount.c_str()) < 3)//当天大于三次不再重启进程 From b7384686bca817f1db85fa9596d22d2e6c2ec712 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Mon, 9 Dec 2024 13:57:23 +0800 Subject: [PATCH 3/7] tmp code --- jsonparse/web_cmd_parse2.cpp | 8 ++++---- localserver/web_cmd.cpp | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/jsonparse/web_cmd_parse2.cpp b/jsonparse/web_cmd_parse2.cpp index 8d015c9..eebdb99 100644 --- a/jsonparse/web_cmd_parse2.cpp +++ b/jsonparse/web_cmd_parse2.cpp @@ -695,14 +695,14 @@ std::string JsonData::JsonCmd_Cgi_41(std::vector ¶m, int isServer) zlog_info(zct, "dataNodeName = %s", param[i].mdataNodeName.c_str()); int dataNodeNameLength = param[i].mdataNodeName.length(); if (dataNodeNameLength != 0) { - sprintf(updateSql, "dataNodeName = '%s',ZigbeePower = '%d',ZigbeeRetry = '%d',featureInterVal='%d',waveInterVal='%d',range='%d',samplingRate='%d',AccSampleTime = '%d',\ + sprintf(updateSql, "dataNodeName = '%s',ZigbeePower = '%d',ZigbeeRetry = '%d',range='%d',samplingRate='%d',AccSampleTime = '%d',\ startBrands = '%s',stopBrands = '%s',envelopeBandPass = '%s',viff = '%d',faultFrequency = '%s' ,MeasurementID = '%s' ,UpdateFlag = -1", - dataNodeName, param[i].ZigbeePower, param[i].ZigbeeRetry, param[i].mfeatureInterVal, param[i].mwaveInterVal, param[i].mrange, param[i].msamplingRate, param[i].mAccSampleTime, param[i].mstartBrands.c_str(), param[i].mstopBrands.c_str(), + dataNodeName, param[i].ZigbeePower, param[i].ZigbeeRetry, param[i].mrange, param[i].msamplingRate, param[i].mAccSampleTime, param[i].mstartBrands.c_str(), param[i].mstopBrands.c_str(), param[i].menvelopeBandPass.c_str(), param[i].mviff, param[i].mfaultFrequency.c_str(), param[i].mMeasurementID.c_str()); } else if (dataNodeNameLength == 0) { - sprintf(updateSql, "ZigbeePower = '%d',ZigbeeRetry = '%d',featureInterVal='%d',waveInterVal='%d',range='%d',samplingRate='%d',AccSampleTime = '%d',\ + sprintf(updateSql, "ZigbeePower = '%d',ZigbeeRetry = '%d',range='%d',samplingRate='%d',AccSampleTime = '%d',\ startBrands = '%s',stopBrands = '%s',envelopeBandPass = '%s',viff = '%d',faultFrequency = '%s',MeasurementID = '%s',NodeWaveSend = '%s',UpdateFlag = 0", - param[i].ZigbeePower, param[i].ZigbeeRetry, param[i].mfeatureInterVal, param[i].mwaveInterVal, param[i].mrange, param[i].msamplingRate, param[i].mAccSampleTime, param[i].mstartBrands.c_str(), param[i].mstopBrands.c_str(), param[i].menvelopeBandPass.c_str(), + param[i].ZigbeePower, param[i].ZigbeeRetry, param[i].mrange, param[i].msamplingRate, param[i].mAccSampleTime, param[i].mstartBrands.c_str(), param[i].mstopBrands.c_str(), param[i].menvelopeBandPass.c_str(), param[i].mviff, param[i].mfaultFrequency.c_str(), param[i].mMeasurementID.c_str(), param[i].nodeWaveSend.c_str()); } int iRet = sqlite_db_ctrl::instance().UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon); diff --git a/localserver/web_cmd.cpp b/localserver/web_cmd.cpp index e9ed312..5675e04 100644 --- a/localserver/web_cmd.cpp +++ b/localserver/web_cmd.cpp @@ -244,8 +244,6 @@ std::string LocalServer::HandleCgi_cmd(std::string &pData) { for (size_t i = 0; i < recvBody.size(); i++) { param.mdataNodeNo = recvBody[i]["dataNodeNo"].asString(); param.mfeatureInterVal = recvBody[i]["featureInterVal"].asInt(); - param.mwaveInterVal = recvBody[i]["waveInterVal"].asInt(); - param.msamplingRate = recvBody[i]["samplingRate"].asInt(); param.mrange = recvBody[i]["range"].asInt(); param.mAccSampleTime = recvBody[i]["ACCSampleTime"].asInt(); param.mstartBrands = recvBody[i]["startBrands"].asString(); From 29e490da3b369e0b4b48b04056d387cfcbe23b68 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Mon, 9 Dec 2024 14:29:22 +0800 Subject: [PATCH 4/7] tmp code --- jsonparse/web_cmd_parse2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsonparse/web_cmd_parse2.cpp b/jsonparse/web_cmd_parse2.cpp index eebdb99..fb8b3c6 100644 --- a/jsonparse/web_cmd_parse2.cpp +++ b/jsonparse/web_cmd_parse2.cpp @@ -701,9 +701,9 @@ std::string JsonData::JsonCmd_Cgi_41(std::vector ¶m, int isServer) param[i].menvelopeBandPass.c_str(), param[i].mviff, param[i].mfaultFrequency.c_str(), param[i].mMeasurementID.c_str()); } else if (dataNodeNameLength == 0) { sprintf(updateSql, "ZigbeePower = '%d',ZigbeeRetry = '%d',range='%d',samplingRate='%d',AccSampleTime = '%d',\ - startBrands = '%s',stopBrands = '%s',envelopeBandPass = '%s',viff = '%d',faultFrequency = '%s',MeasurementID = '%s',NodeWaveSend = '%s',UpdateFlag = 0", + startBrands = '%s',stopBrands = '%s',envelopeBandPass = '%s',viff = '%d',faultFrequency = '%s',MeasurementID = '%s',UpdateFlag = 0", param[i].ZigbeePower, param[i].ZigbeeRetry, param[i].mrange, param[i].msamplingRate, param[i].mAccSampleTime, param[i].mstartBrands.c_str(), param[i].mstopBrands.c_str(), param[i].menvelopeBandPass.c_str(), - param[i].mviff, param[i].mfaultFrequency.c_str(), param[i].mMeasurementID.c_str(), param[i].nodeWaveSend.c_str()); + param[i].mviff, param[i].mfaultFrequency.c_str(), param[i].mMeasurementID.c_str()); } int iRet = sqlite_db_ctrl::instance().UpdateTableData(T_SENSOR_INFO(TNAME), updateSql, whereCon); memset(whereCon, 0x00, sizeof(whereCon)); From 9842f05fdba1649c6742a688ccf7677230dfb830 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Mon, 9 Dec 2024 15:10:36 +0800 Subject: [PATCH 5/7] tmp code --- common/global.hpp | 2 +- localserver/web_cmd.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/global.hpp b/common/global.hpp index ac03d9a..2ff7763 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/localserver/web_cmd.cpp b/localserver/web_cmd.cpp index 5675e04..2281c90 100644 --- a/localserver/web_cmd.cpp +++ b/localserver/web_cmd.cpp @@ -243,7 +243,7 @@ std::string LocalServer::HandleCgi_cmd(std::string &pData) { std::vector param41; for (size_t i = 0; i < recvBody.size(); i++) { param.mdataNodeNo = recvBody[i]["dataNodeNo"].asString(); - param.mfeatureInterVal = recvBody[i]["featureInterVal"].asInt(); + param.msamplingRate = recvBody[i]["samplingRate"].asInt(); param.mrange = recvBody[i]["range"].asInt(); param.mAccSampleTime = recvBody[i]["ACCSampleTime"].asInt(); param.mstartBrands = recvBody[i]["startBrands"].asString(); From db724e1165f2832929b193f724a7818564fec373 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Mon, 9 Dec 2024 16:49:09 +0800 Subject: [PATCH 6/7] fix bugs,version 5.1 --- common/global.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/global.hpp b/common/global.hpp index 2ff7763..ac03d9a 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 From 891127d2368f9165173d18d8682831db2780e309 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Mon, 9 Dec 2024 17:18:40 +0800 Subject: [PATCH 7/7] fix memory bug,version 5.1 --- common/global.hpp | 2 +- uart/uart_parameter_config.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/global.hpp b/common/global.hpp index ac03d9a..2ff7763 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/uart/uart_parameter_config.cpp b/uart/uart_parameter_config.cpp index d96d92b..a2c0f09 100644 --- a/uart/uart_parameter_config.cpp +++ b/uart/uart_parameter_config.cpp @@ -49,7 +49,7 @@ void Uart::UpdateWirelessNode(uint16_t shortAdd) { char localtimestamp[32] = {0}; GetTimeNet(localtimestamp, 1); char insertSql[100] = {0}; - char wherecon[64] = {0}; + char wherecon[100] = {0}; sprintf(wherecon," short_Addr = '%02x%02x' and status = 3 order by start_timestamp DESC",UINT16_HIGH(shortAdd), UINT16_LOW(shortAdd)); std::string spend_count = sqlite_db_ctrl::instance().GetData(" firmware_upgrade ","spend_count",wherecon); if (atoi(spend_count.c_str()) >= 10){