xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

串口log文件名统一

Browse Source
rtmpsuck
XI.CHEN 5 months ago
parent d4a561f3c2
commit f3b2f01f8b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/cpp/PhoneDevice.cpp
Unescape Escape View File

@ -3802,7 +3802,7 @@ int CPhoneDevice::GetSerialPhoto(int devno, D_IMAGE_DEF *photo)
return GetImage(devno, (IMAGE_DEF*)photo); return GetImage(devno, (IMAGE_DEF*)photo);
} }
void CPhoneDevice::InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir, char *logpath) void CPhoneDevice::InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir,const char *logpath)
{ {
Gm_InitSerialComm((SENSOR_PARAM *)sensorParam, filedir, logpath); Gm_InitSerialComm((SENSOR_PARAM *)sensorParam, filedir, logpath);
} }

2
app/src/main/cpp/PhoneDevice.h
Unescape Escape View File

@ -241,7 +241,7 @@ public:
virtual bool GetCameraStatus(); virtual bool GetCameraStatus();
virtual void CameraCtrl(unsigned short waitTime, unsigned short delayTime, unsigned char channel, int cmdidx, unsigned char presetno, const char *serfile, unsigned int baud, int addr); virtual void CameraCtrl(unsigned short waitTime, unsigned short delayTime, unsigned char channel, int cmdidx, unsigned char presetno, const char *serfile, unsigned int baud, int addr);
virtual int GetSerialPhoto(int devno, D_IMAGE_DEF *photo); virtual int GetSerialPhoto(int devno, D_IMAGE_DEF *photo);
virtual void InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir, char *logpath); virtual void InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir,const char *logpath);
bool LoadNetworkInfo(); bool LoadNetworkInfo();
bool GetNextScheduleItem(uint32_t tsBasedZero, uint32_t scheduleTime, vector<uint32_t>& items); bool GetNextScheduleItem(uint32_t tsBasedZero, uint32_t scheduleTime, vector<uint32_t>& items);

4
app/src/main/cpp/SensorsProtocol.cpp
Unescape Escape View File

@ -950,7 +950,7 @@ uint8_t getdevtype(int devno)
return devparam[devno].ProtocolIdx; return devparam[devno].ProtocolIdx;
} }
// 初始化所有串口及所接传感器的配置 // 初始化所有串口及所接传感器的配置
void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir, char *log) void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir,const char *log)
{ {
int i; int i;
char szbuf[128]; char szbuf[128];
@ -1687,7 +1687,7 @@ int SaveLogTofile(int commid, char *szbuf)
} }
// 写入文件到sdcard // 写入文件到sdcard
memset(filename, 0, sizeof(filename)); memset(filename, 0, sizeof(filename));
sprintf(filename, "%sCOM%dlog-%d-%d-%d.log", filedir, commid + 1, t0.tm_year + 1900, t0.tm_mon + 1, t0.tm_mday); sprintf(filename, "%sCOM%dlog-%04d-%02d-%02d.log", filedir, commid + 1, t0.tm_year + 1900, t0.tm_mon + 1, t0.tm_mday);
fp = fopen(filename, "a+"); fp = fopen(filename, "a+");
if (NULL == fp) if (NULL == fp)
return -1; return -1;

2
app/src/main/cpp/SensorsProtocol.h
Unescape Escape View File

@ -336,7 +336,7 @@ void DebugLog(int commid, char *szbuf, char flag);
int SaveLogTofile(int commid, char *szbuf); int SaveLogTofile(int commid, char *szbuf);
// 功能说明:串口发送数据 返回实际发送的字节数 // 功能说明:串口发送数据 返回实际发送的字节数
int GM_SerialComSend(const unsigned char * cSendBuf, size_t nSendLen, int commid); int GM_SerialComSend(const unsigned char * cSendBuf, size_t nSendLen, int commid);
void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir, char *log); void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir,const char *log);
// 启动串口通讯 // 启动串口通讯
void GM_StartSerialComm(); void GM_StartSerialComm();
// 启动使用串口拍照 // 启动使用串口拍照

Write Preview
Loading…
Cancel
Save