@@ -14,49 +14,29 @@ class LoadContainer {
1414 // constexpr uint_fast8_t NUM_MAIN_TASKS = 1;
1515 // Arduino Loop has priority 1
1616 // TODO: Note: Task priority must be < 25
17- etl::array<TaskInfo, NUM_MAIN_TASKS > mainTaskDescriptions = {
18- TaskInfo{vTaskUpdateFSM, " FSM" , 1024 , nullptr , 24 , nullptr , 0 ,
19- false }, // 0
20- TaskInfo{vTaskPollSensors, " Poll" , 2048 , nullptr , 20 , nullptr , 0 ,
21- false }, // 1
22- TaskInfo{vTaskAdjustLoad, " AdLd" , 2048 , nullptr , 20 , nullptr , 0 ,
23- false }, // 2
24- TaskInfo{vTaskRecvData, " Recv" , 2048 , nullptr , 15 , nullptr , 0 ,
25- false }, // 3
2617
27- TaskInfo{vTaskSendData, " Send" , 2048 , nullptr , 15 , nullptr , 0 ,
28- false }, // 4
29- TaskInfo{vTaskConfigure, " Cfg" , 1024 , nullptr , 10 , nullptr , 0 ,
30- false }, // 5
31- TaskInfo{vTaskStatusLED, " LED" , 2048 , nullptr , 2 , nullptr , 0 ,
32- false }, // 6
33- TaskInfo{vTLog, " Log" , 4096 , nullptr , 1 , nullptr , 0 , false } // 7
34- };
18+ TaskInfo tFSM{vTaskUpdateFSM, " FSM" , 1024 , nullptr , 24 , nullptr , 0 , false };
19+ TaskInfo tPoll{vTaskPollSensors, " Poll" , 2048 , nullptr , 20 ,
20+ nullptr , 0 , false };
21+ TaskInfo tAdjustLoad{vTaskAdjustLoad, " AdLd" , 2048 , nullptr , 20 ,
22+ nullptr , 0 , false };
23+ TaskInfo tRecv{vTaskRecvData, " Recv" , 2048 , nullptr , 15 , nullptr , 0 , false };
3524
36- etl::array< TaskInfo, NUM_OPTIONAL_TASKS > optionalTaskDescriptions = {
37- TaskInfo{vTaskTelnet , " Telnet " , 4096 , nullptr , 1 , nullptr , 0 ,
38- false }, // 0
39- TaskInfo{vTaskOTA , " OTA " , 4096 , nullptr , 1 , nullptr , 0 , false }, // 1
40- };
25+ TaskInfo tSend{vTaskSendData, " Send " , 2048 , nullptr , 15 , nullptr , 0 , false };
26+ TaskInfo tCfg{vTaskConfigure , " Cfg " , 1024 , nullptr , 10 , nullptr , 0 , false };
27+ TaskInfo tLED{vTaskStatusLED, " LED " , 2048 , nullptr , 2 , nullptr , 0 , false };
28+ TaskInfo tLog{vTLog , " Log " , 4096 , nullptr , 1 , nullptr , 0 , false };
29+ // namespace TaskInfo
4130
42- /* *
43- * @SupressWarnings("cpp:S3642") // Does not work
44- */
45- enum TASK_IDS : uint_fast8_t { // NOSONAR
46- TID_FSM = 0 ,
47- TID_POLL ,
48- TID_ADJUST_LOAD ,
49- TID_RECV ,
50- TID_SEND ,
51- TID_CFG ,
52- TID_LED ,
53- TID_LOG
54- };
31+ etl::array<TaskInfo *, NUM_MAIN_TASKS > mainTaskDescriptions = {
32+ &tFSM, &tPoll, &tAdjustLoad, &tRecv, &tSend, &tCfg, &tLED, &tLog};
5533
56- enum OPT_TASK_IDS : uint_fast8_t { // NOSONAR
57- TID_TELNET = 0 ,
58- TID_OTA
59- };
34+ TaskInfo tTelnet{vTaskTelnet, " Telnet" , 4096 , nullptr ,
35+ 1 , nullptr , 0 , false };
36+ TaskInfo tOTA{vTaskOTA, " OTA" , 4096 , nullptr , 1 , nullptr , 0 , false };
37+
38+ etl::array<TaskInfo *, NUM_OPTIONAL_TASKS > optionalTaskDescriptions = {
39+ &tTelnet, &tOTA};
6040
6141 LoadContainer (MCP23008T &loadDevice) : loadDevice(loadDevice) {}
6242 ~LoadContainer () = default ;
0 commit comments