mcbstm32, updated examples.

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

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

diff --git a/boards/stm32_mcbstm32/examples/os_simple/config/EcuM_PBcfg.c b/boards/stm32_mcbstm32/examples/os_simple/config/EcuM_PBcfg.c
index 6b9c62ed9c0a4d449f0eee0d570df2bbd11e4e17..a01052a0b8596c2c27e73f6f39ef8581f94ca26e 100644 (file)
--- a/boards/stm32_mcbstm32/examples/os_simple/config/EcuM_PBcfg.c
+++ b/boards/stm32_mcbstm32/examples/os_simple/config/EcuM_PBcfg.c
@@ -7,13 +7,12 @@
 * Configured for (MCU):    STM32_F103\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.1.10\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
 \r
 \r
-\r
 #include "EcuM.h"\r
 #include "EcuM_Generated_Types.h"\r
 \r
@@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config;
 extern const J1939Tp_ConfigType J1939Tp_Config;\r
 #endif\r
 \r
+#if defined(USE_WDGM)\r
+const EcuM_WdgMType EcuM_WdgMConfig = {\r
+  .EcuMSupervisedEntity = NULL,\r
+  .EcuMWdgMWakeupMode  = NULL,\r
+  .EcuMWdgMStartupMode  = NULL,\r
+  .EcuMWdgMRunMode = NULL,\r
+  .EcuMWdgMPostRunMode  = NULL,\r
+  .EcuMWdgMShutdownMode = NULL,\r
+};\r
+#endif\r
+\r
+const EcuM_SleepModeType EcuM_SleepModeConfig[] = {\r
+       { // EcuMSleepMode \r
+               .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode,\r
+               .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMSleepModeMcuMode = MCU_MODE_SLEEP,\r
+#if defined(USE_WDGM)\r
+               .EcuMSleepModeWdgMMode = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
+const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = {\r
+       { // EcuMWakeupSource \r
+               .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE,\r
+               .EcuMWakeupSourcePolling = false,\r
+               .EcuMValidationTimeout = 0,\r
+#if defined(USE_COMM)\r
+               .EcuMComMChannel = NULL,\r
+#endif\r
+       }\r
+};\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
@@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig =
        .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
        .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
        .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
+#if defined(USE_WDGM)\r
+       .EcuMWdgMConfig = &EcuM_WdgMConfig,\r
+#endif\r
+       .EcuMSleepModeConfig = &EcuM_SleepModeConfig,\r
 \r
 #if defined(USE_MCU)\r
-        .McuConfig = McuConfigData,\r
+       .McuConfig = McuConfigData,\r
 #endif\r
 #if defined(USE_PORT)\r
-        .PortConfig = &PortConfigData,\r
+       .PortConfig = &PortConfigData,\r
 #endif\r
 #if defined(USE_CAN)\r
-        .CanConfig = &CanConfigData,\r
+       .CanConfig = &CanConfigData,\r
 #endif\r
 #if defined(USE_CANIF)\r
-        .CanIfConfig = &CanIf_Config,\r
+       .CanIfConfig = &CanIf_Config,\r
 #endif\r
 #if defined(USE_CANSM)\r
-        .CanSMConfig = &CanSM_Config,\r
+       .CanSMConfig = &CanSM_Config,\r
 #endif\r
 #if defined(USE_CANNM)\r
-        .CanNmConfig = &CanNm_Config,\r
+       .CanNmConfig = &CanNm_Config,\r
 #endif\r
 #if defined(USE_UDPNM)\r
-        .UdpNmConfig = &UdpNm_Config,\r
+       .UdpNmConfig = &UdpNm_Config,\r
 #endif\r
 #if defined(USE_COM)\r
-        .ComConfig = &ComConfiguration,\r
+       .ComConfig = &ComConfiguration,\r
 #endif\r
 #if defined(USE_COMM)\r
-        .ComMConfig = &ComM_Config,\r
+       .ComMConfig = &ComM_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_NM)\r
-        .NmConfig = &Nm_Config,\r
+       .NmConfig = &Nm_Config,\r
 #endif\r
 #if defined(USE_PDUR)\r
-        .PduRConfig = &PduR_Config,\r
+       .PduRConfig = &PduR_Config,\r
 #endif\r
 #if defined(USE_J1939TP)\r
-        .J1939TpConfig = &J1939Tp_Config,\r
+       .J1939TpConfig = &J1939Tp_Config,\r
 #endif\r
 #if defined(USE_DMA)\r
-        .DmaConfig = DmaConfig,\r
+       .DmaConfig = DmaConfig,\r
 #endif\r
 #if defined(USE_ADC)\r
-        .AdcConfig = AdcConfig,\r
+       .AdcConfig = AdcConfig,\r
 #endif\r
 #if defined(USE_PWM)\r
-        .PwmConfig = &PwmConfig,\r
+       .PwmConfig = &PwmConfig,\r
 #endif\r
 #if defined(USE_WDG)\r
     .WdgConfig = &WdgConfig,\r
@@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig =
     .WdgIfConfig = &WdgIfConfig,\r
 #endif\r
 #if defined(USE_GPT)\r
-        .GptConfig = GptConfigData,\r
+       .GptConfig = GptConfigData,\r
 #endif\r
 #if defined(USE_FLS)\r
        .FlashConfig = FlsConfigSet,\r

diff --git a/boards/stm32_mcbstm32/examples/os_simple/config/Mcu_Cfg.c b/boards/stm32_mcbstm32/examples/os_simple/config/Mcu_Cfg.c
index 8376dcc6c768b437b1788a18ad876f62bd03a5c7..08002eb956eb1b76bab231f64966f7b600aa1853 100644 (file)
--- a/boards/stm32_mcbstm32/examples/os_simple/config/Mcu_Cfg.c
+++ b/boards/stm32_mcbstm32/examples/os_simple/config/Mcu_Cfg.c
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F103\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r

diff --git a/boards/stm32_mcbstm32/examples/os_simple/config/Mcu_Cfg.h b/boards/stm32_mcbstm32/examples/os_simple/config/Mcu_Cfg.h
index 4d3aba0d38e0ea6d602fd1020fa0c18a72184ed7..1c81c3897465f7c9dcf4ad9c937765e660e9fd7d 100644 (file)
--- a/boards/stm32_mcbstm32/examples/os_simple/config/Mcu_Cfg.h
+++ b/boards/stm32_mcbstm32/examples/os_simple/config/Mcu_Cfg.h
@@ -7,7 +7,7 @@
 * Configured for (MCU):    STM32_F103\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
 */\r
@@ -28,6 +28,14 @@
 #define MCU_PERFORM_RESET_API  STD_ON\r
 #define MCU_VERSION_INFO_API   STD_ON\r
 \r
+\r
+typedef enum {\r
+       MCU_MODE_RUN = 0,\r
+       MCU_MODE_SLEEP = 1,\r
+       MCU_MODE_NORMAL = 2 // Here for backwards compatibility reasons. Not used anymore.\r
+} Mcu_ModeType;\r
+\r
+\r
 typedef enum {\r
        MCU_CLOCKTYPE_Clock = 0,\r
   MCU_NBR_OF_CLOCKS,\r

diff --git a/boards/stm32_mcbstm32/examples/os_simple/os_simple_stm32_mcbstm32.arxml b/boards/stm32_mcbstm32/examples/os_simple/os_simple_stm32_mcbstm32.arxml
index ccc519e32391e60471a8e3b72de0d9c9cd6a7c4e..74cf39f8c58c0003487a2054639e7c8b377603e4 100644 (file)
--- a/boards/stm32_mcbstm32/examples/os_simple/os_simple_stm32_mcbstm32.arxml
+++ b/boards/stm32_mcbstm32/examples/os_simple/os_simple_stm32_mcbstm32.arxml
@@ -521,6 +521,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="693c7bc4-c751-42c6-91ce-5389ce42f5ea">\r
+                  <SHORT-NAME>EcuMDefaultShutdownTarget</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState</DEFINITION-REF>\r
+                      <VALUE>EcuMStateReset</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef</DEFINITION-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="71395fc7-851e-4098-aac9-c900a7122f79">\r
+                  <SHORT-NAME>EcuMSleepMode</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <REFERENCE-VALUES>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_stm32_mcbstm32/Mcu/McuModuleConfiguration/SLEEP</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                    <REFERENCE-VALUE>\r
+                      <DEFINITION-REF DEST="SYMBOLIC-NAME-REFERENCE-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask</DEFINITION-REF>\r
+                      <VALUE-REF DEST="CONTAINER">/os_simple_stm32_mcbstm32/EcuM/EcuMConfiguration/EcuMWakeupSource</VALUE-REF>\r
+                    </REFERENCE-VALUE>\r
+                  </REFERENCE-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="5803a2cc-b839-46ce-9c2b-0822be5324b8">\r
+                  <SHORT-NAME>EcuMWakeupSource</SHORT-NAME>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <FLOAT-VALUE>\r
+                      <DEFINITION-REF DEST="FLOAT-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout</DEFINITION-REF>\r
+                      <VALUE>0.0</VALUE>\r
+                    </FLOAT-VALUE>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                    <BOOLEAN-VALUE>\r
+                      <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling</DEFINITION-REF>\r
+                      <VALUE>false</VALUE>\r
+                    </BOOLEAN-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
               </SUB-CONTAINERS>\r
             </CONTAINER>\r
           </CONTAINERS>\r
@@ -663,8 +729,28 @@
                     </CONTAINER>\r
                   </SUB-CONTAINERS>\r
                 </CONTAINER>\r
-                <CONTAINER UUID="686122a2-ff3b-4cf8-917e-014fcd86d2ed">\r
-                  <SHORT-NAME>McuModeSettingConf</SHORT-NAME>\r
+                <CONTAINER UUID="47fc1ec0-2f1f-4d18-b5b6-fdbf28f12be3">\r
+                  <SHORT-NAME>RUN</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <INTEGER-VALUE>\r
+                      <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf/McuMode</DEFINITION-REF>\r
+                      <VALUE>0</VALUE>\r
+                    </INTEGER-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                </CONTAINER>\r
+                <CONTAINER UUID="c7d0acad-e0ef-40ce-a1ee-f37820e5d4ab">\r
+                  <SHORT-NAME>SLEEP</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
                   <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Mcu/McuModuleConfiguration/McuModeSettingConf</DEFINITION-REF>\r
                   <PARAMETER-VALUES>\r
                     <INTEGER-VALUE>\r