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') 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 e04a5e74f41b182fa48a906fede8e2bca78d39ed Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 11 May 2020 08:39:56 +0300 Subject: Version 1.4.6.25 --- Software/Embedded_SW/Embedded/CheckSum/Checksum.c | 78 ---------------------- Software/Embedded_SW/Embedded/CheckSum/Checksum.h | 14 ---- .../Embedded/Common/CheckSum/Checksum.c | 78 ++++++++++++++++++++++ .../Embedded/Common/CheckSum/Checksum.h | 14 ++++ .../Embedded_SW/Embedded/Common/SW_Info/SW_Info.c | 2 +- 5 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 Software/Embedded_SW/Embedded/CheckSum/Checksum.c delete mode 100644 Software/Embedded_SW/Embedded/CheckSum/Checksum.h create mode 100644 Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.c create mode 100644 Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.h (limited to 'Software/Embedded_SW/Embedded/Common') diff --git a/Software/Embedded_SW/Embedded/CheckSum/Checksum.c b/Software/Embedded_SW/Embedded/CheckSum/Checksum.c deleted file mode 100644 index 391946698..000000000 --- a/Software/Embedded_SW/Embedded/CheckSum/Checksum.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Checksum.c - * - * Created on: May 7, 2020 - * Author: avi - */ - -#include -#include -#include "Include.h" - -//***************************************************************************** -// -//! CheckSum() Calculates an 8 bit checksum -//! -//! \param pui8Data is a pointer to an array of 8 bit data of size ui8Size. -//! \param ui8Size is the size of the array that will run through the checksum -//! algorithm. -//! -//! This function simply calculates an 8 bit checksum on the data passed in. -//! -//! \return The function returns the calculated checksum. -// -//***************************************************************************** -uint8_t -CheckSum8bit(uint8_t *pui8Data, uint8_t ui8Size) -{ - int32_t i; - uint8_t ui8CheckSum; - - ui8CheckSum = 0; - - for(i = 0; i < ui8Size; ++i) - { - ui8CheckSum += pui8Data[i]; - } - return(ui8CheckSum); -} - - -//***************************************************************************** -// -//! Calculates an 8-bit checksum -//! -//! \param pui8Data is a pointer to an array of 8-bit data of size ui32Size. -//! \param ui32Size is the size of the array that will run through the checksum -//! algorithm. -//! -//! This function simply calculates an 8-bit checksum on the data passed in. -//! -//! \return Returns the calculated checksum. -// -//***************************************************************************** -uint32_t -CheckSum32bit(const uint8_t *pui8Data, uint32_t ui32Size) -{ - uint32_t ui32CheckSum; - - // - // Initialize the checksum to zero. - // - ui32CheckSum = 0; - - // - // Add up all the bytes, do not do anything for an overflow. - // - while(ui32Size--) - { - ui32CheckSum += *pui8Data++; - } - - // - // Return the calculated check sum. - // - return(ui32CheckSum & 0xff); -} - - diff --git a/Software/Embedded_SW/Embedded/CheckSum/Checksum.h b/Software/Embedded_SW/Embedded/CheckSum/Checksum.h deleted file mode 100644 index 2d245f81a..000000000 --- a/Software/Embedded_SW/Embedded/CheckSum/Checksum.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Checksum.h - * - * Created on: May 7, 2020 - * Author: avi - */ - -#ifndef CHECKSUM_H_ -#define CHECKSUM_H_ - -uint8_t CheckSum8bit(uint8_t *pui8Data, uint8_t ui8Size); -uint32_t CheckSum32bit(const uint8_t *pui8Data, uint32_t ui32Size); - -#endif /* CHECKSUM_H_ */ diff --git a/Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.c b/Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.c new file mode 100644 index 000000000..391946698 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.c @@ -0,0 +1,78 @@ +/* + * Checksum.c + * + * Created on: May 7, 2020 + * Author: avi + */ + +#include +#include +#include "Include.h" + +//***************************************************************************** +// +//! CheckSum() Calculates an 8 bit checksum +//! +//! \param pui8Data is a pointer to an array of 8 bit data of size ui8Size. +//! \param ui8Size is the size of the array that will run through the checksum +//! algorithm. +//! +//! This function simply calculates an 8 bit checksum on the data passed in. +//! +//! \return The function returns the calculated checksum. +// +//***************************************************************************** +uint8_t +CheckSum8bit(uint8_t *pui8Data, uint8_t ui8Size) +{ + int32_t i; + uint8_t ui8CheckSum; + + ui8CheckSum = 0; + + for(i = 0; i < ui8Size; ++i) + { + ui8CheckSum += pui8Data[i]; + } + return(ui8CheckSum); +} + + +//***************************************************************************** +// +//! Calculates an 8-bit checksum +//! +//! \param pui8Data is a pointer to an array of 8-bit data of size ui32Size. +//! \param ui32Size is the size of the array that will run through the checksum +//! algorithm. +//! +//! This function simply calculates an 8-bit checksum on the data passed in. +//! +//! \return Returns the calculated checksum. +// +//***************************************************************************** +uint32_t +CheckSum32bit(const uint8_t *pui8Data, uint32_t ui32Size) +{ + uint32_t ui32CheckSum; + + // + // Initialize the checksum to zero. + // + ui32CheckSum = 0; + + // + // Add up all the bytes, do not do anything for an overflow. + // + while(ui32Size--) + { + ui32CheckSum += *pui8Data++; + } + + // + // Return the calculated check sum. + // + return(ui32CheckSum & 0xff); +} + + diff --git a/Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.h b/Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.h new file mode 100644 index 000000000..2d245f81a --- /dev/null +++ b/Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.h @@ -0,0 +1,14 @@ +/* + * Checksum.h + * + * Created on: May 7, 2020 + * Author: avi + */ + +#ifndef CHECKSUM_H_ +#define CHECKSUM_H_ + +uint8_t CheckSum8bit(uint8_t *pui8Data, uint8_t ui8Size); +uint32_t CheckSum32bit(const uint8_t *pui8Data, uint32_t ui32Size); + +#endif /* CHECKSUM_H_ */ diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c index 80b4719fb..86f8fecc1 100644 --- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c +++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c @@ -20,7 +20,7 @@ typedef struct } TangoVersion_t; -TangoVersion_t _gTangoVersion = {1,4,6,24}; +TangoVersion_t _gTangoVersion = {1,4,6,25}; #define BUILD_DATE __DATE__ char Dat[50] = BUILD_DATE; char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d -- 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') 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