]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Merge with 3bd2b84a75d8d5d7708e0818fe64cc6cee360049
authorjohn <devnull@localhost>
Wed, 19 Sep 2012 11:42:20 +0000 (13:42 +0200)
committerjohn <devnull@localhost>
Wed, 19 Sep 2012 11:42:20 +0000 (13:42 +0200)
182 files changed:
arch/ppc/mpc55xx/drivers/Dma.c
arch/ppc/mpc55xx/drivers/Dma.h
arch/ppc/mpc55xx/drivers/Mcu.c
arch/ppc/mpc55xx/drivers/Mcu_Sleep.sx
arch/ppc/mpc55xx/scripts/linkscript_gcc.ldf
boards/generic/EcuM_Callout_Stubs.c [deleted file]
boards/mpc5516it/board_mpc5516it.arxml
boards/mpc5516it/examples/com_simple/com_simple_mpc5516it.arxml
boards/mpc5516it/examples/com_simple/config/Can_Cfg.h
boards/mpc5516it/examples/com_simple/config/Can_PBcfg.c
boards/mpc5516it/examples/com_simple/config/Com_Cfg.h
boards/mpc5516it/examples/com_simple/config/Com_PbCfg.c
boards/mpc5516it/examples/com_simple/config/Com_PbCfg.h
boards/mpc5516it/examples/com_simple/config/EcuM_Callout_Stubs.c [deleted file]
boards/mpc5516it/examples/com_simple/config/EcuM_Cfg.h
boards/mpc5516it/examples/com_simple/config/EcuM_Generated_Types.h [deleted file]
boards/mpc5516it/examples/com_simple/config/EcuM_PBcfg.c
boards/mpc5516it/examples/com_simple/config/Mcu_Cfg.h
boards/mpc5516it/examples/com_simple/config/Port_Cfg.c
boards/mpc5516it/examples/com_simple/config/Port_Cfg.h
boards/mpc5516it/examples/led_rte/config/Calibration_Settings.h
boards/mpc5516it/examples/led_rte/config/EcuM_Cfg.h
boards/mpc5516it/examples/led_rte/config/EcuM_Generated_Types.h [deleted file]
boards/mpc5516it/examples/led_rte/config/EcuM_PBcfg.c
boards/mpc5516it/examples/led_rte/config/Mcu_Cfg.h
boards/mpc5516it/examples/led_rte/config/Port_Cfg.c
boards/mpc5516it/examples/led_rte/config/Port_Cfg.h
boards/mpc5516it/examples/led_rte/config/Rte.c
boards/mpc5516it/examples/led_rte/config/Rte_Blinker.c
boards/mpc5516it/examples/led_rte/config/Rte_Blinker.h
boards/mpc5516it/examples/led_rte/config/Rte_Blinker_Internal.h
boards/mpc5516it/examples/led_rte/config/Rte_Cbk.c
boards/mpc5516it/examples/led_rte/config/Rte_Data.c
boards/mpc5516it/examples/led_rte/config/Rte_Data.h
boards/mpc5516it/examples/led_rte/config/Rte_EcuAbstraction.c
boards/mpc5516it/examples/led_rte/config/Rte_EcuAbstraction.h
boards/mpc5516it/examples/led_rte/config/Rte_EcuAbstraction_Internal.h
boards/mpc5516it/examples/led_rte/config/Rte_Type.h
boards/mpc5516it/examples/led_rte/led_rte_ecuc_mpc5516.arxml
boards/mpc5516it/examples/os_simple/config/EcuM_Callout_Stubs.c [deleted file]
boards/mpc5516it/examples/os_simple/config/EcuM_Cfg.h
boards/mpc5516it/examples/os_simple/config/EcuM_Generated_Types.h [deleted file]
boards/mpc5516it/examples/os_simple/config/EcuM_PBcfg.c
boards/mpc5516it/examples/os_simple/config/Mcu_Cfg.c
boards/mpc5516it/examples/os_simple/config/Mcu_Cfg.h
boards/mpc5516it/examples/os_simple/config/Port_Cfg.c
boards/mpc5516it/examples/os_simple/config/Port_Cfg.h
boards/mpc5516it/examples/os_simple/os_simple_mpc5516it.arxml
boards/mpc5567qrtech/examples/led_rte/config/Calibration_Settings.h
boards/mpc5567qrtech/examples/led_rte/config/EcuM_Cfg.h
boards/mpc5567qrtech/examples/led_rte/config/EcuM_Generated_Types.h [deleted file]
boards/mpc5567qrtech/examples/led_rte/config/EcuM_PBcfg.c
boards/mpc5567qrtech/examples/led_rte/config/Mcu_Cfg.h
boards/mpc5567qrtech/examples/led_rte/config/Port_Cfg.c
boards/mpc5567qrtech/examples/led_rte/config/Port_Cfg.h
boards/mpc5567qrtech/examples/led_rte/config/Rte.c
boards/mpc5567qrtech/examples/led_rte/config/Rte_Blinker.c
boards/mpc5567qrtech/examples/led_rte/config/Rte_Blinker.h
boards/mpc5567qrtech/examples/led_rte/config/Rte_Blinker_Internal.h
boards/mpc5567qrtech/examples/led_rte/config/Rte_Cbk.c
boards/mpc5567qrtech/examples/led_rte/config/Rte_Data.c
boards/mpc5567qrtech/examples/led_rte/config/Rte_Data.h
boards/mpc5567qrtech/examples/led_rte/config/Rte_EcuAbstraction.c
boards/mpc5567qrtech/examples/led_rte/config/Rte_EcuAbstraction.h
boards/mpc5567qrtech/examples/led_rte/config/Rte_EcuAbstraction_Internal.h
boards/mpc5567qrtech/examples/led_rte/config/Rte_Type.h
boards/mpc5567qrtech/examples/led_rte/led_rte_ecuc_mpc5567.arxml
boards/mpc5567qrtech/examples/os_simple/config/EcuM_Callout_Stubs.c [deleted file]
boards/mpc5567qrtech/examples/os_simple/config/EcuM_Cfg.h
boards/mpc5567qrtech/examples/os_simple/config/EcuM_Generated_Types.h [deleted file]
boards/mpc5567qrtech/examples/os_simple/config/EcuM_PBcfg.c
boards/mpc5567qrtech/examples/os_simple/config/Mcu_Cfg.h
boards/mpc5567qrtech/examples/os_simple/os_simple_mpc5567qrtech.arxml
boards/mpc5567qrtech/examples/rte_simple/config/Calibration_Settings.h
boards/mpc5567qrtech/examples/rte_simple/config/EcuM_Cfg.h
boards/mpc5567qrtech/examples/rte_simple/config/EcuM_Generated_Types.h [deleted file]
boards/mpc5567qrtech/examples/rte_simple/config/EcuM_PBcfg.c
boards/mpc5567qrtech/examples/rte_simple/config/Mcu_Cfg.h
boards/mpc5567qrtech/examples/rte_simple/config/Os_Cfg.h
boards/mpc5567qrtech/examples/rte_simple/config/Rte.c
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Calculator.c
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Calculator.h
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Calculator_Internal.h
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Cbk.c
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Data.c
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Data.h
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Logger.c
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Logger.h
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Logger2.c
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Logger2.h
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Logger2_Internal.h
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Logger_Internal.h
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Tester.c
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Tester.h
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Tester_Internal.h
boards/mpc5567qrtech/examples/rte_simple/config/Rte_Type.h
boards/mpc5567qrtech/examples/rte_simple/rte_simple_mpc5567qrtech.arxml
boards/mpc5668_gkit/examples/os_simple/config/EcuM_Callout_Stubs.c [deleted file]
boards/mpc5668_gkit/examples/os_simple/config/EcuM_Cfg.h
boards/mpc5668_gkit/examples/os_simple/config/EcuM_Generated_Types.h [deleted file]
boards/mpc5668_gkit/examples/os_simple/config/EcuM_PBcfg.c
boards/mpc5668_gkit/examples/os_simple/config/Mcu_Cfg.c
boards/mpc5668_gkit/examples/os_simple/config/Mcu_Cfg.h
boards/mpc5668_gkit/examples/os_simple/os_simple_mpc5668_gkit.arxml
boards/stm32_mcbstm32/examples/os_simple/config/EcuM_Callout_Stubs.c [deleted file]
boards/stm32_mcbstm32/examples/os_simple/config/EcuM_Cfg.h
boards/stm32_mcbstm32/examples/os_simple/config/EcuM_Generated_Types.h [deleted file]
boards/stm32_mcbstm32/examples/os_simple/config/EcuM_PBcfg.c
boards/stm32_mcbstm32/examples/os_simple/config/Mcu_Cfg.c
boards/stm32_mcbstm32/examples/os_simple/config/Mcu_Cfg.h
boards/stm32_mcbstm32/examples/os_simple/os_simple_stm32_mcbstm32.arxml
boards/stm32_stm3210c/examples/com_simple/com_simple_stm3210c.arxml
boards/stm32_stm3210c/examples/com_simple/config/Com_Cfg.h
boards/stm32_stm3210c/examples/com_simple/config/Com_PbCfg.c
boards/stm32_stm3210c/examples/com_simple/config/Com_PbCfg.h
boards/stm32_stm3210c/examples/com_simple/config/EcuM_Callout_Stubs.c [deleted file]
boards/stm32_stm3210c/examples/com_simple/config/EcuM_Cfg.h
boards/stm32_stm3210c/examples/com_simple/config/EcuM_Generated_Types.h [deleted file]
boards/stm32_stm3210c/examples/com_simple/config/EcuM_PBcfg.c
boards/stm32_stm3210c/examples/com_simple/config/Mcu_Cfg.h
boards/stm32_stm3210c/examples/os_simple/config/EcuM_Callout_Stubs.c [deleted file]
boards/stm32_stm3210c/examples/os_simple/config/EcuM_Cfg.h
boards/stm32_stm3210c/examples/os_simple/config/EcuM_Generated_Types.h [deleted file]
boards/stm32_stm3210c/examples/os_simple/config/EcuM_PBcfg.c
boards/stm32_stm3210c/examples/os_simple/config/Mcu_Cfg.c
boards/stm32_stm3210c/examples/os_simple/config/Mcu_Cfg.h
boards/stm32_stm3210c/examples/os_simple/os_simple_stm32_stm3210c.arxml
boards/ti_tms570ls/examples/os_simple/config/EcuM.mk
boards/ti_tms570ls/examples/os_simple/config/EcuM_Callout_Stubs.c [deleted file]
boards/ti_tms570ls/examples/os_simple/config/EcuM_Cfg.h
boards/ti_tms570ls/examples/os_simple/config/EcuM_Generated_Types.h [deleted file]
boards/ti_tms570ls/examples/os_simple/config/EcuM_PBcfg.c
boards/ti_tms570ls/examples/os_simple/config/Mcu_Cfg.h
boards/ti_tms570ls/examples/os_simple/os_simple_tms570ls.arxml
boards/ti_tms570ls/examples/rte_simple/config/Calibration_Settings.h
boards/ti_tms570ls/examples/rte_simple/config/Can_Cfg.h
boards/ti_tms570ls/examples/rte_simple/config/Can_Lcfg.c
boards/ti_tms570ls/examples/rte_simple/config/Com_Cfg.h
boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.c
boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.h
boards/ti_tms570ls/examples/rte_simple/config/Dio_Cfg.h
boards/ti_tms570ls/examples/rte_simple/config/Dio_Lcfg.c
boards/ti_tms570ls/examples/rte_simple/config/EcuM_Cfg.h
boards/ti_tms570ls/examples/rte_simple/config/EcuM_Generated_Types.h [deleted file]
boards/ti_tms570ls/examples/rte_simple/config/EcuM_PBcfg.c [new file with mode: 0644]
boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.c
boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.h
boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.c
boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.h
boards/ti_tms570ls/examples/rte_simple/config/Rte.c
boards/ti_tms570ls/examples/rte_simple/config/Rte.mk
boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator.c
boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator.h
boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator_Internal.h
boards/ti_tms570ls/examples/rte_simple/config/Rte_Cbk.c
boards/ti_tms570ls/examples/rte_simple/config/Rte_Data.c
boards/ti_tms570ls/examples/rte_simple/config/Rte_Data.h
boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger.c
boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger.h
boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2.c
boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2.h
boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2_Internal.h
boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger_Internal.h
boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester.c
boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester.h
boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester_Internal.h
boards/ti_tms570ls/examples/rte_simple/config/Rte_Type.h
boards/ti_tms570ls/examples/rte_simple/rte_simple_ti_tms570ls.arxml
common/newlib_port.c
drivers/Adc_Internal.c
examples/os_simple/os_simple.c
include/EcuM.h
include/EcuM_Types.h
include/Gpt.h
include/Os.h
include/arm/Cpu.h
include/io.h
scripts/rules.mk
system/EcuM/EcuM.c
system/EcuM/EcuM_Callout_Stubs.c
system/EcuM/EcuM_Main.c
system/kernel/init.c

index 3787a6f2113cda358849c7bb501eb4f66fcede8b..9153fd0440239fe92f0314c0e70fd213e4d111ed 100644 (file)
@@ -48,6 +48,15 @@ void Dma_Init (const Dma_ConfigType *ConfigPtr)
   EDMA.CR.B.ERCA = ConfigPtr->dmaChannelArbitration;\r
 }\r
 \r
+void Dma_DeInit( void ) {\r
+       Dma_ChannelType channel;\r
+       for (channel = (Dma_ChannelType)0; channel < DMA_NUMBER_OF_CHANNELS; channel++)\r
+       {\r
+               Dma_StopChannel(channel);\r
+       }\r
+}\r
+\r
+\r
 void Dma_ConfigureChannel (Dma_TcdType *tcd, Dma_ChannelType channel)\r
 {\r
   /* Copy transfer configuration to correct channel. */\r
index da43a2d007f43fe469d2938273c82835151ad627..dcea7a3b8292e68d42e7dc817daf7559683a8d5d 100644 (file)
@@ -346,6 +346,7 @@ extern const Dma_ConfigType DmaConfig [];
 \r
 \r
 void Dma_Init (const Dma_ConfigType *ConfigPtr);\r
+void Dma_DeInit (void );\r
 void Dma_ConfigureChannel (Dma_TcdType *tcd, Dma_ChannelType channel);\r
 void Dma_ConfigureChannelTranferSize (uint32_t nbrOfIterations, Dma_ChannelType channel);\r
 void Dma_ConfigureChannelSourceCorr (uint32_t sourceCorrection, Dma_ChannelType channel);\r
index 13da5609a247c8a75c0028e9c17a58d7c830133f..d216c45c857ae776533028e84d9a5cb87df997ae 100644 (file)
@@ -14,6 +14,7 @@
  * -------------------------------- Arctic Core ------------------------------*/\r
 \r
 \r
+/* ----------------------------[includes]------------------------------------*/\r
 #include <assert.h>\r
 #include <string.h>\r
 #include "Std_Types.h"\r
 #include "Ramlog.h"\r
 #include "Os.h"\r
 #include "isr.h"\r
+#include "io.h"\r
 \r
 //#define USE_LDEBUG_PRINTF 1\r
 #include "debug.h"\r
 \r
+/* ----------------------------[private define]------------------------------*/\r
+\r
 #define SYSCLOCK_SELECT_PLL    0x2\r
 \r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5668)\r
+\r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5668)\r
+#define CRP_BASE                       (0xFFFEC000ul)\r
+#else\r
+#error Please define CRP_BASE\r
+#endif\r
+\r
+#define CRP_CLKSRC                     (CRP_BASE+0x0)\r
+#define CRP_RTCSC                      (CRP_BASE+0x10)\r
+#define CRP_RTCCNT                     (CRP_BASE+0x14)\r
+/* 40--4F differs ALOT */\r
+#define CRP_Z1VEC                      (CRP_BASE+0x50)\r
+#define CRP_Z6VEC                      (CRP_BASE+0x50)\r
+#define CRP_Z0VEC                      (CRP_BASE+0x54)\r
+#define CRP_RECPTR                     (CRP_BASE+0x58)\r
+#define CRP_PSCR                       (CRP_BASE+0x60)\r
+\r
+#define xVEC_xVEC(_x)\r
+#define PSCR_SLEEP                     0x00008000ul\r
+#define PSCR_SLP12EN           0x00000800ul\r
+#define PCSR_RAMSEL(_x)                ((_x)<<8)\r
+#define xVEC_VLE                       0x00000001ul\r
+#define xVEC_xRST                      0x00000002ul\r
+\r
+#define RECPTR_FASTREC         0x00000002ul\r
+\r
+\r
+#if defined(CFG_VLE)\r
+#define VLE_VAL                xVEC_VLE\r
+#else\r
+#define VLE_VAL                0\r
+#endif\r
+\r
+#if defined(CFG_MPC5516 )\r
+#define RAMSEL_VAL             0x7\r
+#elif defined(CFG_MPC5668)\r
+#define RAMSEL_VAL             0x3\r
+#else\r
+#error  Please define RAMSEL_VAL\r
+#endif\r
+\r
+#endif\r
+\r
+\r
+/* ----------------------------[private macro]-------------------------------*/\r
+\r
+\r
 #if defined(CFG_MPC5567)\r
 #define CALC_SYSTEM_CLOCK(_extal,_emfd,_eprediv,_erfd)  \\r
             ( (_extal) * ((_emfd)+4) / (((_eprediv)+1)*(1<<(_erfd))) )\r
             ( (_extal) * ((_emfd)+16) / (((_eprediv)+1)*((_erfd)+1)) )\r
 #endif\r
 \r
+/* ----------------------------[private typedef]-----------------------------*/\r
+\r
+\r
 typedef void (*vfunc_t)();\r
 \r
+\r
+/* ----------------------------[private function prototypes]-----------------*/\r
+/* ----------------------------[private variables]---------------------------*/\r
+\r
+#if defined(CFG_MPC5516)\r
+static uint32 Mcu_SavedHaltFlags;\r
+#else\r
+static uint32 Mcu_SavedHaltFlags[2];\r
+#endif\r
+\r
+\r
+\r
+/* ----------------------------[private functions]---------------------------*/\r
+/* ----------------------------[public functions]----------------------------*/\r
+\r
 /* Function declarations. */\r
 static void Mcu_ConfigureFlash(void);\r
 \r
@@ -679,6 +749,8 @@ void Mcu_PerformReset(void)
 \r
 //-------------------------------------------------------------------\r
 \r
