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.

1 files changed, 62 insertions, 60 deletions

diff --git a/Software/Embedded_SW/Embedded/Embedded.cfg b/Software/Embedded_SW/Embedded/Embedded.cfg
index 6ba47d133..4f2dfa09c 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;
 
@@ -109,74 +109,76 @@ Program.global.ReconnectSem = Semaphore.create(null, semaphore7Params);
    // deleteFxn: '&myDeleteFxn',
     switchFxn: '&mySwitchFxn'
 });*/
-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 = 2048;
-task7Params.priority = 11;
-Program.global.control = Task.create("&controlTask", task7Params);
+var MillisecTaskParams = new Task.Params();
+MillisecTaskParams.instance.name = "MilliSecond";
+MillisecTaskParams.stackSize = 2048;
+MillisecTaskParams.priority = 12;
+Program.global.millisec = Task.create("&MillisecTask", MillisecTaskParams);
 
-var task2Params = new Task.Params();
-task2Params.instance.name = "communication";
-task2Params.priority = 10;
-task2Params.stackSize = 8192;
-Program.global.communication = Task.create("&communicationTask", task2Params);
+var ControlTaskParams = new Task.Params();
+ControlTaskParams.instance.name = "control";
+ControlTaskParams.stackSize = 2048;
+ControlTaskParams.priority = 11;
+Program.global.control = Task.create("&controlTask", ControlTaskParams);
 
-var task9Params = new Task.Params();
-task9Params.instance.name = "HeatersControl";
-task9Params.priority = 9;
-Program.global.HeatersControl = Task.create("&HeatersControlTask", task9Params);
+var CommRxTaskParams = new Task.Params();
+CommRxTaskParams.instance.name = "communication";
+CommRxTaskParams.priority = 10;
+CommRxTaskParams.stackSize = 8192;
+Program.global.communication = Task.create("&communicationTask", CommRxTaskParams);
 
-var task5Params = new Task.Params();
-task5Params.instance.name = "process";
-task5Params.stackSize = 2048;
-task5Params.priority = 8;
-Program.global.process = Task.create("&jobTask", task5Params);
-/*
-var task8Params = new Task.Params();
-task8Params.instance.name = "MilliSecondLow";
-task8Params.stackSize = 2048;
-task8Params.priority = 7;
-Program.global.millisec = Task.create("&MillisecTask", task8Params);
+var HeaterControlTaskParams = new Task.Params();
+HeaterControlTaskParams.instance.name = "HeatersControl";
+HeaterControlTaskParams.priority = 9;
+Program.global.HeatersControl = Task.create("&HeatersControlTask", HeaterControlTaskParams);
 
-var task7Params = new Task.Params();
-task7Params.instance.name = "controlLow";
-task7Params.stackSize = 2048;
-task7Params.priority = 7;
-Program.global.control = Task.create("&controlTask", task7Params);
-*/
-var task10Params = new Task.Params();
-task10Params.instance.name = "communicationTx";
-task10Params.priority = 7;
-Program.global.communicationTx = Task.create("&communicationTxTask", task10Params);
+var ProcessTaskParams = new Task.Params();
+ProcessTaskParams.instance.name = "process";
+ProcessTaskParams.stackSize = 2048;
+ProcessTaskParams.priority = 8;
+Program.global.process = Task.create("&jobTask", ProcessTaskParams);
+
+var CommTxTaskParams = new Task.Params();
+CommTxTaskParams.instance.name = "communicationTx";
+CommTxTaskParams.priority = 7;
+CommTxTaskParams.stackSize = 4096;
+Program.global.communicationTx = Task.create("&communicationTxTask", CommTxTaskParams);
+
+var AlarmHandlingTaskParams = new Task.Params();
+AlarmHandlingTaskParams.instance.name = "AlarmHandling";
+AlarmHandlingTaskParams.stackSize = 1024;
+AlarmHandlingTaskParams.priority = 6;
+Program.global.AlarmHandling = Task.create("&AlarmHandlingTask", AlarmHandlingTaskParams);
+
+var MillisecLowTaskParams = new Task.Params();
+MillisecLowTaskParams.instance.name = "MilliSecondLow";
+MillisecLowTaskParams.stackSize = 2048;
+MillisecLowTaskParams.priority = 5;
+Program.global.millisecLow = Task.create("&MillisecLowTask", MillisecLowTaskParams);
 
-var task12Params = new Task.Params();
-task12Params.instance.name = "AlarmHandling";
-task12Params.stackSize = 1024;
-task12Params.priority = 6;
-Program.global.AlarmHandling = Task.create("&AlarmHandlingTask", task12Params);
+var ControlLowTaskParams = new Task.Params();
+ControlLowTaskParams.instance.name = "controlLow";
+ControlLowTaskParams.stackSize = 2048;
+ControlLowTaskParams.priority = 5;
+Program.global.controlLow = Task.create("&controlLowTask", ControlLowTaskParams);
 
-var task0Params = new Task.Params();
-task0Params.instance.name = "adcProcess";
-task0Params.stackSize = 512;
-task0Params.priority = 6;
-Program.global.adcProcess = Task.create("&ADCProcessTask", task0Params);
+var DiagnosticsTaskParams = new Task.Params();
+DiagnosticsTaskParams.instance.name = "Diagnostics";
+DiagnosticsTaskParams.priority = 4;
+DiagnosticsTaskParams.stackSize = 8192;
+Program.global.Diagnostics = Task.create("&DiagnosticsTask", DiagnosticsTaskParams);
 
-var task11Params = new Task.Params();
-task11Params.instance.name = "Diagnostics";
-task11Params.priority = 3;
-task11Params.stackSize = 8192;
-Program.global.Diagnostics = Task.create("&DiagnosticsTask", task11Params);
+var ADCProcessTaskParams = new Task.Params();
+ADCProcessTaskParams.instance.name = "adcProcess";
+ADCProcessTaskParams.stackSize = 512;
+ADCProcessTaskParams.priority = 3;
+Program.global.adcProcess = Task.create("&ADCProcessTask", ADCProcessTaskParams);
 
-var task6Params = new Task.Params();
-task6Params.instance.name = "report";
-task6Params.priority = 3;
-Program.global.report = Task.create("&reportService", task6Params);
+var ReportTaskParams = new Task.Params();
+ReportTaskParams.instance.name = "report";
+ReportTaskParams.priority = 3;
+Program.global.report = Task.create("&reportService", ReportTaskParams);
 
 var updateTaskParams = new Task.Params();
 updateTaskParams.instance.name = "update";