From c072840a7e3f4530afb55aaad1f81e4ae8667e8b Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Sun, 10 May 2020 18:35:12 +0300 Subject: bug fixes and investigations. IFS brushstop closing, waste tank diagnostics, heaters hangout handling --- Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c') diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index feac91829..0fbe1cc0d 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -194,16 +194,19 @@ uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer) else { FileReceivedLength += WrittenBytes; - ReportWithPackageFilter(CommFilter,"Chunk received", __FILE__,WrittenBytes,FileReceivedLength, RpMessage,msec_millisecondCounter-save_milisec, 0); + ReportWithPackageFilter(CommFilter,"Chunk received", __FILE__,FileLength,FileReceivedLength, RpMessage,msec_millisecondCounter-save_milisec, 0); //REPORT_MSG (FileReceivedLength,"file upload chunk"); if (FileReceivedLength == FileLength) { - REPORT_MSG (FileReceivedLength,"file upload ended successfully"); + REPORT_MSG (FileReceivedLength,"file upload ended successfully 111"); + STATUS_RED_LED_ON; f_close(ReceivedFileHandle); my_free (UploadFileHandle); UploadFileHandle = 0; FileReceivedLength = 0; + STATUS_RED_LED_OFF; + REPORT_MSG (FileReceivedLength,"file upload ended successfully 222"); FileDone = true; } else @@ -211,6 +214,7 @@ uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer) if (FileReceivedLength > FileLength) { REPORT_MSG (FileReceivedLength,"file upload too much data!"); + Task_setPri(CommRxTaskHandle, 9); f_close(ReceivedFileHandle); my_free (UploadFileHandle); UploadFileHandle = 0; @@ -237,9 +241,9 @@ uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer) SendCharsWithType(container_buffer, container_size,MESSAGE_TYPE__FileChunkUploadResponse); if (FileDone == true) { - Task_setPri(CommRxTaskHandle, 9); Semaphore_post(FFS_Sem); - //Report("Task_setPri", __FILE__, __LINE__, 9, RpWarning, (int)CommRxTaskHandle, 0); + Task_setPri(CommRxTaskHandle, 9); + Report("Task_setPri", __FILE__, __LINE__, 9, RpWarning, (int)CommRxTaskHandle, 0); } return OK; } -- cgit v1.3.1 From 995fa3bfa4536e0462e42231328855d2e1a6bfda Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 11 May 2020 10:35:56 +0300 Subject: Version 1.4.6.25 release notes (pack 2) --- .../Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c | 10 +++------- Software/Embedded_SW/Embedded/Software Release Notes.txt | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c') diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index 0fbe1cc0d..84d8fa725 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -199,14 +199,11 @@ uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer) //REPORT_MSG (FileReceivedLength,"file upload chunk"); if (FileReceivedLength == FileLength) { - REPORT_MSG (FileReceivedLength,"file upload ended successfully 111"); - STATUS_RED_LED_ON; + REPORT_MSG (FileReceivedLength,"file upload ended successfully"); f_close(ReceivedFileHandle); my_free (UploadFileHandle); UploadFileHandle = 0; FileReceivedLength = 0; - STATUS_RED_LED_OFF; - REPORT_MSG (FileReceivedLength,"file upload ended successfully 222"); FileDone = true; } else @@ -214,7 +211,6 @@ uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer) if (FileReceivedLength > FileLength) { REPORT_MSG (FileReceivedLength,"file upload too much data!"); - Task_setPri(CommRxTaskHandle, 9); f_close(ReceivedFileHandle); my_free (UploadFileHandle); UploadFileHandle = 0; @@ -241,9 +237,9 @@ uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer) SendCharsWithType(container_buffer, container_size,MESSAGE_TYPE__FileChunkUploadResponse); if (FileDone == true) { - Semaphore_post(FFS_Sem); Task_setPri(CommRxTaskHandle, 9); - Report("Task_setPri", __FILE__, __LINE__, 9, RpWarning, (int)CommRxTaskHandle, 0); + Semaphore_post(FFS_Sem); + //Report("Task_setPri", __FILE__, __LINE__, 9, RpWarning, (int)CommRxTaskHandle, 0); } return OK; } diff --git a/Software/Embedded_SW/Embedded/Software Release Notes.txt b/Software/Embedded_SW/Embedded/Software Release Notes.txt index 20bf32db7..389d0a790 100644 --- a/Software/Embedded_SW/Embedded/Software Release Notes.txt +++ b/Software/Embedded_SW/Embedded/Software Release Notes.txt @@ -1,3 +1,18 @@ +Embedded SW Release note - Version 1.4.6.25 - Pack 2 +============================================================= +dispenser EEPROM read/write from stub +power up interface - progress report and error codes +job preparation (file analysis) in lower priority to avoid overheating in large files +bug fix in millisec task +diagnostics - waste level(in chiller temperature) +dispenser/motor homing real progress report +fix bugs in hw version support (discovered by Ori) +improve heaters tracking +improve thread loading error handling +integrate new waste tank level info in the WHS module +drivers: bug fixes, waste level and gas sensor, head type identification according to EEPROM, fix blower flow and control, whs gpio, + + Embedded SW Release note - Version 1.4.6.21 - Pack 1++ ============================================================= File system improved -- cgit v1.3.1