+#if defined(CFG_MPC5516) || defined(CFG_MPC5668)\r
+\r
 /**\r
  *\r
  * Application Notes!\r
@@ -691,75 +763,51 @@ void Mcu_PerformReset(void)
  */\r
 static void enterLowPower (Mcu_ModeType mcuMode )\r
 {\r
-#if defined(CFG_MPC5668)\r
-       uint32 timeout;\r
-       /* Set the sleep bit; following a WAIT instruction, the device will go to sleep */\r
-       CRP.PSCR.B.SLEEP = 1;\r
 \r
-       /* 0x1 32k, 0x2 64k, 0x3 128k -- RAMs maintain power */\r
-       CRP.PSCR.B.RAMSEL = 0x3;                // Keep all 128K\r
 \r
-       CRP.Z6VEC.R = (uint32)&McuE_LowPowerRecoverFlash;\r
-#if defined(CFG_VLE)\r
-       CRP.Z6VEC.VLE = 1;\r
-#endif\r
+       uint32 timeout;\r
+       /* - Set the sleep bit; following a WAIT instruction, the device will go to sleep\r
+        * - enable the 1.2V internal regulator when in sleep mode only\r
+        * - MPC5516\r
+        *   - 0x1 8k, 0x2 16k, 0x3 32k, 0x6 64k -- RAMs maintain power\r
+        * - MPC5668\r
+        *   - 0x1 32k, 0x2 64k, 0x3 128k\r
+        */\r
+       WRITE32(CRP_PSCR, PSCR_SLEEP | PSCR_SLP12EN | PCSR_RAMSEL(RAMSEL_VAL));\r
 \r
-       /* If we "Mcu_Wakeup()" is located in RAM, set FASTREC */\r
-       CRP.RECPTR.B.FASTREC = 0;\r
+       /* Set Recover Vector */\r
+#if defined(CFG_MPC5516)\r
+\r
+       WRITE32(CRP_Z1VEC, ((uint32)&McuE_LowPowerRecoverFlash) | VLE_VAL );\r
+       READWRITE32( CRP_RECPTR, RECPTR_FASTREC, 0 );\r
 \r
+       Mcu_SavedHaltFlags = SIU.HLT.R;\r
        /* Halt everything */\r
-    SIU.HLT0.R = 0x037FFF3D;\r
-    SIU.HLT1.R = 0x18000F3C;\r
-    while((SIU.HLTACK0.R != 0x037FFF3D) && (SIU.HLTACK1.R != 0x18000F3C) && (timeout<3000)){}\r
+       SIU.HLT.R = 0x3FFFFFFF;\r
+       while((SIU.HLTACK.R != 0x3FFFFFFF) && (timeout<3000)) {}\r
 \r
        /* put Z0 in reset if not used for wakeup */\r
        CRP.Z0VEC.B.Z0RST = 1;\r
 \r
-       // TODO: Enable_all_internal_pull_devices (PULL_DOWN);\r
-\r
-       /* Save context and execute wait instruction.\r
-        *\r
-        * Things that matter here are\r
-        * - Z1VEC, determines where TLB0 will point. TLB0 is written with a\r
-        *   value at startup that 4K aligned to this address.\r
-        * - LowPower_Sleep() will save a interrupt context so we will return\r
-        *   intact.\r
-        * - For devices with little RAM we don't want to impose the alignment\r
-        *   requirements there. Almost as we have to occupy a 4K block for this..\r
-        *   although the code does not take that much space.\r
-        * */\r
-       McuE_EnterLowPower(mcuMode);\r
-\r
-    /* Clear sleep flags to allow pads to operate */\r
-       CRP.PSCR.B.SLEEPF = 0x1;\r
-\r
-#elif defined(CFG_MPC5516)\r
-       uint32 timeout;\r
-       /* Set the sleep bit; following a WAIT instruction, the device will go to sleep */\r
-       CRP.PSCR.B.SLEEP = 1;\r
-       /* enable the 1.2V internal regulator when in sleep mode only */\r
-       CRP.PSCR.B.STOP12EN = 1;\r
-       /* 0x1 8k, 0x2 16k, 0x3 32k, 0x6 64k -- RAMs maintain power */\r
-       CRP.PSCR.B.RAMSEL = 0x7;                // Keep all 80K\r
-\r
-       CRP.Z1VEC.R = (uint32)&McuE_LowPowerRecoverFlash;\r
-#if defined(CFG_VLE)\r
-       CRP.VLE = 1;\r
-#endif\r
+#elif defined(CFG_MPC5668)\r
 \r
-       /* If we "Mcu_Wakeup()" is located in RAM, set FASTREC */\r
-       CRP.RECPRTR.B.FASTREC = 0;\r
+       WRITE32(CRP_Z6VEC, ((uint32)&McuE_LowPowerRecoverFlash) | VLE_VAL );\r
+       READWRITE32(CRP_RECPTR,RECPTR_FASTREC,0 );\r
 \r
+       Mcu_SavedHaltFlags[0] = SIU.HLT0.R;\r
+       Mcu_SavedHaltFlags[1] = SIU.HLT1.R;\r
        /* Halt everything */\r
-       SIU.HLT.R = 0x3FFFFFFF;\r
-       while((SIU.HLTACK.R != 0x3FFFFFFF) && (timeout<3000)) {}\r
+    SIU.HLT0.R = 0x037FFF3D;\r
+    SIU.HLT1.R = 0x18000F3C;\r
+    while((SIU.HLTACK0.R != 0x037FFF3D) && (SIU.HLTACK1.R != 0x18000F3C) && (timeout<3000)){}\r
+#else\r
+#error CPU not defined\r
+#endif\r
 \r
        /* put Z0 in reset if not used for wakeup */\r
        CRP.Z0VEC.B.Z0RST = 1;\r
 \r
-       // TODO: Enable_all_internal_pull_devices (PULL_DOWN);\r
-\r
-       /* Save context and execute wait instruction.\r
+    /* Save context and execute wait instruction.\r
         *\r
         * Things that matter here are\r
         * - Z1VEC, determines where TLB0 will point. TLB0 is written with a\r
@@ -774,12 +822,9 @@ static void enterLowPower (Mcu_ModeType mcuMode )
 \r
     /* Clear sleep flags to allow pads to operate */\r
     CRP.PSCR.B.SLEEPF = 0x1;\r
-#else\r
-       /* NOT SUPPORTED */\r
-       (void) mcuMode;\r
-#endif\r
 }\r
 \r
