diff --git a/.vscode/settings.json b/.vscode/settings.json index 455a709..2a4af4f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -68,6 +68,7 @@ "stop_token": "cpp", "thread": "cpp", "cfenv": "cpp", - "typeindex": "cpp" + "typeindex": "cpp", + "xstring": "cpp" } } \ No newline at end of file diff --git a/Cidn-SH b/Cidn-SH index 9da501b..6379534 100644 Binary files a/Cidn-SH and b/Cidn-SH differ diff --git a/common/SH_global.h b/common/SH_global.h index f8c818c..cecd330 100644 --- a/common/SH_global.h +++ b/common/SH_global.h @@ -24,8 +24,8 @@ enum enumZigBeeTransmitStatus { #define Q4G_MODULE //#define WIFI_MODULE //#define NR5G_MEIGE -//#define G2UL_GATEWAY -#define IMX6UL_GATEWAY +#define G2UL_GATEWAY +//#define IMX6UL_GATEWAY class GlobalConfig { diff --git a/uart/SH_Uart.cpp b/uart/SH_Uart.cpp index 820d824..16e17d8 100644 --- a/uart/SH_Uart.cpp +++ b/uart/SH_Uart.cpp @@ -3968,6 +3968,7 @@ void Uart::WriteDatFile(int sampleRate,string& strMeasurementID,int iChannel,std LOG_INFO( " vecData.size : %d,start \n", vecData.size()); int id = 0; char buf[33] = {0x00}; + memset(mqttData, 0x00, sizeof(mqttData)); float mean = pCalculation->mean(vecData); float frTemp; for (size_t i = 0; i < vecData.size(); i++) {