Generated and built in-tree examples with stm3210c and tested

diff --git a/boards/stm32_stm3210c/examples/com_simple/build_config.mk b/boards/stm32_stm3210c/examples/com_simple/build_config.mk
index adddeda1845936521557830dae69c82d00d33ac3..c3e5fd22ec4f10fd77d037c79913fc1bdd02bb6c 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/build_config.mk
+++ b/boards/stm32_stm3210c/examples/com_simple/build_config.mk
@@ -9,8 +9,6 @@ REQUIRED_BUILD_SYSTEM_VERSION=1.0.0
 \r
 # Project settings\r
 \r
-MOD_USE += MCU KERNEL ECUM DET\r
-\r
 SELECT_CONSOLE = RAMLOG\r
 \r
 SELECT_OPT = OPT_DEBUG \r

diff --git a/boards/stm32_stm3210c/examples/com_simple/com_simple_stm3210c.arxml b/boards/stm32_stm3210c/examples/com_simple/com_simple_stm3210c.arxml
index 51013c1d1b3e6a3413e4d6b88baebd14d30e03f8..a5d275c77a5fac723af29c043d6de60d17aea633 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/com_simple_stm3210c.arxml
+++ b/boards/stm32_stm3210c/examples/com_simple/com_simple_stm3210c.arxml
@@ -13,7 +13,7 @@
             <SDGS>\r
               <SDG GID="Arccore::EcuOptions">\r
                 <SD GID="MCU">STM32_F107</SD>\r
-                <SD GID="GENDIR">${PROJECT_LOC}/config</SD>\r
+                <SD GID="GENDIR">${fileDir}/config</SD>\r
               </SDG>\r
             </SDGS>\r
           </ADMIN-DATA>\r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/CanIf_Cfg.c b/boards/stm32_stm3210c/examples/com_simple/config/CanIf_Cfg.c
index 659d6c7e69a5aba9ce2becd2b46ec976a6146dac..655e53bb431bd6d0f18ee6dbd8cb81c60a5c2a6b 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/CanIf_Cfg.c
+++ b/boards/stm32_stm3210c/examples/com_simple/config/CanIf_Cfg.c
@@ -7,10 +7,9 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.5\r
+* Generator version:       2.0.6\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:32 CEST 2011\r
 */\r
 \r
 \r
@@ -20,6 +19,10 @@
 #include "CanTp.h"\r
 #include "CanTp_Cbk.h"\r
 #endif\r
+#if defined(USE_J1939TP)\r
+#include "J1939Tp.h"\r
+#include "J1939Tp_Cbk.h"\r
+#endif\r
 #if defined(USE_PDUR)\r
 #include "PduR.h"\r
 #endif\r
