diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-06-30 10:07:12 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-06-30 10:07:12 +0300 |
| commit | 59487d307a565dfd6258beb0c348ef072fe6039e (patch) | |
| tree | 15177838bbc83b998395204d3c70821a7e18c75c /Software/Embedded_SW/Embedded/Common | |
| parent | 69355e96c90f1ae473421fd9c9d34b96e47fbeb3 (diff) | |
| parent | 2a72d2b881503a077670b3703a8f360294136ca0 (diff) | |
| download | Tango-59487d307a565dfd6258beb0c348ef072fe6039e.tar.gz Tango-59487d307a565dfd6258beb0c348ef072fe6039e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/Utilities/Update.c | 7 |
2 files changed, 8 insertions, 1 deletions
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. |