some memory improvements. job resume fixed, preparation for new winder.

1 files changed, 11 insertions, 37 deletions

diff --git a/Software/Embedded_SW/Embedded/Embedded.cfg b/Software/Embedded_SW/Embedded/Embedded.cfg
index 599609b38..d41241553 100644
--- a/Software/Embedded_SW/Embedded/Embedded.cfg
+++ b/Software/Embedded_SW/Embedded/Embedded.cfg
@@ -17,7 +17,7 @@ var Task = xdc.useModule('ti.sysbios.knl.Task');
 
 BIOS.heapSize = 30767;   // bios heapmem
 //Memory.defaultHeapSize = 48767;
-Program.heap = 50000;  //sysmem
+Program.heap = 40000;  //sysmem
 
 Clock.timerId = 7;
 
@@ -56,6 +56,10 @@ var hwi6Params = new Hwi.Params();
 hwi6Params.instance.name = "timer1";
 Program.global.timer1 = Hwi.create(37, "&OneMilliSecondMillisecInterrupt", hwi6Params);
 
+var hwi17Params = new Hwi.Params();
+hwi17Params.instance.name = "timer3";
+hwi17Params.arg = 3;
+Program.global.timer3 = Hwi.create(51, "&ScrewTimerInterrupt", hwi17Params);
 
 /*
 var semaphore1Params = new Semaphore.Params();
@@ -107,12 +111,13 @@ Program.global.ReconnectSem = Semaphore.create(null, semaphore7Params);
 });*/
 var task8Params = new Task.Params();
 task8Params.instance.name = "MilliSecond";
+task8Params.stackSize = 2048;
 task8Params.priority = 12;
 Program.global.millisec = Task.create("&MillisecTask", task8Params);
 
 var task7Params = new Task.Params();
 task7Params.instance.name = "control";
-task7Params.stackSize = 4096;
+task7Params.stackSize = 2048;
 task7Params.priority = 11;
 Program.global.control = Task.create("&controlTask", task7Params);
 
@@ -129,7 +134,7 @@ Program.global.HeatersControl = Task.create("&HeatersControlTask", task9Params);
 
 var task5Params = new Task.Params();
 task5Params.instance.name = "process";
-task5Params.stackSize = 4096;
+task5Params.stackSize = 2048;
 task5Params.priority = 8;
 Program.global.process = Task.create("&jobTask", task5Params);
 
@@ -140,12 +145,13 @@ Program.global.communicationTx = Task.create("&communicationTxTask", task10Param
 
 var task12Params = new Task.Params();
 task12Params.instance.name = "AlarmHandling";
-task12Params.stackSize = 2048;
+task12Params.stackSize = 1024;
 task12Params.priority = 6;
 Program.global.AlarmHandling = Task.create("&AlarmHandlingTask", task12Params);
 
 var task0Params = new Task.Params();
 task0Params.instance.name = "adcProcess";
+task0Params.stackSize = 512;
 task0Params.priority = 6;
 Program.global.adcProcess = Task.create("&ADCProcessTask", task0Params);
 
@@ -160,38 +166,6 @@ task6Params.instance.name = "report";
 task6Params.priority = 3;
 Program.global.report = Task.create("&reportService", task6Params);
 
-/*var task3Params = new Task.Params();
-task3Params.instance.name = "update";
-task3Params.priority = 2;
-Program.global.update = Task.create("&updateTask", task3Params);
-
-var task4Params = new Task.Params();
-task4Params.instance.name = "Reconnect";
-task4Params.priority = 2;
-Program.global.Reconnect = Task.create("&ReconnectTask", task4Params);
-*/
-/* ================ NDK configuration ================ */
-/*var Ndk       = xdc.loadPackage('ti.ndk.config');
-var Global    = xdc.useModule('ti.ndk.config.Global');
-var Ip        = xdc.useModule('ti.ndk.config.Ip');
-var Udp       = xdc.useModule('ti.ndk.config.Udp');
-var Tcp       = xdc.useModule('ti.ndk.config.Tcp');
-
-Global.IPv6 = false;
-Global.stackLibType = Global.MIN;
-Global.networkOpenHook = "&netOpenHook";
-
-/* automatically call fdOpen/CloseSession for our sockets Task */
-/*Global.autoOpenCloseFD = true;
-
-Global.pktNumFrameBufs = 10;
-Global.memRawPageCount = 6;
-Global.ndkThreadStackSize = 2048;
-Global.lowTaskStackSize = 1024;
-Global.normTaskStackSize = 1024;
-Global.highTaskStackSize = 1024;
-Tcp.transmitBufSize = 1024;
-Tcp.receiveBufSize = 1024;
 /* ================ Text configuration ================ */
 var Text = xdc.useModule('xdc.runtime.Text');
 /*
@@ -251,4 +225,4 @@ Program.gen.debuggerFiles = false;
 Task.defaultStackSize = 1024;
 Task.idleTaskVitalTaskFlag = false;
 Task.enableIdleTask = false;
-Program.stack = 2048;
+Program.stack = 4096;