Version 1.4.0.4: Improved memory handling, handles SW crash after a job failure

1 files changed, 9 insertions, 41 deletions

diff --git a/Software/Embedded_SW/Embedded/Embedded.cfg b/Software/Embedded_SW/Embedded/Embedded.cfg
index 5dd991512..c50a0057a 100644
--- a/Software/Embedded_SW/Embedded/Embedded.cfg
+++ b/Software/Embedded_SW/Embedded/Embedded.cfg
@@ -5,19 +5,22 @@ var SysMin = xdc.useModule('xdc.runtime.SysMin');
 var System = xdc.useModule('xdc.runtime.System');
 var Error = xdc.useModule('xdc.runtime.Error');
 var ti_sysbios_hal_Hwi = xdc.useModule('ti.sysbios.hal.Hwi');
-var Memory = xdc.useModule('xdc.runtime.Memory');
 var Timestamp = xdc.useModule('xdc.runtime.Timestamp');
 var TimestampProvider = xdc.useModule('ti.sysbios.family.arm.lm4.TimestampProvider');
 var SyncGeneric = xdc.useModule('xdc.runtime.knl.SyncGeneric');
 var Mailbox = xdc.useModule('ti.sysbios.knl.Mailbox');
-var HeapStd = xdc.useModule('xdc.runtime.HeapStd');
+//var HeapStd = xdc.useModule('xdc.runtime.HeapStd');
 var GIO = xdc.useModule('ti.sysbios.io.GIO');
 var Semaphore = xdc.useModule('ti.sysbios.knl.Semaphore');
 var Task = xdc.useModule('ti.sysbios.knl.Task');
+//var HeapMem = xdc.useModule('ti.sysbios.heaps.HeapMem');
+var HeapTrack = xdc.useModule('ti.sysbios.heaps.HeapTrack');
+//var Memory = xdc.useModule('xdc.runtime.Memory');
 
-BIOS.heapSize = 30767;   // bios heapmem
-//Memory.defaultHeapSize = 48767;
-Program.heap = 50000;  //sysmem
+BIOS.heapSize = 50000;   // bios heapmem
+//Memory.defaultHeapSize = 20000;
+//Program.heap = 40000;
+//Program.stack = 4096;
 
 Clock.timerId = 7;
 
@@ -27,15 +30,7 @@ Program.global.adcHwi = Hwi.create(30, "&ADC0SS0Handler", hwi0Params);
 var hwi1Params = new Hwi.Params();
 hwi1Params.instance.name = "sysTick";
 Program.global.sysTick = Hwi.create(15, "&SysTickHandler", hwi1Params);
-/*var hwi2Params = new Hwi.Params();
-hwi2Params.instance.name = "UART0";
-Program.global.uart0 = Hwi.create(21, "&USB0Handler", hwi2Params);
-*/
-/*
-var hwi21Params = new Hwi.Params();
-hwi21Params.instance.name = "portpint";
-Program.global.portpint = Hwi.create(92, "&PortPIntHandler", hwi21Params);
-*/
+
 var hwi13Params = new Hwi.Params();
 hwi13Params.instance.name = "timer0";
 hwi13Params.priority = 128;
@@ -51,10 +46,6 @@ hwi15Params.arg = 2;
 hwi15Params.priority = 160;
 Program.global.timer2 = Hwi.create(39, "&EightMilliSecondHeatersInterrupt", hwi15Params);
 
-/*var hwi5Params = new Hwi.Params();
-hwi5Params.instance.name = "usb0";
-Program.global.usb0 = Hwi.create(58, "&USBCDCD_hwiHandler", hwi5Params);*/
-
 var hwi6Params = new Hwi.Params();
 hwi6Params.instance.name = "timer1";
 hwi6Params.priority = 128;
@@ -66,33 +57,11 @@ hwi17Params.arg = 3;
 hwi17Params.priority = 96;
 Program.global.timer3 = Hwi.create(51, "&ScrewTimerInterrupt", hwi17Params);
 
-/*
-var semaphore1Params = new Semaphore.Params();
-semaphore1Params.instance.name = "messageSem";
-semaphore1Params.mode = Semaphore.Mode_BINARY;
-Program.global.messageSem = Semaphore.create(null, semaphore1Params);
-
-var semaphore2Params = new Semaphore.Params();
-semaphore2Params.instance.name = "selfCheckSem";
-semaphore2Params.mode = Semaphore.Mode_BINARY;
-Program.global.selfCheckSem = Semaphore.create(null, semaphore2Params);
-
-*/
 var semaphore4Params = new Semaphore.Params();
 semaphore4Params.instance.name = "initConnectionSem";
 semaphore4Params.mode = Semaphore.Mode_BINARY;
 Program.global.initConnectionSem = Semaphore.create(null, semaphore4Params);
-/*
-var semaphore5Params = new Semaphore.Params();
-semaphore5Params.instance.name = "uart7Sem";
-semaphore5Params.mode = Semaphore.Mode_BINARY;
-Program.global.uart7Sem = Semaphore.create(null, semaphore5Params);
 
-var semaphore6Params = new Semaphore.Params();
-semaphore6Params.instance.name = "ethernetSem";
-semaphore6Params.mode = Semaphore.Mode_BINARY;
-Program.global.ethernetSem = Semaphore.create(null, semaphore6Params);
-*/
 var semaphore0Params = new Semaphore.Params();
 semaphore0Params.instance.name = "adcResultSem";
 semaphore0Params.mode = Semaphore.Mode_BINARY;
@@ -267,4 +236,3 @@ Program.gen.debuggerFiles = false;
 Task.defaultStackSize = 1024;
 Task.idleTaskVitalTaskFlag = false;
 Task.enableIdleTask = false;
-Program.stack = 4096;