zhangsheng/WLG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refactor' of http://192.168.0.10:3000/pandx/WLG into refactor

Browse Source
This commit is contained in:
pandx 2024-11-08 17:55:19 +08:00
commit f078a3c04f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
uart/uart_feature_parse.cpp
View File

@ -922,8 +922,7 @@ void Uart::WriteDatFile(int sampleRate, std::string &strMeasurementID, int iChan
id = id + strlen(buf);
strncpy(mqttData + id,",",1);
id = id + 1;
}
else{
}else{
strncpy(mqttData + id ,buf,strlen(buf));
}
}

3
uart/uart_parameter_config.cpp
View File

@ -8,6 +8,7 @@
#include <boost/algorithm/string.hpp>
#include <zlog.h>
#include "common/common_func.hpp"
#include "minilzo/minilzo.h"
extern zlog_category_t* zct;
extern zlog_category_t* zbt;
@ -83,7 +84,7 @@ bool Uart::ReadUpdatePackge(unsigned short shortAdd) {
fread(buffer, sizeof(char), thisSize, pFile);
fclose(pFile);
}
int r = lzo1x_1_compress(data, count, outdata, &new_len, NULL);
unsigned char Data[12] = {0x00};
unsigned char size[4] = {0x00};
zlog_info(zct, "thisSize = %d", thisSize);