+#endif\r
 \r
 void Mcu_SetMode( Mcu_ModeType mcuMode)\r
 {\r
@@ -790,13 +835,21 @@ void Mcu_SetMode( Mcu_ModeType mcuMode)
 #if defined(CFG_MPC5516) || defined(CFG_MPC5668)\r
        if( MCU_MODE_RUN == mcuMode ) {\r
 \r
+               /* Get back to "normal" halt flags */\r
+#if defined(CFG_MPC5516)\r
+               SIU.HLT.R = Mcu_SavedHaltFlags;\r
+#elif defined(CFG_MPC5668)\r
+               SIU.HLT0.R = Mcu_SavedHaltFlags[0];\r
+               SIU.HLT1.R = Mcu_SavedHaltFlags[1];\r
+#endif\r
+\r
        } else if( MCU_MODE_SLEEP == mcuMode ) {\r
                /*\r
                 * Follows the AN3548 from Freescale\r
                 *\r
                 */\r
 #if defined(USE_DMA)\r
-               Dma_StopAll();\r
+               Dma_DeInit();\r
 #endif\r
 \r
 \r
index 9f6d4919b6c8cb3e21d200997164ea6614b6ab45..d79c8d001393a63fe3b93b67b5db504142d79c0c 100644 (file)
@@ -102,8 +102,6 @@ McuE_LowPowerRecoverFlash:
        mtCR    r29\r
        mtXER   r30\r
        mtCTR   r31                 // Load SPRs with GPR values\r
-       lmw     r2, 0(r1)           // Restore GPRs from stack\r
-       addi    r1,r1,0x94      // Deallocate space on stack\r
 \r
 #if defined(USE_ECUM)\r
 \r
@@ -112,8 +110,10 @@ McuE_LowPowerRecoverFlash:
        bl EcuM_CheckWakeup\r
 \r
 #endif\r
+       mtLR    r27\r
 \r
-\r
+       lmw     r2, 0(r1)           // Restore GPRs from stack\r
+       addi    r1,r1,0x94      // Deallocate space on stack\r
 \r
     /* branch back to Mcu_SetMode().. */\r
     blr\r
index 146e6443623f39474eea496f10557ebb7b0fc8ce..65ab90012c377bd600b7e1335602477ed07ebfdf 100644 (file)
@@ -46,7 +46,7 @@ MEMORY
 SECTIONS\r
 {\r
 \r
-#if 0\r
+\r
 /* __CALIB_RAM_START, __CALIB_RAM_END, __CALIB_ROM_START are needed by the a2l and the rte generator. \r
   CALIBRATION_ENABLED, CALIBRATION_INITIALIZED_RAM, CALIBRATION_FLS_START are generated by rte \r
 */\r
@@ -98,7 +98,7 @@ __FLS_PROG_START__ = 0;       /* Must be aligned to a sector start. */
 #if !defined(CFG_BOOT)\r
        .rcw __FLS_PROG_START__ : { *(.rcw) } > flash\r
 #endif\r
-#endif\r
+\r
     .text :\r
        {\r
            crt0.o(.text);\r
diff --git a/boards/generic/EcuM_Callout_Stubs.c b/boards/generic/EcuM_Callout_Stubs.c
deleted file mode 100644 (file)
index 3068032..0000000
+++ /dev/null
@@ -1,408 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Callout_Stubs.c)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC5567\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
-#define VALIDATE_STATE(_state) \\r
-       do { \\r
-               EcuM_StateType ecuMState;  \\r
-               EcuM_GetState(&ecuMState); \\r
-               assert(ecuMState == (_state) ); \\r
-       } while(0)\r
-\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
-\r
-void EcuM_CheckWakeup(EcuM_WakeupSourceType source) {\r
-}\r
-\r
-void EcuM_EnableWakeupSources( EcuM_WakeupSourceType source ) {\r
-}\r
-\r
-void EcuM_DisableWakeupSources(EcuM_WakeupSourceType wakeupSource) {\r
-}\r
-\r
-\r
-/**\r
- *\r
- *\r
- *\r
- * @param wakeupSource\r
- */\r
-void EcuM_StartWakeupSources(EcuM_WakeupSourceType wakeupSource) {\r
-       VALIDATE_STATE( ECUM_STATE_WAKEUP_VALIDATION );\r
-\r
-}\r
-\r
-\r
-/**\r
- * Restart drivers..\r
- */\r
-void EcuM_AL_DriverRestart( void ) {\r
-\r
-       VALIDATE_STATE( ECUM_STATE_WAKEUP_VALIDATION );\r
-\r
-}\r
-\r
-\r
-/**\r
- *\r
- * @param wact\r
- * @return\r
- */\r
-EcuM_WakeupReactionType EcuM_OnWakeupReaction( EcuM_WakeupReactionType wact ) {\r
-\r
-       VALIDATE_STATE( ECUM_STATE_WAKEUP_REACTION );\r
-\r
-       return wact;\r
-}\r
-\r
-/**\r
- * Generate RAM hash.\r
- * We are in ECUM_STATE_SLEEP here.\r
- *\r
- */\r
-void EcuM_GenerateRamHash( void ) {\r
-       VALIDATE_STATE( ECUM_STATE_SLEEP );\r
-}\r
-\r
-/**\r
- * Check RAM hash.\r
- * We are still in ECUM_STATE_SLEEP here.\r
- *\r
- * @return\r
- */\r
-uint8 EcuM_CheckRamHash( void ) {\r
-       VALIDATE_STATE( ECUM_STATE_SLEEP );\r
-\r
-       return 0;\r
-}\r
-\r
-\r
-\r
index 00057dae0e1aedb50119c80419fcb32a3cefe11d..a388a677d21f3e9ca72852ead43aa938c924581d 100644 (file)
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="edd643af-7788-4a0c-bf48-bf4b686db735">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="fa8110f8-e82b-45f8-9d88-174fbe014406">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="f9e3a1b1-c3e7-4bdb-93a9-00ad8a6254e4">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
                   <SHORT-NAME>User_1</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="a74e951e-f2bb-40c8-8164-14692f2bbe14">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="aa62333b-67af-4c63-a427-f7ef9b4aa51c">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/board_mpc5516it/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/board_mpc5516it/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="2b207b30-650a-4d9c-b42a-84d7769ff4b9">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
index 3745e612eae6ac524b035bc02a8c40618397750d..e57a0a608578977da1ee6f2553dc27b1438f383a 100644 (file)
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="edd643af-7788-4a0c-bf48-bf4b686db735">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="7e75121e-1421-40b2-9b4d-91047757af91">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="26c69ffb-5ee8-4508-882b-19b2c3139773">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
                   <SHORT-NAME>User_1</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="a16a32de-8d8e-4853-8707-370441edbd7c">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="67dfe2a6-780a-49e7-a5fd-b87988c82c82">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/com_simple_mpc5516it/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/com_simple_mpc5516it/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="a2bca66e-9e78-4dc1-8bce-9cdef2e48d20">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
index 536d33117254257978bc0bce60d7b11978096a9c..f4b990c0c9bdda4af88746b51064704d49b0e005 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.3\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 8108872b898e0d732d8280303841a089f67b4b52..00e3f5f12f25c175a217d38b98166283c1852cc4 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.3\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index fd206e42141aa3c4e95c9aaf368e95d525a2a9a4..65271db29b4156535e8531c5d9d5fb09d351af5b 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.8\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 955f406d5442e0578df9a937b21a71cb19684a6e..60bf24f4f101dac5115f25ed53479584ab168c46 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.8\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
@@ -75,8 +75,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_32_21_BE_Tester,\r
+               \r
                .ComBitPosition = 20,\r
                .ComBitSize = 21,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = UINT32,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -103,8 +105,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_1_4_LE_Tester,\r
+               \r
                .ComBitPosition = 1,\r
                .ComBitSize = 4,\r
+               \r
                .ComSignalEndianess = COM_LITTLE_ENDIAN,\r
                .ComSignalType = UINT8,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -131,8 +135,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_45_12_LE_Tester,\r
+               \r
                .ComBitPosition = 45,\r
                .ComBitSize = 12,\r
+               \r
                .ComSignalEndianess = COM_LITTLE_ENDIAN,\r
                .ComSignalType = SINT16,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -159,8 +165,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_29_12_BE_Tester,\r
+               \r
                .ComBitPosition = 0,\r
                .ComBitSize = 12,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = SINT16,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -187,8 +195,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_32_21_BE,\r
+               \r
                .ComBitPosition = 20,\r
                .ComBitSize = 21,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = UINT32,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -215,8 +225,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_1_4_LE,\r
+               \r
                .ComBitPosition = 1,\r
                .ComBitSize = 4,\r
+               \r
                .ComSignalEndianess = COM_LITTLE_ENDIAN,\r
                .ComSignalType = UINT8,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -243,8 +255,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_45_12_LE,\r
+               \r
                .ComBitPosition = 45,\r
                .ComBitSize = 12,\r
+               \r
                .ComSignalEndianess = COM_LITTLE_ENDIAN,\r
                .ComSignalType = SINT16,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -271,8 +285,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_29_12_BE,\r
+               \r
                .ComBitPosition = 0,\r
                .ComBitSize = 12,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = SINT16,\r
                .Com_Arc_IsSignalGroup = 0,\r
index ffef12ecf629642caa6945dc02bad1afaf7e741f..9e4644d13f34cf5478fe50efa468192f42d9d3c4 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.8\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
diff --git a/boards/mpc5516it/examples/com_simple/config/EcuM_Callout_Stubs.c b/boards/mpc5516it/examples/com_simple/config/EcuM_Callout_Stubs.c
deleted file mode 100644 (file)
index 5b0c900..0000000
+++ /dev/null
@@ -1,332 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Callout_Stubs.c)\r
-*\r
-* Created by:              ArcCore\r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC551x\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
index 9cb3039ae5bfbebc172602b12611b10bc96d5987..d02d249980211050daa72301d997f1e4ae73f4e6 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_User_1,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
 \r
diff --git a/boards/mpc5516it/examples/com_simple/config/EcuM_Generated_Types.h b/boards/mpc5516it/examples/com_simple/config/EcuM_Generated_Types.h
deleted file mode 100644 (file)
index bcdfa93..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
-*\r
-* Created by:              ArcCore\r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC551x\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
-#ifdef CFG_ECUM_USE_SERVICE_COMPONENT\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
index 36f166dfcac60759cab0ca86f785cfd67388ccee..34c181012e87772ffb94d5c048d65db1d92445fc 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index eca13bcbc2878f6e59c590f452d5e0186d9f521b..381f77048a73bdfc4c58a49fea8459e88a5497e6 100644 (file)
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_EXT_REF_80MHZ = 0,\r
        MCU_CLOCKTYPE_EXT_REF_66MHZ = 1,\r
index 5470bf1d83c66df66772401e2c925d01a599c14b..f1b183ea771e9d1dc8acd1c435baad1cc45d4ffd 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index d75346b459e53695c10f8630985727aa5ea2c639..7d5a6e2256a4cc68625d100ee03644a412fae5df 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 0072973a289fd573fa2408d2d9efb756f8d5d13b..058246ac1b18770066faf9b9bad29853dc83f9c4 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 9b8b9660c3b8c81b8716fb0dd47073d9b5fb9db8..bf16ba23a4786848fda38438534d0024566f55c5 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_User_1,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
 \r
diff --git a/boards/mpc5516it/examples/led_rte/config/EcuM_Generated_Types.h b/boards/mpc5516it/examples/led_rte/config/EcuM_Generated_Types.h
deleted file mode 100644 (file)
index d74e5b8..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC551x\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
-#ifdef CFG_ECUM_USE_SERVICE_COMPONENT\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
index 072d9958ecb836959002b7d3eec172373b1c4f53..13661ad892f8da82bf0b9100d4feb35adedbd0a5 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index 2593e7c689beb743737ee89ab1321d1f1578d6c0..6c8cbc6a2adb5a8279bac34bcda38787db76c272 100644 (file)
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_EXT_REF_80MHZ = 0,\r
        MCU_CLOCKTYPE_EXT_REF_66MHZ = 1,\r
index 02116a9da2d3fc63ac0292145fa7cf394fe7d0a8..7b9fa8984f7e1d79d4ed92318308a3d5536c91d1 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index bf7be85b22c6f50782fccb9ce9d25c6c92c37b8a..1af26934fbb1be88d8da4affffd2461830405a82 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 49d787bd87e1857494aafe1c00dd482a0649eaf4..b2324ff5939f229606172358f461c27825bb3e05 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index e1dcf4414c824ceea04dc98c19309efb1cd926dc..f42a540fc5af0e613fddb0608077e9adb2b58ced 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 90471b0b259a03cea115179b58804bcd214f8305..3af8338fba207167fb928408bf3e9fe1a9460d63 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 1f1146cf35540bafa8a5215df16b7abdc4c6c909..7187bb3b3fa0b9824475c7be1a3fea2050259e87 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index fd4586968e624d67bed64bc6caab9e1014e65ce0..ae1fed33f8af40da189e08469a76d74e66e20aa0 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index b94ab14ab726f7b761f282c07b83b5741946d312..29abe831111741f49cd429eeaad8e352b3365462 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index d5d01b895d665eb17e2eecd5184cafeaeef1cd64..4e5075a947c894e847c64216f987ea1d1604dd42 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 7ce055486b70b494c24f743f5eaf3af80350008e..37033cde50eb4354674e6029fb9b7cf1f3f7fa13 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 6dd66703b6189cccf379398f4660fbcdf94018e1..870dd89aa4e48a1901d646cc3d12522a64ef26dc 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index d2e531381e9943f7ac0ec424e46bc5f364eaffcb..24fdfc4b16258f6f08444686135e654b0bf406d1 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 390c492b2f204c300edad92c6b5e5b3f02c12389..81918aae2833247b7bbb2d5f19224685373b76ef 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
@@ -37,6 +37,90 @@ typedef uint8 DigitalLevel;
 \r
 #define _DEFINED_TYPEDEF_FOR_DigitalLevel_ \r
 \r
+typedef uint8 EcuM_BootTargetType;\r
+#ifndef ECUM_BOOT_TARGET_APP\r
+#define ECUM_BOOT_TARGET_APP ((EcuM_BootTargetType)0)\r
+#endif /*ECUM_BOOT_TARGET_APP*/\r
+#ifndef ECUM_BOOT_TARGET_OEM_BOOTLOADER\r
+#define ECUM_BOOT_TARGET_OEM_BOOTLOADER ((EcuM_BootTargetType)1)\r
+#endif /*ECUM_BOOT_TARGET_OEM_BOOTLOADER*/\r
+#ifndef ECUM_BOOT_TARGET_SYS_BOOTLOADER\r
+#define ECUM_BOOT_TARGET_SYS_BOOTLOADER ((EcuM_BootTargetType)2)\r
+#endif /*ECUM_BOOT_TARGET_SYS_BOOTLOADER*/\r
+#define EcuM_BootTargetType_LowerLimit 0\r
+#define EcuM_BootTargetType_UpperLimit 1\r
+\r
+#define _DEFINED_TYPEDEF_FOR_EcuM_BootTargetType_ \r
+\r
+typedef uint8 EcuM_StateType;\r
+#ifndef ECUM_STATE_STARTUP\r
+#define ECUM_STATE_STARTUP ((EcuM_StateType)16)\r
+#endif /*ECUM_STATE_STARTUP*/\r
+#ifndef ECUM_STATE_STARTUP_ONE\r
+#define ECUM_STATE_STARTUP_ONE ((EcuM_StateType)17)\r
+#endif /*ECUM_STATE_STARTUP_ONE*/\r
+#ifndef ECUM_STATE_STARTUP_TWO\r
+#define ECUM_STATE_STARTUP_TWO ((EcuM_StateType)18)\r
+#endif /*ECUM_STATE_STARTUP_TWO*/\r
+#ifndef ECUM_STATE_WAKEUP\r
+#define ECUM_STATE_WAKEUP ((EcuM_StateType)32)\r
+#endif /*ECUM_STATE_WAKEUP*/\r
+#ifndef ECUM_STATE_WAKEUP_ONE\r
+#define ECUM_STATE_WAKEUP_ONE ((EcuM_StateType)33)\r
+#endif /*ECUM_STATE_WAKEUP_ONE*/\r
+#ifndef ECUM_STATE_WAKEUP_VALIDATION\r
+#define ECUM_STATE_WAKEUP_VALIDATION ((EcuM_StateType)34)\r
+#endif /*ECUM_STATE_WAKEUP_VALIDATION*/\r
+#ifndef ECUM_STATE_WAKEUP_REACTION\r
+#define ECUM_STATE_WAKEUP_REACTION ((EcuM_StateType)35)\r
+#endif /*ECUM_STATE_WAKEUP_REACTION*/\r
+#ifndef ECUM_STATE_WAKEUP_TWO\r
+#define ECUM_STATE_WAKEUP_TWO ((EcuM_StateType)36)\r
+#endif /*ECUM_STATE_WAKEUP_TWO*/\r
+#ifndef ECUM_STATE_WAKEUP_WAKESLEEP\r
+#define ECUM_STATE_WAKEUP_WAKESLEEP ((EcuM_StateType)37)\r
+#endif /*ECUM_STATE_WAKEUP_WAKESLEEP*/\r
+#ifndef ECUM_STATE_WAKEUP_TTII\r
+#define ECUM_STATE_WAKEUP_TTII ((EcuM_StateType)38)\r
+#endif /*ECUM_STATE_WAKEUP_TTII*/\r
+#ifndef ECUM_STATE_RUN\r
+#define ECUM_STATE_RUN ((EcuM_StateType)48)\r
+#endif /*ECUM_STATE_RUN*/\r
+#ifndef ECUM_STATE_APP_RUN\r
+#define ECUM_STATE_APP_RUN ((EcuM_StateType)50)\r
+#endif /*ECUM_STATE_APP_RUN*/\r
+#ifndef ECUM_STATE_APP_POST_RUN\r
+#define ECUM_STATE_APP_POST_RUN ((EcuM_StateType)51)\r
+#endif /*ECUM_STATE_APP_POST_RUN*/\r
+#ifndef ECUM_STATE_SHUTDOWN\r
+#define ECUM_STATE_SHUTDOWN ((EcuM_StateType)64)\r
+#endif /*ECUM_STATE_SHUTDOWN*/\r
+#ifndef ECUM_STATE_PREP_SHUTDOWN\r
+#define ECUM_STATE_PREP_SHUTDOWN ((EcuM_StateType)68)\r
+#endif /*ECUM_STATE_PREP_SHUTDOWN*/\r
+#ifndef ECUM_STATE_GO_SLEEP\r
+#define ECUM_STATE_GO_SLEEP ((EcuM_StateType)73)\r
+#endif /*ECUM_STATE_GO_SLEEP*/\r
+#ifndef ECUM_STATE_GO_OFF_ONE\r
+#define ECUM_STATE_GO_OFF_ONE ((EcuM_StateType)77)\r
+#endif /*ECUM_STATE_GO_OFF_ONE*/\r
+#ifndef ECUM_STATE_GO_OFF_TWO\r
+#define ECUM_STATE_GO_OFF_TWO ((EcuM_StateType)78)\r
+#endif /*ECUM_STATE_GO_OFF_TWO*/\r
+#ifndef ECUM_STATE_SLEEP\r
+#define ECUM_STATE_SLEEP ((EcuM_StateType)80)\r
+#endif /*ECUM_STATE_SLEEP*/\r
+#ifndef ECUM_STATE_OFF\r
+#define ECUM_STATE_OFF ((EcuM_StateType)128)\r
+#endif /*ECUM_STATE_OFF*/\r
+#ifndef ECUM_STATE_RESET\r
+#define ECUM_STATE_RESET ((EcuM_StateType)144)\r
+#endif /*ECUM_STATE_RESET*/\r
+#define EcuM_StateType_LowerLimit 0x10\r
+#define EcuM_StateType_UpperLimit 0x90\r
+\r
+#define _DEFINED_TYPEDEF_FOR_EcuM_StateType_ \r
+\r
 typedef float Float;\r
 \r
 #define _DEFINED_TYPEDEF_FOR_Float_ \r
@@ -165,6 +249,15 @@ typedef uint8 Rte_ModeType_WdgMMode;
 #define RTE_MODE_WdgMMode_ALIVE_STOPPED ((Rte_ModeType_WdgMMode)4)\r
 #define RTE_MODE_WdgMMode_ALIVE_DEACTIVATED ((Rte_ModeType_WdgMMode)0)\r
 \r
+typedef uint8 Rte_ModeType_EcuM_Mode;\r
+#define RTE_TRANSITION_EcuM_Mode ((Rte_ModeType_EcuM_Mode)6)\r
+#define RTE_MODE_EcuM_Mode_STARTUP ((Rte_ModeType_EcuM_Mode)4)\r
+#define RTE_MODE_EcuM_Mode_RUN ((Rte_ModeType_EcuM_Mode)1)\r
+#define RTE_MODE_EcuM_Mode_POST_RUN ((Rte_ModeType_EcuM_Mode)0)\r
+#define RTE_MODE_EcuM_Mode_SLEEP ((Rte_ModeType_EcuM_Mode)3)\r
+#define RTE_MODE_EcuM_Mode_WAKE_SLEEP ((Rte_ModeType_EcuM_Mode)5)\r
+#define RTE_MODE_EcuM_Mode_SHUTDOWN ((Rte_ModeType_EcuM_Mode)2)\r
+\r
 typedef struct {\r
 } Rte_PDS_Blinker_DigitalOutput_P;\r
 typedef struct {\r
index 0165719899a9097730b961cbfeefc70983c640a3..a5c6f7e4a8ce54aae8d69f90e126cdf8c7c4d475 100644 (file)
                   <SHORT-NAME>User_1</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="76b52a41-1922-4c65-b4a3-164033511c84">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="cf5a02c8-91c7-4295-8101-da8870a3ef8c">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/led_rte_ecuc_mpc5516/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/led_rte_ecuc_mpc5516/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="37d689a9-ecb6-489e-a7df-bdbefa2fc9fa">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="734a50e2-70db-4cf9-856c-afd74514d902">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="179784d4-a14b-4884-acc6-467cb591944d">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="28e05313-efc0-4055-b185-b6302426e83a">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
diff --git a/boards/mpc5516it/examples/os_simple/config/EcuM_Callout_Stubs.c b/boards/mpc5516it/examples/os_simple/config/EcuM_Callout_Stubs.c
deleted file mode 100644 (file)
index 96d746c..0000000
+++ /dev/null
@@ -1,332 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Callout_Stubs.c)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC551x\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
index 5467b0b35d9682b53e57e2b8c74bfdb7144871b1..c98417e80d654253b46ef00c2f393cfe0f5c6c0d 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_EcuMUserConfig,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
 \r
diff --git a/boards/mpc5516it/examples/os_simple/config/EcuM_Generated_Types.h b/boards/mpc5516it/examples/os_simple/config/EcuM_Generated_Types.h
deleted file mode 100644 (file)
index d74e5b8..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC551x\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
-#ifdef CFG_ECUM_USE_SERVICE_COMPONENT\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
index 072d9958ecb836959002b7d3eec172373b1c4f53..13661ad892f8da82bf0b9100d4feb35adedbd0a5 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index d66f94d4f03dda3de3dbe9a822ef30e24e6ba385..4aff46d12dc3d450b1bdb1bf3b413d31ca2d2578 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index a357e4da1484a8fb498149a1ffdd54814ade908c..6c8cbc6a2adb5a8279bac34bcda38787db76c272 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_EXT_REF_80MHZ = 0,\r
        MCU_CLOCKTYPE_EXT_REF_66MHZ = 1,\r
index f9f4c7d882e8925a891ac848cfb83e85f26930c7..d61e70b8195b9473151f16d54770c8090316ba00 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
@@ -71,24 +71,24 @@ const uint16_t PortPadConfigData[] = {
        ( PORT_FUNC1 | PORT_IBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ), /* PCR  49 : PORT_PIN_MODE_CAN */\r
        ( PORT_PCR_RESET | PORT_IBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ),     /* PCR  50 : PORT_PIN_MODE_OTHER */\r
        PORT_PCR_RESET,                 /* PCR  51 */\r
-       ( PORT_FUNC0 | PORT_OBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ), /* PCR  52 : PORT_PIN_MODE_DIO */\r
-       ( PORT_FUNC0 | PORT_OBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ), /* PCR  53 : PORT_PIN_MODE_DIO */\r
+       ( PORT_PCR_RESET | PORT_OBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ),     /* PCR  52 : PORT_PIN_MODE_DIO */\r
+       ( PORT_PCR_RESET | PORT_OBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ),     /* PCR  53 : PORT_PIN_MODE_DIO */\r
        PORT_PCR_RESET,                 /* PCR  54 */\r
        PORT_PCR_RESET,                 /* PCR  55 */\r
        ( PORT_PCR_RESET | PORT_OBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ),     /* PCR  56 : PORT_PIN_MODE_OTHER */\r
        ( PORT_PCR_RESET | PORT_IBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ),     /* PCR  57 : PORT_PIN_MODE_OTHER */\r
        PORT_PCR_RESET,                 /* PCR  58 */\r
        PORT_PCR_RESET,                 /* PCR  59 */\r
-       ( PORT_FUNC1 | PORT_OBE_ENABLE | PORT_SLEW_RATE_MAX | PORT_PULL_NONE ), /* PCR  60 : PORT_PIN_MODE_SPI */\r
-       ( PORT_FUNC1 | PORT_OBE_ENABLE | PORT_SLEW_RATE_MAX | PORT_PULL_NONE ), /* PCR  61 : PORT_PIN_MODE_SPI */\r
-       ( PORT_FUNC1 | PORT_OBE_ENABLE | PORT_SLEW_RATE_MAX | PORT_PULL_NONE ), /* PCR  62 : PORT_PIN_MODE_SPI */\r
-       ( PORT_FUNC1 | PORT_IBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ), /* PCR  63 : PORT_PIN_MODE_SPI */\r
-       ( PORT_FUNC1 | PORT_OBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ), /* PCR  64 : PORT_PIN_MODE_SPI */\r
-       ( PORT_FUNC1 | PORT_OBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ), /* PCR  65 : PORT_PIN_MODE_SPI */\r
+       ( PORT_PCR_RESET | PORT_OBE_ENABLE | PORT_SLEW_RATE_MAX | PORT_PULL_NONE ),     /* PCR  60 : PORT_PIN_MODE_SPI */\r
+       ( PORT_PCR_RESET | PORT_OBE_ENABLE | PORT_SLEW_RATE_MAX | PORT_PULL_NONE ),     /* PCR  61 : PORT_PIN_MODE_SPI */\r
+       ( PORT_PCR_RESET | PORT_OBE_ENABLE | PORT_SLEW_RATE_MAX | PORT_PULL_NONE ),     /* PCR  62 : PORT_PIN_MODE_SPI */\r
+       ( PORT_PCR_RESET | PORT_IBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ),     /* PCR  63 : PORT_PIN_MODE_SPI */\r
+       ( PORT_PCR_RESET | PORT_OBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ),     /* PCR  64 : PORT_PIN_MODE_SPI */\r
+       ( PORT_PCR_RESET | PORT_OBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ),     /* PCR  65 : PORT_PIN_MODE_SPI */\r
        PORT_PCR_RESET,                 /* PCR  66 */\r
-       ( PORT_FUNC1 | PORT_OBE_ENABLE | PORT_SLEW_RATE_MAX | PORT_PULL_NONE ), /* PCR  67 : PORT_PIN_MODE_SPI */\r
-       ( PORT_FUNC1 | PORT_OBE_ENABLE | PORT_SLEW_RATE_MAX | PORT_PULL_NONE ), /* PCR  68 : PORT_PIN_MODE_SPI */\r
-       ( PORT_FUNC1 | PORT_IBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ), /* PCR  69 : PORT_PIN_MODE_SPI */\r
+       ( PORT_PCR_RESET | PORT_OBE_ENABLE | PORT_SLEW_RATE_MAX | PORT_PULL_NONE ),     /* PCR  67 : PORT_PIN_MODE_SPI */\r
+       ( PORT_PCR_RESET | PORT_OBE_ENABLE | PORT_SLEW_RATE_MAX | PORT_PULL_NONE ),     /* PCR  68 : PORT_PIN_MODE_SPI */\r
+       ( PORT_PCR_RESET | PORT_IBE_ENABLE | PORT_SLEW_RATE_MIN | PORT_PULL_NONE ),     /* PCR  69 : PORT_PIN_MODE_SPI */\r
        PORT_PCR_RESET,                 /* PCR  70 */\r
        PORT_PCR_RESET,                 /* PCR  71 */\r
        PORT_PCR_RESET,                 /* PCR  72 */\r
index d43c7076627cea9bc080ac9c0900ce416f741b42..551c48945c09092b1c6a9794265497e2858408c8 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC551x\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 25616b3640c984de55f9b648ca84abc9541c4930..defefd4000d9a71dc769e5a7c0aece8d8695814a 100644 (file)
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="edd643af-7788-4a0c-bf48-bf4b686db735">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="7af9e311-f187-4195-8af3-33e33a6e9d24">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="77b8fd0c-5481-40e8-8fda-dd1517af0aaa">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
                   <SHORT-NAME>EcuMUserConfig</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="59ceba4b-288b-460a-b797-d469262fe9de">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="9dc21f66-765b-4e55-8af0-588d2c1df5b0">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_mpc5516it/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_mpc5516it/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="b658b87a-f262-475d-9273-1e38b307aa5e">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
index bc87e59d1d7d0e74415a4853aac397447935e3c6..4d0aee240afde9fb329de3c5b8264c2b0f2ee27d 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index cf2a269d91938e6ea3995f5827c3dc991ff8a883..29bdec2adf53bfee314e7bd6c73fe3622f513986 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_User_1,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
 \r
diff --git a/boards/mpc5567qrtech/examples/led_rte/config/EcuM_Generated_Types.h b/boards/mpc5567qrtech/examples/led_rte/config/EcuM_Generated_Types.h
deleted file mode 100644 (file)
index f20bcb5..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC5567\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
-#ifdef CFG_ECUM_USE_SERVICE_COMPONENT\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
index 7a572db4c3fe231f4cd2ea7deec23b28fd182259..767a8eee12e10afb324214a82879ee48af84c93f 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index 536192109dd549b20c86596281f11f1a5b3ceb9e..66d52a3a18c045ff8eb852b316a0a98fb2f872c8 100644 (file)
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_Clock = 0,\r
   MCU_NBR_OF_CLOCKS,\r
index 299f5eacb623a73d3fed0cb9d3439f8b0b718590..b82fc28818871517cda76e96b84c7ea0a5c847be 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 41a3eb8e76694f48b4fdde5c82128e99e5354a5e..832f34d33d951b5b918df8d424a57ad04be1eceb 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 901983fc0c26b8ef6d56aa3c0fa242e1f1ff53be..47a402a64ab11122ccff99dd332ea02f8a5db41f 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 43860d03b1d05be58f122db80fdf3e1bd548aebe..1bb55afaf79c56fc268220d5e05a3b2983c56bd7 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 1e239f15ee41e2367d08cc9f39c65ef36b7feea6..13244aee178559236fc5abf1d80f54b59c0cb5dc 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index fd0c3ffb4612e5e576610a435d911756b29d730e..2196e90df2cf5a2dde2d459e4b1d854b2dfc67e9 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 84f048545bdba7f72a74541eb03b2bfad369814a..bb7f9ef4296574975e4a7068ed4b4c8e7130c003 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 6bacf854163e32c7afef005003735bcf3204270b..b2643a9f9e7666bc38a56b9f7c40ef88f49d460c 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 1c6951f929a7ac430bf218aa26a863465debb349..6a33d29c2d6545827ee79e315a296fad6c5764c8 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 465b6d1b5952c5572e9b9976d8d19b7a72c6b0dc..17f659323591667906513d11411962cc12a04b37 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 1c8ffd8cec7db42add36986753b7a14bb8e76289..af60f68962a4ebb612e48b4bc78b148a8f92c4bb 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 31c616c8dc15f41b2cae4385b254e481d720cc19..c9ea5400f3a797c5703ffe34a6dccf037bf20731 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 1a966b7070f65b3387ed7fc774f2aaf04a513fc8..c5e46fec59934eb2f30f134cc0cb5f6ada4be801 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
@@ -37,6 +37,90 @@ typedef uint8 DigitalLevel;
 \r
 #define _DEFINED_TYPEDEF_FOR_DigitalLevel_ \r
 \r
+typedef uint8 EcuM_BootTargetType;\r
+#ifndef ECUM_BOOT_TARGET_APP\r
+#define ECUM_BOOT_TARGET_APP ((EcuM_BootTargetType)0)\r
+#endif /*ECUM_BOOT_TARGET_APP*/\r
+#ifndef ECUM_BOOT_TARGET_OEM_BOOTLOADER\r
+#define ECUM_BOOT_TARGET_OEM_BOOTLOADER ((EcuM_BootTargetType)1)\r
+#endif /*ECUM_BOOT_TARGET_OEM_BOOTLOADER*/\r
+#ifndef ECUM_BOOT_TARGET_SYS_BOOTLOADER\r
+#define ECUM_BOOT_TARGET_SYS_BOOTLOADER ((EcuM_BootTargetType)2)\r
+#endif /*ECUM_BOOT_TARGET_SYS_BOOTLOADER*/\r
+#define EcuM_BootTargetType_LowerLimit 0\r
+#define EcuM_BootTargetType_UpperLimit 1\r
+\r
+#define _DEFINED_TYPEDEF_FOR_EcuM_BootTargetType_ \r
+\r
+typedef uint8 EcuM_StateType;\r
+#ifndef ECUM_STATE_STARTUP\r
+#define ECUM_STATE_STARTUP ((EcuM_StateType)16)\r
+#endif /*ECUM_STATE_STARTUP*/\r
+#ifndef ECUM_STATE_STARTUP_ONE\r
+#define ECUM_STATE_STARTUP_ONE ((EcuM_StateType)17)\r
+#endif /*ECUM_STATE_STARTUP_ONE*/\r
+#ifndef ECUM_STATE_STARTUP_TWO\r
+#define ECUM_STATE_STARTUP_TWO ((EcuM_StateType)18)\r
+#endif /*ECUM_STATE_STARTUP_TWO*/\r
+#ifndef ECUM_STATE_WAKEUP\r
+#define ECUM_STATE_WAKEUP ((EcuM_StateType)32)\r
+#endif /*ECUM_STATE_WAKEUP*/\r
+#ifndef ECUM_STATE_WAKEUP_ONE\r
+#define ECUM_STATE_WAKEUP_ONE ((EcuM_StateType)33)\r
+#endif /*ECUM_STATE_WAKEUP_ONE*/\r
+#ifndef ECUM_STATE_WAKEUP_VALIDATION\r
+#define ECUM_STATE_WAKEUP_VALIDATION ((EcuM_StateType)34)\r
+#endif /*ECUM_STATE_WAKEUP_VALIDATION*/\r
+#ifndef ECUM_STATE_WAKEUP_REACTION\r
+#define ECUM_STATE_WAKEUP_REACTION ((EcuM_StateType)35)\r
+#endif /*ECUM_STATE_WAKEUP_REACTION*/\r
+#ifndef ECUM_STATE_WAKEUP_TWO\r
+#define ECUM_STATE_WAKEUP_TWO ((EcuM_StateType)36)\r
+#endif /*ECUM_STATE_WAKEUP_TWO*/\r
+#ifndef ECUM_STATE_WAKEUP_WAKESLEEP\r
+#define ECUM_STATE_WAKEUP_WAKESLEEP ((EcuM_StateType)37)\r
+#endif /*ECUM_STATE_WAKEUP_WAKESLEEP*/\r
+#ifndef ECUM_STATE_WAKEUP_TTII\r
+#define ECUM_STATE_WAKEUP_TTII ((EcuM_StateType)38)\r
+#endif /*ECUM_STATE_WAKEUP_TTII*/\r
+#ifndef ECUM_STATE_RUN\r
+#define ECUM_STATE_RUN ((EcuM_StateType)48)\r
+#endif /*ECUM_STATE_RUN*/\r
+#ifndef ECUM_STATE_APP_RUN\r
+#define ECUM_STATE_APP_RUN ((EcuM_StateType)50)\r
+#endif /*ECUM_STATE_APP_RUN*/\r
+#ifndef ECUM_STATE_APP_POST_RUN\r
+#define ECUM_STATE_APP_POST_RUN ((EcuM_StateType)51)\r
+#endif /*ECUM_STATE_APP_POST_RUN*/\r
+#ifndef ECUM_STATE_SHUTDOWN\r
+#define ECUM_STATE_SHUTDOWN ((EcuM_StateType)64)\r
+#endif /*ECUM_STATE_SHUTDOWN*/\r
+#ifndef ECUM_STATE_PREP_SHUTDOWN\r
+#define ECUM_STATE_PREP_SHUTDOWN ((EcuM_StateType)68)\r
+#endif /*ECUM_STATE_PREP_SHUTDOWN*/\r
+#ifndef ECUM_STATE_GO_SLEEP\r
+#define ECUM_STATE_GO_SLEEP ((EcuM_StateType)73)\r
+#endif /*ECUM_STATE_GO_SLEEP*/\r
+#ifndef ECUM_STATE_GO_OFF_ONE\r
+#define ECUM_STATE_GO_OFF_ONE ((EcuM_StateType)77)\r
+#endif /*ECUM_STATE_GO_OFF_ONE*/\r
+#ifndef ECUM_STATE_GO_OFF_TWO\r
+#define ECUM_STATE_GO_OFF_TWO ((EcuM_StateType)78)\r
+#endif /*ECUM_STATE_GO_OFF_TWO*/\r
+#ifndef ECUM_STATE_SLEEP\r
+#define ECUM_STATE_SLEEP ((EcuM_StateType)80)\r
+#endif /*ECUM_STATE_SLEEP*/\r
+#ifndef ECUM_STATE_OFF\r
+#define ECUM_STATE_OFF ((EcuM_StateType)128)\r
+#endif /*ECUM_STATE_OFF*/\r
+#ifndef ECUM_STATE_RESET\r
+#define ECUM_STATE_RESET ((EcuM_StateType)144)\r
+#endif /*ECUM_STATE_RESET*/\r
+#define EcuM_StateType_LowerLimit 0x10\r
+#define EcuM_StateType_UpperLimit 0x90\r
+\r
+#define _DEFINED_TYPEDEF_FOR_EcuM_StateType_ \r
+\r
 typedef float Float;\r
 \r
 #define _DEFINED_TYPEDEF_FOR_Float_ \r
@@ -157,6 +241,15 @@ typedef UInt8 DstPtrType[1024];
 \r
 #define _DEFINED_TYPEDEF_FOR_DstPtrType_ \r
 \r
+typedef uint8 Rte_ModeType_EcuM_Mode;\r
+#define RTE_TRANSITION_EcuM_Mode ((Rte_ModeType_EcuM_Mode)6)\r
+#define RTE_MODE_EcuM_Mode_STARTUP ((Rte_ModeType_EcuM_Mode)4)\r
+#define RTE_MODE_EcuM_Mode_RUN ((Rte_ModeType_EcuM_Mode)1)\r
+#define RTE_MODE_EcuM_Mode_POST_RUN ((Rte_ModeType_EcuM_Mode)0)\r
+#define RTE_MODE_EcuM_Mode_SLEEP ((Rte_ModeType_EcuM_Mode)3)\r
+#define RTE_MODE_EcuM_Mode_WAKE_SLEEP ((Rte_ModeType_EcuM_Mode)5)\r
+#define RTE_MODE_EcuM_Mode_SHUTDOWN ((Rte_ModeType_EcuM_Mode)2)\r
+\r
 typedef uint8 Rte_ModeType_WdgMMode;\r
 #define RTE_TRANSITION_WdgMMode ((Rte_ModeType_WdgMMode)5)\r
 #define RTE_MODE_WdgMMode_ALIVE_OK ((Rte_ModeType_WdgMMode)3)\r
index 3ac09d4e5b43426cbe73aedfb216a6c864418f66..feab7b3637497b91522adbb191ab200d4ae223fb 100644 (file)
                   <SHORT-NAME>User_1</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="a4038218-a66d-40f4-800e-1d0e8dc57b74">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="aed51413-87e0-4bc5-830b-29a617ef9cb5">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/led_rte_ecuc_mpc5567/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/led_rte_ecuc_mpc5567/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="fd768b60-df84-4248-b85c-7ef801a665b8">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="654e3ed7-00f1-4ea5-af70-b81e2ce44183">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="b3c1a44d-b7c6-46f5-8963-ba70e7491b90">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="b700d6c4-cf7b-4ca4-a730-1d62d548f4f6">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
diff --git a/boards/mpc5567qrtech/examples/os_simple/config/EcuM_Callout_Stubs.c b/boards/mpc5567qrtech/examples/os_simple/config/EcuM_Callout_Stubs.c
deleted file mode 100644 (file)
index 28d9918..0000000
+++ /dev/null
@@ -1,332 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Callout_Stubs.c)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC5567\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
index d14811927628f61b51f6820822f84e737f55e957..e0b0fef91fca0a3ab6253e5afd6c113fb2f66d80 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_EcuMUserConfig,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
 \r
diff --git a/boards/mpc5567qrtech/examples/os_simple/config/EcuM_Generated_Types.h b/boards/mpc5567qrtech/examples/os_simple/config/EcuM_Generated_Types.h
deleted file mode 100644 (file)
index f20bcb5..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC5567\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
-#ifdef CFG_ECUM_USE_SERVICE_COMPONENT\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
index 7a572db4c3fe231f4cd2ea7deec23b28fd182259..767a8eee12e10afb324214a82879ee48af84c93f 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index 1fbdeefdb7df63115d07eefdec273b8e2ce15112..8e9cf6a705972db049039cc956380dbe20252674 100644 (file)
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_EXT_REF_80MHZ = 0,\r
   MCU_NBR_OF_CLOCKS,\r
index 1e56cd6ebaf678f377ff797f7fab7df287475d5a..575b9b3f470552f9b2edf6290d634e4bb0f52711 100644 (file)
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="bb62035a-69d0-4503-8ce8-7b7adb6b845a">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="902243a7-dd17-4ff2-a1f8-633cf6629972">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="2c491d8a-a1d5-45ad-b2ba-bba5a9a66cd6">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
                   <SHORT-NAME>EcuMUserConfig</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="97c3da4e-6f06-48e9-8c21-054f65424ae4">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="ab126ab4-6d39-4229-b155-c5d3a4362b56">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_mpc5567qrtech/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_mpc5567qrtech/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="0681ac33-e695-4fc1-8b1c-58fd9a7bfa9c">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
index bc87e59d1d7d0e74415a4853aac397447935e3c6..4d0aee240afde9fb329de3c5b8264c2b0f2ee27d 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index cf2a269d91938e6ea3995f5827c3dc991ff8a883..29bdec2adf53bfee314e7bd6c73fe3622f513986 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_User_1,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
 \r
diff --git a/boards/mpc5567qrtech/examples/rte_simple/config/EcuM_Generated_Types.h b/boards/mpc5567qrtech/examples/rte_simple/config/EcuM_Generated_Types.h
deleted file mode 100644 (file)
index f20bcb5..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC5567\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
-#ifdef CFG_ECUM_USE_SERVICE_COMPONENT\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
index 7a572db4c3fe231f4cd2ea7deec23b28fd182259..767a8eee12e10afb324214a82879ee48af84c93f 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index 536192109dd549b20c86596281f11f1a5b3ceb9e..66d52a3a18c045ff8eb852b316a0a98fb2f872c8 100644 (file)
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_Clock = 0,\r
   MCU_NBR_OF_CLOCKS,\r
index 7e19547a6fe73c81b4e1714a956f9519768996df..f8c5611533efa2ed6f78775f78f9a5184e66c454 100644 (file)
@@ -110,7 +110,7 @@ void StepTask( void );
 #define OS_ISR2_CNT            0\r
 #define OS_ISR1_CNT                    0\r
 \r
-#define OS_ISR_MAX_CNT         10\r
+#define OS_ISR_MAX_CNT         30\r
 \r
 #define OS_NUM_CORES           1\r
 \r
index 7ffbc87302c525384f58f984a14320f1b419a0a7..3ddbf69eedeae5b14c9bff773fd1147d76c739be 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 7eab49fc31bc0b4791f976d3dbf0a9dbd987d9bb..ae882b2de6e7e73f3148b53122f5f2533e8b78e4 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 56d36a582cc1ec75fd0543b491a140424bcaffb1..2e50977d1bf8984f66af25ecfbd48de2119c4dd7 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index e536e06ccb064eb6124656899c8044f1d00c81e1..b8fe4c63c88b5d06179104517e5fb6c1cc2a3f05 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 5b3841e3bc65d8cceedc0a58d68b6d9bd08d6100..9e7e384e25e8bbfbaac4b9241f0e0d7eb08adb25 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 358adc0ccb020810c9023203992bfb550c58292c..04fb680dfc2058f79f93e5b743ff0cfe6a6d017b 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 13108bc75b67745a278e06d59026147f95ccc967..7c614f2fa26cbf764c8a86d29b124a972fe0bc55 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 84009da0d922ff4a76e9a87b9038db02ccc17497..7af0570ed20241ab716eff152bec77b4034eef39 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index af334e21a7a41432a71f2c12a1b91a2f454c2522..5a2e12393d402d4c3f395e70453a4e93b544a4bc 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index e61d41efe4edf6cab5d2c90840903a8905843f87..18181cf00f6c84ffe6f23f67e9cb2474aefe4520 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index fb2227188086ad5e5d388d2e36bb2762ae8e7247..663a2ebf82f32bd6cb950adfa1cd53bfcf27a24c 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index bb1fb0701fdd04db8726a053d8604d4b449abf57..d4c8de00d1265330f7d3297d6ccdf597337f437f 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 04f3ca4bf265377361b366b5a91d307e93cb786d..b2b169f635721379b1e49553bd7b5080e4d3f3cc 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index b29be1db4dba9dbb77b906b6bd378312e8019149..c2bb8d6c7668ce22cf155cbe2537dc64d123b85f 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 7ffb2b1fdd4d8d0c3b3496c1bd8251ab825f8e8c..4123bb93d58e3ff4fb053bd9c17f126f5e3d028f 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 621c676b110e87335b24d949eecebb418361657e..e2ade07f60dd4e5f807bfa275272febf3ef3de83 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index a8fc8e57f92a452098aacad3602d526f71c3c1bd..ec7bb9aac67da9281ead8934121d3e5c63a6fc17 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5567\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
@@ -25,10 +25,164 @@ typedef boolean Boolean;
 \r
 #define _DEFINED_TYPEDEF_FOR_Boolean_ \r
 \r
+typedef uint8 DigitalLevel;\r
+#ifndef Low\r
+#define Low ((DigitalLevel)0)\r
+#endif /*Low*/\r
+#ifndef High\r
+#define High ((DigitalLevel)1)\r
+#endif /*High*/\r
+#define DigitalLevel_LowerLimit 0\r
+#define DigitalLevel_UpperLimit 1\r
+\r
+#define _DEFINED_TYPEDEF_FOR_DigitalLevel_ \r
+\r
+typedef uint8 EcuM_BootTargetType;\r
+#ifndef ECUM_BOOT_TARGET_APP\r
+#define ECUM_BOOT_TARGET_APP ((EcuM_BootTargetType)0)\r
+#endif /*ECUM_BOOT_TARGET_APP*/\r
+#ifndef ECUM_BOOT_TARGET_OEM_BOOTLOADER\r
+#define ECUM_BOOT_TARGET_OEM_BOOTLOADER ((EcuM_BootTargetType)1)\r
+#endif /*ECUM_BOOT_TARGET_OEM_BOOTLOADER*/\r
+#ifndef ECUM_BOOT_TARGET_SYS_BOOTLOADER\r
+#define ECUM_BOOT_TARGET_SYS_BOOTLOADER ((EcuM_BootTargetType)2)\r
+#endif /*ECUM_BOOT_TARGET_SYS_BOOTLOADER*/\r
+#define EcuM_BootTargetType_LowerLimit 0\r
+#define EcuM_BootTargetType_UpperLimit 1\r
+\r
+#define _DEFINED_TYPEDEF_FOR_EcuM_BootTargetType_ \r
+\r
+typedef uint8 EcuM_StateType;\r
+#ifndef ECUM_STATE_STARTUP\r
+#define ECUM_STATE_STARTUP ((EcuM_StateType)16)\r
+#endif /*ECUM_STATE_STARTUP*/\r
+#ifndef ECUM_STATE_STARTUP_ONE\r
+#define ECUM_STATE_STARTUP_ONE ((EcuM_StateType)17)\r
+#endif /*ECUM_STATE_STARTUP_ONE*/\r
+#ifndef ECUM_STATE_STARTUP_TWO\r
+#define ECUM_STATE_STARTUP_TWO ((EcuM_StateType)18)\r
+#endif /*ECUM_STATE_STARTUP_TWO*/\r
+#ifndef ECUM_STATE_WAKEUP\r
+#define ECUM_STATE_WAKEUP ((EcuM_StateType)32)\r
+#endif /*ECUM_STATE_WAKEUP*/\r
+#ifndef ECUM_STATE_WAKEUP_ONE\r
+#define ECUM_STATE_WAKEUP_ONE ((EcuM_StateType)33)\r
+#endif /*ECUM_STATE_WAKEUP_ONE*/\r
+#ifndef ECUM_STATE_WAKEUP_VALIDATION\r
+#define ECUM_STATE_WAKEUP_VALIDATION ((EcuM_StateType)34)\r
+#endif /*ECUM_STATE_WAKEUP_VALIDATION*/\r
+#ifndef ECUM_STATE_WAKEUP_REACTION\r
+#define ECUM_STATE_WAKEUP_REACTION ((EcuM_StateType)35)\r
+#endif /*ECUM_STATE_WAKEUP_REACTION*/\r
+#ifndef ECUM_STATE_WAKEUP_TWO\r
+#define ECUM_STATE_WAKEUP_TWO ((EcuM_StateType)36)\r
+#endif /*ECUM_STATE_WAKEUP_TWO*/\r
+#ifndef ECUM_STATE_WAKEUP_WAKESLEEP\r
+#define ECUM_STATE_WAKEUP_WAKESLEEP ((EcuM_StateType)37)\r
+#endif /*ECUM_STATE_WAKEUP_WAKESLEEP*/\r
+#ifndef ECUM_STATE_WAKEUP_TTII\r
+#define ECUM_STATE_WAKEUP_TTII ((EcuM_StateType)38)\r
+#endif /*ECUM_STATE_WAKEUP_TTII*/\r
+#ifndef ECUM_STATE_RUN\r
+#define ECUM_STATE_RUN ((EcuM_StateType)48)\r
+#endif /*ECUM_STATE_RUN*/\r
+#ifndef ECUM_STATE_APP_RUN\r
+#define ECUM_STATE_APP_RUN ((EcuM_StateType)50)\r
+#endif /*ECUM_STATE_APP_RUN*/\r
+#ifndef ECUM_STATE_APP_POST_RUN\r
+#define ECUM_STATE_APP_POST_RUN ((EcuM_StateType)51)\r
+#endif /*ECUM_STATE_APP_POST_RUN*/\r
+#ifndef ECUM_STATE_SHUTDOWN\r
+#define ECUM_STATE_SHUTDOWN ((EcuM_StateType)64)\r
+#endif /*ECUM_STATE_SHUTDOWN*/\r
+#ifndef ECUM_STATE_PREP_SHUTDOWN\r
+#define ECUM_STATE_PREP_SHUTDOWN ((EcuM_StateType)68)\r
+#endif /*ECUM_STATE_PREP_SHUTDOWN*/\r
+#ifndef ECUM_STATE_GO_SLEEP\r
+#define ECUM_STATE_GO_SLEEP ((EcuM_StateType)73)\r
+#endif /*ECUM_STATE_GO_SLEEP*/\r
+#ifndef ECUM_STATE_GO_OFF_ONE\r
+#define ECUM_STATE_GO_OFF_ONE ((EcuM_StateType)77)\r
+#endif /*ECUM_STATE_GO_OFF_ONE*/\r
+#ifndef ECUM_STATE_GO_OFF_TWO\r
+#define ECUM_STATE_GO_OFF_TWO ((EcuM_StateType)78)\r
+#endif /*ECUM_STATE_GO_OFF_TWO*/\r
+#ifndef ECUM_STATE_SLEEP\r
+#define ECUM_STATE_SLEEP ((EcuM_StateType)80)\r
+#endif /*ECUM_STATE_SLEEP*/\r
+#ifndef ECUM_STATE_OFF\r
+#define ECUM_STATE_OFF ((EcuM_StateType)128)\r
+#endif /*ECUM_STATE_OFF*/\r
+#ifndef ECUM_STATE_RESET\r
+#define ECUM_STATE_RESET ((EcuM_StateType)144)\r
+#endif /*ECUM_STATE_RESET*/\r
+#define EcuM_StateType_LowerLimit 0x10\r
+#define EcuM_StateType_UpperLimit 0x90\r
+\r
+#define _DEFINED_TYPEDEF_FOR_EcuM_StateType_ \r
+\r
 typedef float Float;\r
 \r
 #define _DEFINED_TYPEDEF_FOR_Float_ \r
 \r
+typedef sint32 Hertz;\r
+#define Hertz_LowerLimit -2147483647\r
+#define Hertz_UpperLimit 2147483647\r
+\r
+#define _DEFINED_TYPEDEF_FOR_Hertz_ \r
+\r
+typedef uint16 IoHwAb_SignalType;\r
+#define IoHwAb_SignalType_LowerLimit 0\r
+#define IoHwAb_SignalType_UpperLimit 65535\r
+\r
+#define _DEFINED_TYPEDEF_FOR_IoHwAb_SignalType_ \r
+\r
+typedef sint32 MilliAmpere;\r
+#define MilliAmpere_LowerLimit -2147483647\r
+#define MilliAmpere_UpperLimit 2147483647\r
+\r
+#define _DEFINED_TYPEDEF_FOR_MilliAmpere_ \r
+\r
+typedef sint32 MilliOhm;\r
+#define MilliOhm_LowerLimit -2147483647\r
+#define MilliOhm_UpperLimit 2147483647\r
+\r
+#define _DEFINED_TYPEDEF_FOR_MilliOhm_ \r
+\r
+typedef sint32 MilliVolt;\r
+#define MilliVolt_LowerLimit -2147483647\r
+#define MilliVolt_UpperLimit 2147483647\r
+\r
+#define _DEFINED_TYPEDEF_FOR_MilliVolt_ \r
+\r
+typedef uint8 NvM_RequestResultType;\r
+#ifndef NVM_REQ_OK\r
+#define NVM_REQ_OK ((NvM_RequestResultType)0)\r
+#endif /*NVM_REQ_OK*/\r
+#ifndef NVM_REQ_NOT_OK\r
+#define NVM_REQ_NOT_OK ((NvM_RequestResultType)1)\r
+#endif /*NVM_REQ_NOT_OK*/\r
+#ifndef NVM_REQ_PENDING\r
+#define NVM_REQ_PENDING ((NvM_RequestResultType)2)\r
+#endif /*NVM_REQ_PENDING*/\r
+#ifndef NVM_REQ_INTEGRITY_FAILED\r
+#define NVM_REQ_INTEGRITY_FAILED ((NvM_RequestResultType)3)\r
+#endif /*NVM_REQ_INTEGRITY_FAILED*/\r
+#ifndef NVM_REQ_BLOCK_SKIPPED\r
+#define NVM_REQ_BLOCK_SKIPPED ((NvM_RequestResultType)4)\r
+#endif /*NVM_REQ_BLOCK_SKIPPED*/\r
+#ifndef NVM_REQ_NV_INVALIDATED\r
+#define NVM_REQ_NV_INVALIDATED ((NvM_RequestResultType)5)\r
+#endif /*NVM_REQ_NV_INVALIDATED*/\r
+\r
+#define _DEFINED_TYPEDEF_FOR_NvM_RequestResultType_ \r
+\r
+typedef sint32 Percent;\r
+#define Percent_LowerLimit -2147483647\r
+#define Percent_UpperLimit 2147483647\r
+\r
+#define _DEFINED_TYPEDEF_FOR_Percent_ \r
+\r
 typedef sint16 SInt16;\r
 #define SInt16_LowerLimit -32768\r
 #define SInt16_UpperLimit 32767\r
@@ -47,6 +201,24 @@ typedef sint8 SInt8;
 \r
 #define _DEFINED_TYPEDEF_FOR_SInt8_ \r
 \r
+typedef uint8 SignalQuality;\r
+#ifndef SignalQuality_InitialValue\r
+#define SignalQuality_InitialValue ((SignalQuality)0)\r
+#endif /*SignalQuality_InitialValue*/\r
+#ifndef SignalQuality_Error\r
+#define SignalQuality_Error ((SignalQuality)1)\r
+#endif /*SignalQuality_Error*/\r
+#ifndef SignalQuality_Bad\r
+#define SignalQuality_Bad ((SignalQuality)2)\r
+#endif /*SignalQuality_Bad*/\r
+#ifndef SignalQuality_Good\r
+#define SignalQuality_Good ((SignalQuality)3)\r
+#endif /*SignalQuality_Good*/\r
+#define SignalQuality_LowerLimit 0\r
+#define SignalQuality_UpperLimit 3\r
+\r
+#define _DEFINED_TYPEDEF_FOR_SignalQuality_ \r
+\r
 typedef uint16 UInt16;\r
 #define UInt16_LowerLimit 0\r
 #define UInt16_UpperLimit 65535\r
@@ -65,6 +237,10 @@ typedef uint8 UInt8;
 \r
 #define _DEFINED_TYPEDEF_FOR_UInt8_ \r
 \r
+typedef UInt8 DstPtrType[1024];\r
+\r
+#define _DEFINED_TYPEDEF_FOR_DstPtrType_ \r
+\r
 typedef struct {\r
        UInt8 value;\r
 } Rte_DE_Read_TesterRunnable_ReadArg1;\r
@@ -93,6 +269,23 @@ typedef struct {
        UInt16 value;\r
 } Rte_DE_Read_Logger2Runnable_ReadResult;\r
 \r
+typedef uint8 Rte_ModeType_EcuM_Mode;\r
+#define RTE_TRANSITION_EcuM_Mode ((Rte_ModeType_EcuM_Mode)6)\r
+#define RTE_MODE_EcuM_Mode_STARTUP ((Rte_ModeType_EcuM_Mode)4)\r
+#define RTE_MODE_EcuM_Mode_RUN ((Rte_ModeType_EcuM_Mode)1)\r
+#define RTE_MODE_EcuM_Mode_POST_RUN ((Rte_ModeType_EcuM_Mode)0)\r
+#define RTE_MODE_EcuM_Mode_SLEEP ((Rte_ModeType_EcuM_Mode)3)\r
+#define RTE_MODE_EcuM_Mode_WAKE_SLEEP ((Rte_ModeType_EcuM_Mode)5)\r
+#define RTE_MODE_EcuM_Mode_SHUTDOWN ((Rte_ModeType_EcuM_Mode)2)\r
+\r
+typedef uint8 Rte_ModeType_WdgMMode;\r
+#define RTE_TRANSITION_WdgMMode ((Rte_ModeType_WdgMMode)5)\r
+#define RTE_MODE_WdgMMode_ALIVE_OK ((Rte_ModeType_WdgMMode)3)\r
+#define RTE_MODE_WdgMMode_ALIVE_FAILED ((Rte_ModeType_WdgMMode)2)\r
+#define RTE_MODE_WdgMMode_ALIVE_EXPIRED ((Rte_ModeType_WdgMMode)1)\r
+#define RTE_MODE_WdgMMode_ALIVE_STOPPED ((Rte_ModeType_WdgMMode)4)\r
+#define RTE_MODE_WdgMMode_ALIVE_DEACTIVATED ((Rte_ModeType_WdgMMode)0)\r
+\r
 typedef struct {\r
 } Rte_PDS_Calculator_CalculatorOperations_P;\r
 typedef struct {\r
index e6a9b78cca27fad6033e68680aba22aa51e4bef1..cbbe68d6097ac9ae734e703b18bd99940fb547d4 100644 (file)
@@ -13,7 +13,7 @@
             <SDGS>\r
               <SDG GID="Arccore::EcuOptions">\r
                 <SD GID="MCU">MPC5567</SD>\r
-                <SD GID="GENDIR">${PROJECT_LOC}/config</SD>\r
+                <SD GID="GENDIR">${RESOURCE_LOC}/config</SD>\r
               </SDG>\r
             </SDGS>\r
           </ADMIN-DATA>\r
                   <SHORT-NAME>User_1</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="ea5c0039-0730-47a2-9c70-6d3509c886c7">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="e2a11371-7eaa-45b9-9f51-f9634333c57b">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/rte_simple_mpc5567qrtech/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/rte_simple_mpc5567qrtech/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="d976427f-d603-4874-a7dc-4233b6108867">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
                 </INTEGER-VALUE>\r
                 <INTEGER-VALUE>\r
                   <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Os/OsOS/ArcOsIsrMaxCount</DEFINITION-REF>\r
-                  <VALUE>10</VALUE>\r
+                  <VALUE>30</VALUE>\r
                 </INTEGER-VALUE>\r
                 <BOOLEAN-VALUE>\r
                   <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Os/OsOS/ArcCoreOsUseDebug</DEFINITION-REF>\r
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="abbec6bd-bfe2-4c2f-8949-e8793a33138b">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="0fa35d0d-3e03-4d9d-830b-556fc9090120">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="fda53ddb-c312-4dc5-9384-cef03d88b991">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
diff --git a/boards/mpc5668_gkit/examples/os_simple/config/EcuM_Callout_Stubs.c b/boards/mpc5668_gkit/examples/os_simple/config/EcuM_Callout_Stubs.c
deleted file mode 100644 (file)
index ebbf7a4..0000000
+++ /dev/null
@@ -1,332 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Callout_Stubs.c)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC5668\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
index d2a4470faa4ce4e7ceea72378090428974a4b55b..9d817ef08d72825e232588c2ff77b9237998bc6a 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5668\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_EcuMUserConfig,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
 \r
diff --git a/boards/mpc5668_gkit/examples/os_simple/config/EcuM_Generated_Types.h b/boards/mpc5668_gkit/examples/os_simple/config/EcuM_Generated_Types.h
deleted file mode 100644 (file)
index bcc478a..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    MPC5668\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
-#ifdef CFG_ECUM_USE_SERVICE_COMPONENT\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
index 194e498a0e6e903f4653a01541309b356f70fe74..2838b547e7b54cc61d41e4667d74b3aa9257d0f1 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    MPC5668\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index 12b1ce15ee93addcf8415d40a2a83d66b535d73f..1da543dcbe6e8653426a379981fa294288a30ac8 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5668\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 5371dbf3a5ce81a793d16cdc49216563057fca6a..24bdd71138ae59d15165a09d94794035f11f0974 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    MPC5668\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_EXT_REF_112MHZ = 0,\r
   MCU_NBR_OF_CLOCKS,\r
index f71b6fafb52196e756548ab132fef606eefa807d..e030f05c397edd8bfbe7209b34ff36ccb4f19962 100644 (file)
                   <SHORT-NAME>EcuMUserConfig</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="2b9f843d-9ae2-46d0-a37c-aab97b3edf49">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="96a2da2b-4a12-4eb5-9714-02f22ff10dfe">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_mpc5668_gkit/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_mpc5668_gkit/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="452b79fc-3a23-4615-bf27-9b336892e6eb">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="981c619f-8c0e-448e-8ec9-c269a1cad94f">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="1ea8d5da-1890-4d22-9d85-bedf041a1874">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="e6435b61-a599-4555-ad6f-9b21f2dafb63">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
diff --git a/boards/stm32_mcbstm32/examples/os_simple/config/EcuM_Callout_Stubs.c b/boards/stm32_mcbstm32/examples/os_simple/config/EcuM_Callout_Stubs.c
deleted file mode 100644 (file)
index 5ad4c08..0000000
+++ /dev/null
@@ -1,332 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Callout_Stubs.c)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    STM32_F103\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
index bad8c262cb5eae54981fde42526831b3b312900f..471f0828f76e2f10a8f378e9362d65d25b1640a3 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F103\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_User_1,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
 \r
diff --git a/boards/stm32_mcbstm32/examples/os_simple/config/EcuM_Generated_Types.h b/boards/stm32_mcbstm32/examples/os_simple/config/EcuM_Generated_Types.h
deleted file mode 100644 (file)
index 4d6d88a..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    STM32_F103\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
-#ifdef CFG_ECUM_USE_SERVICE_COMPONENT\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
index 6b9c62ed9c0a4d449f0eee0d570df2bbd11e4e17..a01052a0b8596c2c27e73f6f39ef8581f94ca26e 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    STM32_F103\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index 8376dcc6c768b437b1788a18ad876f62bd03a5c7..08002eb956eb1b76bab231f64966f7b600aa1853 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F103\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 4d3aba0d38e0ea6d602fd1020fa0c18a72184ed7..1c81c3897465f7c9dcf4ad9c937765e660e9fd7d 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F103\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_Clock = 0,\r
   MCU_NBR_OF_CLOCKS,\r
index ccc519e32391e60471a8e3b72de0d9c9cd6a7c4e..74cf39f8c58c0003487a2054639e7c8b377603e4 100644 (file)
                   <SHORT-NAME>User_1</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="693c7bc4-c751-42c6-91ce-5389ce42f5ea">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="71395fc7-851e-4098-aac9-c900a7122f79">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_stm32_mcbstm32/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_stm32_mcbstm32/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="5803a2cc-b839-46ce-9c2b-0822be5324b8">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="686122a2-ff3b-4cf8-917e-014fcd86d2ed">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="47fc1ec0-2f1f-4d18-b5b6-fdbf28f12be3">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="c7d0acad-e0ef-40ce-a1ee-f37820e5d4ab">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
index 27fdc6e734acedf1696c5226a83df9bf7cabddfc..0c9284825a235279125f1f56d3b3620e4fc3e14c 100644 (file)
                   <SHORT-NAME>User_1</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="b14502c0-68d6-4cb7-9cee-9e4bef5d2c60">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="bc9d071e-3ba8-49b5-ac8a-5cc81ee13eaf">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/com_simple_stm3210c/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/com_simple_stm3210c/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="ec7bac66-ecea-4102-9c20-906c737272ee">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="179c0741-fc9d-403a-a18f-b1c76a5374f7">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="408458ee-cc9c-434d-9e48-f6c11ab54145">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="be0f638b-b5ff-493d-abb8-5115cf1035bf">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
index c216d16372489a946e67681578b6efc6dfc70a21..b7b4f1308d9f8eea9ae67f51ca702cc9beee85ac 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.8\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 4a0abb72335fd2dd4c6afd9d10a5f95ee0bed8d1..2e153d10370c5eb370cb779d3d1d2fe194771e24 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.8\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
@@ -75,8 +75,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_32_21_BE_Tester,\r
+               \r
                .ComBitPosition = 20,\r
                .ComBitSize = 21,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = UINT32,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -103,8 +105,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_1_4_LE_Tester,\r
+               \r
                .ComBitPosition = 1,\r
                .ComBitSize = 4,\r
+               \r
                .ComSignalEndianess = COM_LITTLE_ENDIAN,\r
                .ComSignalType = UINT8,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -131,8 +135,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_45_12_LE_Tester,\r
+               \r
                .ComBitPosition = 45,\r
                .ComBitSize = 12,\r
+               \r
                .ComSignalEndianess = COM_LITTLE_ENDIAN,\r
                .ComSignalType = SINT16,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -159,8 +165,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_29_12_BE_Tester,\r
+               \r
                .ComBitPosition = 0,\r
                .ComBitSize = 12,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = SINT16,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -187,8 +195,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_32_21_BE,\r
+               \r
                .ComBitPosition = 20,\r
                .ComBitSize = 21,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = UINT32,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -215,8 +225,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_1_4_LE,\r
+               \r
                .ComBitPosition = 1,\r
                .ComBitSize = 4,\r
+               \r
                .ComSignalEndianess = COM_LITTLE_ENDIAN,\r
                .ComSignalType = UINT8,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -243,8 +255,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_45_12_LE,\r
+               \r
                .ComBitPosition = 45,\r
                .ComBitSize = 12,\r
+               \r
                .ComSignalEndianess = COM_LITTLE_ENDIAN,\r
                .ComSignalType = SINT16,\r
                .Com_Arc_IsSignalGroup = 0,\r
@@ -271,8 +285,10 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_CanDB_Signal_29_12_BE,\r
+               \r
                .ComBitPosition = 0,\r
                .ComBitSize = 12,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = SINT16,\r
                .Com_Arc_IsSignalGroup = 0,\r
index cbdbb96494864432fe1991f331acd39ac024e837..83ea327a61c308307584fd4359b0e8968b29e580 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.8\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \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
deleted file mode 100644 (file)
index 4fd8169..0000000
+++ /dev/null
@@ -1,332 +0,0 @@
-/*\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
index b1cc93f0da764200b84c0f35899dba47d340441d..d837283a861535f6a7f338f7a491cde105be8a6a 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_User_1,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\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
deleted file mode 100644 (file)
index 22995e4..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\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
-#ifdef CFG_ECUM_USE_SERVICE_COMPONENT\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
index cfb351cf483eca262629c3660c31ac44ba2280ef..3f770db55625325ad13d3de68da093395961a74c 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index 5e620a71c1c45f3962ef32211062a4d910cfaec8..e027b05badd87162c4b6bd589fbc907c7c71b3fd 100644 (file)
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_EXT_REF_25MHZ = 0,\r
   MCU_NBR_OF_CLOCKS,\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
deleted file mode 100644 (file)
index 4fd8169..0000000
+++ /dev/null
@@ -1,332 +0,0 @@
-/*\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
index b1cc93f0da764200b84c0f35899dba47d340441d..d837283a861535f6a7f338f7a491cde105be8a6a 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_User_1,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\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
deleted file mode 100644 (file)
index 22995e4..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\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
-#ifdef CFG_ECUM_USE_SERVICE_COMPONENT\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
index cfb351cf483eca262629c3660c31ac44ba2280ef..3f770db55625325ad13d3de68da093395961a74c 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index ecbb2f8fbeba658456d51be38d45964440e4c0be..ca0d6eb3a0b66ff330febf306b003f40a423ef83 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 354034469466d27bbbc8b47ea2f23c72ed193f1f..e027b05badd87162c4b6bd589fbc907c7c71b3fd 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F107\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_EXT_REF_25MHZ = 0,\r
   MCU_NBR_OF_CLOCKS,\r
index ca686acbd73c68ced6ef6f8b3b9b0fe484059eb4..c677f0ad5b5ca1bfa444f4960cf38fce083548df 100644 (file)
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="179c0741-fc9d-403a-a18f-b1c76a5374f7">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="720a5fff-d9d5-47c9-9c01-ccd9e5f935a6">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="0b31e696-30f9-4ccd-a352-31eeff55ad70">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r
                   <SHORT-NAME>User_1</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="dfa5c6c3-0130-401f-8021-c0c80e556cff">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="db74db17-454e-4e71-9687-e59d5692840e">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_stm32_stm3210c/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_stm32_stm3210c/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="c8073cc6-7471-4361-8f5e-3c1d4f0288ca">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
index f6eeffc92f488998563cea97b02e875a3505af31..c726b8771d02da52af324e1dd9d8075d0371f042 100644 (file)
@@ -1,5 +1,3 @@
 \r
 MOD_USE += KERNEL DET ECUM MCU \r
 \r
-def-y += ECUM_USE_SERVICE_PORTS=STDOFF\r
-\r
diff --git a/boards/ti_tms570ls/examples/os_simple/config/EcuM_Callout_Stubs.c b/boards/ti_tms570ls/examples/os_simple/config/EcuM_Callout_Stubs.c
deleted file mode 100644 (file)
index 595d8ff..0000000
+++ /dev/null
@@ -1,332 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Callout_Stubs.c)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    TMS570\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
index e74a516a705feb4020550421789c2b190114023c..064184ab708b0db5898e97e529a7c6b6ea39b0b1 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_User_1,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
+\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
 \r
diff --git a/boards/ti_tms570ls/examples/os_simple/config/EcuM_Generated_Types.h b/boards/ti_tms570ls/examples/os_simple/config/EcuM_Generated_Types.h
deleted file mode 100644 (file)
index 9791344..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    TMS570\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
index 85f88e13151ec19fae1a9de857e7406daa6d5119..b35e067bfa7ba85faf27d097b317ccda109aedf5 100644 (file)
@@ -7,13 +7,12 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\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
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_MCUMODESETTINGCONF,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r
index 66aa8a54885a675396dc30b8759b8c7036df3f15..dd0ec942a4bb715ca51301da8db0582bfe805c66 100644 (file)
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_MCUMODESETTINGCONF = 0,\r
+       MCU_MODE_NORMAL = 1 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_Clock = 0,\r
   MCU_NBR_OF_CLOCKS,\r
index 3abb7a47b87233f76405e2df07de09e978c6de7d..32c4fec1fb674b6d463818f97dabb80bb5b6e52f 100644 (file)
                   </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="ebb0a29c-29fb-498e-a1cf-dc347072948e">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="8fe5b690-90c0-433c-8f7e-6d519f82344b">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_tms570ls/Mcu/McuModuleConfiguration/McuModeSettingConf</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_tms570ls/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="cf198c67-58a5-4ad9-90e4-70af5a450f6a">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
index 41b82a5bd6ef594aeee2d6e98bdf031b4a8d5fd0..2150ac3c2be97dc492313e2a484fc48f2790b5c5 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index bee2ac53ba048d0dddef96c598a766cf87b10e0a..f58d599db43d71ae4936106172b2b216df49ef66 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 9e19df9cb89f34051bae629b6ad3c35ab36833ec..c368012846ef4ab4a8d77e71c5fd6dc55b75c97b 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 3a8742820b910069ca13e5ef5eebadf5c2b633f8..b7fb1e2eedf97918b91c02eef32355dc59eac20f 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.6\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index d5b6a74e0e6126ae522d20926a21ac77894c808f..1c4cb6ba5172ed87ce0a025b7740be495c2c6106 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.6\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
@@ -43,12 +43,28 @@ const ComGroupSignal_type ComGroupSignal[] = {
 \r
 /* SignalGroup GroupSignals lists. */\r
 \r
+\r
+/* IPdu buffers and signal group buffers */\r
+uint8 ComArcIPduBuffer_FreqInd[8]; \r
+          \r
+uint8 ComArcIPduBuffer_FreqReq[8];\r
+uint8 ComArcIPduDeferredRxBuffer_FreqReq[8]; \r
+          \r
+uint8 ComArcIPduBuffer_RX_PDU[8];\r
+uint8 ComArcIPduDeferredRxBuffer_RX_PDU[8]; \r
+          \r
+uint8 ComArcIPduBuffer_TX_PDU[8]; \r
+          \r
+\r
 /*\r
  * Signal definitions\r
  */\r
\r
 const ComSignal_type ComSignal[] = {\r
        {\r
                .ComHandleId = Arg1,\r
+               .ComIPduHandleId = 2,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -61,18 +77,24 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_Arg1,\r
+               \r
                .ComBitPosition = 7,\r
                .ComBitSize = 8,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = UINT8,\r
                .Com_Arc_IsSignalGroup = 0,\r
                .ComGroupSignal = NULL,\r
                \r
+               \r
                .ComRxDataTimeoutAction = COM_TIMEOUT_DATA_ACTION_NONE,\r
+               \r
                .Com_Arc_EOL = 0\r
        },\r
        {\r
                .ComHandleId = ResultSig,\r
+               .ComIPduHandleId = 3,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -85,18 +107,24 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_ResultSig,\r
+               \r
                .ComBitPosition = 7,\r
                .ComBitSize = 8,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = UINT8,\r
                .Com_Arc_IsSignalGroup = 0,\r
                .ComGroupSignal = NULL,\r
                \r
+               \r
                .ComRxDataTimeoutAction = COM_TIMEOUT_DATA_ACTION_NONE,\r
+               \r
                .Com_Arc_EOL = 0\r
        },\r
        {\r
                .ComHandleId = Arg2,\r
+               .ComIPduHandleId = 2,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -109,18 +137,24 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_Arg2,\r
+               \r
                .ComBitPosition = 15,\r
                .ComBitSize = 8,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = UINT8,\r
                .Com_Arc_IsSignalGroup = 0,\r
                .ComGroupSignal = NULL,\r
                \r
+               \r
                .ComRxDataTimeoutAction = COM_TIMEOUT_DATA_ACTION_NONE,\r
+               \r
                .Com_Arc_EOL = 0\r
        },\r
        {\r
                .ComHandleId = FreqIndSig,\r
+               .ComIPduHandleId = 0,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = NULL,\r
                .ComTimeoutFactor = 0,\r
@@ -133,18 +167,24 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_FreqIndSig,\r
+               \r
                .ComBitPosition = 7,\r
                .ComBitSize = 32,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = UINT32,\r
                .Com_Arc_IsSignalGroup = 0,\r
                .ComGroupSignal = NULL,\r
                \r
+               \r
                .ComRxDataTimeoutAction = COM_TIMEOUT_DATA_ACTION_NONE,\r
+               \r
                .Com_Arc_EOL = 0\r
        },\r
        {\r
                .ComHandleId = FreqReqSig,\r
+               .ComIPduHandleId = 1,\r
+               .Com_Arc_ShadowBuffer = NULL,\r
                .ComFirstTimeoutFactor = 0,\r
                .ComNotification = Rte_COMCbk_FreqReqSig,\r
                .ComTimeoutFactor = 0,\r
@@ -157,14 +197,18 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_FreqReqSig,\r
+               \r
                .ComBitPosition = 7,\r
                .ComBitSize = 32,\r
+               \r
                .ComSignalEndianess = COM_BIG_ENDIAN,\r
                .ComSignalType = UINT32,\r
                .Com_Arc_IsSignalGroup = 0,\r
                .ComGroupSignal = NULL,\r
                \r
+               \r
                .ComRxDataTimeoutAction = COM_TIMEOUT_DATA_ACTION_NONE,\r
+               \r
                .Com_Arc_EOL = 0\r
        },\r
        {\r
@@ -214,11 +258,13 @@ const ComIPdu_type ComIPdu[] = {
        { // FreqInd\r
                .ArcIPduOutgoingId = PDUR_PDU_ID_FreqInd,\r
                .ComIPduCallout = NULL,\r
+               \r
                .ComIPduSignalProcessing =  DEFERRED,\r
                .ComIPduSize =  8,\r
                .ComIPduDirection = SEND,\r
                .ComIPduGroupRef = ComPduGroup,\r
                \r
+               .ComIPduDeferredDataPtr = 0,            \r
                .ComTxIPdu = {\r
                        .ComTxIPduMinimumDelayFactor = 0,\r
                        .ComTxIPduUnusedAreasDefault = 0,\r
@@ -231,17 +277,21 @@ const ComIPdu_type ComIPdu[] = {
                        },\r
                },\r
                \r
+               .ComIPduDataPtr = ComArcIPduBuffer_FreqInd,             \r
                .ComIPduSignalRef = ComIPduSignalRefs_FreqInd,\r
+               .ComIPduDynSignalRef = 0,\r
                .Com_Arc_EOL = 0\r
        },   \r
        { // FreqReq\r
                .ArcIPduOutgoingId = PDUR_REVERSE_PDU_ID_FreqReq,\r
                .ComIPduCallout = NULL,\r
+               \r
                .ComIPduSignalProcessing =  DEFERRED,\r
                .ComIPduSize =  8,\r
                .ComIPduDirection = RECEIVE,\r
                .ComIPduGroupRef = ComPduGroup,\r
                \r
+               .ComIPduDeferredDataPtr = ComArcIPduDeferredRxBuffer_FreqReq,\r
                .ComTxIPdu = {\r
                        .ComTxIPduMinimumDelayFactor = 0,\r
                        .ComTxIPduUnusedAreasDefault = 0,\r
@@ -254,17 +304,21 @@ const ComIPdu_type ComIPdu[] = {
                        },\r
                },\r
                \r
+               .ComIPduDataPtr = ComArcIPduBuffer_FreqReq,             \r
                .ComIPduSignalRef = ComIPduSignalRefs_FreqReq,\r
+               .ComIPduDynSignalRef = 0,\r
                .Com_Arc_EOL = 0\r
        },   \r
        { // RX_PDU\r
                .ArcIPduOutgoingId = PDUR_REVERSE_PDU_ID_RX_PDU,\r
                .ComIPduCallout = NULL,\r
+               \r
                .ComIPduSignalProcessing =  DEFERRED,\r
                .ComIPduSize =  8,\r
                .ComIPduDirection = RECEIVE,\r
                .ComIPduGroupRef = ComPduGroup,\r
                \r
+               .ComIPduDeferredDataPtr = ComArcIPduDeferredRxBuffer_RX_PDU,\r
                .ComTxIPdu = {\r
                        .ComTxIPduMinimumDelayFactor = 0,\r
                        .ComTxIPduUnusedAreasDefault = 0,\r
@@ -277,17 +331,21 @@ const ComIPdu_type ComIPdu[] = {
                        },\r
                },\r
                \r
+               .ComIPduDataPtr = ComArcIPduBuffer_RX_PDU,              \r
                .ComIPduSignalRef = ComIPduSignalRefs_RX_PDU,\r
+               .ComIPduDynSignalRef = 0,\r
                .Com_Arc_EOL = 0\r
        },   \r
        { // TX_PDU\r
                .ArcIPduOutgoingId = PDUR_PDU_ID_TX_PDU,\r
                .ComIPduCallout = NULL,\r
+               \r
                .ComIPduSignalProcessing =  DEFERRED,\r
                .ComIPduSize =  8,\r
                .ComIPduDirection = SEND,\r
                .ComIPduGroupRef = ComPduGroup,\r
                \r
+               .ComIPduDeferredDataPtr = 0,            \r
                .ComTxIPdu = {\r
                        .ComTxIPduMinimumDelayFactor = 0,\r
                        .ComTxIPduUnusedAreasDefault = 0,\r
@@ -300,7 +358,9 @@ const ComIPdu_type ComIPdu[] = {
                        },\r
                },\r
                \r
+               .ComIPduDataPtr = ComArcIPduBuffer_TX_PDU,              \r
                .ComIPduSignalRef = ComIPduSignalRefs_TX_PDU,\r
+               .ComIPduDynSignalRef = 0,\r
                .Com_Arc_EOL = 0\r
        },   \r
        {\r
@@ -316,16 +376,6 @@ const Com_ConfigType ComConfiguration = {
        .ComGroupSignal = ComGroupSignal\r
 };\r
 \r
-/* IPdu buffers and signal group buffers */\r
-uint8 ComArcIPduBuffer_FreqInd[8];\r
-          \r
-uint8 ComArcIPduBuffer_FreqReq[8];\r
-          \r
-uint8 ComArcIPduBuffer_RX_PDU[8];\r
-          \r
-uint8 ComArcIPduBuffer_TX_PDU[8];\r
-          \r
-\r
 Com_Arc_IPdu_type Com_Arc_IPdu[] = {\r
        { // FreqInd\r
                .Com_Arc_TxIPduTimers = {\r
@@ -333,8 +383,7 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = {
                        .ComTxModeRepetitionPeriodTimer = 0,\r
                        .ComTxIPduMinimumDelayTimer = 0,\r
                        .ComTxModeTimePeriodTimer = 0\r
-               },\r
-               .ComIPduDataPtr = ComArcIPduBuffer_FreqInd,\r
+               },              \r
                .Com_Arc_IpduStarted = 0        \r
        },\r
        { // FreqReq\r
@@ -343,8 +392,7 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = {
                        .ComTxModeRepetitionPeriodTimer = 0,\r
                        .ComTxIPduMinimumDelayTimer = 0,\r
                        .ComTxModeTimePeriodTimer = 0\r
-               },\r
-               .ComIPduDataPtr = ComArcIPduBuffer_FreqReq,\r
+               },              \r
                .Com_Arc_IpduStarted = 0        \r
        },\r
        { // RX_PDU\r
@@ -353,8 +401,7 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = {
                        .ComTxModeRepetitionPeriodTimer = 0,\r
                        .ComTxIPduMinimumDelayTimer = 0,\r
                        .ComTxModeTimePeriodTimer = 0\r
-               },\r
-               .ComIPduDataPtr = ComArcIPduBuffer_RX_PDU,\r
+               },              \r
                .Com_Arc_IpduStarted = 0        \r
        },\r
        { // TX_PDU\r
@@ -363,8 +410,7 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = {
                        .ComTxModeRepetitionPeriodTimer = 0,\r
                        .ComTxIPduMinimumDelayTimer = 0,\r
                        .ComTxModeTimePeriodTimer = 0\r
-               },\r
-               .ComIPduDataPtr = ComArcIPduBuffer_TX_PDU,\r
+               },              \r
                .Com_Arc_IpduStarted = 0        \r
        },\r
 };\r
@@ -372,57 +418,27 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = {
 Com_Arc_Signal_type Com_Arc_Signal[] = {\r
        { // Arg1\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
        { // ResultSig\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
        { // Arg2\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
        { // FreqIndSig\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
        { // FreqReqSig\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
index 3fbeb926c0e5a7f302d37e444098121302ab21e8..8806c81b6d7b2b32662217bc8de25b6faa4a6558 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.6\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index d9eef2731e28884c517de725a6d50f1d0cb04d37..07c16796fa0c7c3e52fd0a966f211fdd0d87373c 100644 (file)
@@ -25,7 +25,7 @@
 #define DIO_VERSION_INFO_API    STD_OFF\r
 #define DIO_DEV_ERROR_DETECT    STD_OFF\r
 \r
-#define DIO_END_OF_LIST  -1\r
+#define DIO_END_OF_LIST  (-1u)\r
 \r
 // Physical ports\r
 typedef enum\r
index c4fcae6c7568a166edfa53a7ae1587f84afb9e7e..fbbe325930f971e2cd92c8997bf95aae3881509e 100644 (file)
@@ -30,8 +30,8 @@ const Dio_PortType DioPortConfigData[] = {
 const Dio_ChannelGroupType DioConfigData[] = {\r
        { \r
          .port = DIO_END_OF_LIST, \r
-         .offset = DIO_END_OF_LIST\r
-         .mask = DIO_END_OF_LIST\r
+         .offset = 0\r
+         .mask = 0\r
        }\r
 };\r
 \r
index 8563afb8d43b2f4342c1b050c29a9ebc5da0cf56..064184ab708b0db5898e97e529a7c6b6ea39b0b1 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #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
 #define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
 \r
+#define ECUM_VALIDATION_TIMEOUT          0\r
 \r
 typedef enum {\r
        ECUM_USER_User_1,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+// EcuM Sleep Mode IDs\r
+#define ECUM_SLEEP_MODE_EcuMSleepMode 0\r
+#define ECUM_SLEEP_MODE_CNT 1\r
 \r
-extern EcuM_ConfigType EcuMConfig;\r
+typedef enum {\r
+       ECUM_WKSOURCE_POWER = (1<<0),\r
+       ECUM_WKSOURCE_RESET = (1<<1),\r
+       ECUM_WKSOURCE_INTERNAL_RESET = (1<<2),\r
+       ECUM_WKSOURCE_INTERNAL_WDG = (1<<3),\r
+       ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4),\r
+       ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5),        \r
+       ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF\r
+} EcuM_WakeupSourceType ;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
 \r
diff --git a/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Generated_Types.h b/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Generated_Types.h
deleted file mode 100644 (file)
index 63eef4f..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-/*\r
-* Configuration of module: EcuM (EcuM_Generated_Types.h)\r
-*\r
-* Created by:              \r
-* Copyright:               \r
-*\r
-* Configured for (MCU):    TMS570\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 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/ti_tms570ls/examples/rte_simple/config/EcuM_PBcfg.c b/boards/ti_tms570ls/examples/rte_simple/config/EcuM_PBcfg.c
new file mode 100644 (file)
index 0000000..b35e067
--- /dev/null
@@ -0,0 +1,155 @@
+/*\r
+* Configuration of module: EcuM (EcuM_PBcfg.c)\r
+*\r
+* Created by:              \r
+* Copyright:               \r
+*\r
+* Configured for (MCU):    TMS570\r
+*\r
+* Module vendor:           ArcCore\r
+* Generator version:       2.1.10\r
+*\r
+* Generated by Arctic Studio (http://arccore.com) \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
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_MCUMODESETTINGCONF,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\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
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = EcuM_SleepModeConfig,\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
index 764997757fb86d704dc94265bd975ea4c701e13a..b965fcc555559b2ebe8f895af3787ece3bb449b8 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 60973c135368a5615f38d5c43092a6748201cab2..dd0ec942a4bb715ca51301da8db0582bfe805c66 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_MCUMODESETTINGCONF = 0,\r
+       MCU_MODE_NORMAL = 1 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_Clock = 0,\r
   MCU_NBR_OF_CLOCKS,\r
index b088ec3f3e0f40110974d14d1e2876dd093a1408..336d585429109f353c72ec11e6f61171515ce446 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index daefc8bae0b9a38ff707b4e41d10c8c9975535e1..164765c8c8b1dd4e0245730acf435feffb3a345a 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.1\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 65820251d3552ec095e6e579635adaa5794d7b18..0a0931588974cd47c33b3cc60c542103414b281c 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 #include "Rte_Logger2_Internal.h"\r
 #include "Com.h"\r
 \r
-Rte_DE_UInt8 Rte_Buf_Tester_prototype_Argumentsarg1_ibuffer;\r
-Rte_DE_UInt8 Rte_Buf_Tester_prototype_Argumentsarg2_ibuffer;\r
-Rte_DE_UInt32 Rte_Buf_Tester_prototype_FreqReqfreq_ibuffer;\r
-Rte_DE_UInt32 Rte_Buf_Tester_prototype_FreqReqIndfreq_ibuffer;\r
-Rte_DE_UInt16 Rte_Buf_Tester_prototype_Resultresult_ibuffer;\r
+Rte_DE_Read_TesterRunnable_ReadArg1 Rte_Buf_TesterRunnable_Argumentsarg1_ibuffer;\r
+Rte_DE_Read_TesterRunnable_ReadArg2 Rte_Buf_TesterRunnable_Argumentsarg2_ibuffer;\r
+Rte_DE_Read_FreqReqRunnable_ReadFreqReq Rte_Buf_FreqReqRunnable_FreqReqfreq_ibuffer;\r
+Rte_DE_Write_TesterRunnable_WriteResult Rte_Buf_TesterRunnable_Resultresult_ibuffer;\r
+Rte_DE_Write_FreqReqRunnable_WriteFreqReqInd Rte_Buf_FreqReqRunnable_FreqReqIndfreq_ibuffer;\r
 Rte_CDS_Tester Rte_Inst_Tester =\r
 {\r
-       .TesterRunnable_Arguments_arg1 = &Rte_Buf_Tester_prototype_Argumentsarg1_ibuffer,\r
-       .TesterRunnable_Arguments_arg2 = &Rte_Buf_Tester_prototype_Argumentsarg2_ibuffer,\r
-       .FreqReqRunnable_FreqReq_freq = &Rte_Buf_Tester_prototype_FreqReqfreq_ibuffer,\r
-       .FreqReqRunnable_FreqReqInd_freq = &Rte_Buf_Tester_prototype_FreqReqIndfreq_ibuffer,\r
-       .TesterRunnable_Result_result = &Rte_Buf_Tester_prototype_Resultresult_ibuffer,\r
+       .TesterRunnable_Arguments_arg1 = &Rte_Buf_TesterRunnable_Argumentsarg1_ibuffer,\r
+       .TesterRunnable_Arguments_arg2 = &Rte_Buf_TesterRunnable_Argumentsarg2_ibuffer,\r
+       .FreqReqRunnable_FreqReq_freq = &Rte_Buf_FreqReqRunnable_FreqReqfreq_ibuffer,\r
+       .TesterRunnable_Result_result = &Rte_Buf_TesterRunnable_Resultresult_ibuffer,\r
+       .FreqReqRunnable_FreqReqInd_freq = &Rte_Buf_FreqReqRunnable_FreqReqIndfreq_ibuffer,\r
 };\r
 \r
-Rte_DE_UInt16 Rte_Buf_Logger_prototype_Resultresult_ibuffer;\r
+Rte_DE_Read_LoggerRunnable_ReadResult Rte_Buf_LoggerRunnable_Resultresult_ibuffer;\r
 Rte_CDS_Logger Rte_Inst_Logger =\r
 {\r
-       .LoggerRunnable_Result_result = &Rte_Buf_Logger_prototype_Resultresult_ibuffer,\r
+       .LoggerRunnable_Result_result = &Rte_Buf_LoggerRunnable_Resultresult_ibuffer,\r
 };\r
 \r
-Rte_DE_UInt16 Rte_Buf_Logger2_prototype_Resultresult_ibuffer;\r
+Rte_DE_Read_Logger2Runnable_ReadResult Rte_Buf_Logger2Runnable_Resultresult_ibuffer;\r
 Rte_CDS_Logger2 Rte_Inst_Logger2 =\r
 {\r
-       .Logger2Runnable_Result_result = &Rte_Buf_Logger2_prototype_Resultresult_ibuffer,\r
+       .Logger2Runnable_Result_result = &Rte_Buf_Logger2Runnable_Resultresult_ibuffer,\r
 };\r
 \r
 void Rte_PRE_TesterRunnable() {\r
-       imask_t irqMask = 0;\r
-       Irq_Save(irqMask);\r
+       GetResource(RES_SCHEDULER);\r
 \r
        uint8 Arg1_buf = 0;\r
        Com_ReceiveSignal(Arg1, &Arg1_buf);\r
@@ -61,48 +60,44 @@ void Rte_PRE_TesterRunnable() {
        Com_ReceiveSignal(Arg2, &Arg2_buf);\r
        Rte_Inst_Tester.TesterRunnable_Arguments_arg2->value = (UInt8) Arg2_buf;\r
 \r
-       Irq_Restore(irqMask);\r
+       ReleaseResource(RES_SCHEDULER);\r
 \r
 }\r
 \r
 void Rte_PRE_FreqReqRunnable() {\r
-       imask_t irqMask = 0;\r
-       Irq_Save(irqMask);\r
+       GetResource(RES_SCHEDULER);\r
 \r
        uint32 FreqReqSig_buf = 0;\r
        Com_ReceiveSignal(FreqReqSig, &FreqReqSig_buf);\r
-       Rte_Inst_Tester.FreqReqRunnable_FreqReq_freq->value\r
-                       (UInt32) FreqReqSig_buf;\r
+       Rte_Inst_Tester.FreqReqRunnable_FreqReq_freq->value =\r
+                       (UInt32) FreqReqSig_buf;\r
 \r
-       Irq_Restore(irqMask);\r
+       ReleaseResource(RES_SCHEDULER);\r
 \r
 }\r
 \r
 void Rte_PRE_LoggerRunnable() {\r
-       imask_t irqMask = 0;\r
-       Irq_Save(irqMask);\r
+       GetResource(RES_SCHEDULER);\r
 \r
-       Rte_Inst_Logger.LoggerRunnable_Result_result->value\r
-                       Rte_Buf_Tester_prototype_Result_result;\r
+       Rte_Inst_Logger.LoggerRunnable_Result_result->value =\r
+                       Rte_Buf_Tester_prototype_Result_result;\r
 \r
-       Irq_Restore(irqMask);\r
+       ReleaseResource(RES_SCHEDULER);\r
 \r
 }\r
 \r
 void Rte_PRE_Logger2Runnable() {\r
-       imask_t irqMask = 0;\r
-       Irq_Save(irqMask);\r
+       GetResource(RES_SCHEDULER);\r
 \r
-       Rte_Inst_Logger2.Logger2Runnable_Result_result->value\r
-                       Rte_Buf_Tester_prototype_Result_result;\r
+       Rte_Inst_Logger2.Logger2Runnable_Result_result->value =\r
+                       Rte_Buf_Tester_prototype_Result_result;\r
 \r
-       Irq_Restore(irqMask);\r
+       ReleaseResource(RES_SCHEDULER);\r
 \r
 }\r
 \r
 void Rte_POST_TesterRunnable() {\r
-       imask_t irqMask = 0;\r
-       Irq_Save(irqMask);\r
+       GetResource(RES_SCHEDULER);\r
 \r
        uint8 ResultSig_buf =\r
                        (uint8) Rte_Inst_Tester.TesterRunnable_Result_result->value;\r
@@ -111,19 +106,18 @@ void Rte_POST_TesterRunnable() {
        Rte_WriteBuffer_Rte_Buf_Tester_prototype_Result_result(\r
                        Rte_Inst_Tester.TesterRunnable_Result_result->value);\r
 \r
-       Irq_Restore(irqMask);\r
+       ReleaseResource(RES_SCHEDULER);\r
 \r
 }\r
 \r
 void Rte_POST_FreqReqRunnable() {\r
-       imask_t irqMask = 0;\r
-       Irq_Save(irqMask);\r
+       GetResource(RES_SCHEDULER);\r
 \r
        uint32 FreqIndSig_buf =\r
                        (uint32) Rte_Inst_Tester.FreqReqRunnable_FreqReqInd_freq->value;\r
        Com_SendSignal(FreqIndSig, &FreqIndSig_buf);\r
 \r
-       Irq_Restore(irqMask);\r
+       ReleaseResource(RES_SCHEDULER);\r
 \r
 }\r
 \r
@@ -139,7 +133,8 @@ void Rte_FreqReqRunnable() {
        Rte_POST_FreqReqRunnable();\r
 }\r
 \r
-Std_ReturnType Rte_Multiply(const UInt8 arg1, const UInt8 arg2, UInt16* result) {\r
+Std_ReturnType Rte_Multiply(const UInt8 arg1, const UInt8 arg2,\r
+               UInt16* result) {\r
        Std_ReturnType retVal = Multiply(arg1, arg2, result);\r
        return retVal;\r
 }\r
@@ -161,8 +156,8 @@ Std_ReturnType Rte_Start() {
 void StepTask() {\r
        EventMaskType eventMask = 0;\r
        while (1) {\r
-               WaitEvent( EVENT_MASK_StepEvent);\r
-               GetResource( RES_SCHEDULER);\r
+               WaitEvent(EVENT_MASK_StepEvent);\r
+               GetResource(RES_SCHEDULER);\r
                GetEvent(TASK_ID_StepTask, &eventMask);\r
                ClearEvent(EVENT_MASK_StepEvent);\r
                ReleaseResource(RES_SCHEDULER);\r
index 149fc885f6ff7b46ae9ebc2f5c55870dfff51833..fc35d23deb95857317edb14bee84855af146443d 100644 (file)
@@ -1,8 +1,7 @@
+obj-y += Rte.o
+obj-y += Rte_Data.o
 obj-y += Rte_Cbk.o
-obj-y += cirq_buffer.o
 obj-y += Rte_Calculator.o
-obj-y += Rte_Logger2.o
-obj-y += Rte.o
 obj-y += Rte_Tester.o
-obj-y += Rte_Data.o
 obj-y += Rte_Logger.o
+obj-y += Rte_Logger2.o
index 60b9bc93dccd3a833913a831fad74ea1abe8cdf0..67c16fbc834d0f88ee285217006d0c3d215ea058 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index f6963726419e066b08b1887d823cb0a9962a04ee..2a14805f26e17619c139f5685cf9f7b913b43918 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 1e2da5d9e58d801403fca435c202e1fd711d2bde..8c0b3e620186be16f7e11a0c41c630daf28eea36 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index a89e89238d8b6d00917ac5084258796391660211..22a72569d59f9592109903751ec8a9aeb727aee4 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 void Rte_COMCbk_Arg1() {\r
 }\r
 \r
+void Rte_COMCbkTOut_Arg1() {\r
+}\r
+\r
 void Rte_COMCbk_Arg2() {\r
 }\r
 \r
+void Rte_COMCbkTOut_Arg2() {\r
+}\r
+\r
 void Rte_COMCbk_ResultSig() {\r
 }\r
 \r
+void Rte_COMCbkTOut_ResultSig() {\r
+}\r
+\r
 void Rte_COMCbk_FreqReqSig() {\r
        Rte_FreqReqRunnable();\r
 }\r
 \r
+void Rte_COMCbkTOut_FreqReqSig() {\r
+}\r
+\r
 void Rte_COMCbk_FreqIndSig() {\r
 }\r
 \r
+void Rte_COMCbkTOut_FreqIndSig() {\r
+}\r
+\r
index 4e2fe45b8b7e60986dd7c9e145fae73d0643902a..1f8704af1d613d27ab51a78b7658b86fd16b9aee 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 011db50ba344e3b2d9e03dae670f35c4a6f49824..1c671fee2c0c3eca4af4d4ef53dddfbef4453d3f 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index f337ffcfff7f94c740cda587805b5fba0608edbe..67ac9a480b79413d2c505f9562ea0014f07873ab 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 4195f86a083903956b712afc575db42a4518129d..20433ddaa4919c5b40c47977c9cb557f97c977a9 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 1962b4a39dc9beeae75cacda1bf73fdf36e41d25..2c1dca98aa81cf8bb6b65f7a029d48e839cc84c9 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 598b1c69b08d1a5a1b20067a62a1ca58b3f2dd1f..6b3c87d17ddb5a9f2addeb132033cb61c40eb3dc 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index e078469e7370eecffa24fd9a79e740c0eb174ee1..3a85bb87d9189d50152adc320b00c4e14444242a 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 90bc8aba22b471d457e0d00e2d12677c2a24e4a3..ab7657b22366ab61906d820dfc1df33220e8f57f 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 6b2d7f7dabf20980b83f576192f249fbfed97fbe..8c91fa2521e0c4e27e746105880f4e07e02b241b 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 81c17b606529e6450e42ea70d3a7f0388035483c..d5073d08773e3397cd4fe6f69b533f9c250ce544 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index 3747abe01acaf2a4debabc10904c147b7e2d57c6..bc2e2ea8dab4391657b3d988727ffac2401a4ea6 100644 (file)
@@ -7,7 +7,7 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
index c0aaabf74f3842bd4e7f628b50aff6505389837f..8b620aa9f813ab14326b4065d585c12328a86325 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
-* Configuration of module: Rte (Rte_Types.h)\r
+* Configuration of module: Rte (Rte_Type.h)\r
 *\r
 * Created by:              \r
 * Copyright:               \r
@@ -7,24 +7,34 @@
 * Configured for (MCU):    TMS570\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       0.0.9\r
+* Generator version:       0.0.13\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 \r
-/* Rte_Types.h */\r
+/* Rte_Type.h */\r
 \r
-#ifndef RTE_TYPES_H\r
-#define RTE_TYPES_H\r
+#ifndef RTE_TYPE_H\r
+#define RTE_TYPE_H\r
 \r
 #include "Rte.h"\r
 \r
 typedef void * Rte_Instance;\r
 \r
+typedef boolean Boolean;\r
+\r
+#define _DEFINED_TYPEDEF_FOR_Boolean_ \r
+\r
 typedef float Float;\r
 \r
 #define _DEFINED_TYPEDEF_FOR_Float_ \r
 \r
+typedef sint16 SInt16;\r
+#define SInt16_LowerLimit -32768\r
+#define SInt16_UpperLimit 32767\r
+\r
+#define _DEFINED_TYPEDEF_FOR_SInt16_ \r
+\r
 typedef sint32 SInt32;\r
 #define SInt32_LowerLimit -2147483648\r
 #define SInt32_UpperLimit 2147483647\r
@@ -37,6 +47,12 @@ typedef sint8 SInt8;
 \r
 #define _DEFINED_TYPEDEF_FOR_SInt8_ \r
 \r
+typedef uint16 UInt16;\r
+#define UInt16_LowerLimit 0\r
+#define UInt16_UpperLimit 65535\r
+\r
+#define _DEFINED_TYPEDEF_FOR_UInt16_ \r
+\r
 typedef uint32 UInt32;\r
 #define UInt32_LowerLimit 0\r
 #define UInt32_UpperLimit 4294967295\r
@@ -49,61 +65,33 @@ typedef uint8 UInt8;
 \r
 #define _DEFINED_TYPEDEF_FOR_UInt8_ \r
 \r
-typedef sint16 SInt16;\r
-#define SInt16_LowerLimit -32768\r
-#define SInt16_UpperLimit 32767\r
-\r
-#define _DEFINED_TYPEDEF_FOR_SInt16_ \r
-\r
-typedef boolean Boolean;\r
-\r
-#define _DEFINED_TYPEDEF_FOR_Boolean_ \r
-\r
-typedef boolean BooleanType;\r
-\r
-#define _DEFINED_TYPEDEF_FOR_BooleanType_ \r
-\r
-typedef uint16 UInt16;\r
-#define UInt16_LowerLimit 0\r
-#define UInt16_UpperLimit 65535\r
-\r
-#define _DEFINED_TYPEDEF_FOR_UInt16_ \r
-\r
 typedef struct {\r
-       Float value;\r
-} Rte_DE_Float;\r
+       UInt8 value;\r
+} Rte_DE_Read_TesterRunnable_ReadArg1;\r
 \r
 typedef struct {\r
-       SInt32 value;\r
-} Rte_DE_SInt32;\r
+       UInt8 value;\r
+} Rte_DE_Read_TesterRunnable_ReadArg2;\r
 \r
 typedef struct {\r
-       SInt8 value;\r
-} Rte_DE_SInt8;\r
+       UInt16 value;\r
+} Rte_DE_Write_TesterRunnable_WriteResult;\r
 \r
 typedef struct {\r
        UInt32 value;\r
-} Rte_DE_UInt32;\r
+} Rte_DE_Read_FreqReqRunnable_ReadFreqReq;\r
 \r
 typedef struct {\r
-       UInt8 value;\r
-} Rte_DE_UInt8;\r
-\r
-typedef struct {\r
-       SInt16 value;\r
-} Rte_DE_SInt16;\r
-\r
-typedef struct {\r
-       Boolean value;\r
-} Rte_DE_Boolean;\r
+       UInt32 value;\r
+} Rte_DE_Write_FreqReqRunnable_WriteFreqReqInd;\r
 \r
 typedef struct {\r
-       BooleanType value;\r
-} Rte_DE_BooleanType;\r
+       UInt16 value;\r
+} Rte_DE_Read_LoggerRunnable_ReadResult;\r
 \r
 typedef struct {\r
        UInt16 value;\r
-} Rte_DE_UInt16;\r
+} Rte_DE_Read_Logger2Runnable_ReadResult;\r
 \r
 typedef struct {\r
 } Rte_PDS_Calculator_CalculatorOperations_P;\r
@@ -139,11 +127,11 @@ typedef struct {
 } Rte_PDS_Tester_FreqReqIf_R;\r
 \r
 typedef struct {\r
-       Rte_DE_UInt8* TesterRunnable_Arguments_arg1;\r
-       Rte_DE_UInt8* TesterRunnable_Arguments_arg2;\r
-       Rte_DE_UInt32* FreqReqRunnable_FreqReq_freq;\r
-       Rte_DE_UInt32* FreqReqRunnable_FreqReqInd_freq;\r
-       Rte_DE_UInt16* TesterRunnable_Result_result;\r
+       Rte_DE_Read_TesterRunnable_ReadArg1* TesterRunnable_Arguments_arg1;\r
+       Rte_DE_Read_TesterRunnable_ReadArg2* TesterRunnable_Arguments_arg2;\r
+       Rte_DE_Read_FreqReqRunnable_ReadFreqReq* FreqReqRunnable_FreqReq_freq;\r
+       Rte_DE_Write_TesterRunnable_WriteResult* TesterRunnable_Result_result;\r
+       Rte_DE_Write_FreqReqRunnable_WriteFreqReqInd* FreqReqRunnable_FreqReqInd_freq;\r
 } Rte_CDS_Tester;\r
 \r
 typedef struct {\r
@@ -154,7 +142,7 @@ typedef struct {
 } Rte_PDS_Logger_ResultIf_R;\r
 \r
 typedef struct {\r
-       Rte_DE_UInt16* LoggerRunnable_Result_result;\r
+       Rte_DE_Read_LoggerRunnable_ReadResult* LoggerRunnable_Result_result;\r
 } Rte_CDS_Logger;\r
 \r
 typedef struct {\r
@@ -165,7 +153,7 @@ typedef struct {
 } Rte_PDS_Logger2_ResultIf_R;\r
 \r
 typedef struct {\r
-       Rte_DE_UInt16* Logger2Runnable_Result_result;\r
+       Rte_DE_Read_Logger2Runnable_ReadResult* Logger2Runnable_Result_result;\r
 } Rte_CDS_Logger2;\r
 \r
 #endif\r
index 05469f3e6a345f90e1f58733420e99f0605cf821..29652d992546007ccc1c1eac5b8eb323232005bd 100644 (file)
                   <SHORT-NAME>User_1</SHORT-NAME>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig</DEFINITION-REF>\r
                 </CONTAINER>\r
+                <CONTAINER UUID="0bea3fcd-eb0e-40e4-9f00-cfd01c979c4e">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="52ea1f6f-dbd6-4a28-9519-94cc02d63a59">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/rte_simple_ti_tms570ls/Mcu/McuModuleConfiguration/McuModeSettingConf</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/rte_simple_ti_tms570ls/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="c29222b7-7622-43c4-a670-eb2a43d2f413">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
index ad1706f585cf2cdf7d623be8f3e6aad38f7f9076..0a9ca794057f8ee7c5921bf5824e8bed11f3862e 100644 (file)
@@ -107,9 +107,11 @@ volatile char g_TConn __attribute__ ((section (".winidea_port")));
 \r
 \r
 static unsigned char parmbuf[8];\r
-#define BUFSIZ 512\r
-#define CC_BUFFER_SIZE ((BUFSIZ)+32)\r
+#define CC_BUFSIZ 512\r
+#define CC_BUFFER_SIZE ((CC_BUFSIZ)+32)\r
 volatile unsigned int _CIOBUF_[CC_BUFFER_SIZE] __attribute__ ((section (".cio")));\r
+static unsigned char CIOTMPBUF[CC_BUFSIZ];\r
+static uint16 cio_tmp_buf_index = 0;\r
 \r
 /***************************************************************************/\r
 /*                                                                         */\r
@@ -179,15 +181,29 @@ int HOSTwrite(int dev_fd, const char *buf, unsigned count)
 {\r
    int result;\r
 \r
-   if (count > BUFSIZ) count = BUFSIZ;\r
+   // WARNING. Can only handle count == 1!\r
+   if (count != 1) _exit(1);\r
+\r
+   if (count > CC_BUFSIZ) count = CC_BUFSIZ;\r
+\r
+   if (cio_tmp_buf_index < CC_BUFSIZ) {\r
+          CIOTMPBUF[cio_tmp_buf_index++] = *buf;\r
+\r
+          if (*buf != 0xA) { // Only flush if newline\r
+                  return 0;\r
+          }\r
+   }\r
+\r
 \r
    LOADSHORT(parmbuf,dev_fd,0);\r
-   LOADSHORT(parmbuf,count,2);\r
-   writemsg(_DTWRITE,parmbuf,(char *)buf,count);\r
+   LOADSHORT(parmbuf,cio_tmp_buf_index,2);\r
+   writemsg(_DTWRITE,parmbuf,(char *)CIOTMPBUF,cio_tmp_buf_index);\r
    readmsg(parmbuf,NULL);\r
 \r
    result = UNLOADSHORT(parmbuf,0);\r
 \r
+   cio_tmp_buf_index = 0;\r
+\r
    return result;\r
 }\r
 \r
index 3f5b7301fd0d19b227b6322374d0eed28c68b921..5ecf7690b7ca4f9fe708cadb7df5c8e9cc4c4edf 100644 (file)
@@ -38,7 +38,8 @@ Std_ReturnType ValidateInit(Adc_StateType adcState, Adc_APIServiceIDType api)
 Std_ReturnType ValidateGroup(const Adc_ConfigType *ConfigPtr, Adc_GroupType group,Adc_APIServiceIDType api)\r
 {\r
        Std_ReturnType res = E_OK;\r
-       if(!(((group % ADC_NOF_GROUP_PER_CONTROLLER) >= 0) && ((group % ADC_NOF_GROUP_PER_CONTROLLER) < ConfigPtr->nbrOfGroups))) {\r
+       if(!(((group % ADC_NOF_GROUP_PER_CONTROLLER) >= 0) && ((group % ADC_NOF_GROUP_PER_CONTROLLER) < ConfigPtr->nbrOfGroups))\r
+     || ConfigPtr == 0) {\r
                Det_ReportError(MODULE_ID_ADC,0,api,ADC_E_PARAM_GROUP );\r
                res = E_NOT_OK;\r
        }\r
index 576f9e90f6f020065e234e50f40584ae463a2410..d817ce5f7d00bad497dccc004e63988a8aee46c1 100644 (file)
@@ -18,7 +18,7 @@
 #include "Mcu.h"
 #include "arc.h"
 
-//#define USE_LDEBUG_PRINTF // Uncomment this to turn debug statements on.
+#define USE_LDEBUG_PRINTF // Uncomment this to turn debug statements on.
 #include "debug.h"
 
 // How many errors to keep in error log.
index 767eb57f5dbd209065b112d6f32afdc0298a5d9a..099495782394d92fa455b22df4168b968e5b56d4 100644 (file)
@@ -80,6 +80,7 @@
 #define ECUM_AR_MINOR_VERSION  2\r
 #define ECUM_AR_PATCH_VERSION  2\r
 \r
+\r
 #include "EcuM_Cfg.h"\r
 #include "EcuM_Types.h"\r
 #include "EcuM_Cbk.h"\r
@@ -92,6 +93,7 @@
 #include "ComM.h"\r
 #endif\r
 \r
+\r
 /** @name Error Codes */\r
 //@{\r
 #define ECUM_E_NOT_INITIATED (0x10)\r
index 860044c2161f3963039bb6e6dcb03c3112bac42f..87294d3de4deef85244d10a685506cb998dfbeb6 100644 (file)
@@ -172,7 +172,9 @@ typedef struct EcuM_SleepMode
 #endif\r
  } EcuM_SleepModeType;\r
 \r
-\r
+ /* Defines for illegal modes/channels */\r
+#define ECUM_SLEEP_MODE_WDGM_MODE_ILL          0xff\r
+#define ECUM_COMM_CHANNEL_ILL                          0xff\r
 \r
 #endif /* ECUM_TYPES_H_ */\r
 /** @} */\r
index 703d1d1c4f7b21351a824490a6ea95d2f2889c9f..7db96b2c1dcc438d1b678d04382fead7f1057751 100644 (file)
@@ -97,10 +97,6 @@ typedef uint8_t Gpt_ChannelType;
 #define GPT_AR_MINOR_VERSION     2\r
 #define GPT_AR_PATCH_VERSION     1\r
 \r
-#if (GPT_REPORT_WAKEUP_SOURCE==STD_ON)\r
-#include "EcuM_Cbk.h"          /* @req 4.0.3/GPT271 */\r
-#endif\r
-\r
 /* Needs Gpt_ConfigType */\r
 #include "Gpt_Cfg.h"           /* @req 4.0.3/GPT259 */\r
 \r
index 671e9af8eebea8d06cacd389b27ee039a0f9dc36..0d9e8e1edb449157806a8baa6283db60fd015855 100644 (file)
@@ -345,6 +345,8 @@ StatusType GetElapsedCounterValue( CounterType, TickRefType val, TickRefType ela
  * System timer\r
  *-----------------------------------------------------------------*/\r
 typedef const uint32 OsTickType;\r
+\r
+extern OsTickType OsTickFreq;\r
 void Os_SysTickInit( void );\r
 void Os_SysTickStart(TickType period_ticks);\r
 TickType Os_SysTickGetValue( void );\r
index bf4c9e0823b6d40c647767ff4b97362905fb6ae8..5faf0cf0d31e9dfa489199d2f01451a627ee6e72 100644 (file)
@@ -43,4 +43,6 @@ typedef uint32_t imask_t;
 
 #define CallService(index,param)
 
+#define ilog2(x) __builtin_ffs(x)
+
 #endif /* CPU_H_ */
index f0b13e5b6b0bf0b6e611128fc8d22e30ba452b64..f115d3766bb1d31a70782a95b1f55b732c268aac 100644 (file)
 #define READ16_NA(address )                    ( (((uint16_t)(((uint8_t *)address)[0]))<<8) +  \\r
                                                                          (((uint16_t)(((uint8_t *)address)[1]))) )\r
 \r
+#define READWRITE32(address,mask,val)  WRITE32(address,(READ32(address)&~(mask))|val)\r
+\r
+\r
+\r
+/* NA - Not Aligned */\r
 #define WRITE32_NA(address, value ) \\r
        do { \\r
        ((uint8_t *)address)[0] = ((value>>24)&0xff); \\r
index 7bfe0ef7cc04f8644beae3bc067f40193e029d89..e41b18fc3f4b20e6db6f64f82ecc03e409b57e0d 100644 (file)
@@ -27,8 +27,8 @@ endif
 ifeq (${COMPILER},cw)\r
 ifneq (${CW_COMPILE},${DEFAULT_CW_COMPILE})\r
 ${warning Not using default cross compiler for architecture.}\r
-${warning CROSS_COMPILE:         ${CW_COMPILE} [${origin CW_COMPILE}]}\r
-${warning DEFAULT_CROSS_COMPILE: ${DEFAULT_CW_COMPILE} [${origin DEFAULT_CW_COMPILE}]}\r
+${warning CW_COMPILE:            ${CW_COMPILE} [${origin CW_COMPILE}]}\r
+${warning DEFAULT_CW_COMPILE:    ${DEFAULT_CW_COMPILE} [${origin DEFAULT_CW_COMPILE}]}\r
 endif\r
 else\r
 ifneq (${DEFAULT_CROSS_COMPILE},)\r
index a7129716dc5be483c8a296ff6bafa21f0c6667df..d2c009accdac43edcd4295d0ae4e123d3d5a38b2 100644 (file)
@@ -495,12 +495,6 @@ EcuM_WakeupSourceType EcuM_GetPendingWakeupEvents( void ) {
 }\r
 \r
 \r
-void EcuM_CheckValidation(EcuM_WakeupSourceType wakeupSource) {\r
-       /* Used only if CanIf is used ? CanIf_Checkvalidation(wakeupSource) */\r
-       (void)wakeupSource;\r
-}\r
-\r
-\r
 EcuM_WakeupSourceType EcuM_GetValidatedWakeupEvents( void ) {\r
        // TODO:\r
        return 0;\r
@@ -510,4 +504,27 @@ EcuM_WakeupStatusType EcuM_GetStatusOfWakeupSource( EcuM_WakeupSourceType source
        return 0;\r
 }\r
 \r
+/**\r
+ *\r
+ * @param sources\r
+ */\r
+void EcuM_ValidateWakeupEvent(EcuM_WakeupSourceType sources) {\r
+\r
+       /* !req 3.1.5/EcuM2344 */\r
+       /* !req 3.1.5/EcuM2645 */\r
+       /* !req 3.1.5/EcuM2868 */\r
+       /* !req 3.1.5/EcuM2345 */\r
+\r
+/*\r
+#if defined(USE_COMM)\r
+       if( internal_data.config->)\r
+       ComM_EcuM_WakeUpIndication()\r
+#endif\r
+*/\r
+       /* !req 3.1.5/EcuM2790 */\r
+       /* !req 3.1.5/EcuM2791 */\r
+\r
+}\r
+\r
+\r
 \r
index 30680323096ab21ef65ce5219d0a07877361b77f..5356f576b9c3f044728d3466f1a4b032e5f6c611 100644 (file)
@@ -360,6 +360,12 @@ void EcuM_StartWakeupSources(EcuM_WakeupSourceType wakeupSource) {
 \r
 }\r
 \r
+void EcuM_CheckValidation(EcuM_WakeupSourceType wakeupSource) {\r
+\r
+       VALIDATE_STATE( ECUM_STATE_WAKEUP_VALIDATION);\r
+\r
+       (void) wakeupSource;\r
+}\r
 \r
 /**\r
  * Restart drivers..\r
index 10a9aef2098742a94defd3b56fb3b5b8a444738e..3fa423bf4757642a96ff13cfb41f012bfb3d59c5 100644 (file)
@@ -185,13 +185,16 @@ static void in_state_goSleep( void ) {
                        /* @req 3.1.5/ECUM2389 */\r
                        EcuM_EnableWakeupSources( 1<< source );\r
 \r
+               }\r
+\r
 #if defined(WDGM)\r
-                       WdgM_SetMode(sleepModePtr->EcuMSleepModeWdgMMode);\r
+               WdgM_SetMode(sleepModePtr->EcuMSleepModeWdgMMode);\r
 #endif\r
 \r
-                       /* Let no one else run */\r
-                       GetResource(RES_SCHEDULER);\r
-               }\r
+               /* Let no one else run */\r
+               GetResource(RES_SCHEDULER);\r
+\r
+               set_current_state(ECUM_STATE_SLEEP);\r
 \r
        } else if( EcuM_GetPendingWakeupEvents() != 0 ) {\r
                /* We have pending wakeup events, need to startup again */\r
@@ -383,7 +386,7 @@ void EcuM_MainFunction(void){
                        break;\r
                case ECUM_STATE_SLEEP:\r
                        in_state_sleep();\r
-                       break;\r
+                       /* Flow Through */\r
                case ECUM_STATE_WAKEUP_ONE:\r
                {\r
                        /* TODO: we must have a normal RUN mode.. can't find any\r
index 62a1ce5e4546cc20ddf2a0fdab27c0a375edaf73..fe5f9da4878662cff751d209e7b83d9d903bf205 100644 (file)
@@ -67,7 +67,6 @@ static void Os_CfgValidate(void ) {
 /* ----------------------------[public functions]----------------------------*/\r
 \r
 extern uint32_t McuE_GetSystemClock( void );\r
-extern OsTickType OsTickFreq;\r
 \r
 \r
 /**\r