diff --git a/.gitignore b/.gitignore index 1dc6372..0ecbf19 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /Release/ /Debug/ +debug/ .settings/* .cproject diff --git a/Cidn-SH b/Cidn-SH deleted file mode 100755 index 5715a55..0000000 Binary files a/Cidn-SH and /dev/null differ diff --git a/jsonparse/web_cmd_parse2.cpp b/jsonparse/web_cmd_parse2.cpp index 70f2dee..a70cd01 100644 --- a/jsonparse/web_cmd_parse2.cpp +++ b/jsonparse/web_cmd_parse2.cpp @@ -702,9 +702,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));