aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Common
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-05-10 14:50:37 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-05-10 14:50:37 +0300
commitf82ae06fbae6d69ea493906feb5ac13b57472b9d (patch)
tree0b3c24f69ef85ea590cae7db4b97ca9db9caca3d /Software/Embedded_SW/Embedded/Common
parente5200c6ba6a1b13525cc1261992ad61b03f93951 (diff)
downloadTango-f82ae06fbae6d69ea493906feb5ac13b57472b9d.tar.gz
Tango-f82ae06fbae6d69ea493906feb5ac13b57472b9d.zip
MERGE
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common')
-rw-r--r--Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c2
-rw-r--r--Software/Embedded_SW/Embedded/Common/Utilities/Utils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index 1cf86c705..4acfe8d4c 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -188,7 +188,7 @@ uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer)
status = ERROR_CODE__FILE_NOT_FOUND;
}*/
- responseContainer = createContainer(MESSAGE_TYPE__FileChunkUploadResponse, requestContainer->token, false, &response, &file_chunk_upload_response__pack, &file_chunk_upload_response__get_packed_size);
+ responseContainer = createContainer(MESSAGE_TYPE__FileChunkUploadResponse, requestContainer->token, FileDone, &response, &file_chunk_upload_response__pack, &file_chunk_upload_response__get_packed_size);
if (Fresult!= OK)
{
responseContainer.error = getErrorCode(Fresult);
diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c b/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c
index 078aa5f53..341a43704 100644
--- a/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c
+++ b/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c
@@ -43,7 +43,7 @@ void *my_malloc(size_t _size)
malloc_time[malloc_index] = msec_millisecondCounter;
}
*/
- if (addr)
+ if ((addr)&&(_size>400))
{
malloc_addr[malloc_index] = addr;
malloc_size[malloc_index] = _size;