Updated examples for HCS12

diff --git a/boards/hcs12_elmicro_card12/examples/blinker/config/Com_Cfg.h b/boards/hcs12_elmicro_card12/examples/blinker/config/Com_Cfg.h
index b1fa3c8f0cecbd657317601d819762d363e966ae..671183e26c0046318fcf5d5d0bb8f0a695d89057 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/blinker/config/Com_Cfg.h
+++ b/boards/hcs12_elmicro_card12/examples/blinker/config/Com_Cfg.h
@@ -7,7 +7,7 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.7\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r

diff --git a/boards/hcs12_elmicro_card12/examples/blinker/config/Com_PbCfg.c b/boards/hcs12_elmicro_card12/examples/blinker/config/Com_PbCfg.c
index e4ec62a499c3997dcd15c02e620bf65657783919..2033cc74edd729fc7a10311ea54d2276bb3e86e1 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/blinker/config/Com_PbCfg.c
+++ b/boards/hcs12_elmicro_card12/examples/blinker/config/Com_PbCfg.c
@@ -7,7 +7,7 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.7\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
@@ -69,14 +69,18 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_FreqIndSig,\r
+               \r
                .ComBitPosition = 0,\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
@@ -95,14 +99,18 @@ const ComSignal_type ComSignal[] = {
                \r
                \r
                .ComSignalInitValue = &Com_SignalInitValue_FreqReqSig,\r
+               \r
                .ComBitPosition = 0,\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

diff --git a/boards/hcs12_elmicro_card12/examples/blinker/config/Com_PbCfg.h b/boards/hcs12_elmicro_card12/examples/blinker/config/Com_PbCfg.h
index 24ba841cf37ffc002f060383952e143ffe89c5e1..6cd0d4a4aada333363997b88120f600798bffd53 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/blinker/config/Com_PbCfg.h
+++ b/boards/hcs12_elmicro_card12/examples/blinker/config/Com_PbCfg.h
@@ -7,7 +7,7 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.7\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r

diff --git a/boards/hcs12_elmicro_card12/examples/blinker/config/EcuM.mk b/boards/hcs12_elmicro_card12/examples/blinker/config/EcuM.mk
index 761e8d215059a67cd1782fab7517b192b6c0772c..4f222cea3a696c3da24925011336beec0dd1b5f7 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/blinker/config/EcuM.mk
+++ b/boards/hcs12_elmicro_card12/examples/blinker/config/EcuM.mk
@@ -1,5 +1,3 @@
 \r
 MOD_USE += CAN CANIF COM ECUM DIO DET KERNEL PORT PDUR MCU \r
 \r
-def-y += ECUM_USE_SERVICE_PORTS=STDOFF\r
-\r

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

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

diff --git a/boards/hcs12_elmicro_card12/examples/blinker/config/EcuM_PBcfg.c b/boards/hcs12_elmicro_card12/examples/blinker/config/EcuM_PBcfg.c
index dd49a6e96fb2dec93712e39211acb55630b1801d..712d7d7e2407afad2b2d0bc3018fa4142a8ebc38 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/blinker/config/EcuM_PBcfg.c
+++ b/boards/hcs12_elmicro_card12/examples/blinker/config/EcuM_PBcfg.c
@@ -7,13 +7,12 @@
 * Configured for (MCU):    HCS12\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

diff --git a/boards/hcs12_elmicro_card12/examples/blinker/config/Mcu_Cfg.h b/boards/hcs12_elmicro_card12/examples/blinker/config/Mcu_Cfg.h
index c9580239b204bec02f44b410216281c47acd1be3..25c28845fe1395a9bcd395dd48b711edb37a20f7 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/blinker/config/Mcu_Cfg.h
+++ b/boards/hcs12_elmicro_card12/examples/blinker/config/Mcu_Cfg.h
@@ -26,6 +26,13 @@
 #define MCU_PERFORM_RESET_API  STD_OFF\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_EXT_REF_16MHZ = 0,\r
   MCU_NBR_OF_CLOCKS,\r

diff --git a/boards/hcs12_elmicro_card12/examples/blinker/config/PduR_Cfg.h b/boards/hcs12_elmicro_card12/examples/blinker/config/PduR_Cfg.h
index e6e6c8c2299531e7dd42d82d20ee27c6f6bedc76..8149a0ae3e37c2326b42b8d93f5ce2f500ff8351 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/blinker/config/PduR_Cfg.h
+++ b/boards/hcs12_elmicro_card12/examples/blinker/config/PduR_Cfg.h
@@ -7,10 +7,9 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       3.0.8\r
+* Generator version:       3.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Tue Jun 28 16:58:19 CEST 2011\r
 */\r
 \r
 
@@ -33,7 +32,7 @@
 #define PDUR_COM_SUPPORT                       STD_ON\r
 #define PDUR_DCM_SUPPORT                       STD_OFF\r
 #define PDUR_IPDUM_SUPPORT                     STD_OFF  /* Not supported */\r
-#define PDUR_SOAD_SUPPORT                      STD_OFF\r
+#define PDUR_J1939TP_SUPPORT           STD_OFF\r
 \r
 #define PDUR_DEV_ERROR_DETECT          STD_OFF\r
 #define PDUR_VERSION_INFO_API          STD_OFF\r
@@ -44,7 +43,6 @@
 #define PDUR_SINGLE_IF                         CAN_IF\r
 #define PDUR_SINGLE_TP                         CAN_TP\r
 \r
-\r
 // Gateway operation\r
 #define PDUR_GATEWAY_OPERATION                         STD_ON\r
 #define PDUR_MEMORY_SIZE                                       10 /* Not used */\r
@@ -104,16 +102,17 @@
 #define PduR_LinIfTriggerTransmit(...)\r
 #endif\r
 \r
-#if PDUR_SOAD_SUPPORT == STD_ON\r
-#define PduR_SoAdTpProvideRxBuffer Dcm_ProvideRxBuffer\r
-#define PduR_SoAdTpRxIndication Dcm_RxIndication\r
-#define PduR_SoAdTpProvideTxBuffer Dcm_ProvideTxBuffer\r
-#define PduR_SoAdTpTxConfirmation Dcm_TxConfirmation\r
+\r
+#if PDUR_J1939TP_SUPPORT == STD_ON\r
+#define PduR_J1939TpProvideRxBuffer Dcm_ProvideRxBuffer\r
+#define PduR_J1939TpRxIndication Dcm_RxIndication\r
+#define PduR_J1939TpProvideTxBuffer Dcm_ProvideTxBuffer\r
+#define PduR_J1939TpTxConfirmation Dcm_TxConfirmation\r
 #else\r
-#define PduR_SoAdProvideRxBuffer(...)\r
-#define PduR_SoAdRxIndication(...)\r
-#define PduR_SoAdProvideTxBuffer(...)\r
-#define PduR_SoAdTxConfirmation(...)\r
+#define PduR_J1939TpProvideRxBuffer(...)\r
+#define PduR_J1939TpRxIndication(...)\r
+#define PduR_J1939TpProvideTxBuffer(...)\r
+#define PduR_J1939TpTxConfirmation(...)\r
 #endif\r
 \r
 #if PDUR_COM_SUPPORT == STD_ON\r

diff --git a/boards/hcs12_elmicro_card12/examples/os_simple/config/EcuM.mk b/boards/hcs12_elmicro_card12/examples/os_simple/config/EcuM.mk
index b4da18d08be3427f94c901fdea9a0842aa8ea921..8bf087733fe5fefd3eed8ae77cccc2a0968e86d3 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/os_simple/config/EcuM.mk
+++ b/boards/hcs12_elmicro_card12/examples/os_simple/config/EcuM.mk
@@ -1,5 +1,3 @@
 \r
 MOD_USE += MCU DET ECUM KERNEL \r
 \r
-def-y += ECUM_USE_SERVICE_PORTS=STDOFF\r
-\r

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

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

diff --git a/boards/hcs12_elmicro_card12/examples/os_simple/config/EcuM_PBcfg.c b/boards/hcs12_elmicro_card12/examples/os_simple/config/EcuM_PBcfg.c
index dd49a6e96fb2dec93712e39211acb55630b1801d..712d7d7e2407afad2b2d0bc3018fa4142a8ebc38 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/os_simple/config/EcuM_PBcfg.c
+++ b/boards/hcs12_elmicro_card12/examples/os_simple/config/EcuM_PBcfg.c
@@ -7,13 +7,12 @@
 * Configured for (MCU):    HCS12\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

diff --git a/boards/hcs12_elmicro_card12/examples/os_simple/config/Mcu_Cfg.h b/boards/hcs12_elmicro_card12/examples/os_simple/config/Mcu_Cfg.h
index c9580239b204bec02f44b410216281c47acd1be3..25c28845fe1395a9bcd395dd48b711edb37a20f7 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/os_simple/config/Mcu_Cfg.h
+++ b/boards/hcs12_elmicro_card12/examples/os_simple/config/Mcu_Cfg.h
@@ -26,6 +26,13 @@
 #define MCU_PERFORM_RESET_API  STD_OFF\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_EXT_REF_16MHZ = 0,\r
   MCU_NBR_OF_CLOCKS,\r

diff --git a/boards/hcs12_elmicro_card12/examples/os_simple/os_simple_hcs12_card12.arxml b/boards/hcs12_elmicro_card12/examples/os_simple/os_simple_hcs12_card12.arxml
index 321310a3c37ea0f317b6d1eb6aeacf555715da27..678e9f5ead1e12d414271ff220d0427fd8d91852 100644 (file)
--- a/boards/hcs12_elmicro_card12/examples/os_simple/os_simple_hcs12_card12.arxml
+++ b/boards/hcs12_elmicro_card12/examples/os_simple/os_simple_hcs12_card12.arxml
@@ -232,6 +232,72 @@
                   <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="02d77d8e-d1b4-49f4-be56-50de3a5336d5">\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="727e8f0d-89f7-4303-8a4e-b5c36e2cad15">\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_hcs12_card12/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_hcs12_card12/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="c94c4e19-9962-4b9a-837d-3aab31af798d">\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

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_Cfg.h
index b1fa3c8f0cecbd657317601d819762d363e966ae..671183e26c0046318fcf5d5d0bb8f0a695d89057 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_Cfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_Cfg.h
@@ -7,7 +7,7 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.7\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.c
index 840274aabbbf0d499123bd7f5ece00aba7d19972..28c7e40252672b3b86cddd0574ae480668e1aa2e 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.c
@@ -7,7 +7,7 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.7\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
@@ -69,14 +69,18 @@ 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
@@ -95,14 +99,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

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.h
index 24ba841cf37ffc002f060383952e143ffe89c5e1..6cd0d4a4aada333363997b88120f600798bffd53 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.h
@@ -7,7 +7,7 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.7\r
+* Generator version:       2.1.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM.mk b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM.mk
index 65852c97349f0c542014e034cf6dd85b48217f3e..4abc1367999058e4ee82b7583b2767486a4521b9 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM.mk
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM.mk
@@ -1,5 +1,3 @@
 \r
 MOD_USE += DET MCU PWM DIO PORT KERNEL ECUM CAN CANIF COM PDUR ADC \r
 \r
-def-y += ECUM_USE_SERVICE_PORTS=STDOFF\r
-\r

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

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

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_PBcfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_PBcfg.c
index dd49a6e96fb2dec93712e39211acb55630b1801d..712d7d7e2407afad2b2d0bc3018fa4142a8ebc38 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_PBcfg.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_PBcfg.c
@@ -7,13 +7,12 @@
 * Configured for (MCU):    HCS12\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

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.h
index c9580239b204bec02f44b410216281c47acd1be3..25c28845fe1395a9bcd395dd48b711edb37a20f7 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.h
@@ -26,6 +26,13 @@
 #define MCU_PERFORM_RESET_API  STD_OFF\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_EXT_REF_16MHZ = 0,\r
   MCU_NBR_OF_CLOCKS,\r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/ledmaster_hcs12x_tboard.arxml b/boards/hcs12x_elmicro_tboard/examples/ledmaster/ledmaster_hcs12x_tboard.arxml
index 03b227088622d5a6088c86cdf4aec03a08c8697f..b3044986cf41b106035215b660c181c56cb29b5b 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/ledmaster_hcs12x_tboard.arxml
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/ledmaster_hcs12x_tboard.arxml
@@ -2801,6 +2801,72 @@
                   <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="f612dd3c-a26d-4870-9ccf-99627efe2943">\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="5899814d-9163-4732-a75f-334ab53968c2">\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">/ledmaster_hcs12x_tboard/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">/ledmaster_hcs12x_tboard/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="6fd14285-8f29-45bb-a68c-07d4a1a049c9">\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
@@ -3645,6 +3711,10 @@
                       <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Com/ComConfig/ComSignal/ComTransferProperty</DEFINITION-REF>\r
                       <VALUE>PENDING</VALUE>\r
                     </ENUMERATION-VALUE>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Com/ComConfig/ComSignal/ComRxDataTimeoutAction</DEFINITION-REF>\r
+                      <VALUE>NONE</VALUE>\r
+                    </ENUMERATION-VALUE>\r
                   </PARAMETER-VALUES>\r
                 </CONTAINER>\r
                 <CONTAINER UUID="98149d0c-7805-42e4-91b0-0e3fc746425f">\r
@@ -3704,6 +3774,10 @@
                       <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Com/ComConfig/ComSignal/ComTransferProperty</DEFINITION-REF>\r
                       <VALUE>PENDING</VALUE>\r
                     </ENUMERATION-VALUE>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Com/ComConfig/ComSignal/ComRxDataTimeoutAction</DEFINITION-REF>\r
+                      <VALUE>NONE</VALUE>\r
+                    </ENUMERATION-VALUE>\r
                   </PARAMETER-VALUES>\r
                 </CONTAINER>\r
               </SUB-CONTAINERS>\r

diff --git a/boards/hcs12x_elmicro_tboard/examples/os_simple/config/EcuM.mk b/boards/hcs12x_elmicro_tboard/examples/os_simple/config/EcuM.mk
index 4aa228e5161240fe4dae4e53efb3f71042c9fb59..b5712353dc2b6e0ce4b3c99265d42468d84b76f8 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/os_simple/config/EcuM.mk
+++ b/boards/hcs12x_elmicro_tboard/examples/os_simple/config/EcuM.mk
@@ -1,5 +1,3 @@
 \r
 MOD_USE += DET ECUM MCU KERNEL \r
 \r
-def-y += ECUM_USE_SERVICE_PORTS=STDOFF\r
-\r

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

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

diff --git a/boards/hcs12x_elmicro_tboard/examples/os_simple/config/EcuM_PBcfg.c b/boards/hcs12x_elmicro_tboard/examples/os_simple/config/EcuM_PBcfg.c
index dd49a6e96fb2dec93712e39211acb55630b1801d..712d7d7e2407afad2b2d0bc3018fa4142a8ebc38 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/os_simple/config/EcuM_PBcfg.c
+++ b/boards/hcs12x_elmicro_tboard/examples/os_simple/config/EcuM_PBcfg.c
@@ -7,13 +7,12 @@
 * Configured for (MCU):    HCS12\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

diff --git a/boards/hcs12x_elmicro_tboard/examples/os_simple/config/Mcu_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/os_simple/config/Mcu_Cfg.h
index c9580239b204bec02f44b410216281c47acd1be3..25c28845fe1395a9bcd395dd48b711edb37a20f7 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/os_simple/config/Mcu_Cfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/os_simple/config/Mcu_Cfg.h
@@ -26,6 +26,13 @@
 #define MCU_PERFORM_RESET_API  STD_OFF\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_EXT_REF_16MHZ = 0,\r
   MCU_NBR_OF_CLOCKS,\r

diff --git a/boards/hcs12x_elmicro_tboard/examples/os_simple/os_simple_hcs12x_tboard.arxml b/boards/hcs12x_elmicro_tboard/examples/os_simple/os_simple_hcs12x_tboard.arxml
index 4e36ad812db72c9a0f5d287532d6ef1bd9972c4c..6d28140ba3218d171cc9405349e8ada34ca9eedb 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/os_simple/os_simple_hcs12x_tboard.arxml
+++ b/boards/hcs12x_elmicro_tboard/examples/os_simple/os_simple_hcs12x_tboard.arxml
@@ -134,6 +134,72 @@
                   <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="1a8be5f0-7d6e-4c18-950b-57bffdd7909b">\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="6dd49c98-cf1f-43a6-aaba-43eb2038319d">\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_hcs12x_tboard/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_hcs12x_tboard/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="4799bc07-d920-411c-80ae-f11364fa6c15">\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

diff --git a/include/hc1x/Cpu.h b/include/hc1x/Cpu.h
index 6c91d89d19dada605bd6bbaea91a4935280dd3a1..0aff7bf03a780fd682eaf0bc6f34c625d8fd59c8 100644 (file)
--- a/include/hc1x/Cpu.h
+++ b/include/hc1x/Cpu.h
@@ -48,4 +48,5 @@ static inline void _Irq_Disable_restore(unsigned long flags)
    asm volatile ("tfr %0, CCR" : : "r" (flags) );\r
 }\r
 \r
+#define ilog2(x) __builtin_ffs(x)\r
 #endif /* CPU_H_ */\r