@@ -136,7 +139,6 @@ const CanIf_RxPduConfigType CanIfRxPduConfigData[] = {
 #if ( CANIF_READTXPDU_NOTIFY_STATUS_API == STD_ON )\r
     .CanIfReadRxPduNotifyStatus = false, \r
 #endif\r
-       .CanIfRxPduIdCanIdType = CANIF_CAN_ID_TYPE_11,\r
        .CanIfRxUserType = CANIF_USER_TYPE_CAN_PDUR,\r
     .CanIfCanRxPduHrhRef = &CanIfHrhConfigData_Hoh[0],\r
     .CanIfRxPduIdCanIdType = CANIF_CAN_ID_TYPE_11,\r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/CanIf_Cfg.h b/boards/stm32_stm3210c/examples/com_simple/config/CanIf_Cfg.h
index 72c1cee72a1b28711d84aca44e27a970bd7fb45c..65790e70403c8253c38563fd6dc1a3136fca6a0b 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/CanIf_Cfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/CanIf_Cfg.h
@@ -7,10 +7,9 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.5\r
+* Generator version:       2.0.6\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:31 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/CanIf_SpecialPdus.h b/boards/stm32_stm3210c/examples/com_simple/config/CanIf_SpecialPdus.h
index 982b0aa11f5e2fac8c9348292b37bdeb205a3d26..71fda36a61dd21e3f72390c06c9d1f0419950561 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/CanIf_SpecialPdus.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/CanIf_SpecialPdus.h
@@ -7,10 +7,9 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.5\r
+* Generator version:       2.0.6\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:32 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Can_Cfg.h b/boards/stm32_stm3210c/examples/com_simple/config/Can_Cfg.h
index 666eee1650a4e567ff5df8f8c92344c866c8cfb2..bf6da4be0520d6010a861ee0ff35148d9bed2fe3 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Can_Cfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Can_Cfg.h
@@ -10,7 +10,6 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:36 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Can_Lcfg.c b/boards/stm32_stm3210c/examples/com_simple/config/Can_Lcfg.c
index 03ecf39ec15c2421b7124dd5ba7ddf3942ef505d..9f4a8b42280c3462a7906638499ef65e69e027e0 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Can_Lcfg.c
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Can_Lcfg.c
@@ -10,7 +10,6 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:36 CEST 2011\r
 */\r
 \r
        \r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Com_Cfg.h b/boards/stm32_stm3210c/examples/com_simple/config/Com_Cfg.h
index c048fa27e2443abf0a7d866dc6f5de06dc9d6e79..9c233d81a38fe3339fca2f939b28ad9717435031 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Com_Cfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Com_Cfg.h
@@ -7,10 +7,9 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.5\r
+* Generator version:       2.0.7\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:32 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Com_PbCfg.c b/boards/stm32_stm3210c/examples/com_simple/config/Com_PbCfg.c
index a66252dadee2e54bb580869a70faf3cb96c27219..8a43aad1d85c4633a0f1504ef18f9c9931e18398 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Com_PbCfg.c
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Com_PbCfg.c
@@ -7,10 +7,9 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.5\r
+* Generator version:       2.0.7\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:32 CEST 2011\r
 */\r
 \r
 \r
@@ -47,12 +46,23 @@ const ComGroupSignal_type ComGroupSignal[] = {
 \r
 /* SignalGroup GroupSignals lists. */\r
 \r
+\r
+/* IPdu buffers and signal group buffers */\r
+uint8 ComArcIPduBuffer_CanDB_Message_1[8];\r
+uint8 ComArcIPduDeferredRxBuffer_CanDB_Message_1[8]; \r
+          \r
+uint8 ComArcIPduBuffer_CanDB_Message_2[8]; \r
+          \r
+\r
 /*\r
  * Signal definitions\r
  */\r
+ \r
 const ComSignal_type ComSignal[] = {\r
        {\r
                .ComHandleId = CanDB_Signal_32_21_BE_Tester,\r
+               .ComIPduHandleId = 0,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -77,6 +87,8 @@ const ComSignal_type ComSignal[] = {
        },\r
        {\r
                .ComHandleId = CanDB_Signal_1_4_LE_Tester,\r
+               .ComIPduHandleId = 0,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -101,6 +113,8 @@ const ComSignal_type ComSignal[] = {
        },\r
        {\r
                .ComHandleId = CanDB_Signal_45_12_LE_Tester,\r
+               .ComIPduHandleId = 0,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -125,6 +139,8 @@ const ComSignal_type ComSignal[] = {
        },\r
        {\r
                .ComHandleId = CanDB_Signal_29_12_BE_Tester,\r
+               .ComIPduHandleId = 0,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -149,6 +165,8 @@ const ComSignal_type ComSignal[] = {
        },\r
        {\r
                .ComHandleId = CanDB_Signal_32_21_BE,\r
+               .ComIPduHandleId = 1,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -173,6 +191,8 @@ const ComSignal_type ComSignal[] = {
        },\r
        {\r
                .ComHandleId = CanDB_Signal_1_4_LE,\r
+               .ComIPduHandleId = 1,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -197,6 +217,8 @@ const ComSignal_type ComSignal[] = {
        },\r
        {\r
                .ComHandleId = CanDB_Signal_45_12_LE,\r
+               .ComIPduHandleId = 1,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -221,6 +243,8 @@ const ComSignal_type ComSignal[] = {
        },\r
        {\r
                .ComHandleId = CanDB_Signal_29_12_BE,\r
+               .ComIPduHandleId = 1,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -292,11 +316,13 @@ const ComIPdu_type ComIPdu[] = {
        { // CanDB_Message_1\r
                .ArcIPduOutgoingId = PDUR_REVERSE_PDU_ID_CanDB_Message_1,\r
                .ComIPduCallout = NULL,\r
+               \r
                .ComIPduSignalProcessing =  DEFERRED,\r
                .ComIPduSize =  8,\r
                .ComIPduDirection = RECEIVE,\r
                .ComIPduGroupRef = CanDbImportedPdus,\r
                \r
+               .ComIPduDeferredDataPtr = ComArcIPduDeferredRxBuffer_CanDB_Message_1,\r
                .ComTxIPdu = {\r
                        .ComTxIPduMinimumDelayFactor = 0,\r
                        .ComTxIPduUnusedAreasDefault = 0,\r
@@ -309,17 +335,21 @@ const ComIPdu_type ComIPdu[] = {
                        },\r
                },\r
                \r
+               .ComIPduDataPtr = ComArcIPduBuffer_CanDB_Message_1,             \r
                .ComIPduSignalRef = ComIPduSignalRefs_CanDB_Message_1,\r
+               .ComIPduDynSignalRef = 0,\r
                .Com_Arc_EOL = 0\r
        },   \r
        { // CanDB_Message_2\r
                .ArcIPduOutgoingId = PDUR_PDU_ID_CanDB_Message_2,\r
                .ComIPduCallout = NULL,\r
+               \r
                .ComIPduSignalProcessing =  DEFERRED,\r
                .ComIPduSize =  8,\r
                .ComIPduDirection = SEND,\r
                .ComIPduGroupRef = CanDbImportedPdus,\r
                \r
+               .ComIPduDeferredDataPtr = 0,            \r
                .ComTxIPdu = {\r
                        .ComTxIPduMinimumDelayFactor = 0,\r
                        .ComTxIPduUnusedAreasDefault = 0,\r
@@ -332,7 +362,9 @@ const ComIPdu_type ComIPdu[] = {
                        },\r
                },\r
                \r
+               .ComIPduDataPtr = ComArcIPduBuffer_CanDB_Message_2,             \r
                .ComIPduSignalRef = ComIPduSignalRefs_CanDB_Message_2,\r
+               .ComIPduDynSignalRef = 0,\r
                .Com_Arc_EOL = 0\r
        },   \r
        {\r
@@ -348,12 +380,6 @@ const Com_ConfigType ComConfiguration = {
        .ComGroupSignal = ComGroupSignal\r
 };\r
 \r
-/* IPdu buffers and signal group buffers */\r
-uint8 ComArcIPduBuffer_CanDB_Message_1[8];\r
-          \r
-uint8 ComArcIPduBuffer_CanDB_Message_2[8];\r
-          \r
-\r
 Com_Arc_IPdu_type Com_Arc_IPdu[] = {\r
        { // CanDB_Message_1\r
                .Com_Arc_TxIPduTimers = {\r
@@ -361,8 +387,7 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = {
                        .ComTxModeRepetitionPeriodTimer = 0,\r
                        .ComTxIPduMinimumDelayTimer = 0,\r
                        .ComTxModeTimePeriodTimer = 0\r
-               },\r
-               .ComIPduDataPtr = ComArcIPduBuffer_CanDB_Message_1,\r
+               },              \r
                .Com_Arc_IpduStarted = 0        \r
        },\r
        { // CanDB_Message_2\r
@@ -371,8 +396,7 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = {
                        .ComTxModeRepetitionPeriodTimer = 0,\r
                        .ComTxIPduMinimumDelayTimer = 0,\r
                        .ComTxModeTimePeriodTimer = 0\r
-               },\r
-               .ComIPduDataPtr = ComArcIPduBuffer_CanDB_Message_2,\r
+               },              \r
                .Com_Arc_IpduStarted = 0        \r
        },\r
 };\r
@@ -380,90 +404,42 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = {
 Com_Arc_Signal_type Com_Arc_Signal[] = {\r
        { // CanDB_Signal_32_21_BE_Tester\r
                .Com_Arc_DeadlineCounter = 0,\r
-               .ComTimeoutFactor = 0,\r
-               .ComIPduHandleId = 0,\r
                .ComSignalUpdated = 0,\r
-               .ComIPduDataPtr = NULL,\r
-               \r
-               .Com_Arc_ShadowBuffer = NULL\r
-               \r
        },\r
        \r
        { // CanDB_Signal_1_4_LE_Tester\r
                .Com_Arc_DeadlineCounter = 0,\r
-               .ComTimeoutFactor = 0,\r
-               .ComIPduHandleId = 0,\r
                .ComSignalUpdated = 0,\r
-               .ComIPduDataPtr = NULL,\r
-               \r
-               .Com_Arc_ShadowBuffer = NULL\r
-               \r
        },\r
        \r
        { // CanDB_Signal_45_12_LE_Tester\r
                .Com_Arc_DeadlineCounter = 0,\r
-               .ComTimeoutFactor = 0,\r
-               .ComIPduHandleId = 0,\r
                .ComSignalUpdated = 0,\r
-               .ComIPduDataPtr = NULL,\r
-               \r
-               .Com_Arc_ShadowBuffer = NULL\r
-               \r
        },\r
        \r
        { // CanDB_Signal_29_12_BE_Tester\r
                .Com_Arc_DeadlineCounter = 0,\r
-               .ComTimeoutFactor = 0,\r
-               .ComIPduHandleId = 0,\r
                .ComSignalUpdated = 0,\r
-               .ComIPduDataPtr = NULL,\r
-               \r
-               .Com_Arc_ShadowBuffer = NULL\r
-               \r
        },\r
        \r
        { // CanDB_Signal_32_21_BE\r
                .Com_Arc_DeadlineCounter = 0,\r
-               .ComTimeoutFactor = 0,\r
-               .ComIPduHandleId = 0,\r
                .ComSignalUpdated = 0,\r
-               .ComIPduDataPtr = NULL,\r
-               \r
-               .Com_Arc_ShadowBuffer = NULL\r
-               \r
        },\r
        \r
        { // CanDB_Signal_1_4_LE\r
                .Com_Arc_DeadlineCounter = 0,\r
-               .ComTimeoutFactor = 0,\r
-               .ComIPduHandleId = 0,\r
                .ComSignalUpdated = 0,\r
-               .ComIPduDataPtr = NULL,\r
-               \r
-               .Com_Arc_ShadowBuffer = NULL\r
-               \r
        },\r
        \r
        { // CanDB_Signal_45_12_LE\r
                .Com_Arc_DeadlineCounter = 0,\r
-               .ComTimeoutFactor = 0,\r
-               .ComIPduHandleId = 0,\r
                .ComSignalUpdated = 0,\r
-               .ComIPduDataPtr = NULL,\r
-               \r
-               .Com_Arc_ShadowBuffer = NULL\r
-               \r
        },\r
        \r
        { // CanDB_Signal_29_12_BE\r
                .Com_Arc_DeadlineCounter = 0,\r
-               .ComTimeoutFactor = 0,\r
-               .ComIPduHandleId = 0,\r
                .ComSignalUpdated = 0,\r
-               .ComIPduDataPtr = NULL,\r
-               \r
-               .Com_Arc_ShadowBuffer = NULL\r
-               \r
        },\r
        \r
 };\r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Com_PbCfg.h b/boards/stm32_stm3210c/examples/com_simple/config/Com_PbCfg.h
index 7596d3f62169df3f68ae3cc4e4f7eb1ea1024a57..d68ca2c68e45a7585d15ca24f580974c277fd675 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Com_PbCfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Com_PbCfg.h
@@ -7,10 +7,9 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.5\r
+* Generator version:       2.0.7\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:32 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Det_Cfg.h b/boards/stm32_stm3210c/examples/com_simple/config/Det_Cfg.h
index 102787bfc0521f0026660822fbd7c549a1a92d25..0d978a8c51107391fce59b5f3d87416d6015d324 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Det_Cfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Det_Cfg.h
@@ -10,7 +10,6 @@
 * Generator version:       2.0.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:33 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/EcuM.mk b/boards/stm32_stm3210c/examples/com_simple/config/EcuM.mk
index 7b7f9b9428311bb23c46da242b5c8705fe417773..c81d73c62e2db8d7c59eb799fd3c33016db3a3b7 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/EcuM.mk
+++ b/boards/stm32_stm3210c/examples/com_simple/config/EcuM.mk
@@ -1,3 +1,5 @@
 \r
 MOD_USE += CANIF COM DET ECUM KERNEL PDUR MCU PORT CAN \r
 \r
+def-y += ECUM_USE_SERVICE_PORTS=STDOFF\r
+\r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/EcuM_Callout_Stubs.c b/boards/stm32_stm3210c/examples/com_simple/config/EcuM_Callout_Stubs.c
new file mode 100644 (file)
index 0000000..4fd8169
--- /dev/null
+++ b/boards/stm32_stm3210c/examples/com_simple/config/EcuM_Callout_Stubs.c
@@ -0,0 +1,332 @@
+/*\r
+* Configuration of module: EcuM (EcuM_Callout_Stubs.c)\r
+*\r
+* Created by:              \r
+* Copyright:               \r
+*\r
+* Configured for (MCU):    STM32_F107\r
+*\r
+* Module vendor:           ArcCore\r
+* Generator version:       2.0.2\r
+*\r
+* Generated by Arctic Studio (http://arccore.com) \r
+*/\r
+\r
+\r
+#include "EcuM.h"\r
+#include "EcuM_Generated_Types.h"\r
+#include "Det.h"\r
+#if defined(USE_DEM)\r
+#include "Dem.h"\r
+#endif\r
+#if defined(USE_MCU)\r
+#include "Mcu.h"\r
+#endif\r
+#if defined(USE_GPT)\r
+#include "Gpt.h"\r
+#endif\r
+#if defined(USE_CAN)\r
+#include "Can.h"\r
+#endif\r
+#if defined(USE_CANIF)\r
+#include "CanIf.h"\r
+#endif\r
+#if defined(USE_PDUR)\r
+#include "PduR.h"\r
+#endif\r
+#if defined(USE_COM)\r
+#include "Com.h"\r
+#endif\r
+#if defined(USE_CANTP)\r
+#include "CanTp.h"\r
+#endif\r
+#if defined(USE_J1939TP)\r
+#include "J1939Tp.h"\r
+#endif\r
+#if defined(USE_DCM)\r
+#include "Dcm.h"\r
+#endif\r
+#if defined(USE_PWM)\r
+#include "Pwm.h"\r
+#endif\r
+#if defined(USE_IOHWAB)\r
+#include "IoHwAb.h"\r
+#endif\r
+#if defined(USE_FLS)\r
+#include "Fls.h"\r
+#endif\r
+#if defined(USE_EEP)\r
+#include "Eep.h"\r
+#endif\r
+#if defined(USE_FEE)\r
+#include "Fee.h"\r
+#endif\r
+#if defined(USE_EA)\r
+#include "Ea.h"\r
+#endif\r
+#if defined(USE_NVM)\r
+#include "NvM.h"\r
+#endif\r
+#if defined(USE_COMM)\r
+#include "ComM.h"\r
+#endif\r
+#if defined(USE_NM)\r
+#include "Nm.h"\r
+#endif\r
+#if defined(USE_CANNM)\r
+#include "CanNm.h"\r
+#endif\r
+#if defined(USE_CANSM)\r
+#include "CanSM.h"\r
+#endif\r
+#if defined(USE_UDPNM)\r
+#include "UdpNm.h"\r
+#endif\r
+#if defined(USE_LINSM)\r
+#include "LinSM.h"\r
+#endif\r
+#if defined(USE_SPI)\r
+#include "Spi.h"\r
+#endif\r
+#if defined(USE_WDG)\r
+#include "Wdg.h"\r
+#endif\r
+#if defined(USE_WDGM)\r
+#include "WdgM.h"\r
+#endif\r
+\r
+void EcuM_AL_DriverInitZero(void)\r
+{\r
+       Det_Init();/** @req EcuM2783 */\r
+    Det_Start();/** @req EcuM2634 */\r
+}\r
+\r
+extern EcuM_ConfigType EcuMConfig;\r
+\r
+EcuM_ConfigType* EcuM_DeterminePbConfiguration(void)\r
+{\r
+       return &EcuMConfig;\r
+}\r
+\r
+void EcuM_AL_DriverInitOne(const EcuM_ConfigType *ConfigPtr)\r
+{\r
+       (void)ConfigPtr;\r
+  //lint --e{715}       PC-Lint (715) - ConfigPtr usage depends on configuration of modules\r
+\r
+#if defined(USE_MCU)\r
+       Mcu_Init(ConfigPtr->McuConfig);\r
+\r
+       /* Set up default clock (Mcu_InitClock requires initRun==1) */\r
+       /* Ignoring return value */\r
+       (void) Mcu_InitClock( ConfigPtr->McuConfig->McuDefaultClockSettings );\r
+\r
+       // Wait for PLL to sync.\r
+       while (Mcu_GetPllStatus() != MCU_PLL_LOCKED)\r
+       {\r
+         ;\r
+       }\r
+#endif\r
+\r
+#if defined(USE_DEM)\r
+       // Preinitialize DEM\r
+       Dem_PreInit();\r
+#endif\r
+\r
+#if defined(USE_PORT)\r
+       // Setup Port\r
+       Port_Init(ConfigPtr->PortConfig);\r
+#endif\r
+\r
+\r
+#if defined(USE_GPT)\r
+       // Setup the GPT\r
+       Gpt_Init(ConfigPtr->GptConfig);\r
+#endif\r
+\r
+       // Setup watchdog\r
+#if defined(USE_WDG)\r
+       Wdg_Init(ConfigPtr->WdgConfig);\r
+#endif\r
+#if defined(USE_WDGM)\r
+       WdgM_Init(ConfigPtr->WdgMConfig);\r
+#endif\r
+\r
+#if defined(USE_DMA)\r
+       // Setup DMA\r
+       Dma_Init(ConfigPtr->DmaConfig);\r
+#endif\r
+\r
+#if defined(USE_ADC)\r
+       // Setup ADC\r
+       Adc_Init(ConfigPtr->AdcConfig);\r
+#endif\r
+\r
+       // Setup ICU\r
+       // TODO\r
+\r
+       // Setup PWM\r
+#if defined(USE_PWM)\r
+       // Setup PWM\r
+       Pwm_Init(ConfigPtr->PwmConfig);\r
+#endif\r
+}\r
+\r
+void EcuM_AL_DriverInitTwo(const EcuM_ConfigType* ConfigPtr)\r
+{\r
+       (void)ConfigPtr;\r
+  //lint --e{715}       PC-Lint (715) - ConfigPtr usage depends on configuration of modules\r
+\r
+#if defined(USE_SPI)\r
+       // Setup SPI\r
+       Spi_Init(ConfigPtr->SpiConfig);\r
+#endif\r
+\r
+#if defined(USE_EEP)\r
+       // Setup EEP\r
+       Eep_Init(ConfigPtr->EepConfig);\r
+#endif\r
+\r
+#if defined(USE_FLS)\r
+       // Setup Flash\r
+       Fls_Init(ConfigPtr->FlashConfig);\r
+#endif\r
+\r
+#if defined(USE_FEE)\r
+       // Setup FEE\r
+       Fee_Init();\r
+#endif\r
+\r
+#if defined(USE_EA)\r
+       // Setup EA\r
+       Ea_Init();\r
+#endif\r
+\r
+#if defined(USE_NVM)\r
+       // Setup NVRAM Manager and start the read all job\r
+       NvM_Init();\r
+       NvM_ReadAll();\r
+#endif\r
+\r
+       // Setup CAN tranceiver\r
+       // TODO\r
+\r
+#if defined(USE_CAN)\r
+       // Setup Can driver\r
+       Can_Init(ConfigPtr->CanConfig);\r
+#endif\r
+\r
+#if defined(USE_CANIF)\r
+       // Setup CanIf\r
+       CanIf_Init(ConfigPtr->CanIfConfig);\r
+#endif\r
+\r
+#if defined(USE_CANTP)\r
+       // Setup CAN TP\r
+       CanTp_Init();\r
+#endif\r
+\r
+#if defined(USE_CANSM)\r
+        CanSM_Init(ConfigPtr->CanSMConfig);\r
+#endif\r
+\r
+#if defined(USE_J1939TP)\r
+       // Setup J1939Tp\r
+       J1939Tp_Init(ConfigPtr->J1939TpConfig);\r
+#endif\r
+\r
+\r
+       // Setup LIN\r
+       // TODO\r
+\r
+#if defined(USE_PDUR)\r
+       // Setup PDU Router\r
+       PduR_Init(ConfigPtr->PduRConfig);\r
+#endif\r
+\r
+#if defined(USE_CANNM)\r
+        // Setup Can Network Manager\r
+        CanNm_Init(ConfigPtr->CanNmConfig);\r
+#endif\r
+\r
+#if defined(USE_UDPNM)\r
+        // Setup Udp Network Manager\r
+        UdpNm_Init(ConfigPtr->UdpNmConfig);\r
+#endif\r
+\r
+#if defined(USE_NM)\r
+        // Setup Network Management Interface\r
+        Nm_Init(ConfigPtr->NmConfig);\r
+#endif\r
+\r
+#if defined(USE_COM)\r
+       // Setup COM layer\r
+       Com_Init(ConfigPtr->ComConfig);\r
+#endif\r
+\r
+#if defined(USE_DCM)\r
+       // Setup DCM\r
+       Dcm_Init();\r
+#endif\r
+\r
+#if defined(USE_IOHWAB)\r
+       // Setup IO hardware abstraction layer\r
+       IoHwAb_Init();\r
+#endif\r
+\r
+}\r
+\r
+void EcuM_AL_DriverInitThree(const EcuM_ConfigType* ConfigPtr)\r
+{\r
+       (void)ConfigPtr;\r
+  //lint --e{715}       PC-Lint (715) - ConfigPtr usage depends on configuration of modules\r
+\r
+#if defined(USE_DEM)\r
+       // Setup DEM\r
+       Dem_Init();\r
+#endif\r
+\r
+#if defined(USE_COMM)\r
+        // Setup Communication Manager\r
+        ComM_Init(ConfigPtr->ComMConfig);\r
+#endif\r
+}\r
+\r
+void EcuM_OnEnterRUN(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnExitRun(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnExitPostRun(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnPrepShutdown(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnGoSleep(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnGoOffOne(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnGoOffTwo(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_AL_SwitchOff(void)\r
+{\r
+\r
+}\r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/EcuM_Cfg.h b/boards/stm32_stm3210c/examples/com_simple/config/EcuM_Cfg.h
index 40d29c092e604ab7c851be12c1581c013f7b220b..b1cc93f0da764200b84c0f35899dba47d340441d 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/EcuM_Cfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/EcuM_Cfg.h
@@ -10,7 +10,6 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:33 CEST 2011\r
 */\r
 \r
 
@@ -26,8 +25,6 @@
 #define ECUM_VERSION_INFO_API  STD_OFF\r
 #define ECUM_DEV_ERROR_DETECT  STD_OFF\r
 \r
-#include "EcuM_Generated_Types.h"\r
-\r
 #define ECUM_MAIN_FUNCTION_PERIOD  (200)\r
 #define ECUM_NVRAM_READALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
@@ -40,7 +37,5 @@ typedef enum {
 } EcuM_UserList;\r
 \r
 \r
-extern EcuM_ConfigType EcuMConfig;\r
-\r
 #endif /*ECUM_CFG_H_*/\r
 \r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/EcuM_Generated_Types.h b/boards/stm32_stm3210c/examples/com_simple/config/EcuM_Generated_Types.h
new file mode 100644 (file)
index 0000000..907fb2b
--- /dev/null
+++ b/boards/stm32_stm3210c/examples/com_simple/config/EcuM_Generated_Types.h
@@ -0,0 +1,178 @@
+/*\r
+* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
+*\r
+* Created by:              \r
+* Copyright:               \r
+*\r
+* Configured for (MCU):    STM32_F107\r
+*\r
+* Module vendor:           ArcCore\r
+* Generator version:       2.0.2\r
+*\r
+* Generated by Arctic Studio (http://arccore.com) \r
+*/\r
+\r
+
+#if !(((ECUM_SW_MAJOR_VERSION == 2) && (ECUM_SW_MINOR_VERSION == 0)) )
+#error EcuM: Configuration file expected BSW module version to be 2.0.*
+#endif
+
+\r
+#ifndef _ECUM_GENERATED_TYPES_H_\r
+#define _ECUM_GENERATED_TYPES_H_\r
+\r
+#if (ECUM_USE_SERVICE_PORTS == STD_ON) && defined(USE_RTE)\r
+#include "Rte_EcuM.h"\r
+#endif\r
+\r
+#include "EcuM_Types.h"\r
+\r
+#if defined(USE_MCU)\r
+#include "Mcu.h"\r
+#endif\r
+#if defined(USE_PORT)\r
+#include "Port.h"\r
+#endif\r
+#if defined(USE_CAN)\r
+#include "Can.h"\r
+#endif\r
+#if defined(USE_CANIF)\r
+#include "CanIf.h"\r
+#endif\r
+#if defined(USE_PWM)\r
+#include "Pwm.h"\r
+#endif\r
+#if defined(USE_COM)\r
+#include "Com.h"\r
+#endif\r
+#if defined(USE_PDUR)\r
+#include "PduR.h"\r
+#endif\r
+#if defined(USE_DMA)\r
+#include "Dma.h"\r
+#endif\r
+#if defined(USE_ADC)\r
+#include "Adc.h"\r
+#endif\r
+#if defined(USE_GPT)\r
+#include "Gpt.h"\r
+#endif\r
+#if defined(USE_COMM)\r
+#include "ComM.h"\r
+#endif\r
+#if defined(USE_NM)\r
+#include "Nm.h"\r
+#endif\r
+#if defined(USE_CANNM)\r
+#include "CanNm.h"\r
+#endif\r
+#if defined(USE_CANSM)\r
+#include "CanSM.h"\r
+#endif\r
+#if defined(USE_J1939TP)\r
+#include "J1939Tp.h"\r
+#endif\r
+#if defined(USE_UDPNM)\r
+#include "UdpNm.h"\r
+#endif\r
+#if defined(USE_LINSM)\r
+#include "LinSM.h"\r
+#endif\r
+#if defined(USE_FLS)\r
+#include "Fls.h"\r
+#endif\r
+#if defined(USE_EEP)\r
+#include "Eep.h"\r
+#endif\r
+#if defined(USE_SPI)\r
+#include "Spi.h"\r
+#endif\r
+#if defined(USE_WDG)\r
+#include "Wdg.h"\r
+#endif\r
+#if defined(USE_WDGM)\r
+#include "WdgM.h"\r
+#endif\r
+#if defined(USE_WDGIF)\r
+#include "WdgIf.h"\r
+#endif\r
+\r
+\r
+typedef struct\r
+{\r
+       EcuM_StateType EcuMDefaultShutdownTarget;\r
+       uint8 EcuMDefaultSleepMode;\r
+       AppModeType EcuMDefaultAppMode;\r
+       uint32 EcuMRunMinimumDuration;\r
+       uint32 EcuMNvramReadAllTimeout;\r
+       uint32 EcuMNvramWriteAllTimeout;\r
+\r
+#if defined(USE_MCU)\r
+        const Mcu_ConfigType* McuConfig;\r
+#endif\r
+#if defined(USE_PORT)\r
+        const Port_ConfigType* PortConfig;\r
+#endif\r
+#if defined(USE_CAN)\r
+        const Can_ConfigType* CanConfig;\r
+#endif\r
+#if defined(USE_CANIF)\r
+        const CanIf_ConfigType* CanIfConfig;\r
+#endif\r
+#if defined(USE_CANSM)\r
+        const CanSM_ConfigType* CanSMConfig;\r
+#endif\r
+#if defined(USE_NM)\r
+        const Nm_ConfigType* NmConfig;\r
+#endif\r
+#if defined(USE_CANNM)\r
+        const CanNm_ConfigType* CanNmConfig;\r
+#endif\r
+#if defined(USE_UDPNM)\r
+        const UdpNm_ConfigType* UdpNmConfig;\r
+#endif\r
+#if defined(USE_COMM)\r
+        const ComM_ConfigType* ComMConfig;\r
+#endif\r
+#if defined(USE_COM)\r
+        const Com_ConfigType* ComConfig;\r
+#endif\r
+#if defined(USE_J1939TP)\r
+        const J1939Tp_ConfigType* J1939TpConfig;\r
+#endif\r
+#if defined(USE_PDUR)\r
+        const PduR_PBConfigType* PduRConfig;\r
+#endif\r
+#if defined(USE_PWM)\r
+        const Pwm_ConfigType* PwmConfig;\r
+#endif\r
+#if defined(USE_DMA)\r
+        const Dma_ConfigType* DmaConfig;\r
+#endif\r
+#if defined(USE_ADC)\r
+    const Adc_ConfigType* AdcConfig;\r
+#endif\r
+#if defined(USE_GPT)\r
+    const Gpt_ConfigType* GptConfig;\r
+#endif\r
+#if defined(USE_FLS)\r
+       const Fls_ConfigType* FlashConfig;\r
+#endif\r
+#if defined(USE_EEP)\r
+       const Eep_ConfigType* EepConfig;\r
+#endif\r
+#if defined(USE_SPI)\r
+       const Spi_ConfigType* SpiConfig;\r
+#endif\r
+#if defined(USE_WDG)\r
+    const Wdg_ConfigType* WdgConfig;\r
+#endif\r
+#if defined(USE_WDGIF)\r
+    const WdgIf_ConfigType* WdgIfConfig;\r
+#endif\r
+#if defined(USE_WDGM)\r
+    const WdgM_ConfigType* WdgMConfig;\r
+#endif\r
+} EcuM_ConfigType;\r
+\r
+#endif /*_ECUM_GENERATED_TYPES_H_*/\r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/EcuM_PBcfg.c b/boards/stm32_stm3210c/examples/com_simple/config/EcuM_PBcfg.c
new file mode 100644 (file)
index 0000000..cfb351c
--- /dev/null
+++ b/boards/stm32_stm3210c/examples/com_simple/config/EcuM_PBcfg.c
@@ -0,0 +1,119 @@
+/*\r
+* Configuration of module: EcuM (EcuM_PBcfg.c)\r
+*\r
+* Created by:              \r
+* Copyright:               \r
+*\r
+* Configured for (MCU):    STM32_F107\r
+*\r
+* Module vendor:           ArcCore\r
+* Generator version:       2.0.2\r
+*\r
+* Generated by Arctic Studio (http://arccore.com) \r
+*/\r
+\r
+\r
+\r
+#include "EcuM.h"\r
+#include "EcuM_Generated_Types.h"\r
+\r
+#if defined(USE_CANSM)\r
+extern const CanSM_ConfigType CanSM_Config;\r
+#endif\r
+#if defined(USE_NM)\r
+extern const Nm_ConfigType Nm_Config;\r
+#endif\r
+#if defined(USE_CANNM)\r
+extern const CanNm_ConfigType CanNm_Config;\r
+#endif\r
+#if defined(USE_UDPNM)\r
+extern const UdpNm_ConfigType UdpNm_Config;\r
+#endif\r
+#if defined(USE_COMM)\r
+extern const ComM_ConfigType ComM_Config;\r
+#endif\r
+\r
+#if defined(USE_J1939TP)\r
+extern const J1939Tp_ConfigType J1939Tp_Config;\r
+#endif\r
+\r
+\r
+EcuM_ConfigType EcuMConfig =\r
+{\r
+       .EcuMDefaultShutdownTarget = ECUM_STATE_RESET,\r
+       .EcuMDefaultSleepMode = 0, // Don't care\r
+       .EcuMDefaultAppMode = OSDEFAULTAPPMODE,\r
+       .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
+       .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
+       .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+\r
+#if defined(USE_MCU)\r
+        .McuConfig = McuConfigData,\r
+#endif\r
+#if defined(USE_PORT)\r
+        .PortConfig = &PortConfigData,\r
+#endif\r
+#if defined(USE_CAN)\r
+        .CanConfig = &CanConfigData,\r
+#endif\r
+#if defined(USE_CANIF)\r
+        .CanIfConfig = &CanIf_Config,\r
+#endif\r
+#if defined(USE_CANSM)\r
+        .CanSMConfig = &CanSM_Config,\r
+#endif\r
+#if defined(USE_CANNM)\r
+        .CanNmConfig = &CanNm_Config,\r
+#endif\r
+#if defined(USE_UDPNM)\r
+        .UdpNmConfig = &UdpNm_Config,\r
+#endif\r
+#if defined(USE_COM)\r
+        .ComConfig = &ComConfiguration,\r
+#endif\r
+#if defined(USE_COMM)\r
+        .ComMConfig = &ComM_Config,\r
+#endif\r
+#if defined(USE_J1939TP)\r
+        .J1939TpConfig = &J1939Tp_Config,\r
+#endif\r
+#if defined(USE_NM)\r
+        .NmConfig = &Nm_Config,\r
+#endif\r
+#if defined(USE_PDUR)\r
+        .PduRConfig = &PduR_Config,\r
+#endif\r
+#if defined(USE_J1939TP)\r
+        .J1939TpConfig = &J1939Tp_Config,\r
+#endif\r
+#if defined(USE_DMA)\r
+        .DmaConfig = DmaConfig,\r
+#endif\r
+#if defined(USE_ADC)\r
+        .AdcConfig = AdcConfig,\r
+#endif\r
+#if defined(USE_PWM)\r
+        .PwmConfig = &PwmConfig,\r
+#endif\r
+#if defined(USE_WDG)\r
+    .WdgConfig = &WdgConfig,\r
+#endif\r
+#if defined(USE_WDGM)\r
+    .WdgMConfig = &WdgMConfig,\r
+#endif\r
+#if defined(USE_WDGIF)\r
+    .WdgIfConfig = &WdgIfConfig,\r
+#endif\r
+#if defined(USE_GPT)\r
+        .GptConfig = GptConfigData,\r
+#endif\r
+#if defined(USE_FLS)\r
+       .FlashConfig = FlsConfigSet,\r
+#endif\r
+#if defined(USE_EEP)\r
+       .EepConfig = EepConfigData,\r
+#endif\r
+#if defined(USE_SPI)\r
+       .SpiConfig = &SpiConfigData,\r
+#endif\r
+};\r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Mcu_Cfg.c b/boards/stm32_stm3210c/examples/com_simple/config/Mcu_Cfg.c
index a46556ae5f49854ec1fd953cb3af0cea211a0775..ca0d6eb3a0b66ff330febf306b003f40a423ef83 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Mcu_Cfg.c
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Mcu_Cfg.c
@@ -10,7 +10,6 @@
 * Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:35 CEST 2011\r
 */\r
 \r
 \r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Mcu_Cfg.h b/boards/stm32_stm3210c/examples/com_simple/config/Mcu_Cfg.h
index 4ebf5cf735041d77c6f942d9c36296c160da70d4..5e620a71c1c45f3962ef32211062a4d910cfaec8 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Mcu_Cfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Mcu_Cfg.h
@@ -10,7 +10,6 @@
 * Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:35 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Os_Cfg.c b/boards/stm32_stm3210c/examples/com_simple/config/Os_Cfg.c
index 19041ff4a500e22c9dbac4a0e861c2d9e01f02b9..d30bcc11e52ac2b45670d098a14d68486444fe7b 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Os_Cfg.c
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Os_Cfg.c
@@ -10,7 +10,6 @@
 * Generator version:       2.0.34\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:34 CEST 2011\r
 */\r
 \r
        \r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Os_Cfg.h b/boards/stm32_stm3210c/examples/com_simple/config/Os_Cfg.h
index 19bc4bbd8929508382c2911556bf8f75e9c743b4..4c032b7e6e51fe27a8d41cae31740bc90fec94c1 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Os_Cfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Os_Cfg.h
@@ -10,7 +10,6 @@
 * Generator version:       2.0.34\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:33 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/PduR_Cfg.h b/boards/stm32_stm3210c/examples/com_simple/config/PduR_Cfg.h
index 232bda7501941b52b7a1ade4160fc47cfcb2550b..0b76d9fe4b0fd3d54d20c12015cfb36711d1ebe8 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/PduR_Cfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/PduR_Cfg.h
@@ -7,10 +7,9 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       3.0.8\r
+* Generator version:       3.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:34 CEST 2011\r
 */\r
 \r
 
@@ -33,7 +32,7 @@
 #define PDUR_COM_SUPPORT                       STD_ON\r
 #define PDUR_DCM_SUPPORT                       STD_OFF\r
 #define PDUR_IPDUM_SUPPORT                     STD_OFF  /* Not supported */\r
-#define PDUR_SOAD_SUPPORT                      STD_OFF\r
+#define PDUR_J1939TP_SUPPORT           STD_OFF\r
 \r
 #define PDUR_DEV_ERROR_DETECT          STD_OFF\r
 #define PDUR_VERSION_INFO_API          STD_OFF\r
@@ -44,7 +43,6 @@
 #define PDUR_SINGLE_IF                         NULL\r
 #define PDUR_SINGLE_TP                         NULL\r
 \r
-\r
 // Gateway operation\r
 #define PDUR_GATEWAY_OPERATION                         STD_ON\r
 #define PDUR_MEMORY_SIZE                                       10 /* Not used */\r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/PduR_PbCfg.c b/boards/stm32_stm3210c/examples/com_simple/config/PduR_PbCfg.c
index e28f969d4fd65830621b26fc26642ada5dc0e34e..8ff0d3cc1ad93e5582449a5f1eeeddd9361ec3b3 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/PduR_PbCfg.c
+++ b/boards/stm32_stm3210c/examples/com_simple/config/PduR_PbCfg.c
@@ -7,10 +7,9 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       3.0.8\r
+* Generator version:       3.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:34 CEST 2011\r
 */\r
 \r
 \r
@@ -32,13 +31,12 @@
 #if PDUR_DCM_SUPPORT == STD_ON\r
 #include "Dcm.h"\r
 #endif\r
-#if PDUR_SOAD_SUPPORT == STD_ON\r
-#include "SoAd.h"\r
+#if PDUR_J1939TP_SUPPORT == STD_ON\r
+#include "J1939Tp.h"\r
 #endif\r
 \r
 \r
 \r
-\r
 PduRTpBufferInfo_type PduRTpBuffers[] = {\r
        {\r
                .pduInfoPtr = NULL,\r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/PduR_PbCfg.h b/boards/stm32_stm3210c/examples/com_simple/config/PduR_PbCfg.h
index 93fceb3ee5793e4e6b645b675d1d85e15ef53bd2..eddfa23cc04dc638c95c6778c69f120fa359626b 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/PduR_PbCfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/PduR_PbCfg.h
@@ -7,10 +7,9 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       3.0.8\r
+* Generator version:       3.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:34 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Port_Cfg.c b/boards/stm32_stm3210c/examples/com_simple/config/Port_Cfg.c
index 9872b468506d9292b161dc2e74a3bfeda4aab40f..8f5b354d076da973a41236f9f50dc9ce3e035729 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Port_Cfg.c
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Port_Cfg.c
@@ -10,7 +10,6 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:35 CEST 2011\r
 */\r
 \r
        \r

diff --git a/boards/stm32_stm3210c/examples/com_simple/config/Port_Cfg.h b/boards/stm32_stm3210c/examples/com_simple/config/Port_Cfg.h
index 23d3a20d1d47627cbcdee4b83bdd313cab3b3deb..f639c407604553996b3ad9067270ceab7e2762c0 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/config/Port_Cfg.h
+++ b/boards/stm32_stm3210c/examples/com_simple/config/Port_Cfg.h
@@ -10,7 +10,6 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Wed Jul 06 13:54:35 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/stm32_stm3210c/examples/com_simple/makefile b/boards/stm32_stm3210c/examples/com_simple/makefile
index 7634d2e1da1aa0049d36ab9e13fce94845aacdef..81f7e9cf2ed603bc3e390cc7e512cfa5d5d53f18 100644 (file)
--- a/boards/stm32_stm3210c/examples/com_simple/makefile
+++ b/boards/stm32_stm3210c/examples/com_simple/makefile
@@ -2,6 +2,8 @@
 # Project name, used for output files et.c.\r
 PROJECTNAME = com_simple_stm3210c\r
 \r
+ROOTDIR?=../../../..\r
+\r
 # Default settings\r
 include $(ROOTDIR)/scripts/project_defaults.mk\r
 \r

diff --git a/boards/stm32_stm3210c/examples/os_simple/build_config.mk b/boards/stm32_stm3210c/examples/os_simple/build_config.mk
index c5777cdfc0b85520beaaa9706e203f696238f0d6..c3e5fd22ec4f10fd77d037c79913fc1bdd02bb6c 100644 (file)
--- a/boards/stm32_stm3210c/examples/os_simple/build_config.mk
+++ b/boards/stm32_stm3210c/examples/os_simple/build_config.mk
@@ -1,4 +1,15 @@
 \r
+# Version of build system\r
+REQUIRED_BUILD_SYSTEM_VERSION=1.0.0\r
+\r
+# Get configuration makefiles\r
+-include ../config/*.mk\r
+-include ../config/$(BOARDDIR)/*.mk\r
+\r
+\r
+# Project settings\r
+\r
+SELECT_CONSOLE = RAMLOG\r
+\r
+SELECT_OPT = OPT_DEBUG \r
 \r
-#CFG+=VLE\r
-MOD_USE+= DET ECUM MCU KERNEL RAMLOG
\ No newline at end of file

diff --git a/boards/stm32_stm3210c/examples/os_simple/config/EcuM.mk b/boards/stm32_stm3210c/examples/os_simple/config/EcuM.mk
new file mode 100644 (file)
index 0000000..d1ee650
--- /dev/null
+++ b/boards/stm32_stm3210c/examples/os_simple/config/EcuM.mk
@@ -0,0 +1,5 @@
+\r
+MOD_USE += MCU KERNEL ECUM \r
+\r
+def-y += ECUM_USE_SERVICE_PORTS=STDOFF\r
+\r

diff --git a/boards/stm32_stm3210c/examples/os_simple/config/EcuM_Callout_Stubs.c b/boards/stm32_stm3210c/examples/os_simple/config/EcuM_Callout_Stubs.c
new file mode 100644 (file)
index 0000000..4fd8169
--- /dev/null
+++ b/boards/stm32_stm3210c/examples/os_simple/config/EcuM_Callout_Stubs.c
@@ -0,0 +1,332 @@
+/*\r
+* Configuration of module: EcuM (EcuM_Callout_Stubs.c)\r
+*\r
+* Created by:              \r
+* Copyright:               \r
+*\r
+* Configured for (MCU):    STM32_F107\r
+*\r
+* Module vendor:           ArcCore\r
+* Generator version:       2.0.2\r
+*\r
+* Generated by Arctic Studio (http://arccore.com) \r
+*/\r
+\r
+\r
+#include "EcuM.h"\r
+#include "EcuM_Generated_Types.h"\r
+#include "Det.h"\r
+#if defined(USE_DEM)\r
+#include "Dem.h"\r
+#endif\r
+#if defined(USE_MCU)\r
+#include "Mcu.h"\r
+#endif\r
+#if defined(USE_GPT)\r
+#include "Gpt.h"\r
+#endif\r
+#if defined(USE_CAN)\r
+#include "Can.h"\r
+#endif\r
+#if defined(USE_CANIF)\r
+#include "CanIf.h"\r
+#endif\r
+#if defined(USE_PDUR)\r
+#include "PduR.h"\r
+#endif\r
+#if defined(USE_COM)\r
+#include "Com.h"\r
+#endif\r
+#if defined(USE_CANTP)\r
+#include "CanTp.h"\r
+#endif\r
+#if defined(USE_J1939TP)\r
+#include "J1939Tp.h"\r
+#endif\r
+#if defined(USE_DCM)\r
+#include "Dcm.h"\r
+#endif\r
+#if defined(USE_PWM)\r
+#include "Pwm.h"\r
+#endif\r
+#if defined(USE_IOHWAB)\r
+#include "IoHwAb.h"\r
+#endif\r
+#if defined(USE_FLS)\r
+#include "Fls.h"\r
+#endif\r
+#if defined(USE_EEP)\r
+#include "Eep.h"\r
+#endif\r
+#if defined(USE_FEE)\r
+#include "Fee.h"\r
+#endif\r
+#if defined(USE_EA)\r
+#include "Ea.h"\r
+#endif\r
+#if defined(USE_NVM)\r
+#include "NvM.h"\r
+#endif\r
+#if defined(USE_COMM)\r
+#include "ComM.h"\r
+#endif\r
+#if defined(USE_NM)\r
+#include "Nm.h"\r
+#endif\r
+#if defined(USE_CANNM)\r
+#include "CanNm.h"\r
+#endif\r
+#if defined(USE_CANSM)\r
+#include "CanSM.h"\r
+#endif\r
+#if defined(USE_UDPNM)\r
+#include "UdpNm.h"\r
+#endif\r
+#if defined(USE_LINSM)\r
+#include "LinSM.h"\r
+#endif\r
+#if defined(USE_SPI)\r
+#include "Spi.h"\r
+#endif\r
+#if defined(USE_WDG)\r
+#include "Wdg.h"\r
+#endif\r
+#if defined(USE_WDGM)\r
+#include "WdgM.h"\r
+#endif\r
+\r
+void EcuM_AL_DriverInitZero(void)\r
+{\r
+       Det_Init();/** @req EcuM2783 */\r
+    Det_Start();/** @req EcuM2634 */\r
+}\r
+\r
+extern EcuM_ConfigType EcuMConfig;\r
+\r
+EcuM_ConfigType* EcuM_DeterminePbConfiguration(void)\r
+{\r
+       return &EcuMConfig;\r
+}\r
+\r
+void EcuM_AL_DriverInitOne(const EcuM_ConfigType *ConfigPtr)\r
+{\r
+       (void)ConfigPtr;\r
+  //lint --e{715}       PC-Lint (715) - ConfigPtr usage depends on configuration of modules\r
+\r
+#if defined(USE_MCU)\r
+       Mcu_Init(ConfigPtr->McuConfig);\r
+\r
+       /* Set up default clock (Mcu_InitClock requires initRun==1) */\r
+       /* Ignoring return value */\r
+       (void) Mcu_InitClock( ConfigPtr->McuConfig->McuDefaultClockSettings );\r
+\r
+       // Wait for PLL to sync.\r
+       while (Mcu_GetPllStatus() != MCU_PLL_LOCKED)\r
+       {\r
+         ;\r
+       }\r
+#endif\r
+\r
+#if defined(USE_DEM)\r
+       // Preinitialize DEM\r
+       Dem_PreInit();\r
+#endif\r
+\r
+#if defined(USE_PORT)\r
+       // Setup Port\r
+       Port_Init(ConfigPtr->PortConfig);\r
+#endif\r
+\r
+\r
+#if defined(USE_GPT)\r
+       // Setup the GPT\r
+       Gpt_Init(ConfigPtr->GptConfig);\r
+#endif\r
+\r
+       // Setup watchdog\r
+#if defined(USE_WDG)\r
+       Wdg_Init(ConfigPtr->WdgConfig);\r
+#endif\r
+#if defined(USE_WDGM)\r
+       WdgM_Init(ConfigPtr->WdgMConfig);\r
+#endif\r
+\r
+#if defined(USE_DMA)\r
+       // Setup DMA\r
+       Dma_Init(ConfigPtr->DmaConfig);\r
+#endif\r
+\r
+#if defined(USE_ADC)\r
+       // Setup ADC\r
+       Adc_Init(ConfigPtr->AdcConfig);\r
+#endif\r
+\r
+       // Setup ICU\r
+       // TODO\r
+\r
+       // Setup PWM\r
+#if defined(USE_PWM)\r
+       // Setup PWM\r
+       Pwm_Init(ConfigPtr->PwmConfig);\r
+#endif\r
+}\r
+\r
+void EcuM_AL_DriverInitTwo(const EcuM_ConfigType* ConfigPtr)\r
+{\r
+       (void)ConfigPtr;\r
+  //lint --e{715}       PC-Lint (715) - ConfigPtr usage depends on configuration of modules\r
+\r
+#if defined(USE_SPI)\r
+       // Setup SPI\r
+       Spi_Init(ConfigPtr->SpiConfig);\r
+#endif\r
+\r
+#if defined(USE_EEP)\r
+       // Setup EEP\r
+       Eep_Init(ConfigPtr->EepConfig);\r
+#endif\r
+\r
+#if defined(USE_FLS)\r
+       // Setup Flash\r
+       Fls_Init(ConfigPtr->FlashConfig);\r
+#endif\r
+\r
+#if defined(USE_FEE)\r
+       // Setup FEE\r
+       Fee_Init();\r
+#endif\r
+\r
+#if defined(USE_EA)\r
+       // Setup EA\r
+       Ea_Init();\r
+#endif\r
+\r
+#if defined(USE_NVM)\r
+       // Setup NVRAM Manager and start the read all job\r
+       NvM_Init();\r
+       NvM_ReadAll();\r
+#endif\r
+\r
+       // Setup CAN tranceiver\r
+       // TODO\r
+\r
+#if defined(USE_CAN)\r
+       // Setup Can driver\r
+       Can_Init(ConfigPtr->CanConfig);\r
+#endif\r
+\r
+#if defined(USE_CANIF)\r
+       // Setup CanIf\r
+       CanIf_Init(ConfigPtr->CanIfConfig);\r
+#endif\r
+\r
+#if defined(USE_CANTP)\r
+       // Setup CAN TP\r
+       CanTp_Init();\r
+#endif\r
+\r
+#if defined(USE_CANSM)\r
+        CanSM_Init(ConfigPtr->CanSMConfig);\r
+#endif\r
+\r
+#if defined(USE_J1939TP)\r
+       // Setup J1939Tp\r
+       J1939Tp_Init(ConfigPtr->J1939TpConfig);\r
+#endif\r
+\r
+\r
+       // Setup LIN\r
+       // TODO\r
+\r
+#if defined(USE_PDUR)\r
+       // Setup PDU Router\r
+       PduR_Init(ConfigPtr->PduRConfig);\r
+#endif\r
+\r
+#if defined(USE_CANNM)\r
+        // Setup Can Network Manager\r
+        CanNm_Init(ConfigPtr->CanNmConfig);\r
+#endif\r
+\r
+#if defined(USE_UDPNM)\r
+        // Setup Udp Network Manager\r
+        UdpNm_Init(ConfigPtr->UdpNmConfig);\r
+#endif\r
+\r
+#if defined(USE_NM)\r
+        // Setup Network Management Interface\r
+        Nm_Init(ConfigPtr->NmConfig);\r
+#endif\r
+\r
+#if defined(USE_COM)\r
+       // Setup COM layer\r
+       Com_Init(ConfigPtr->ComConfig);\r
+#endif\r
+\r
+#if defined(USE_DCM)\r
+       // Setup DCM\r
+       Dcm_Init();\r
+#endif\r
+\r
+#if defined(USE_IOHWAB)\r
+       // Setup IO hardware abstraction layer\r
+       IoHwAb_Init();\r
+#endif\r
+\r
+}\r
+\r
+void EcuM_AL_DriverInitThree(const EcuM_ConfigType* ConfigPtr)\r
+{\r
+       (void)ConfigPtr;\r
+  //lint --e{715}       PC-Lint (715) - ConfigPtr usage depends on configuration of modules\r
+\r
+#if defined(USE_DEM)\r
+       // Setup DEM\r
+       Dem_Init();\r
+#endif\r
+\r
+#if defined(USE_COMM)\r
+        // Setup Communication Manager\r
+        ComM_Init(ConfigPtr->ComMConfig);\r
+#endif\r
+}\r
+\r
+void EcuM_OnEnterRUN(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnExitRun(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnExitPostRun(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnPrepShutdown(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnGoSleep(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnGoOffOne(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_OnGoOffTwo(void)\r
+{\r
+\r
+}\r
+\r
+void EcuM_AL_SwitchOff(void)\r
+{\r
+\r
+}\r

diff --git a/boards/stm32_stm3210c/examples/os_simple/config/EcuM_Cfg.h b/boards/stm32_stm3210c/examples/os_simple/config/EcuM_Cfg.h
new file mode 100644 (file)
index 0000000..b1cc93f
--- /dev/null
+++ b/boards/stm32_stm3210c/examples/os_simple/config/EcuM_Cfg.h
@@ -0,0 +1,41 @@
+/*\r
+* Configuration of module: EcuM (EcuM_Cfg.h)\r
+*\r
+* Created by:              \r
+* Copyright:               \r
+*\r
+* Configured for (MCU):    STM32_F107\r
+*\r
+* Module vendor:           ArcCore\r
+* Generator version:       2.0.2\r
+*\r
+* Generated by Arctic Studio (http://arccore.com) \r
+*/\r
+\r
+
+#if !(((ECUM_SW_MAJOR_VERSION == 2) && (ECUM_SW_MINOR_VERSION == 0)) )
+#error EcuM: Configuration file expected BSW module version to be 2.0.*
+#endif
+
+\r
+\r
+#ifndef ECUM_CFG_H_\r
+#define ECUM_CFG_H_\r
+\r
+#define ECUM_VERSION_INFO_API  STD_OFF\r
+#define ECUM_DEV_ERROR_DETECT  STD_OFF\r
+\r
+#define ECUM_MAIN_FUNCTION_PERIOD  (200)\r
+#define ECUM_NVRAM_READALL_TIMEOUT (10000)\r
+#define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
+#define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
+\r
+\r
+typedef enum {\r
+       ECUM_USER_User_1,\r
+       ECUM_USER_ENDMARK       // Must be the last in list!\r
+} EcuM_UserList;\r
+\r
+\r
+#endif /*ECUM_CFG_H_*/\r
+\r

diff --git a/boards/stm32_stm3210c/examples/os_simple/config/EcuM_Generated_Types.h b/boards/stm32_stm3210c/examples/os_simple/config/EcuM_Generated_Types.h
new file mode 100644 (file)
index 0000000..907fb2b
--- /dev/null
+++ b/boards/stm32_stm3210c/examples/os_simple/config/EcuM_Generated_Types.h
@@ -0,0 +1,178 @@
+/*\r
+* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
+*\r
+* Created by:              \r
+* Copyright:               \r
+*\r
+* Configured for (MCU):    STM32_F107\r
+*\r
+* Module vendor:           ArcCore\r
+* Generator version:       2.0.2\r
+*\r
+* Generated by Arctic Studio (http://arccore.com) \r
+*/\r
+\r
+
+#if !(((ECUM_SW_MAJOR_VERSION == 2) && (ECUM_SW_MINOR_VERSION == 0)) )
+#error EcuM: Configuration file expected BSW module version to be 2.0.*
+#endif
+
+\r
+#ifndef _ECUM_GENERATED_TYPES_H_\r
+#define _ECUM_GENERATED_TYPES_H_\r
+\r
+#if (ECUM_USE_SERVICE_PORTS == STD_ON) && defined(USE_RTE)\r
+#include "Rte_EcuM.h"\r
+#endif\r
+\r
+#include "EcuM_Types.h"\r
+\r
+#if defined(USE_MCU)\r
+#include "Mcu.h"\r
+#endif\r
+#if defined(USE_PORT)\r
+#include "Port.h"\r
+#endif\r
+#if defined(USE_CAN)\r
+#include "Can.h"\r
+#endif\r
+#if defined(USE_CANIF)\r
+#include "CanIf.h"\r
+#endif\r
+#if defined(USE_PWM)\r
+#include "Pwm.h"\r
+#endif\r
+#if defined(USE_COM)\r
+#include "Com.h"\r
+#endif\r
+#if defined(USE_PDUR)\r
+#include "PduR.h"\r
+#endif\r
+#if defined(USE_DMA)\r
+#include "Dma.h"\r
+#endif\r
+#if defined(USE_ADC)\r
+#include "Adc.h"\r
+#endif\r
+#if defined(USE_GPT)\r
+#include "Gpt.h"\r
+#endif\r
+#if defined(USE_COMM)\r
+#include "ComM.h"\r
+#endif\r
+#if defined(USE_NM)\r
+#include "Nm.h"\r
+#endif\r
+#if defined(USE_CANNM)\r
+#include "CanNm.h"\r
+#endif\r
+#if defined(USE_CANSM)\r
+#include "CanSM.h"\r
+#endif\r
+#if defined(USE_J1939TP)\r
+#include "J1939Tp.h"\r
+#endif\r
+#if defined(USE_UDPNM)\r
+#include "UdpNm.h"\r
+#endif\r
+#if defined(USE_LINSM)\r
+#include "LinSM.h"\r
+#endif\r
+#if defined(USE_FLS)\r
+#include "Fls.h"\r
+#endif\r
+#if defined(USE_EEP)\r
+#include "Eep.h"\r
+#endif\r
+#if defined(USE_SPI)\r
+#include "Spi.h"\r
+#endif\r
+#if defined(USE_WDG)\r
+#include "Wdg.h"\r
+#endif\r
+#if defined(USE_WDGM)\r
+#include "WdgM.h"\r
+#endif\r
+#if defined(USE_WDGIF)\r
+#include "WdgIf.h"\r
+#endif\r
+\r
+\r
+typedef struct\r
+{\r
+       EcuM_StateType EcuMDefaultShutdownTarget;\r
+       uint8 EcuMDefaultSleepMode;\r
+       AppModeType EcuMDefaultAppMode;\r
+       uint32 EcuMRunMinimumDuration;\r
+       uint32 EcuMNvramReadAllTimeout;\r
+       uint32 EcuMNvramWriteAllTimeout;\r
+\r
+#if defined(USE_MCU)\r
+        const Mcu_ConfigType* McuConfig;\r
+#endif\r
+#if defined(USE_PORT)\r
+        const Port_ConfigType* PortConfig;\r
+#endif\r
+#if defined(USE_CAN)\r
+        const Can_ConfigType* CanConfig;\r
+#endif\r
+#if defined(USE_CANIF)\r
+        const CanIf_ConfigType* CanIfConfig;\r
+#endif\r
+#if defined(USE_CANSM)\r
+        const CanSM_ConfigType* CanSMConfig;\r
+#endif\r
+#if defined(USE_NM)\r
+        const Nm_ConfigType* NmConfig;\r
+#endif\r
+#if defined(USE_CANNM)\r
+        const CanNm_ConfigType* CanNmConfig;\r
+#endif\r
+#if defined(USE_UDPNM)\r
+        const UdpNm_ConfigType* UdpNmConfig;\r
+#endif\r
+#if defined(USE_COMM)\r
+        const ComM_ConfigType* ComMConfig;\r
+#endif\r
+#if defined(USE_COM)\r
+        const Com_ConfigType* ComConfig;\r
+#endif\r
+#if defined(USE_J1939TP)\r
+        const J1939Tp_ConfigType* J1939TpConfig;\r
+#endif\r
+#if defined(USE_PDUR)\r
+        const PduR_PBConfigType* PduRConfig;\r
+#endif\r
+#if defined(USE_PWM)\r
+        const Pwm_ConfigType* PwmConfig;\r
+#endif\r
+#if defined(USE_DMA)\r
+        const Dma_ConfigType* DmaConfig;\r
+#endif\r
+#if defined(USE_ADC)\r
+    const Adc_ConfigType* AdcConfig;\r
+#endif\r
+#if defined(USE_GPT)\r
+    const Gpt_ConfigType* GptConfig;\r
+#endif\r
+#if defined(USE_FLS)\r
+       const Fls_ConfigType* FlashConfig;\r
+#endif\r
+#if defined(USE_EEP)\r
+       const Eep_ConfigType* EepConfig;\r
+#endif\r
+#if defined(USE_SPI)\r
+       const Spi_ConfigType* SpiConfig;\r
+#endif\r
+#if defined(USE_WDG)\r
+    const Wdg_ConfigType* WdgConfig;\r
+#endif\r
+#if defined(USE_WDGIF)\r
+    const WdgIf_ConfigType* WdgIfConfig;\r
+#endif\r
+#if defined(USE_WDGM)\r
+    const WdgM_ConfigType* WdgMConfig;\r
+#endif\r
+} EcuM_ConfigType;\r
+\r
+#endif /*_ECUM_GENERATED_TYPES_H_*/\r

diff --git a/boards/stm32_stm3210c/examples/os_simple/config/EcuM_PBcfg.c b/boards/stm32_stm3210c/examples/os_simple/config/EcuM_PBcfg.c
new file mode 100644 (file)
index 0000000..cfb351c
--- /dev/null
+++ b/boards/stm32_stm3210c/examples/os_simple/config/EcuM_PBcfg.c
@@ -0,0 +1,119 @@
+/*\r
+* Configuration of module: EcuM (EcuM_PBcfg.c)\r
+*\r
+* Created by:              \r
+* Copyright:               \r
+*\r
+* Configured for (MCU):    STM32_F107\r
+*\r
+* Module vendor:           ArcCore\r
+* Generator version:       2.0.2\r
+*\r
+* Generated by Arctic Studio (http://arccore.com) \r
+*/\r
+\r
+\r
+\r
+#include "EcuM.h"\r
+#include "EcuM_Generated_Types.h"\r
+\r
+#if defined(USE_CANSM)\r
+extern const CanSM_ConfigType CanSM_Config;\r
+#endif\r
+#if defined(USE_NM)\r
+extern const Nm_ConfigType Nm_Config;\r
+#endif\r
+#if defined(USE_CANNM)\r
+extern const CanNm_ConfigType CanNm_Config;\r
+#endif\r
+#if defined(USE_UDPNM)\r
+extern const UdpNm_ConfigType UdpNm_Config;\r
+#endif\r
+#if defined(USE_COMM)\r
+extern const ComM_ConfigType ComM_Config;\r
+#endif\r
+\r
+#if defined(USE_J1939TP)\r
+extern const J1939Tp_ConfigType J1939Tp_Config;\r
+#endif\r
+\r
+\r
+EcuM_ConfigType EcuMConfig =\r
+{\r
+       .EcuMDefaultShutdownTarget = ECUM_STATE_RESET,\r
+       .EcuMDefaultSleepMode = 0, // Don't care\r
+       .EcuMDefaultAppMode = OSDEFAULTAPPMODE,\r
+       .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
+       .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
+       .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+\r
+#if defined(USE_MCU)\r
+        .McuConfig = McuConfigData,\r
+#endif\r
+#if defined(USE_PORT)\r
+        .PortConfig = &PortConfigData,\r
+#endif\r
+#if defined(USE_CAN)\r
+        .CanConfig = &CanConfigData,\r
+#endif\r
+#if defined(USE_CANIF)\r
+        .CanIfConfig = &CanIf_Config,\r
+#endif\r
+#if defined(USE_CANSM)\r
+        .CanSMConfig = &CanSM_Config,\r
+#endif\r
+#if defined(USE_CANNM)\r
+        .CanNmConfig = &CanNm_Config,\r
+#endif\r
+#if defined(USE_UDPNM)\r
+        .UdpNmConfig = &UdpNm_Config,\r
+#endif\r
+#if defined(USE_COM)\r
+        .ComConfig = &ComConfiguration,\r
+#endif\r
+#if defined(USE_COMM)\r
+        .ComMConfig = &ComM_Config,\r
+#endif\r
+#if defined(USE_J1939TP)\r
+        .J1939TpConfig = &J1939Tp_Config,\r
+#endif\r
+#if defined(USE_NM)\r
+        .NmConfig = &Nm_Config,\r
+#endif\r
+#if defined(USE_PDUR)\r
+        .PduRConfig = &PduR_Config,\r
+#endif\r
+#if defined(USE_J1939TP)\r
+        .J1939TpConfig = &J1939Tp_Config,\r
+#endif\r
+#if defined(USE_DMA)\r
+        .DmaConfig = DmaConfig,\r
+#endif\r
+#if defined(USE_ADC)\r
+        .AdcConfig = AdcConfig,\r
+#endif\r
+#if defined(USE_PWM)\r
+        .PwmConfig = &PwmConfig,\r
+#endif\r
+#if defined(USE_WDG)\r
+    .WdgConfig = &WdgConfig,\r
+#endif\r
+#if defined(USE_WDGM)\r
+    .WdgMConfig = &WdgMConfig,\r
+#endif\r
+#if defined(USE_WDGIF)\r
+    .WdgIfConfig = &WdgIfConfig,\r
+#endif\r
+#if defined(USE_GPT)\r
+        .GptConfig = GptConfigData,\r
+#endif\r
+#if defined(USE_FLS)\r
+       .FlashConfig = FlsConfigSet,\r
+#endif\r
+#if defined(USE_EEP)\r
+       .EepConfig = EepConfigData,\r
+#endif\r
+#if defined(USE_SPI)\r
+       .SpiConfig = &SpiConfigData,\r
+#endif\r
+};\r

diff --git a/boards/stm32_stm3210c/examples/os_simple/os_simple_stm32_stm3210c.arxml b/boards/stm32_stm3210c/examples/os_simple/os_simple_stm32_stm3210c.arxml
index 4113daff98aa03fa4bd66638e88917640a519556..ca686acbd73c68ced6ef6f8b3b9b0fe484059eb4 100644 (file)
--- a/boards/stm32_stm3210c/examples/os_simple/os_simple_stm32_stm3210c.arxml
+++ b/boards/stm32_stm3210c/examples/os_simple/os_simple_stm32_stm3210c.arxml
@@ -21,6 +21,7 @@
           <MODULE-REFS>\r
             <MODULE-REF DEST="MODULE-CONFIGURATION">/os_simple_stm32_stm3210c/Mcu</MODULE-REF>\r
             <MODULE-REF DEST="MODULE-CONFIGURATION">/os_simple_stm32_stm3210c/Os</MODULE-REF>\r
+            <MODULE-REF DEST="MODULE-CONFIGURATION">/os_simple_stm32_stm3210c/EcuM</MODULE-REF>\r
           </MODULE-REFS>\r
         </ECU-CONFIGURATION>\r
         <ECU-SW-COMPOSITION UUID="a91fd3fa-db09-43b5-818d-1b3d02627733">\r
@@ -623,6 +624,67 @@
             </CONTAINER>\r
           </CONTAINERS>\r
         </MODULE-CONFIGURATION>\r
+        <MODULE-CONFIGURATION UUID="3b77849b-96fb-4b1f-9d38-4146015167ab">\r
+          <SHORT-NAME>EcuM</SHORT-NAME>\r
+          <ADMIN-DATA>\r
+            <SDGS>\r
+              <SDG />\r
+              <SDG GID="Arccore::ModuleOptions">\r
+                <SD GID="GENERATE_AND_VALIDATE">true</SD>\r
+                <SD GID="ARCCORE_EDITOR_VERSION">2.0.2</SD>\r
+              </SDG>\r
+            </SDGS>\r
+          </ADMIN-DATA>\r
+          <DEFINITION-REF DEST="MODULE-DEF">/ArcCore/EcuM</DEFINITION-REF>\r
+          <CONTAINERS>\r
+            <CONTAINER UUID="bafaa8fe-9522-4479-b2a7-47d7c3e83321">\r
+              <SHORT-NAME>EcuMGeneral</SHORT-NAME>\r
+              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMGeneral</DEFINITION-REF>\r
+              <PARAMETER-VALUES>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMGeneral/EcuMDevErrorDetect</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMGeneral/EcuMIncludeNvramMgr</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMGeneral/EcuMVersionInfoApi</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <FLOAT-VALUE>\r
+                  <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMGeneral/EcuMMainFunctionPeriod</DEFINITION-REF>\r
+                  <VALUE>0.2</VALUE>\r
+                </FLOAT-VALUE>\r
+              </PARAMETER-VALUES>\r
+            </CONTAINER>\r
+            <CONTAINER UUID="1bb0d0ec-697f-43ac-9f1a-2d36915986a5">\r
+              <SHORT-NAME>EcuMConfiguration</SHORT-NAME>\r
+              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration</DEFINITION-REF>\r
+              <PARAMETER-VALUES>\r
+                <FLOAT-VALUE>\r
+                  <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMNvramReadallTimeout</DEFINITION-REF>\r
+                  <VALUE>10.0</VALUE>\r
+                </FLOAT-VALUE>\r
+                <FLOAT-VALUE>\r
+                  <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMRunMinimumDuration</DEFINITION-REF>\r
+                  <VALUE>10.0</VALUE>\r
+                </FLOAT-VALUE>\r
+                <FLOAT-VALUE>\r
+                  <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMNvramWriteallTimeout</DEFINITION-REF>\r
+                  <VALUE>10.0</VALUE>\r
+                </FLOAT-VALUE>\r
+              </PARAMETER-VALUES>\r
+              <SUB-CONTAINERS>\r
+                <CONTAINER UUID="e95c54fc-3ac5-4f8c-9715-2340ba608bb8">\r
+                  <SHORT-NAME>User_1</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
+                </CONTAINER>\r
+              </SUB-CONTAINERS>\r
+            </CONTAINER>\r
+          </CONTAINERS>\r
+        </MODULE-CONFIGURATION>\r
       </ELEMENTS>\r
     </AR-PACKAGE>\r
   </TOP-LEVEL-PACKAGES>\r