From 7679a2d5173a82b755805308239c47909c8afddd Mon Sep 17 00:00:00 2001 From: maek Date: Mon, 17 Sep 2012 15:07:47 +0200 Subject: [PATCH] Regenerated examples for TMS570. --- .../examples/os_simple/config/EcuM.mk | 2 - .../os_simple/config/EcuM_Callout_Stubs.c | 332 ------------------ .../examples/os_simple/config/EcuM_Cfg.h | 16 +- .../os_simple/config/EcuM_Generated_Types.h | 178 ---------- .../examples/os_simple/config/EcuM_PBcfg.c | 74 +++- .../examples/os_simple/config/Mcu_Cfg.h | 7 + .../os_simple/os_simple_tms570ls.arxml | 71 ++++ .../rte_simple/config/Calibration_Settings.h | 2 +- .../examples/rte_simple/config/Can_Cfg.h | 2 +- .../examples/rte_simple/config/Can_Lcfg.c | 2 +- .../examples/rte_simple/config/Com_Cfg.h | 2 +- .../examples/rte_simple/config/Com_PbCfg.c | 114 +++--- .../examples/rte_simple/config/Com_PbCfg.h | 2 +- .../examples/rte_simple/config/Dio_Cfg.h | 2 +- .../examples/rte_simple/config/Dio_Lcfg.c | 4 +- .../examples/rte_simple/config/EcuM_Cfg.h | 18 +- .../rte_simple/config/EcuM_Generated_Types.h | 172 --------- .../examples/rte_simple/config/EcuM_PBcfg.c | 155 ++++++++ .../examples/rte_simple/config/Mcu_Cfg.c | 2 +- .../examples/rte_simple/config/Mcu_Cfg.h | 9 +- .../examples/rte_simple/config/Port_Cfg.c | 2 +- .../examples/rte_simple/config/Port_Cfg.h | 2 +- .../examples/rte_simple/config/Rte.c | 79 ++--- .../examples/rte_simple/config/Rte.mk | 7 +- .../rte_simple/config/Rte_Calculator.c | 2 +- .../rte_simple/config/Rte_Calculator.h | 2 +- .../config/Rte_Calculator_Internal.h | 2 +- .../examples/rte_simple/config/Rte_Cbk.c | 17 +- .../examples/rte_simple/config/Rte_Data.c | 2 +- .../examples/rte_simple/config/Rte_Data.h | 2 +- .../examples/rte_simple/config/Rte_Logger.c | 2 +- .../examples/rte_simple/config/Rte_Logger.h | 2 +- .../examples/rte_simple/config/Rte_Logger2.c | 2 +- .../examples/rte_simple/config/Rte_Logger2.h | 2 +- .../rte_simple/config/Rte_Logger2_Internal.h | 2 +- .../rte_simple/config/Rte_Logger_Internal.h | 2 +- .../examples/rte_simple/config/Rte_Tester.c | 2 +- .../examples/rte_simple/config/Rte_Tester.h | 2 +- .../rte_simple/config/Rte_Tester_Internal.h | 2 +- .../examples/rte_simple/config/Rte_Type.h | 92 +++-- .../rte_simple/rte_simple_ti_tms570ls.arxml | 66 ++++ 41 files changed, 577 insertions(+), 882 deletions(-) delete mode 100644 boards/ti_tms570ls/examples/os_simple/config/EcuM_Callout_Stubs.c delete mode 100644 boards/ti_tms570ls/examples/os_simple/config/EcuM_Generated_Types.h delete mode 100644 boards/ti_tms570ls/examples/rte_simple/config/EcuM_Generated_Types.h create mode 100644 boards/ti_tms570ls/examples/rte_simple/config/EcuM_PBcfg.c diff --git a/boards/ti_tms570ls/examples/os_simple/config/EcuM.mk b/boards/ti_tms570ls/examples/os_simple/config/EcuM.mk index f6eeffc9..c726b877 100644 --- a/boards/ti_tms570ls/examples/os_simple/config/EcuM.mk +++ b/boards/ti_tms570ls/examples/os_simple/config/EcuM.mk @@ -1,5 +1,3 @@ MOD_USE += KERNEL DET ECUM MCU -def-y += ECUM_USE_SERVICE_PORTS=STDOFF - diff --git a/boards/ti_tms570ls/examples/os_simple/config/EcuM_Callout_Stubs.c b/boards/ti_tms570ls/examples/os_simple/config/EcuM_Callout_Stubs.c deleted file mode 100644 index 595d8ffa..00000000 --- a/boards/ti_tms570ls/examples/os_simple/config/EcuM_Callout_Stubs.c +++ /dev/null @@ -1,332 +0,0 @@ -/* -* Configuration of module: EcuM (EcuM_Callout_Stubs.c) -* -* Created by: -* Copyright: -* -* Configured for (MCU): TMS570 -* -* Module vendor: ArcCore -* Generator version: 2.0.2 -* -* Generated by Arctic Studio (http://arccore.com) -*/ - - -#include "EcuM.h" -#include "EcuM_Generated_Types.h" -#include "Det.h" -#if defined(USE_DEM) -#include "Dem.h" -#endif -#if defined(USE_MCU) -#include "Mcu.h" -#endif -#if defined(USE_GPT) -#include "Gpt.h" -#endif -#if defined(USE_CAN) -#include "Can.h" -#endif -#if defined(USE_CANIF) -#include "CanIf.h" -#endif -#if defined(USE_PDUR) -#include "PduR.h" -#endif -#if defined(USE_COM) -#include "Com.h" -#endif -#if defined(USE_CANTP) -#include "CanTp.h" -#endif -#if defined(USE_J1939TP) -#include "J1939Tp.h" -#endif -#if defined(USE_DCM) -#include "Dcm.h" -#endif -#if defined(USE_PWM) -#include "Pwm.h" -#endif -#if defined(USE_IOHWAB) -#include "IoHwAb.h" -#endif -#if defined(USE_FLS) -#include "Fls.h" -#endif -#if defined(USE_EEP) -#include "Eep.h" -#endif -#if defined(USE_FEE) -#include "Fee.h" -#endif -#if defined(USE_EA) -#include "Ea.h" -#endif -#if defined(USE_NVM) -#include "NvM.h" -#endif -#if defined(USE_COMM) -#include "ComM.h" -#endif -#if defined(USE_NM) -#include "Nm.h" -#endif -#if defined(USE_CANNM) -#include "CanNm.h" -#endif -#if defined(USE_CANSM) -#include "CanSM.h" -#endif -#if defined(USE_UDPNM) -#include "UdpNm.h" -#endif -#if defined(USE_LINSM) -#include "LinSM.h" -#endif -#if defined(USE_SPI) -#include "Spi.h" -#endif -#if defined(USE_WDG) -#include "Wdg.h" -#endif -#if defined(USE_WDGM) -#include "WdgM.h" -#endif - -void EcuM_AL_DriverInitZero(void) -{ - Det_Init();/** @req EcuM2783 */ - Det_Start();/** @req EcuM2634 */ -} - -extern EcuM_ConfigType EcuMConfig; - -EcuM_ConfigType* EcuM_DeterminePbConfiguration(void) -{ - return &EcuMConfig; -} - -void EcuM_AL_DriverInitOne(const EcuM_ConfigType *ConfigPtr) -{ - (void)ConfigPtr; - //lint --e{715} PC-Lint (715) - ConfigPtr usage depends on configuration of modules - -#if defined(USE_MCU) - Mcu_Init(ConfigPtr->McuConfig); - - /* Set up default clock (Mcu_InitClock requires initRun==1) */ - /* Ignoring return value */ - (void) Mcu_InitClock( ConfigPtr->McuConfig->McuDefaultClockSettings ); - - // Wait for PLL to sync. - while (Mcu_GetPllStatus() != MCU_PLL_LOCKED) - { - ; - } -#endif - -#if defined(USE_DEM) - // Preinitialize DEM - Dem_PreInit(); -#endif - -#if defined(USE_PORT) - // Setup Port - Port_Init(ConfigPtr->PortConfig); -#endif - - -#if defined(USE_GPT) - // Setup the GPT - Gpt_Init(ConfigPtr->GptConfig); -#endif - - // Setup watchdog -#if defined(USE_WDG) - Wdg_Init(ConfigPtr->WdgConfig); -#endif -#if defined(USE_WDGM) - WdgM_Init(ConfigPtr->WdgMConfig); -#endif - -#if defined(USE_DMA) - // Setup DMA - Dma_Init(ConfigPtr->DmaConfig); -#endif - -#if defined(USE_ADC) - // Setup ADC - Adc_Init(ConfigPtr->AdcConfig); -#endif - - // Setup ICU - // TODO - - // Setup PWM -#if defined(USE_PWM) - // Setup PWM - Pwm_Init(ConfigPtr->PwmConfig); -#endif -} - -void EcuM_AL_DriverInitTwo(const EcuM_ConfigType* ConfigPtr) -{ - (void)ConfigPtr; - //lint --e{715} PC-Lint (715) - ConfigPtr usage depends on configuration of modules - -#if defined(USE_SPI) - // Setup SPI - Spi_Init(ConfigPtr->SpiConfig); -#endif - -#if defined(USE_EEP) - // Setup EEP - Eep_Init(ConfigPtr->EepConfig); -#endif - -#if defined(USE_FLS) - // Setup Flash - Fls_Init(ConfigPtr->FlashConfig); -#endif - -#if defined(USE_FEE) - // Setup FEE - Fee_Init(); -#endif - -#if defined(USE_EA) - // Setup EA - Ea_Init(); -#endif - -#if defined(USE_NVM) - // Setup NVRAM Manager and start the read all job - NvM_Init(); - NvM_ReadAll(); -#endif - - // Setup CAN tranceiver - // TODO - -#if defined(USE_CAN) - // Setup Can driver - Can_Init(ConfigPtr->CanConfig); -#endif - -#if defined(USE_CANIF) - // Setup CanIf - CanIf_Init(ConfigPtr->CanIfConfig); -#endif - -#if defined(USE_CANTP) - // Setup CAN TP - CanTp_Init(); -#endif - -#if defined(USE_CANSM) - CanSM_Init(ConfigPtr->CanSMConfig); -#endif - -#if defined(USE_J1939TP) - // Setup J1939Tp - J1939Tp_Init(ConfigPtr->J1939TpConfig); -#endif - - - // Setup LIN - // TODO - -#if defined(USE_PDUR) - // Setup PDU Router - PduR_Init(ConfigPtr->PduRConfig); -#endif - -#if defined(USE_CANNM) - // Setup Can Network Manager - CanNm_Init(ConfigPtr->CanNmConfig); -#endif - -#if defined(USE_UDPNM) - // Setup Udp Network Manager - UdpNm_Init(ConfigPtr->UdpNmConfig); -#endif - -#if defined(USE_NM) - // Setup Network Management Interface - Nm_Init(ConfigPtr->NmConfig); -#endif - -#if defined(USE_COM) - // Setup COM layer - Com_Init(ConfigPtr->ComConfig); -#endif - -#if defined(USE_DCM) - // Setup DCM - Dcm_Init(); -#endif - -#if defined(USE_IOHWAB) - // Setup IO hardware abstraction layer - IoHwAb_Init(); -#endif - -} - -void EcuM_AL_DriverInitThree(const EcuM_ConfigType* ConfigPtr) -{ - (void)ConfigPtr; - //lint --e{715} PC-Lint (715) - ConfigPtr usage depends on configuration of modules - -#if defined(USE_DEM) - // Setup DEM - Dem_Init(); -#endif - -#if defined(USE_COMM) - // Setup Communication Manager - ComM_Init(ConfigPtr->ComMConfig); -#endif -} - -void EcuM_OnEnterRUN(void) -{ - -} - -void EcuM_OnExitRun(void) -{ - -} - -void EcuM_OnExitPostRun(void) -{ - -} - -void EcuM_OnPrepShutdown(void) -{ - -} - -void EcuM_OnGoSleep(void) -{ - -} - -void EcuM_OnGoOffOne(void) -{ - -} - -void EcuM_OnGoOffTwo(void) -{ - -} - -void EcuM_AL_SwitchOff(void) -{ - -} diff --git a/boards/ti_tms570ls/examples/os_simple/config/EcuM_Cfg.h b/boards/ti_tms570ls/examples/os_simple/config/EcuM_Cfg.h index e74a516a..064184ab 100644 --- a/boards/ti_tms570ls/examples/os_simple/config/EcuM_Cfg.h +++ b/boards/ti_tms570ls/examples/os_simple/config/EcuM_Cfg.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.1.10 * * Generated by Arctic Studio (http://arccore.com) */ @@ -30,12 +30,26 @@ #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000) #define ECUM_NVRAM_MIN_RUN_DURATION (10000) +#define ECUM_VALIDATION_TIMEOUT 0 typedef enum { ECUM_USER_User_1, ECUM_USER_ENDMARK // Must be the last in list! } EcuM_UserList; +// EcuM Sleep Mode IDs +#define ECUM_SLEEP_MODE_EcuMSleepMode 0 +#define ECUM_SLEEP_MODE_CNT 1 + +typedef enum { + ECUM_WKSOURCE_POWER = (1<<0), + ECUM_WKSOURCE_RESET = (1<<1), + ECUM_WKSOURCE_INTERNAL_RESET = (1<<2), + ECUM_WKSOURCE_INTERNAL_WDG = (1<<3), + ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4), + ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5), + ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF +} EcuM_WakeupSourceType ; #endif /*ECUM_CFG_H_*/ diff --git a/boards/ti_tms570ls/examples/os_simple/config/EcuM_Generated_Types.h b/boards/ti_tms570ls/examples/os_simple/config/EcuM_Generated_Types.h deleted file mode 100644 index 97913445..00000000 --- a/boards/ti_tms570ls/examples/os_simple/config/EcuM_Generated_Types.h +++ /dev/null @@ -1,178 +0,0 @@ -/* -* Configuration of module: EcuM (EcuM_Generated_Types.h) -* -* Created by: -* Copyright: -* -* Configured for (MCU): TMS570 -* -* Module vendor: ArcCore -* Generator version: 2.0.2 -* -* Generated by Arctic Studio (http://arccore.com) -*/ - - -#if !(((ECUM_SW_MAJOR_VERSION == 2) && (ECUM_SW_MINOR_VERSION == 0)) ) -#error EcuM: Configuration file expected BSW module version to be 2.0.* -#endif - - -#ifndef _ECUM_GENERATED_TYPES_H_ -#define _ECUM_GENERATED_TYPES_H_ - -#if (ECUM_USE_SERVICE_PORTS == STD_ON) && defined(USE_RTE) -#include "Rte_EcuM.h" -#endif - -#include "EcuM_Types.h" - -#if defined(USE_MCU) -#include "Mcu.h" -#endif -#if defined(USE_PORT) -#include "Port.h" -#endif -#if defined(USE_CAN) -#include "Can.h" -#endif -#if defined(USE_CANIF) -#include "CanIf.h" -#endif -#if defined(USE_PWM) -#include "Pwm.h" -#endif -#if defined(USE_COM) -#include "Com.h" -#endif -#if defined(USE_PDUR) -#include "PduR.h" -#endif -#if defined(USE_DMA) -#include "Dma.h" -#endif -#if defined(USE_ADC) -#include "Adc.h" -#endif -#if defined(USE_GPT) -#include "Gpt.h" -#endif -#if defined(USE_COMM) -#include "ComM.h" -#endif -#if defined(USE_NM) -#include "Nm.h" -#endif -#if defined(USE_CANNM) -#include "CanNm.h" -#endif -#if defined(USE_CANSM) -#include "CanSM.h" -#endif -#if defined(USE_J1939TP) -#include "J1939Tp.h" -#endif -#if defined(USE_UDPNM) -#include "UdpNm.h" -#endif -#if defined(USE_LINSM) -#include "LinSM.h" -#endif -#if defined(USE_FLS) -#include "Fls.h" -#endif -#if defined(USE_EEP) -#include "Eep.h" -#endif -#if defined(USE_SPI) -#include "Spi.h" -#endif -#if defined(USE_WDG) -#include "Wdg.h" -#endif -#if defined(USE_WDGM) -#include "WdgM.h" -#endif -#if defined(USE_WDGIF) -#include "WdgIf.h" -#endif - - -typedef struct -{ - EcuM_StateType EcuMDefaultShutdownTarget; - uint8 EcuMDefaultSleepMode; - AppModeType EcuMDefaultAppMode; - uint32 EcuMRunMinimumDuration; - uint32 EcuMNvramReadAllTimeout; - uint32 EcuMNvramWriteAllTimeout; - -#if defined(USE_MCU) - const Mcu_ConfigType* McuConfig; -#endif -#if defined(USE_PORT) - const Port_ConfigType* PortConfig; -#endif -#if defined(USE_CAN) - const Can_ConfigType* CanConfig; -#endif -#if defined(USE_CANIF) - const CanIf_ConfigType* CanIfConfig; -#endif -#if defined(USE_CANSM) - const CanSM_ConfigType* CanSMConfig; -#endif -#if defined(USE_NM) - const Nm_ConfigType* NmConfig; -#endif -#if defined(USE_CANNM) - const CanNm_ConfigType* CanNmConfig; -#endif -#if defined(USE_UDPNM) - const UdpNm_ConfigType* UdpNmConfig; -#endif -#if defined(USE_COMM) - const ComM_ConfigType* ComMConfig; -#endif -#if defined(USE_COM) - const Com_ConfigType* ComConfig; -#endif -#if defined(USE_J1939TP) - const J1939Tp_ConfigType* J1939TpConfig; -#endif -#if defined(USE_PDUR) - const PduR_PBConfigType* PduRConfig; -#endif -#if defined(USE_PWM) - const Pwm_ConfigType* PwmConfig; -#endif -#if defined(USE_DMA) - const Dma_ConfigType* DmaConfig; -#endif -#if defined(USE_ADC) - const Adc_ConfigType* AdcConfig; -#endif -#if defined(USE_GPT) - const Gpt_ConfigType* GptConfig; -#endif -#if defined(USE_FLS) - const Fls_ConfigType* FlashConfig; -#endif -#if defined(USE_EEP) - const Eep_ConfigType* EepConfig; -#endif -#if defined(USE_SPI) - const Spi_ConfigType* SpiConfig; -#endif -#if defined(USE_WDG) - const Wdg_ConfigType* WdgConfig; -#endif -#if defined(USE_WDGIF) - const WdgIf_ConfigType* WdgIfConfig; -#endif -#if defined(USE_WDGM) - const WdgM_ConfigType* WdgMConfig; -#endif -} EcuM_ConfigType; - -#endif /*_ECUM_GENERATED_TYPES_H_*/ diff --git a/boards/ti_tms570ls/examples/os_simple/config/EcuM_PBcfg.c b/boards/ti_tms570ls/examples/os_simple/config/EcuM_PBcfg.c index 85f88e13..b35e067b 100644 --- a/boards/ti_tms570ls/examples/os_simple/config/EcuM_PBcfg.c +++ b/boards/ti_tms570ls/examples/os_simple/config/EcuM_PBcfg.c @@ -7,13 +7,12 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.1.10 * * Generated by Arctic Studio (http://arccore.com) */ - #include "EcuM.h" #include "EcuM_Generated_Types.h" @@ -37,6 +36,39 @@ extern const ComM_ConfigType ComM_Config; extern const J1939Tp_ConfigType J1939Tp_Config; #endif +#if defined(USE_WDGM) +const EcuM_WdgMType EcuM_WdgMConfig = { + .EcuMSupervisedEntity = NULL, + .EcuMWdgMWakeupMode = NULL, + .EcuMWdgMStartupMode = NULL, + .EcuMWdgMRunMode = NULL, + .EcuMWdgMPostRunMode = NULL, + .EcuMWdgMShutdownMode = NULL, +}; +#endif + +const EcuM_SleepModeType EcuM_SleepModeConfig[] = { + { // EcuMSleepMode + .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode, + .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE, + .EcuMSleepModeMcuMode = MCU_MODE_MCUMODESETTINGCONF, +#if defined(USE_WDGM) + .EcuMSleepModeWdgMMode = NULL, +#endif + } +}; + +const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = { + { // EcuMWakeupSource + .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE, + .EcuMWakeupSourcePolling = false, + .EcuMValidationTimeout = 0, +#if defined(USE_COMM) + .EcuMComMChannel = NULL, +#endif + } +}; + EcuM_ConfigType EcuMConfig = { @@ -46,54 +78,58 @@ EcuM_ConfigType EcuMConfig = .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT, .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT, .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION, +#if defined(USE_WDGM) + .EcuMWdgMConfig = &EcuM_WdgMConfig, +#endif + .EcuMSleepModeConfig = EcuM_SleepModeConfig, #if defined(USE_MCU) - .McuConfig = McuConfigData, + .McuConfig = McuConfigData, #endif #if defined(USE_PORT) - .PortConfig = &PortConfigData, + .PortConfig = &PortConfigData, #endif #if defined(USE_CAN) - .CanConfig = &CanConfigData, + .CanConfig = &CanConfigData, #endif #if defined(USE_CANIF) - .CanIfConfig = &CanIf_Config, + .CanIfConfig = &CanIf_Config, #endif #if defined(USE_CANSM) - .CanSMConfig = &CanSM_Config, + .CanSMConfig = &CanSM_Config, #endif #if defined(USE_CANNM) - .CanNmConfig = &CanNm_Config, + .CanNmConfig = &CanNm_Config, #endif #if defined(USE_UDPNM) - .UdpNmConfig = &UdpNm_Config, + .UdpNmConfig = &UdpNm_Config, #endif #if defined(USE_COM) - .ComConfig = &ComConfiguration, + .ComConfig = &ComConfiguration, #endif #if defined(USE_COMM) - .ComMConfig = &ComM_Config, + .ComMConfig = &ComM_Config, #endif #if defined(USE_J1939TP) - .J1939TpConfig = &J1939Tp_Config, + .J1939TpConfig = &J1939Tp_Config, #endif #if defined(USE_NM) - .NmConfig = &Nm_Config, + .NmConfig = &Nm_Config, #endif #if defined(USE_PDUR) - .PduRConfig = &PduR_Config, + .PduRConfig = &PduR_Config, #endif #if defined(USE_J1939TP) - .J1939TpConfig = &J1939Tp_Config, + .J1939TpConfig = &J1939Tp_Config, #endif #if defined(USE_DMA) - .DmaConfig = DmaConfig, + .DmaConfig = DmaConfig, #endif #if defined(USE_ADC) - .AdcConfig = AdcConfig, + .AdcConfig = AdcConfig, #endif #if defined(USE_PWM) - .PwmConfig = &PwmConfig, + .PwmConfig = &PwmConfig, #endif #if defined(USE_WDG) .WdgConfig = &WdgConfig, @@ -105,7 +141,7 @@ EcuM_ConfigType EcuMConfig = .WdgIfConfig = &WdgIfConfig, #endif #if defined(USE_GPT) - .GptConfig = GptConfigData, + .GptConfig = GptConfigData, #endif #if defined(USE_FLS) .FlashConfig = FlsConfigSet, diff --git a/boards/ti_tms570ls/examples/os_simple/config/Mcu_Cfg.h b/boards/ti_tms570ls/examples/os_simple/config/Mcu_Cfg.h index 66aa8a54..dd0ec942 100644 --- a/boards/ti_tms570ls/examples/os_simple/config/Mcu_Cfg.h +++ b/boards/ti_tms570ls/examples/os_simple/config/Mcu_Cfg.h @@ -26,6 +26,13 @@ #define MCU_PERFORM_RESET_API STD_ON #define MCU_VERSION_INFO_API STD_ON + +typedef enum { + MCU_MODE_MCUMODESETTINGCONF = 0, + MCU_MODE_NORMAL = 1 // Here for backwards compatibility reasons. Not used anymore. +} Mcu_ModeType; + + typedef enum { MCU_CLOCKTYPE_Clock = 0, MCU_NBR_OF_CLOCKS, diff --git a/boards/ti_tms570ls/examples/os_simple/os_simple_tms570ls.arxml b/boards/ti_tms570ls/examples/os_simple/os_simple_tms570ls.arxml index 3abb7a47..32c4fec1 100644 --- a/boards/ti_tms570ls/examples/os_simple/os_simple_tms570ls.arxml +++ b/boards/ti_tms570ls/examples/os_simple/os_simple_tms570ls.arxml @@ -576,6 +576,77 @@ /ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig + + EcuMDefaultShutdownTarget + /ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget + + + /ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState + EcuMStateReset + + + + + /ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef + + + + + EcuMSleepMode + + + + + + /ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode + + + /ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId + 0 + + + /ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend + false + + + + + /ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef + /os_simple_tms570ls/Mcu/McuModuleConfiguration/McuModeSettingConf + + + /ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask + /os_simple_tms570ls/EcuM/EcuMConfiguration/EcuMWakeupSource + + + + + EcuMWakeupSource + + + + + + /ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource + + + /ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason + 0 + + + /ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout + 0.0 + + + /ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId + 0 + + + /ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling + false + + + diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Calibration_Settings.h b/boards/ti_tms570ls/examples/rte_simple/config/Calibration_Settings.h index 41b82a5b..2150ac3c 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Calibration_Settings.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Calibration_Settings.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Can_Cfg.h b/boards/ti_tms570ls/examples/rte_simple/config/Can_Cfg.h index bee2ac53..f58d599d 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Can_Cfg.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Can_Cfg.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.1 +* Generator version: 2.0.2 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Can_Lcfg.c b/boards/ti_tms570ls/examples/rte_simple/config/Can_Lcfg.c index 9e19df9c..c3680128 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Can_Lcfg.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Can_Lcfg.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.1 +* Generator version: 2.0.2 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Com_Cfg.h b/boards/ti_tms570ls/examples/rte_simple/config/Com_Cfg.h index 3a874282..b7fb1e2e 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Com_Cfg.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Com_Cfg.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.6 +* Generator version: 2.1.1 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.c b/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.c index d5b6a74e..1c4cb6ba 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.6 +* Generator version: 2.1.1 * * Generated by Arctic Studio (http://arccore.com) */ @@ -43,12 +43,28 @@ const ComGroupSignal_type ComGroupSignal[] = { /* SignalGroup GroupSignals lists. */ + +/* IPdu buffers and signal group buffers */ +uint8 ComArcIPduBuffer_FreqInd[8]; + +uint8 ComArcIPduBuffer_FreqReq[8]; +uint8 ComArcIPduDeferredRxBuffer_FreqReq[8]; + +uint8 ComArcIPduBuffer_RX_PDU[8]; +uint8 ComArcIPduDeferredRxBuffer_RX_PDU[8]; + +uint8 ComArcIPduBuffer_TX_PDU[8]; + + /* * Signal definitions */ + const ComSignal_type ComSignal[] = { { .ComHandleId = Arg1, + .ComIPduHandleId = 2, + .Com_Arc_ShadowBuffer = NULL, .ComFirstTimeoutFactor = 0, .ComNotification = NULL, .ComTimeoutFactor = 0, @@ -61,18 +77,24 @@ const ComSignal_type ComSignal[] = { .ComSignalInitValue = &Com_SignalInitValue_Arg1, + .ComBitPosition = 7, .ComBitSize = 8, + .ComSignalEndianess = COM_BIG_ENDIAN, .ComSignalType = UINT8, .Com_Arc_IsSignalGroup = 0, .ComGroupSignal = NULL, + .ComRxDataTimeoutAction = COM_TIMEOUT_DATA_ACTION_NONE, + .Com_Arc_EOL = 0 }, { .ComHandleId = ResultSig, + .ComIPduHandleId = 3, + .Com_Arc_ShadowBuffer = NULL, .ComFirstTimeoutFactor = 0, .ComNotification = NULL, .ComTimeoutFactor = 0, @@ -85,18 +107,24 @@ const ComSignal_type ComSignal[] = { .ComSignalInitValue = &Com_SignalInitValue_ResultSig, + .ComBitPosition = 7, .ComBitSize = 8, + .ComSignalEndianess = COM_BIG_ENDIAN, .ComSignalType = UINT8, .Com_Arc_IsSignalGroup = 0, .ComGroupSignal = NULL, + .ComRxDataTimeoutAction = COM_TIMEOUT_DATA_ACTION_NONE, + .Com_Arc_EOL = 0 }, { .ComHandleId = Arg2, + .ComIPduHandleId = 2, + .Com_Arc_ShadowBuffer = NULL, .ComFirstTimeoutFactor = 0, .ComNotification = NULL, .ComTimeoutFactor = 0, @@ -109,18 +137,24 @@ const ComSignal_type ComSignal[] = { .ComSignalInitValue = &Com_SignalInitValue_Arg2, + .ComBitPosition = 15, .ComBitSize = 8, + .ComSignalEndianess = COM_BIG_ENDIAN, .ComSignalType = UINT8, .Com_Arc_IsSignalGroup = 0, .ComGroupSignal = NULL, + .ComRxDataTimeoutAction = COM_TIMEOUT_DATA_ACTION_NONE, + .Com_Arc_EOL = 0 }, { .ComHandleId = FreqIndSig, + .ComIPduHandleId = 0, + .Com_Arc_ShadowBuffer = NULL, .ComFirstTimeoutFactor = 0, .ComNotification = NULL, .ComTimeoutFactor = 0, @@ -133,18 +167,24 @@ const ComSignal_type ComSignal[] = { .ComSignalInitValue = &Com_SignalInitValue_FreqIndSig, + .ComBitPosition = 7, .ComBitSize = 32, + .ComSignalEndianess = COM_BIG_ENDIAN, .ComSignalType = UINT32, .Com_Arc_IsSignalGroup = 0, .ComGroupSignal = NULL, + .ComRxDataTimeoutAction = COM_TIMEOUT_DATA_ACTION_NONE, + .Com_Arc_EOL = 0 }, { .ComHandleId = FreqReqSig, + .ComIPduHandleId = 1, + .Com_Arc_ShadowBuffer = NULL, .ComFirstTimeoutFactor = 0, .ComNotification = Rte_COMCbk_FreqReqSig, .ComTimeoutFactor = 0, @@ -157,14 +197,18 @@ const ComSignal_type ComSignal[] = { .ComSignalInitValue = &Com_SignalInitValue_FreqReqSig, + .ComBitPosition = 7, .ComBitSize = 32, + .ComSignalEndianess = COM_BIG_ENDIAN, .ComSignalType = UINT32, .Com_Arc_IsSignalGroup = 0, .ComGroupSignal = NULL, + .ComRxDataTimeoutAction = COM_TIMEOUT_DATA_ACTION_NONE, + .Com_Arc_EOL = 0 }, { @@ -214,11 +258,13 @@ const ComIPdu_type ComIPdu[] = { { // FreqInd .ArcIPduOutgoingId = PDUR_PDU_ID_FreqInd, .ComIPduCallout = NULL, + .ComIPduSignalProcessing = DEFERRED, .ComIPduSize = 8, .ComIPduDirection = SEND, .ComIPduGroupRef = ComPduGroup, + .ComIPduDeferredDataPtr = 0, .ComTxIPdu = { .ComTxIPduMinimumDelayFactor = 0, .ComTxIPduUnusedAreasDefault = 0, @@ -231,17 +277,21 @@ const ComIPdu_type ComIPdu[] = { }, }, + .ComIPduDataPtr = ComArcIPduBuffer_FreqInd, .ComIPduSignalRef = ComIPduSignalRefs_FreqInd, + .ComIPduDynSignalRef = 0, .Com_Arc_EOL = 0 }, { // FreqReq .ArcIPduOutgoingId = PDUR_REVERSE_PDU_ID_FreqReq, .ComIPduCallout = NULL, + .ComIPduSignalProcessing = DEFERRED, .ComIPduSize = 8, .ComIPduDirection = RECEIVE, .ComIPduGroupRef = ComPduGroup, + .ComIPduDeferredDataPtr = ComArcIPduDeferredRxBuffer_FreqReq, .ComTxIPdu = { .ComTxIPduMinimumDelayFactor = 0, .ComTxIPduUnusedAreasDefault = 0, @@ -254,17 +304,21 @@ const ComIPdu_type ComIPdu[] = { }, }, + .ComIPduDataPtr = ComArcIPduBuffer_FreqReq, .ComIPduSignalRef = ComIPduSignalRefs_FreqReq, + .ComIPduDynSignalRef = 0, .Com_Arc_EOL = 0 }, { // RX_PDU .ArcIPduOutgoingId = PDUR_REVERSE_PDU_ID_RX_PDU, .ComIPduCallout = NULL, + .ComIPduSignalProcessing = DEFERRED, .ComIPduSize = 8, .ComIPduDirection = RECEIVE, .ComIPduGroupRef = ComPduGroup, + .ComIPduDeferredDataPtr = ComArcIPduDeferredRxBuffer_RX_PDU, .ComTxIPdu = { .ComTxIPduMinimumDelayFactor = 0, .ComTxIPduUnusedAreasDefault = 0, @@ -277,17 +331,21 @@ const ComIPdu_type ComIPdu[] = { }, }, + .ComIPduDataPtr = ComArcIPduBuffer_RX_PDU, .ComIPduSignalRef = ComIPduSignalRefs_RX_PDU, + .ComIPduDynSignalRef = 0, .Com_Arc_EOL = 0 }, { // TX_PDU .ArcIPduOutgoingId = PDUR_PDU_ID_TX_PDU, .ComIPduCallout = NULL, + .ComIPduSignalProcessing = DEFERRED, .ComIPduSize = 8, .ComIPduDirection = SEND, .ComIPduGroupRef = ComPduGroup, + .ComIPduDeferredDataPtr = 0, .ComTxIPdu = { .ComTxIPduMinimumDelayFactor = 0, .ComTxIPduUnusedAreasDefault = 0, @@ -300,7 +358,9 @@ const ComIPdu_type ComIPdu[] = { }, }, + .ComIPduDataPtr = ComArcIPduBuffer_TX_PDU, .ComIPduSignalRef = ComIPduSignalRefs_TX_PDU, + .ComIPduDynSignalRef = 0, .Com_Arc_EOL = 0 }, { @@ -316,16 +376,6 @@ const Com_ConfigType ComConfiguration = { .ComGroupSignal = ComGroupSignal }; -/* IPdu buffers and signal group buffers */ -uint8 ComArcIPduBuffer_FreqInd[8]; - -uint8 ComArcIPduBuffer_FreqReq[8]; - -uint8 ComArcIPduBuffer_RX_PDU[8]; - -uint8 ComArcIPduBuffer_TX_PDU[8]; - - Com_Arc_IPdu_type Com_Arc_IPdu[] = { { // FreqInd .Com_Arc_TxIPduTimers = { @@ -333,8 +383,7 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = { .ComTxModeRepetitionPeriodTimer = 0, .ComTxIPduMinimumDelayTimer = 0, .ComTxModeTimePeriodTimer = 0 - }, - .ComIPduDataPtr = ComArcIPduBuffer_FreqInd, + }, .Com_Arc_IpduStarted = 0 }, { // FreqReq @@ -343,8 +392,7 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = { .ComTxModeRepetitionPeriodTimer = 0, .ComTxIPduMinimumDelayTimer = 0, .ComTxModeTimePeriodTimer = 0 - }, - .ComIPduDataPtr = ComArcIPduBuffer_FreqReq, + }, .Com_Arc_IpduStarted = 0 }, { // RX_PDU @@ -353,8 +401,7 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = { .ComTxModeRepetitionPeriodTimer = 0, .ComTxIPduMinimumDelayTimer = 0, .ComTxModeTimePeriodTimer = 0 - }, - .ComIPduDataPtr = ComArcIPduBuffer_RX_PDU, + }, .Com_Arc_IpduStarted = 0 }, { // TX_PDU @@ -363,8 +410,7 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = { .ComTxModeRepetitionPeriodTimer = 0, .ComTxIPduMinimumDelayTimer = 0, .ComTxModeTimePeriodTimer = 0 - }, - .ComIPduDataPtr = ComArcIPduBuffer_TX_PDU, + }, .Com_Arc_IpduStarted = 0 }, }; @@ -372,57 +418,27 @@ Com_Arc_IPdu_type Com_Arc_IPdu[] = { Com_Arc_Signal_type Com_Arc_Signal[] = { { // Arg1 .Com_Arc_DeadlineCounter = 0, - .ComTimeoutFactor = 0, - .ComIPduHandleId = 0, .ComSignalUpdated = 0, - .ComIPduDataPtr = NULL, - - .Com_Arc_ShadowBuffer = NULL - }, { // ResultSig .Com_Arc_DeadlineCounter = 0, - .ComTimeoutFactor = 0, - .ComIPduHandleId = 0, .ComSignalUpdated = 0, - .ComIPduDataPtr = NULL, - - .Com_Arc_ShadowBuffer = NULL - }, { // Arg2 .Com_Arc_DeadlineCounter = 0, - .ComTimeoutFactor = 0, - .ComIPduHandleId = 0, .ComSignalUpdated = 0, - .ComIPduDataPtr = NULL, - - .Com_Arc_ShadowBuffer = NULL - }, { // FreqIndSig .Com_Arc_DeadlineCounter = 0, - .ComTimeoutFactor = 0, - .ComIPduHandleId = 0, .ComSignalUpdated = 0, - .ComIPduDataPtr = NULL, - - .Com_Arc_ShadowBuffer = NULL - }, { // FreqReqSig .Com_Arc_DeadlineCounter = 0, - .ComTimeoutFactor = 0, - .ComIPduHandleId = 0, .ComSignalUpdated = 0, - .ComIPduDataPtr = NULL, - - .Com_Arc_ShadowBuffer = NULL - }, }; diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.h b/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.h index 3fbeb926..8806c81b 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.6 +* Generator version: 2.1.1 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Dio_Cfg.h b/boards/ti_tms570ls/examples/rte_simple/config/Dio_Cfg.h index d9eef273..07c16796 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Dio_Cfg.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Dio_Cfg.h @@ -25,7 +25,7 @@ #define DIO_VERSION_INFO_API STD_OFF #define DIO_DEV_ERROR_DETECT STD_OFF -#define DIO_END_OF_LIST -1 +#define DIO_END_OF_LIST (-1u) // Physical ports typedef enum diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Dio_Lcfg.c b/boards/ti_tms570ls/examples/rte_simple/config/Dio_Lcfg.c index c4fcae6c..fbbe3259 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Dio_Lcfg.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Dio_Lcfg.c @@ -30,8 +30,8 @@ const Dio_PortType DioPortConfigData[] = { const Dio_ChannelGroupType DioConfigData[] = { { .port = DIO_END_OF_LIST, - .offset = DIO_END_OF_LIST, - .mask = DIO_END_OF_LIST, + .offset = 0, + .mask = 0, } }; diff --git a/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Cfg.h b/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Cfg.h index 8563afb8..064184ab 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Cfg.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Cfg.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.1.10 * * Generated by Arctic Studio (http://arccore.com) */ @@ -25,21 +25,31 @@ #define ECUM_VERSION_INFO_API STD_OFF #define ECUM_DEV_ERROR_DETECT STD_OFF -#include "EcuM_Generated_Types.h" - #define ECUM_MAIN_FUNCTION_PERIOD (200) #define ECUM_NVRAM_READALL_TIMEOUT (10000) #define ECUM_NVRAM_WRITEALL_TIMEOUT (10000) #define ECUM_NVRAM_MIN_RUN_DURATION (10000) +#define ECUM_VALIDATION_TIMEOUT 0 typedef enum { ECUM_USER_User_1, ECUM_USER_ENDMARK // Must be the last in list! } EcuM_UserList; +// EcuM Sleep Mode IDs +#define ECUM_SLEEP_MODE_EcuMSleepMode 0 +#define ECUM_SLEEP_MODE_CNT 1 -extern EcuM_ConfigType EcuMConfig; +typedef enum { + ECUM_WKSOURCE_POWER = (1<<0), + ECUM_WKSOURCE_RESET = (1<<1), + ECUM_WKSOURCE_INTERNAL_RESET = (1<<2), + ECUM_WKSOURCE_INTERNAL_WDG = (1<<3), + ECUM_WKSOURCE_EXTERNAL_WDG = (1<<4), + ECUM_WKSOURCE_ECUMWAKEUPSOURCE = (1<<5), + ECUM_WKSOURCE_ALL_SOURCES = 0x3FFFFFFF +} EcuM_WakeupSourceType ; #endif /*ECUM_CFG_H_*/ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Generated_Types.h b/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Generated_Types.h deleted file mode 100644 index 63eef4f2..00000000 --- a/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Generated_Types.h +++ /dev/null @@ -1,172 +0,0 @@ -/* -* Configuration of module: EcuM (EcuM_Generated_Types.h) -* -* Created by: -* Copyright: -* -* Configured for (MCU): TMS570 -* -* Module vendor: ArcCore -* Generator version: 2.0.2 -* -* Generated by Arctic Studio (http://arccore.com) -*/ - - -#if !(((ECUM_SW_MAJOR_VERSION == 2) && (ECUM_SW_MINOR_VERSION == 0)) ) -#error EcuM: Configuration file expected BSW module version to be 2.0.* -#endif - - -#ifndef _ECUM_GENERATED_TYPES_H_ -#define _ECUM_GENERATED_TYPES_H_ - -#if defined(USE_MCU) -#include "Mcu.h" -#endif -#if defined(USE_PORT) -#include "Port.h" -#endif -#if defined(USE_CAN) -#include "Can.h" -#endif -#if defined(USE_CANIF) -#include "CanIf.h" -#endif -#if defined(USE_PWM) -#include "Pwm.h" -#endif -#if defined(USE_COM) -#include "Com.h" -#endif -#if defined(USE_PDUR) -#include "PduR.h" -#endif -#if defined(USE_DMA) -#include "Dma.h" -#endif -#if defined(USE_ADC) -#include "Adc.h" -#endif -#if defined(USE_GPT) -#include "Gpt.h" -#endif -#if defined(USE_COMM) -#include "ComM.h" -#endif -#if defined(USE_NM) -#include "Nm.h" -#endif -#if defined(USE_CANNM) -#include "CanNm.h" -#endif -#if defined(USE_CANSM) -#include "CanSM.h" -#endif -#if defined(USE_J1939TP) -#include "J1939Tp.h" -#endif -#if defined(USE_UDPNM) -#include "UdpNm.h" -#endif -#if defined(USE_LINSM) -#include "LinSM.h" -#endif -#if defined(USE_FLS) -#include "Fls.h" -#endif -#if defined(USE_EEP) -#include "Eep.h" -#endif -#if defined(USE_SPI) -#include "Spi.h" -#endif -#if defined(USE_WDG) -#include "Wdg.h" -#endif -#if defined(USE_WDGM) -#include "WdgM.h" -#endif -#if defined(USE_WDGIF) -#include "WdgIf.h" -#endif - - -typedef struct -{ - EcuM_StateType EcuMDefaultShutdownTarget; - uint8 EcuMDefaultSleepMode; - AppModeType EcuMDefaultAppMode; - uint32 EcuMRunMinimumDuration; - uint32 EcuMNvramReadAllTimeout; - uint32 EcuMNvramWriteAllTimeout; - -#if defined(USE_MCU) - const Mcu_ConfigType* McuConfig; -#endif -#if defined(USE_PORT) - const Port_ConfigType* PortConfig; -#endif -#if defined(USE_CAN) - const Can_ConfigType* CanConfig; -#endif -#if defined(USE_CANIF) - const CanIf_ConfigType* CanIfConfig; -#endif -#if defined(USE_CANSM) - const CanSM_ConfigType* CanSMConfig; -#endif -#if defined(USE_NM) - const Nm_ConfigType* NmConfig; -#endif -#if defined(USE_CANNM) - const CanNm_ConfigType* CanNmConfig; -#endif -#if defined(USE_UDPNM) - const UdpNm_ConfigType* UdpNmConfig; -#endif -#if defined(USE_COMM) - const ComM_ConfigType* ComMConfig; -#endif -#if defined(USE_COM) - const Com_ConfigType* ComConfig; -#endif -#if defined(USE_J1939TP) - const J1939Tp_ConfigType* J1939TpConfig; -#endif -#if defined(USE_PDUR) - const PduR_PBConfigType* PduRConfig; -#endif -#if defined(USE_PWM) - const Pwm_ConfigType* PwmConfig; -#endif -#if defined(USE_DMA) - const Dma_ConfigType* DmaConfig; -#endif -#if defined(USE_ADC) - const Adc_ConfigType* AdcConfig; -#endif -#if defined(USE_GPT) - const Gpt_ConfigType* GptConfig; -#endif -#if defined(USE_FLS) - const Fls_ConfigType* FlashConfig; -#endif -#if defined(USE_EEP) - const Eep_ConfigType* EepConfig; -#endif -#if defined(USE_SPI) - const Spi_ConfigType* SpiConfig; -#endif -#if defined(USE_WDG) - const Wdg_ConfigType* WdgConfig; -#endif -#if defined(USE_WDGIF) - const WdgIf_ConfigType* WdgIfConfig; -#endif -#if defined(USE_WDGM) - const WdgM_ConfigType* WdgMConfig; -#endif -} EcuM_ConfigType; - -#endif /*_ECUM_GENERATED_TYPES_H_*/ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/EcuM_PBcfg.c b/boards/ti_tms570ls/examples/rte_simple/config/EcuM_PBcfg.c new file mode 100644 index 00000000..b35e067b --- /dev/null +++ b/boards/ti_tms570ls/examples/rte_simple/config/EcuM_PBcfg.c @@ -0,0 +1,155 @@ +/* +* Configuration of module: EcuM (EcuM_PBcfg.c) +* +* Created by: +* Copyright: +* +* Configured for (MCU): TMS570 +* +* Module vendor: ArcCore +* Generator version: 2.1.10 +* +* Generated by Arctic Studio (http://arccore.com) +*/ + + +#include "EcuM.h" +#include "EcuM_Generated_Types.h" + +#if defined(USE_CANSM) +extern const CanSM_ConfigType CanSM_Config; +#endif +#if defined(USE_NM) +extern const Nm_ConfigType Nm_Config; +#endif +#if defined(USE_CANNM) +extern const CanNm_ConfigType CanNm_Config; +#endif +#if defined(USE_UDPNM) +extern const UdpNm_ConfigType UdpNm_Config; +#endif +#if defined(USE_COMM) +extern const ComM_ConfigType ComM_Config; +#endif + +#if defined(USE_J1939TP) +extern const J1939Tp_ConfigType J1939Tp_Config; +#endif + +#if defined(USE_WDGM) +const EcuM_WdgMType EcuM_WdgMConfig = { + .EcuMSupervisedEntity = NULL, + .EcuMWdgMWakeupMode = NULL, + .EcuMWdgMStartupMode = NULL, + .EcuMWdgMRunMode = NULL, + .EcuMWdgMPostRunMode = NULL, + .EcuMWdgMShutdownMode = NULL, +}; +#endif + +const EcuM_SleepModeType EcuM_SleepModeConfig[] = { + { // EcuMSleepMode + .EcuMSleepModeId = ECUM_SLEEP_MODE_EcuMSleepMode, + .EcuMWakeupSourceMask = ECUM_WKSOURCE_ECUMWAKEUPSOURCE, + .EcuMSleepModeMcuMode = MCU_MODE_MCUMODESETTINGCONF, +#if defined(USE_WDGM) + .EcuMSleepModeWdgMMode = NULL, +#endif + } +}; + +const EcuM_WakeupSourceConfigType EcuM_WakeupSourceConfig[] = { + { // EcuMWakeupSource + .EcuMWakeupSourceId = ECUM_WKSOURCE_ECUMWAKEUPSOURCE, + .EcuMWakeupSourcePolling = false, + .EcuMValidationTimeout = 0, +#if defined(USE_COMM) + .EcuMComMChannel = NULL, +#endif + } +}; + + +EcuM_ConfigType EcuMConfig = +{ + .EcuMDefaultShutdownTarget = ECUM_STATE_RESET, + .EcuMDefaultSleepMode = 0, // Don't care + .EcuMDefaultAppMode = OSDEFAULTAPPMODE, + .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT, + .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT, + .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION, +#if defined(USE_WDGM) + .EcuMWdgMConfig = &EcuM_WdgMConfig, +#endif + .EcuMSleepModeConfig = EcuM_SleepModeConfig, + +#if defined(USE_MCU) + .McuConfig = McuConfigData, +#endif +#if defined(USE_PORT) + .PortConfig = &PortConfigData, +#endif +#if defined(USE_CAN) + .CanConfig = &CanConfigData, +#endif +#if defined(USE_CANIF) + .CanIfConfig = &CanIf_Config, +#endif +#if defined(USE_CANSM) + .CanSMConfig = &CanSM_Config, +#endif +#if defined(USE_CANNM) + .CanNmConfig = &CanNm_Config, +#endif +#if defined(USE_UDPNM) + .UdpNmConfig = &UdpNm_Config, +#endif +#if defined(USE_COM) + .ComConfig = &ComConfiguration, +#endif +#if defined(USE_COMM) + .ComMConfig = &ComM_Config, +#endif +#if defined(USE_J1939TP) + .J1939TpConfig = &J1939Tp_Config, +#endif +#if defined(USE_NM) + .NmConfig = &Nm_Config, +#endif +#if defined(USE_PDUR) + .PduRConfig = &PduR_Config, +#endif +#if defined(USE_J1939TP) + .J1939TpConfig = &J1939Tp_Config, +#endif +#if defined(USE_DMA) + .DmaConfig = DmaConfig, +#endif +#if defined(USE_ADC) + .AdcConfig = AdcConfig, +#endif +#if defined(USE_PWM) + .PwmConfig = &PwmConfig, +#endif +#if defined(USE_WDG) + .WdgConfig = &WdgConfig, +#endif +#if defined(USE_WDGM) + .WdgMConfig = &WdgMConfig, +#endif +#if defined(USE_WDGIF) + .WdgIfConfig = &WdgIfConfig, +#endif +#if defined(USE_GPT) + .GptConfig = GptConfigData, +#endif +#if defined(USE_FLS) + .FlashConfig = FlsConfigSet, +#endif +#if defined(USE_EEP) + .EepConfig = EepConfigData, +#endif +#if defined(USE_SPI) + .SpiConfig = &SpiConfigData, +#endif +}; diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.c b/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.c index 76499775..b965fcc5 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.0.3 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.h b/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.h index 60973c13..dd0ec942 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.0.3 * * Generated by Arctic Studio (http://arccore.com) */ @@ -26,6 +26,13 @@ #define MCU_PERFORM_RESET_API STD_ON #define MCU_VERSION_INFO_API STD_ON + +typedef enum { + MCU_MODE_MCUMODESETTINGCONF = 0, + MCU_MODE_NORMAL = 1 // Here for backwards compatibility reasons. Not used anymore. +} Mcu_ModeType; + + typedef enum { MCU_CLOCKTYPE_Clock = 0, MCU_NBR_OF_CLOCKS, diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.c b/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.c index b088ec3f..336d5854 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.1 +* Generator version: 2.0.2 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.h b/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.h index daefc8ba..164765c8 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 2.0.1 +* Generator version: 2.0.2 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte.c b/boards/ti_tms570ls/examples/rte_simple/config/Rte.c index 65820251..0a093158 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ @@ -23,35 +23,34 @@ #include "Rte_Logger2_Internal.h" #include "Com.h" -Rte_DE_UInt8 Rte_Buf_Tester_prototype_Argumentsarg1_ibuffer; -Rte_DE_UInt8 Rte_Buf_Tester_prototype_Argumentsarg2_ibuffer; -Rte_DE_UInt32 Rte_Buf_Tester_prototype_FreqReqfreq_ibuffer; -Rte_DE_UInt32 Rte_Buf_Tester_prototype_FreqReqIndfreq_ibuffer; -Rte_DE_UInt16 Rte_Buf_Tester_prototype_Resultresult_ibuffer; +Rte_DE_Read_TesterRunnable_ReadArg1 Rte_Buf_TesterRunnable_Argumentsarg1_ibuffer; +Rte_DE_Read_TesterRunnable_ReadArg2 Rte_Buf_TesterRunnable_Argumentsarg2_ibuffer; +Rte_DE_Read_FreqReqRunnable_ReadFreqReq Rte_Buf_FreqReqRunnable_FreqReqfreq_ibuffer; +Rte_DE_Write_TesterRunnable_WriteResult Rte_Buf_TesterRunnable_Resultresult_ibuffer; +Rte_DE_Write_FreqReqRunnable_WriteFreqReqInd Rte_Buf_FreqReqRunnable_FreqReqIndfreq_ibuffer; Rte_CDS_Tester Rte_Inst_Tester = { - .TesterRunnable_Arguments_arg1 = &Rte_Buf_Tester_prototype_Argumentsarg1_ibuffer, - .TesterRunnable_Arguments_arg2 = &Rte_Buf_Tester_prototype_Argumentsarg2_ibuffer, - .FreqReqRunnable_FreqReq_freq = &Rte_Buf_Tester_prototype_FreqReqfreq_ibuffer, - .FreqReqRunnable_FreqReqInd_freq = &Rte_Buf_Tester_prototype_FreqReqIndfreq_ibuffer, - .TesterRunnable_Result_result = &Rte_Buf_Tester_prototype_Resultresult_ibuffer, + .TesterRunnable_Arguments_arg1 = &Rte_Buf_TesterRunnable_Argumentsarg1_ibuffer, + .TesterRunnable_Arguments_arg2 = &Rte_Buf_TesterRunnable_Argumentsarg2_ibuffer, + .FreqReqRunnable_FreqReq_freq = &Rte_Buf_FreqReqRunnable_FreqReqfreq_ibuffer, + .TesterRunnable_Result_result = &Rte_Buf_TesterRunnable_Resultresult_ibuffer, + .FreqReqRunnable_FreqReqInd_freq = &Rte_Buf_FreqReqRunnable_FreqReqIndfreq_ibuffer, }; -Rte_DE_UInt16 Rte_Buf_Logger_prototype_Resultresult_ibuffer; +Rte_DE_Read_LoggerRunnable_ReadResult Rte_Buf_LoggerRunnable_Resultresult_ibuffer; Rte_CDS_Logger Rte_Inst_Logger = { - .LoggerRunnable_Result_result = &Rte_Buf_Logger_prototype_Resultresult_ibuffer, + .LoggerRunnable_Result_result = &Rte_Buf_LoggerRunnable_Resultresult_ibuffer, }; -Rte_DE_UInt16 Rte_Buf_Logger2_prototype_Resultresult_ibuffer; +Rte_DE_Read_Logger2Runnable_ReadResult Rte_Buf_Logger2Runnable_Resultresult_ibuffer; Rte_CDS_Logger2 Rte_Inst_Logger2 = { - .Logger2Runnable_Result_result = &Rte_Buf_Logger2_prototype_Resultresult_ibuffer, + .Logger2Runnable_Result_result = &Rte_Buf_Logger2Runnable_Resultresult_ibuffer, }; void Rte_PRE_TesterRunnable() { - imask_t irqMask = 0; - Irq_Save(irqMask); + GetResource(RES_SCHEDULER); uint8 Arg1_buf = 0; Com_ReceiveSignal(Arg1, &Arg1_buf); @@ -61,48 +60,44 @@ void Rte_PRE_TesterRunnable() { Com_ReceiveSignal(Arg2, &Arg2_buf); Rte_Inst_Tester.TesterRunnable_Arguments_arg2->value = (UInt8) Arg2_buf; - Irq_Restore(irqMask); + ReleaseResource(RES_SCHEDULER); } void Rte_PRE_FreqReqRunnable() { - imask_t irqMask = 0; - Irq_Save(irqMask); + GetResource(RES_SCHEDULER); uint32 FreqReqSig_buf = 0; Com_ReceiveSignal(FreqReqSig, &FreqReqSig_buf); - Rte_Inst_Tester.FreqReqRunnable_FreqReq_freq->value - = (UInt32) FreqReqSig_buf; + Rte_Inst_Tester.FreqReqRunnable_FreqReq_freq->value = + (UInt32) FreqReqSig_buf; - Irq_Restore(irqMask); + ReleaseResource(RES_SCHEDULER); } void Rte_PRE_LoggerRunnable() { - imask_t irqMask = 0; - Irq_Save(irqMask); + GetResource(RES_SCHEDULER); - Rte_Inst_Logger.LoggerRunnable_Result_result->value - = Rte_Buf_Tester_prototype_Result_result; + Rte_Inst_Logger.LoggerRunnable_Result_result->value = + Rte_Buf_Tester_prototype_Result_result; - Irq_Restore(irqMask); + ReleaseResource(RES_SCHEDULER); } void Rte_PRE_Logger2Runnable() { - imask_t irqMask = 0; - Irq_Save(irqMask); + GetResource(RES_SCHEDULER); - Rte_Inst_Logger2.Logger2Runnable_Result_result->value - = Rte_Buf_Tester_prototype_Result_result; + Rte_Inst_Logger2.Logger2Runnable_Result_result->value = + Rte_Buf_Tester_prototype_Result_result; - Irq_Restore(irqMask); + ReleaseResource(RES_SCHEDULER); } void Rte_POST_TesterRunnable() { - imask_t irqMask = 0; - Irq_Save(irqMask); + GetResource(RES_SCHEDULER); uint8 ResultSig_buf = (uint8) Rte_Inst_Tester.TesterRunnable_Result_result->value; @@ -111,19 +106,18 @@ void Rte_POST_TesterRunnable() { Rte_WriteBuffer_Rte_Buf_Tester_prototype_Result_result( Rte_Inst_Tester.TesterRunnable_Result_result->value); - Irq_Restore(irqMask); + ReleaseResource(RES_SCHEDULER); } void Rte_POST_FreqReqRunnable() { - imask_t irqMask = 0; - Irq_Save(irqMask); + GetResource(RES_SCHEDULER); uint32 FreqIndSig_buf = (uint32) Rte_Inst_Tester.FreqReqRunnable_FreqReqInd_freq->value; Com_SendSignal(FreqIndSig, &FreqIndSig_buf); - Irq_Restore(irqMask); + ReleaseResource(RES_SCHEDULER); } @@ -139,7 +133,8 @@ void Rte_FreqReqRunnable() { Rte_POST_FreqReqRunnable(); } -Std_ReturnType Rte_Multiply(const UInt8 arg1, const UInt8 arg2, UInt16* result) { +Std_ReturnType Rte_Multiply(const UInt8 arg1, const UInt8 arg2, + UInt16* result) { Std_ReturnType retVal = Multiply(arg1, arg2, result); return retVal; } @@ -161,8 +156,8 @@ Std_ReturnType Rte_Start() { void StepTask() { EventMaskType eventMask = 0; while (1) { - WaitEvent( EVENT_MASK_StepEvent); - GetResource( RES_SCHEDULER); + WaitEvent(EVENT_MASK_StepEvent); + GetResource(RES_SCHEDULER); GetEvent(TASK_ID_StepTask, &eventMask); ClearEvent(EVENT_MASK_StepEvent); ReleaseResource(RES_SCHEDULER); diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte.mk b/boards/ti_tms570ls/examples/rte_simple/config/Rte.mk index 149fc885..fc35d23d 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte.mk +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte.mk @@ -1,8 +1,7 @@ +obj-y += Rte.o +obj-y += Rte_Data.o obj-y += Rte_Cbk.o -obj-y += cirq_buffer.o obj-y += Rte_Calculator.o -obj-y += Rte_Logger2.o -obj-y += Rte.o obj-y += Rte_Tester.o -obj-y += Rte_Data.o obj-y += Rte_Logger.o +obj-y += Rte_Logger2.o diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator.c b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator.c index 60b9bc93..67c16fbc 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator.h b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator.h index f6963726..2a14805f 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator_Internal.h b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator_Internal.h index 1e2da5d9..8c0b3e62 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator_Internal.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Calculator_Internal.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Cbk.c b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Cbk.c index a89e8923..22a72569 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Cbk.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Cbk.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ @@ -19,16 +19,31 @@ void Rte_COMCbk_Arg1() { } +void Rte_COMCbkTOut_Arg1() { +} + void Rte_COMCbk_Arg2() { } +void Rte_COMCbkTOut_Arg2() { +} + void Rte_COMCbk_ResultSig() { } +void Rte_COMCbkTOut_ResultSig() { +} + void Rte_COMCbk_FreqReqSig() { Rte_FreqReqRunnable(); } +void Rte_COMCbkTOut_FreqReqSig() { +} + void Rte_COMCbk_FreqIndSig() { } +void Rte_COMCbkTOut_FreqIndSig() { +} + diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Data.c b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Data.c index 4e2fe45b..1f8704af 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Data.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Data.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Data.h b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Data.h index 011db50b..1c671fee 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Data.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Data.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger.c b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger.c index f337ffcf..67ac9a48 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger.h b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger.h index 4195f86a..20433dda 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2.c b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2.c index 1962b4a3..2c1dca98 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2.h b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2.h index 598b1c69..6b3c87d1 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2_Internal.h b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2_Internal.h index e078469e..3a85bb87 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2_Internal.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger2_Internal.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger_Internal.h b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger_Internal.h index 90bc8aba..ab7657b2 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger_Internal.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Logger_Internal.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester.c b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester.c index 6b2d7f7d..8c91fa25 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester.c +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester.c @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester.h b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester.h index 81c17b60..d5073d08 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester_Internal.h b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester_Internal.h index 3747abe0..bc2e2ea8 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester_Internal.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Tester_Internal.h @@ -7,7 +7,7 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ diff --git a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Type.h b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Type.h index c0aaabf7..8b620aa9 100644 --- a/boards/ti_tms570ls/examples/rte_simple/config/Rte_Type.h +++ b/boards/ti_tms570ls/examples/rte_simple/config/Rte_Type.h @@ -1,5 +1,5 @@ /* -* Configuration of module: Rte (Rte_Types.h) +* Configuration of module: Rte (Rte_Type.h) * * Created by: * Copyright: @@ -7,24 +7,34 @@ * Configured for (MCU): TMS570 * * Module vendor: ArcCore -* Generator version: 0.0.9 +* Generator version: 0.0.13 * * Generated by Arctic Studio (http://arccore.com) */ -/* Rte_Types.h */ +/* Rte_Type.h */ -#ifndef RTE_TYPES_H -#define RTE_TYPES_H +#ifndef RTE_TYPE_H +#define RTE_TYPE_H #include "Rte.h" typedef void * Rte_Instance; +typedef boolean Boolean; + +#define _DEFINED_TYPEDEF_FOR_Boolean_ + typedef float Float; #define _DEFINED_TYPEDEF_FOR_Float_ +typedef sint16 SInt16; +#define SInt16_LowerLimit -32768 +#define SInt16_UpperLimit 32767 + +#define _DEFINED_TYPEDEF_FOR_SInt16_ + typedef sint32 SInt32; #define SInt32_LowerLimit -2147483648 #define SInt32_UpperLimit 2147483647 @@ -37,6 +47,12 @@ typedef sint8 SInt8; #define _DEFINED_TYPEDEF_FOR_SInt8_ +typedef uint16 UInt16; +#define UInt16_LowerLimit 0 +#define UInt16_UpperLimit 65535 + +#define _DEFINED_TYPEDEF_FOR_UInt16_ + typedef uint32 UInt32; #define UInt32_LowerLimit 0 #define UInt32_UpperLimit 4294967295 @@ -49,61 +65,33 @@ typedef uint8 UInt8; #define _DEFINED_TYPEDEF_FOR_UInt8_ -typedef sint16 SInt16; -#define SInt16_LowerLimit -32768 -#define SInt16_UpperLimit 32767 - -#define _DEFINED_TYPEDEF_FOR_SInt16_ - -typedef boolean Boolean; - -#define _DEFINED_TYPEDEF_FOR_Boolean_ - -typedef boolean BooleanType; - -#define _DEFINED_TYPEDEF_FOR_BooleanType_ - -typedef uint16 UInt16; -#define UInt16_LowerLimit 0 -#define UInt16_UpperLimit 65535 - -#define _DEFINED_TYPEDEF_FOR_UInt16_ - typedef struct { - Float value; -} Rte_DE_Float; + UInt8 value; +} Rte_DE_Read_TesterRunnable_ReadArg1; typedef struct { - SInt32 value; -} Rte_DE_SInt32; + UInt8 value; +} Rte_DE_Read_TesterRunnable_ReadArg2; typedef struct { - SInt8 value; -} Rte_DE_SInt8; + UInt16 value; +} Rte_DE_Write_TesterRunnable_WriteResult; typedef struct { UInt32 value; -} Rte_DE_UInt32; +} Rte_DE_Read_FreqReqRunnable_ReadFreqReq; typedef struct { - UInt8 value; -} Rte_DE_UInt8; - -typedef struct { - SInt16 value; -} Rte_DE_SInt16; - -typedef struct { - Boolean value; -} Rte_DE_Boolean; + UInt32 value; +} Rte_DE_Write_FreqReqRunnable_WriteFreqReqInd; typedef struct { - BooleanType value; -} Rte_DE_BooleanType; + UInt16 value; +} Rte_DE_Read_LoggerRunnable_ReadResult; typedef struct { UInt16 value; -} Rte_DE_UInt16; +} Rte_DE_Read_Logger2Runnable_ReadResult; typedef struct { } Rte_PDS_Calculator_CalculatorOperations_P; @@ -139,11 +127,11 @@ typedef struct { } Rte_PDS_Tester_FreqReqIf_R; typedef struct { - Rte_DE_UInt8* TesterRunnable_Arguments_arg1; - Rte_DE_UInt8* TesterRunnable_Arguments_arg2; - Rte_DE_UInt32* FreqReqRunnable_FreqReq_freq; - Rte_DE_UInt32* FreqReqRunnable_FreqReqInd_freq; - Rte_DE_UInt16* TesterRunnable_Result_result; + Rte_DE_Read_TesterRunnable_ReadArg1* TesterRunnable_Arguments_arg1; + Rte_DE_Read_TesterRunnable_ReadArg2* TesterRunnable_Arguments_arg2; + Rte_DE_Read_FreqReqRunnable_ReadFreqReq* FreqReqRunnable_FreqReq_freq; + Rte_DE_Write_TesterRunnable_WriteResult* TesterRunnable_Result_result; + Rte_DE_Write_FreqReqRunnable_WriteFreqReqInd* FreqReqRunnable_FreqReqInd_freq; } Rte_CDS_Tester; typedef struct { @@ -154,7 +142,7 @@ typedef struct { } Rte_PDS_Logger_ResultIf_R; typedef struct { - Rte_DE_UInt16* LoggerRunnable_Result_result; + Rte_DE_Read_LoggerRunnable_ReadResult* LoggerRunnable_Result_result; } Rte_CDS_Logger; typedef struct { @@ -165,7 +153,7 @@ typedef struct { } Rte_PDS_Logger2_ResultIf_R; typedef struct { - Rte_DE_UInt16* Logger2Runnable_Result_result; + Rte_DE_Read_Logger2Runnable_ReadResult* Logger2Runnable_Result_result; } Rte_CDS_Logger2; #endif diff --git a/boards/ti_tms570ls/examples/rte_simple/rte_simple_ti_tms570ls.arxml b/boards/ti_tms570ls/examples/rte_simple/rte_simple_ti_tms570ls.arxml index 05469f3e..29652d99 100644 --- a/boards/ti_tms570ls/examples/rte_simple/rte_simple_ti_tms570ls.arxml +++ b/boards/ti_tms570ls/examples/rte_simple/rte_simple_ti_tms570ls.arxml @@ -1492,6 +1492,72 @@ User_1 /ArcCore/EcuM/EcuMConfiguration/EcuMUserConfig + + EcuMDefaultShutdownTarget + /ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget + + + /ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultState + EcuMStateReset + + + + + /ArcCore/EcuM/EcuMConfiguration/EcuMDefaultShutdownTarget/EcuMDefaultSleepModeRef + + + + + EcuMSleepMode + + + + + + /ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode + + + /ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeId + 0 + + + /ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeSuspend + false + + + + + /ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMSleepModeMcuModeRef + /rte_simple_ti_tms570ls/Mcu/McuModuleConfiguration/McuModeSettingConf + + + /ArcCore/EcuM/EcuMConfiguration/EcuMSleepMode/EcuMWakeupSourceMask + /rte_simple_ti_tms570ls/EcuM/EcuMConfiguration/EcuMWakeupSource + + + + + EcuMWakeupSource + /ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource + + + /ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMResetReason + 0 + + + /ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMValidationTimeout + 0.0 + + + /ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourceId + 0 + + + /ArcCore/EcuM/EcuMConfiguration/EcuMWakeupSource/EcuMWakeupSourcePolling + false + + + -- 2.39.2