diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-29 15:59:47 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-29 15:59:47 +0200 |
| commit | 227e1f5959eaae9c3bacfed34aa91c5dd6d5a46a (patch) | |
| tree | b673f0d6e1ff8c836ddba1733534a3798160c0cc /Software/Embedded_SW/Embedded/Communication | |
| parent | 4b789f33eadfc5cc1d937a80ce03ea8425955ffe (diff) | |
| download | Tango-227e1f5959eaae9c3bacfed34aa91c5dd6d5a46a.tar.gz Tango-227e1f5959eaae9c3bacfed34aa91c5dd6d5a46a.zip | |
disconnection on file analysis solved
Diffstat (limited to 'Software/Embedded_SW/Embedded/Communication')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Communication/Connection.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Communication/Container.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Communication/Connection.c b/Software/Embedded_SW/Embedded/Communication/Connection.c index b566aa0e0..2be123948 100644 --- a/Software/Embedded_SW/Embedded/Communication/Connection.c +++ b/Software/Embedded_SW/Embedded/Communication/Connection.c @@ -199,6 +199,8 @@ void KeepAliveOneSecondCall(void) { if (FileUploadGetState()==false) return; + if (FileAnalysisGetState()==true) + return; KeepAliveRequest1Second(); if (KeepAliveActive == false) return; diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c index d12d70aa2..b9580ef81 100644 --- a/Software/Embedded_SW/Embedded/Communication/Container.c +++ b/Software/Embedded_SW/Embedded/Communication/Container.c @@ -148,7 +148,7 @@ void receive_callback(char* buffer, size_t length) ReportWithPackageFilter(CommFilter,"Message received", __FILE__,__LINE__,requestContainer->type, RpMessage,length, 0); } #endif - if (requestContainer->type != MESSAGE_TYPE__KeepAliveRequest) + if ((requestContainer->type != MESSAGE_TYPE__KeepAliveRequest)||(requestContainer->type != MESSAGE_TYPE__KeepAliveResponse)) resetIdleCounter(); //ReportWithPackageFilter(CommFilter,"Message received", __FILE__,__LINE__,requestContainer->type, RpMessage,length, 0); KeepAliveOneSecondCounter = 0; |