diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-12-20 09:13:03 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-12-20 09:13:03 +0200 |
| commit | 39364cc5d70f8ea4b6527eaee8fbb09eaa66a468 (patch) | |
| tree | e115494d27d56dc8b4484adac6e20ca12fa296dd | |
| parent | e6ed8903c323722e9c1529273a09aa148bc13112 (diff) | |
| parent | 631fd1917ab3809b4b8d7e0066c49572f76688da (diff) | |
| download | Tango-39364cc5d70f8ea4b6527eaee8fbb09eaa66a468.tar.gz Tango-39364cc5d70f8ea4b6527eaee8fbb09eaa66a468.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/report/reportInit.c | 5 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c index 2850f666e..8292cdeda 100644 --- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c +++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c @@ -97,7 +97,10 @@ uint32_t OpenLogFile(void) if (LogFileHandle->fsize < 100000) f_lseek(LogFileHandle, LogFileHandle->fsize); else + { f_lseek(LogFileHandle, 0); + f_truncate (LogFileHandle); + } len = usnprintf(RepMessage, 80, "\r\n*******\r\nLog File start %s %s",__DATE__, __TIME__); LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes ); ReportResetReason(); @@ -142,8 +145,6 @@ uint32_t LogToFile(char *message, /* The formatted message len = usnprintf(RepMessage, 300, "\r\nfile %s\t line %d\t code %d\t sev %d,\tparam %d,\t %s",FileName, LineNumber,errorCode, Severity, parameter,message); LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes ); - if (LogFileHandle->fsize > 100000) - f_lseek(LogFileHandle, 0); return LogFresult; #endif diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 4ced1e5fe..8b72c1a30 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -714,10 +714,6 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) { NormalizedError = (-1*NormalizedError); } -/*#ifdef BTSR_ROTATED_WINDER_TFU - if (index == WINDER_MOTOR) - TranslatedReadValue = (-1*TranslatedReadValue); -#endif*/ MotorControlConfig[index].m_mesuredParam = NormalizedError; DancerError[DancerId] = NormalizedError; |