From fa3f933179443f7f50b321e1730f363ae60a6c14 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 27 Jun 2019 19:02:38 +0300 Subject: Embedded SW Release note - Version 1.4.1.0 ============================================================= Move to length calculation FROM PULLER fix intersegment handling FLASH - rebuilt. using data from flash instead of FFS DFU fixed. Heaters handling fixed. job starts only in proximity to requested temperature --- Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c | 2 +- Software/Embedded_SW/Embedded/Common/Utilities/Update.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'Software/Embedded_SW/Embedded/Common') 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 f0ee0af19..7fbc9acc8 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,0,9}; +TangoVersion_t _gTangoVersion = {1,4,1,0}; #define BUILD_DATE __DATE__ char Dat[50] = BUILD_DATE; char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/Update.c b/Software/Embedded_SW/Embedded/Common/Utilities/Update.c index 422c1632b..c2aad92f1 100644 --- a/Software/Embedded_SW/Embedded/Common/Utilities/Update.c +++ b/Software/Embedded_SW/Embedded/Common/Utilities/Update.c @@ -31,6 +31,13 @@ void UpdateUsb(void) // Disable all interrupts. // ROM_IntMasterDisable(); +#ifdef WATCHDOG + //ROM_WatchdogResetDisable(WATCHDOG0_BASE); + //ROM_WatchdogReloadSet(WATCHDOG0_BASE, 120000000*35); +#endif + ControlStop(); + MillisecStop(); + HeatersEnd(); // // Disable SysTick and its interrupt. -- cgit v1.3.1