diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-12-17 09:41:17 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-12-17 09:41:17 +0200 |
| commit | fc23da7f3510cce58308841eefb96d59868317ff (patch) | |
| tree | 40307b75827593669f7cfeb498752601ea2a5ca6 /Software/Embedded_SW/Embedded/Common | |
| parent | dd8771c870ca1130b86f76e3b9c4e83cd50e5f26 (diff) | |
| download | Tango-fc23da7f3510cce58308841eefb96d59868317ff.tar.gz Tango-fc23da7f3510cce58308841eefb96d59868317ff.zip | |
Version 1.3.0.2 Reset Cause in log, remove some logs, improve memory on alarm handling. stop heaters and dispensers on alarm without job. split microsecond and control tasks to high and low priorities. Heaters PID with multiplications - use with new CFG.
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common')
3 files changed, 15 insertions, 3 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 2da8581c0..9749b7e71 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 = {001,002,002,000}; +TangoVersion_t _gTangoVersion = {001,003,000,002}; #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/Utils.c b/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c index 686bf9157..4dd705dc6 100644 --- a/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c +++ b/Software/Embedded_SW/Embedded/Common/Utilities/Utils.c @@ -16,7 +16,7 @@ static const float speedCoef = 5.3051647697298445256294587790838f;//(200 micro s //***************************************************************************** -#define MAX_MEM_LOG 300 +#define MAX_MEM_LOG 100 int freeIndex=0,malloc_index=0; uint32_t malloc_size[MAX_MEM_LOG+1]; uint32_t malloc_time[MAX_MEM_LOG+1]; diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c index 825c23082..850228ec9 100644 --- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c +++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c @@ -168,7 +168,19 @@ uint32_t ReportInitMessage(MessageContainer* requestContainer) if (ReportHandle == NULL) status |= 0x8; status |= ReportFunc(ReportResponseFunc , REPORT_ADD, ReportHandle); start_debug_log_request__free_unpacked(request,NULL); - LOG_ERROR(127,"test"); + /* + #define SYSCTL_CAUSE_HSRVREQ 0x00001000 // Hardware System Service Request + #define SYSCTL_CAUSE_HIB 0x00000040 // Hibernate reset + #define SYSCTL_CAUSE_WDOG1 0x00000020 // Watchdog 1 reset + #define SYSCTL_CAUSE_SW 0x00000010 // Software reset + #define SYSCTL_CAUSE_WDOG0 0x00000008 // Watchdog 0 reset + #define SYSCTL_CAUSE_BOR 0x00000004 // Brown-out reset + #define SYSCTL_CAUSE_POR 0x00000002 // Power on reset + #define SYSCTL_CAUSE_EXT 0x00000001 // External reset + */ + uint32_t RESC = SysCtlResetCauseGet (); + LOG_ERROR(RESC,"Reset Reason Register"); + SysCtlResetCauseClear(RESC); return status; } uint32_t StopReportInitMessage(MessageContainer* requestContainer) |