SchM: More mainfunctions added

diff --git a/system/SchM/SchM.c b/system/SchM/SchM.c
index a371d18008033b94ef8f008c968f66f0faafaf0e..1bae0464cd28f7b19850349aa0164e509dc6c887 100644 (file)
--- a/system/SchM/SchM.c
+++ b/system/SchM/SchM.c
@@ -303,6 +303,9 @@ SCHM_DECLARE(ECUM);
 SCHM_DECLARE(NVM);\r
 SCHM_DECLARE(FEE);\r
 SCHM_DECLARE(EA);\r
+SCHM_DECLARE(FLS);\r
+\r
+\r
 \r
 void SchM_Init( void ) {\r
 \r

diff --git a/system/SchM/SchM.h b/system/SchM/SchM.h
index 2447e8691ffae897131d1934226274244ad534e2..f1062ba9448b730ac04b68b7f3fc0c4d40946145 100644 (file)
--- a/system/SchM/SchM.h
+++ b/system/SchM/SchM.h
@@ -41,7 +41,7 @@ typedef struct  {
                SchM_InfoType SchM_Info_ ## _mod\r
 \r
 #define SCHM_MAINFUNCTION(_mod,_func) \\r
-               if( ++SchM_Info_ ## _mod.timer ==  SCHM_MAINFUNCTION_CYCLE_ ## _mod ) { \\r
+               if( (++SchM_Info_ ## _mod.timer % SCHM_MAINFUNCTION_CYCLE_ ## _mod )== 0 ) { \\r
                        _func; \\r
                        SchM_Info_ ## _mod.timer = 0; \\r
                }\r

diff --git a/system/SchM/SchM_EcuM.h b/system/SchM/SchM_EcuM.h
index 7345135d8012b896bdb4612db798525338948b14..0a8bc44f5441c95f5d4401e2a93356a2de58336a 100644 (file)
--- a/system/SchM/SchM_EcuM.h
+++ b/system/SchM/SchM_EcuM.h
@@ -33,7 +33,7 @@
 #define SchM_Enter_EcuM_0 DisableAllInterrupts\r
 #define SchM_Exit_EcuM_0  ResumeAllInterrupts\r
 \r
-#define SCHM_MAINFUNCTION_ECUM()       EcuM_MainFunction()\r
+#define SCHM_MAINFUNCTION_ECUM()       SCHM_MAINFUNCTION(ECUM,EcuM_MainFunction())\r
 \r
 \r
 /* Skip "instance", req INTEGR058 */\r

diff --git a/system/SchM/SchM_Fee.h b/system/SchM/SchM_Fee.h
index 85690174ebe2384ccc3c304f867c82ec392f8cf9..21712ab624e67cf94cbcd2bbe3e2f10bdb9cee0b 100644 (file)
--- a/system/SchM/SchM_Fee.h
+++ b/system/SchM/SchM_Fee.h
@@ -18,6 +18,6 @@
 #ifndef SCHM_FEE_H_\r
 #define SCHM_FEE_H_\r
 \r
-#define SCHM_MAINFUNCTION_FEE()        Fee_MainFunction()\r
+#define SCHM_MAINFUNCTION_FEE()        SCHM_MAINFUNCTION(FEE,Fee_MainFunction())\r
 \r
 #endif /* SCHM_FEE_H_ */\r

diff --git a/system/SchM/SchM_Fls.h b/system/SchM/SchM_Fls.h
index c7a3130c5267240f79632184efa1579882b0fab3..d125cf573ae590a76ec5938d05ba415c0a650aec 100644 (file)
--- a/system/SchM/SchM_Fls.h
+++ b/system/SchM/SchM_Fls.h
@@ -18,6 +18,6 @@
 #ifndef SCHM_FLS_H_\r
 #define SCHM_FLS_H_\r
 \r
-#define SCHM_MAINFUNCTION_FLS()        Fls_MainFunction()\r
+#define SCHM_MAINFUNCTION_FLS()        SCHM_MAINFUNCTION(FLS,Fls_MainFunction())\r
 \r
 #endif /* SCHM_FLS_H_ */\r

diff --git a/system/SchM/SchM_cfg.h b/system/SchM/SchM_cfg.h
index 3f4e17d1a0c308ddab938bf4e9634acc52fac630..4c418b24b421480ac3798427da5ed646c1813ca8 100644 (file)
--- a/system/SchM/SchM_cfg.h
+++ b/system/SchM/SchM_cfg.h
@@ -23,7 +23,7 @@
 /*\r
  * Scheduling BSW\r
  */\r
-#define SCHM_CYCLE_MAIN                                (5-1)\r
+#define SCHM_CYCLE_MAIN                                (5)\r
 \r
 #define SCHM_MAINFUNCTION_CYCLE_ADC     SCHM_CYCLE_MAIN\r
 #define SCHM_MAINFUNCTION_CYCLE_CAN     SCHM_CYCLE_MAIN\r