diff --git a/common/global.hpp b/common/global.hpp index ec1f193..3567c20 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 //#define BLUETEETH_MODULE diff --git a/uart/uart_feature_parse.cpp b/uart/uart_feature_parse.cpp index 801b776..d0daaa4 100644 --- a/uart/uart_feature_parse.cpp +++ b/uart/uart_feature_parse.cpp @@ -583,7 +583,7 @@ int Uart::DealDataNodeFeature(const char *pData, int flag) { valdatastatic["dataNodeNo"] = strMeasurementID; valNodeData.append(valdatastatic); - root["data"] = valNodeData; + root["Data"] = valNodeData; root["TimeStamp"] = localtimestamp; root["dataNodeNo"] = strMeasurementID; root["dataNodeGatewayNo"] = GlobalConfig::MacAddr_G;