EcuM: More SchM,Gpt stuff

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

diff --git a/system/SchM/SchM.c b/system/SchM/SchM.c
index 1bae0464cd28f7b19850349aa0164e509dc6c887..cab78fc70ca956dc146a49a76512508c6f1100d1 100644 (file)
--- a/system/SchM/SchM.c
+++ b/system/SchM/SchM.c
@@ -147,8 +147,6 @@
 #if defined(USE_PDUR)\r
 #include "PduR.h"\r
 #include "SchM_PduR.h"\r
-#else\r
-#define SCHM_MAINFUNCTION_PDUR()\r
 #endif\r
 \r
 #if defined(USE_COM)\r
@@ -191,8 +189,6 @@
 #if defined(USE_PWM)\r
 #include "Pwm.h"\r
 #include "SchM_Pwm.h"\r
-#else\r
-#define SCHM_MAINFUNCTION_PWM()\r
 #endif\r
 \r
 \r
@@ -299,11 +295,27 @@
 #define SCHM_MAINFUNCTION_WDMG()\r
 #endif\r
 \r
+SCHM_DECLARE(CAN_WRITE);\r
+SCHM_DECLARE(CAN_READ);\r
+SCHM_DECLARE(CAN_BUSOFF);\r
+SCHM_DECLARE(CAN_WAKEUP);\r
+SCHM_DECLARE(CAN_ERROR);\r
+SCHM_DECLARE(COMRX);\r
+SCHM_DECLARE(COMTX);\r
+SCHM_DECLARE(CANTP);\r
+SCHM_DECLARE(CANNM);\r
+SCHM_DECLARE(DCM);\r
+SCHM_DECLARE(DEM);\r
+SCHM_DECLARE(COMM);\r
+SCHM_DECLARE(NM);\r
+SCHM_DECLARE(CANSM);\r
 SCHM_DECLARE(ECUM);\r
 SCHM_DECLARE(NVM);\r
 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
@@ -336,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
@@ -350,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
@@ -384,7 +395,6 @@ TASK(SchM_BswService) {
                SCHM_MAINFUNCTION_CAN_ERROR();\r
                SCHM_MAINFUNCTION_CAN_WAKEUP();\r
 \r
-               SCHM_MAINFUNCTION_PDUR();\r
 \r
                SCHM_MAINFUNCTION_COMRX();\r
                SCHM_MAINFUNCTION_COMTX();\r
@@ -393,13 +403,14 @@ TASK(SchM_BswService) {
                SCHM_MAINFUNCTION_J1939TP();\r
                SCHM_MAINFUNCTION_DCM();\r
                SCHM_MAINFUNCTION_DEM();\r
-               SCHM_MAINFUNCTION_PWM();\r
+\r
                SCHM_MAINFUNCTION_IOWHAB();\r
                SCHM_MAINFUNCTION_COMM();\r
                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