EcuM: More SchM,Gpt stuff

[arc.git] / system / SchM / SchM.c

diff --git a/system/SchM/SchM.c b/system/SchM/SchM.c
index 655b8c74b9ef1860dd5d68980e54ea5db43e21ee..cab78fc70ca956dc146a49a76512508c6f1100d1 100644 (file)
--- a/system/SchM/SchM.c
+++ b/system/SchM/SchM.c
@@ -314,6 +314,8 @@ SCHM_DECLARE(NVM);
 SCHM_DECLARE(FEE);\r
 SCHM_DECLARE(EA);\r
 SCHM_DECLARE(FLS);\r
+SCHM_DECLARE(WDGM_TRIGGER);\r
+SCHM_DECLARE(WDGM_ALIVESUPERVISION);\r
 \r
 \r
 \r
@@ -346,8 +348,6 @@ TASK(SchM_Startup){
 \r
        /* At this point EcuM ==  ECUM_STATE_STARTUP_ONE */\r
 \r
-       /* Schedule memory task more often that usaul so that EcuM_StartupTwo() may return quicker */\r
-       ActivateTask(TASK_ID_SchM_BswService);\r
        /* Set events on TASK_ID_BswService_Mem */\r
        SetRelAlarm(ALARM_ID_Alarm_BswService, 10, 2);\r
 \r
@@ -360,6 +360,7 @@ TASK(SchM_Startup){
        EcuM_StartupTwo();\r
 \r
        /* Start to schedule BSW parts */\r
+       CancelAlarm(ALARM_ID_Alarm_BswService);\r
        SetRelAlarm(ALARM_ID_Alarm_BswService, 10, 5);\r
 \r
        EcuM_RequestRUN(ECUM_USER_User_1);\r
@@ -408,7 +409,8 @@ TASK(SchM_BswService) {
                SCHM_MAINFUNCTION_NM();\r
                SCHM_MAINFUNCTION_CANNM();\r
                SCHM_MAINFUNCTION_CANSM();\r
-               SCHM_MAINFUNCTION_WDMG();\r
+               SCHM_MAINFUNCTION_WDGM_TRIGGER();\r
+               SCHM_MAINFUNCTION_WDGM_ALIVESUPERVISION();\r
                break;\r
        }\r
 \r