From c670cc0cb72f14766c1252c1538383cc0fc1a077 Mon Sep 17 00:00:00 2001 From: john Date: Mon, 14 Nov 2011 14:43:00 +0100 Subject: [PATCH] Opened and re-saved model with latest tools (1.6.0 RC2). Fixed some problems in model (referring to parameters in card12 example). Fixed signal layout in example and added matching dbc-file. --- .../examples/ledmaster/config/Adc_Cfg.c | 3 +- .../examples/ledmaster/config/Adc_Cfg.h | 3 +- .../examples/ledmaster/config/CanIf_Cfg.c | 14 +- .../examples/ledmaster/config/CanIf_Cfg.h | 3 +- .../ledmaster/config/CanIf_SpecialPdus.h | 3 +- .../examples/ledmaster/config/Can_Cfg.h | 3 +- .../examples/ledmaster/config/Can_Lcfg.c | 3 +- .../examples/ledmaster/config/Com_Cfg.h | 3 +- .../examples/ledmaster/config/Com_PbCfg.c | 7 +- .../examples/ledmaster/config/Com_PbCfg.h | 3 +- .../examples/ledmaster/config/Det_Cfg.h | 1 - .../examples/ledmaster/config/Dio_Cfg.h | 1 - .../examples/ledmaster/config/Dio_Lcfg.c | 1 - .../ledmaster/config/EcuM_Callout_template.c | 314 ------------------ .../examples/ledmaster/config/EcuM_Cfg.c | 104 ------ .../examples/ledmaster/config/EcuM_Cfg.h | 1 - .../ledmaster/config/EcuM_Generated_Types.h | 161 --------- .../examples/ledmaster/config/Mcu_Cfg.c | 3 +- .../examples/ledmaster/config/Mcu_Cfg.h | 3 +- .../examples/ledmaster/config/Os_Cfg.c | 1 - .../examples/ledmaster/config/Os_Cfg.h | 1 - .../examples/ledmaster/config/PduR_Cfg.h | 25 +- .../examples/ledmaster/config/PduR_PbCfg.c | 5 +- .../examples/ledmaster/config/PduR_PbCfg.h | 3 +- .../examples/ledmaster/config/Port_Cfg.c | 3 +- .../examples/ledmaster/config/Port_Cfg.h | 3 +- .../examples/ledmaster/config/Pwm_Cfg.c | 3 +- .../examples/ledmaster/config/Pwm_Cfg.h | 3 +- .../examples/ledmaster/example_info.txt | 2 +- .../examples/ledmaster/led_master.dbc | 49 +++ .../ledmaster/ledmaster_hcs12x_tboard.arxml | 18 +- 31 files changed, 103 insertions(+), 647 deletions(-) delete mode 100644 boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Callout_template.c delete mode 100644 boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.c delete mode 100644 boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Generated_Types.h create mode 100644 boards/hcs12x_elmicro_tboard/examples/ledmaster/led_master.dbc diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Adc_Cfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Adc_Cfg.c index 271c5e39..5da60556 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Adc_Cfg.c +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Adc_Cfg.c @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.0.0 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Adc_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Adc_Cfg.h index 65513708..2005571d 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Adc_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Adc_Cfg.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.0.0 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.c index 46aabee2..68475af6 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.c +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.c @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.5 +* Generator version: 2.0.6 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ @@ -20,6 +19,10 @@ #include "CanTp.h" #include "CanTp_Cbk.h" #endif +#if defined(USE_J1939TP) +#include "J1939Tp.h" +#include "J1939Tp_Cbk.h" +#endif #if defined(USE_PDUR) #include "PduR.h" #endif @@ -136,7 +139,6 @@ const CanIf_RxPduConfigType CanIfRxPduConfigData[] = { #if ( CANIF_READTXPDU_NOTIFY_STATUS_API == STD_ON ) .CanIfReadRxPduNotifyStatus = false, #endif - .CanIfRxPduIdCanIdType = CANIF_CAN_ID_TYPE_11, .CanIfRxUserType = CANIF_USER_TYPE_CAN_PDUR, .CanIfCanRxPduHrhRef = &CanIfHrhConfigData_HardwareObject[0], .CanIfRxPduIdCanIdType = CANIF_CAN_ID_TYPE_11, @@ -151,9 +153,9 @@ const CanIf_RxPduConfigType CanIfRxPduConfigData[] = { // Multiplicity 1..* const CanIf_InitConfigType CanIfInitConfig = { - .CanIfConfigSet = 0, // Not used - .CanIfNumberOfCanRxPduIds = sizeof(CanIfRxPduConfigData)/sizeof(CanIf_RxPduConfigType), - .CanIfNumberOfCanTXPduIds = sizeof(CanIfTxPduConfigData)/sizeof(CanIf_TxPduConfigType), + .CanIfConfigSet = 0, // Not used + .CanIfNumberOfCanRxPduIds = 1, + .CanIfNumberOfCanTXPduIds = 1, .CanIfNumberOfDynamicCanTXPduIds = 0, // Not used // Containers diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.h index 6a9b7f7c..0dc83b1b 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.5 +* Generator version: 2.0.6 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_SpecialPdus.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_SpecialPdus.h index 3caf8cb5..84bbe922 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_SpecialPdus.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_SpecialPdus.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.5 +* Generator version: 2.0.6 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Can_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Can_Cfg.h index ee361ad2..23e27d0d 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Can_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Can_Cfg.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.1 +* Generator version: 2.0.2 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Can_Lcfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Can_Lcfg.c index 6211e17b..36419286 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Can_Lcfg.c +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Can_Lcfg.c @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.1 +* Generator version: 2.0.2 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ 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 c2ed88c5..817b520d 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_Cfg.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.5 +* Generator version: 2.0.6 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ 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 cba4f7c8..f72990e8 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.c +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.c @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.5 +* Generator version: 2.0.6 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ @@ -59,7 +58,7 @@ const ComSignal_type ComSignal[] = { .ComSignalInitValue = &Com_SignalInitValue_FreqIndSig, - .ComBitPosition = 0, + .ComBitPosition = 7, .ComBitSize = 32, .ComSignalEndianess = COM_BIG_ENDIAN, .ComSignalType = UINT32, @@ -83,7 +82,7 @@ const ComSignal_type ComSignal[] = { .ComSignalInitValue = &Com_SignalInitValue_FreqReqSig, - .ComBitPosition = 0, + .ComBitPosition = 7, .ComBitSize = 32, .ComSignalEndianess = COM_BIG_ENDIAN, .ComSignalType = UINT32, 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 c5cb96b0..4256b8fc 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.5 +* Generator version: 2.0.6 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Det_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Det_Cfg.h index 348eebe6..ae5cfff1 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Det_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Det_Cfg.h @@ -10,7 +10,6 @@ * Generator version: 2.0.1 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Dio_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Dio_Cfg.h index bcac6ab4..c69decee 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Dio_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Dio_Cfg.h @@ -10,7 +10,6 @@ * Generator version: 2.0.0 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Dio_Lcfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Dio_Lcfg.c index 62655894..2277c6ea 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Dio_Lcfg.c +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Dio_Lcfg.c @@ -10,7 +10,6 @@ * Generator version: 2.0.0 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Callout_template.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Callout_template.c deleted file mode 100644 index 7e43e7cb..00000000 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Callout_template.c +++ /dev/null @@ -1,314 +0,0 @@ -/* -* Configuration of module: EcuM (EcuM_Callout_template.c) -* -* Created by: -* Copyright: -* -* Configured for (MCU): HCS12 -* -* Module vendor: ArcCore -* Generator version: 2.0.2 -* -* Generated by Arctic Studio (http://arccore.com) -* on Mon Jun 27 21:49:46 CEST 2011 -*/ - - -#include "EcuM.h" -#include "EcuM_Cbk.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_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_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 */ -} - -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 - - // 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_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/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.c deleted file mode 100644 index 8bce3809..00000000 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.c +++ /dev/null @@ -1,104 +0,0 @@ -/* -* Configuration of module: EcuM (EcuM_Cfg.c) -* -* Created by: -* Copyright: -* -* Configured for (MCU): HCS12 -* -* Module vendor: ArcCore -* Generator version: 2.0.2 -* -* Generated by Arctic Studio (http://arccore.com) -* on Mon Jun 27 21:49:46 CEST 2011 -*/ - - - -#include "EcuM.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_COMM) -extern const ComM_ConfigType ComM_Config; -#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_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_COM) - .ComConfig = &ComConfiguration, -#endif -#if defined(USE_COMM) - .ComMConfig = &ComM_Config, -#endif -#if defined(USE_NM) - .NmConfig = &Nm_Config, -#endif -#if defined(USE_PDUR) - .PduRConfig = &PduR_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/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.h index c79b4401..24e9f0a3 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.h @@ -10,7 +10,6 @@ * Generator version: 2.0.2 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ 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 index f75149e5..00000000 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Generated_Types.h +++ /dev/null @@ -1,161 +0,0 @@ -/* -* Configuration of module: EcuM (EcuM_Generated_Types.h) -* -* Created by: -* Copyright: -* -* Configured for (MCU): HCS12 -* -* Module vendor: ArcCore -* Generator version: 2.0.2 -* -* Generated by Arctic Studio (http://arccore.com) -* on Mon Jun 27 21:49:46 CEST 2011 -*/ - - -#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_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_COMM) - const ComM_ConfigType* ComMConfig; -#endif -#if defined(USE_COM) - const Com_ConfigType* ComConfig; -#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/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.c index 1d3a13c5..91ce307f 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.c +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.c @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.0.3 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ 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 e3c0fa75..c9580239 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.0.3 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Os_Cfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Os_Cfg.c index aea83087..7feb03ac 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Os_Cfg.c +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Os_Cfg.c @@ -10,7 +10,6 @@ * Generator version: 2.0.34 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Os_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Os_Cfg.h index 44c7c223..b79acf1f 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Os_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Os_Cfg.h @@ -10,7 +10,6 @@ * Generator version: 2.0.34 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_Cfg.h index 862e1ee6..8149a0ae 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_Cfg.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 3.0.8 +* Generator version: 3.1.10 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ @@ -33,7 +32,7 @@ #define PDUR_COM_SUPPORT STD_ON #define PDUR_DCM_SUPPORT STD_OFF #define PDUR_IPDUM_SUPPORT STD_OFF /* Not supported */ -#define PDUR_SOAD_SUPPORT STD_OFF +#define PDUR_J1939TP_SUPPORT STD_OFF #define PDUR_DEV_ERROR_DETECT STD_OFF #define PDUR_VERSION_INFO_API STD_OFF @@ -44,7 +43,6 @@ #define PDUR_SINGLE_IF CAN_IF #define PDUR_SINGLE_TP CAN_TP - // Gateway operation #define PDUR_GATEWAY_OPERATION STD_ON #define PDUR_MEMORY_SIZE 10 /* Not used */ @@ -104,16 +102,17 @@ #define PduR_LinIfTriggerTransmit(...) #endif -#if PDUR_SOAD_SUPPORT == STD_ON -#define PduR_SoAdTpProvideRxBuffer Dcm_ProvideRxBuffer -#define PduR_SoAdTpRxIndication Dcm_RxIndication -#define PduR_SoAdTpProvideTxBuffer Dcm_ProvideTxBuffer -#define PduR_SoAdTpTxConfirmation Dcm_TxConfirmation + +#if PDUR_J1939TP_SUPPORT == STD_ON +#define PduR_J1939TpProvideRxBuffer Dcm_ProvideRxBuffer +#define PduR_J1939TpRxIndication Dcm_RxIndication +#define PduR_J1939TpProvideTxBuffer Dcm_ProvideTxBuffer +#define PduR_J1939TpTxConfirmation Dcm_TxConfirmation #else -#define PduR_SoAdProvideRxBuffer(...) -#define PduR_SoAdRxIndication(...) -#define PduR_SoAdProvideTxBuffer(...) -#define PduR_SoAdTxConfirmation(...) +#define PduR_J1939TpProvideRxBuffer(...) +#define PduR_J1939TpRxIndication(...) +#define PduR_J1939TpProvideTxBuffer(...) +#define PduR_J1939TpTxConfirmation(...) #endif #if PDUR_COM_SUPPORT == STD_ON diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.c index 25e7466e..0d077b3e 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.c +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.c @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 3.0.8 +* Generator version: 3.1.10 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ @@ -22,4 +21,4 @@ PduR_PBConfigType PduR_Config = { .TpBuffers = NULL, .TpRouteBuffers = NULL, .NRoutingPaths = 0 -}; \ No newline at end of file +}; diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.h index 1b1ed44b..0eb070c6 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 3.0.8 +* Generator version: 3.1.10 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:44 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.c index b0bf7022..78df8ab2 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.c +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.c @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.1 +* Generator version: 2.0.2 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.h index b1fd3929..8253f325 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.1 +* Generator version: 2.0.2 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.c index edd8b21a..c04fea07 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.c +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.c @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.0.1 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.h index 5f30dfe7..4db3e38d 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.h @@ -7,10 +7,9 @@ * Configured for (MCU): HCS12 * * Module vendor: ArcCore -* Generator version: 2.0.2 +* Generator version: 2.0.1 * * Generated by Arctic Studio (http://arccore.com) -* on Tue Jun 28 16:50:43 CEST 2011 */ diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/example_info.txt b/boards/hcs12x_elmicro_tboard/examples/ledmaster/example_info.txt index 2fa74749..c0be8b97 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/example_info.txt +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/example_info.txt @@ -3,7 +3,7 @@ frequency is 1 Hz. The frequency can be changed by sending a new period in a CAN message. The first 32 bit in a message with CAN Id 100 is treated as the new period (in system ticks). A CAN message with CAN Id 102 is transmitted every 1 s to indicate -the current period. Baudrate 125 kbit/s +the current period. Baudrate 125 kbit/s. See led_master.dbc. The DIP switches on the board are used to set the LEDs in the LEDBar. diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/led_master.dbc b/boards/hcs12x_elmicro_tboard/examples/ledmaster/led_master.dbc new file mode 100644 index 00000000..317f5066 --- /dev/null +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/led_master.dbc @@ -0,0 +1,49 @@ +VERSION "" + + +NS_ : + NS_DESC_ + CM_ + BA_DEF_ + BA_ + VAL_ + CAT_DEF_ + CAT_ + FILTER + BA_DEF_DEF_ + EV_DATA_ + ENVVAR_DATA_ + SGTYPE_ + SGTYPE_VAL_ + BA_DEF_SGTYPE_ + BA_SGTYPE_ + SIG_TYPE_REF_ + VAL_TABLE_ + SIG_GROUP_ + SIG_VALTYPE_ + SIGTYPE_VALTYPE_ + BO_TX_BU_ + BA_DEF_REL_ + BA_REL_ + BA_DEF_DEF_REL_ + BU_SG_REL_ + BU_EV_REL_ + BU_BO_REL_ + SG_MUL_VAL_ + +BS_: + +BU_: tester led_master + + +BO_ 258 LedMasterStatus: 8 led_master + SG_ LedPeriodStatus : 7|32@0+ (1,0) [0|0] "" Vector__XXX + +BO_ 256 SetLedPeriodFrame: 8 tester + SG_ LedPeriod : 7|32@0+ (1,0) [0|100000] "" Vector__XXX + + + +BA_DEF_ "BusType" STRING ; +BA_DEF_DEF_ "BusType" "CAN"; + 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 d1771326..03b22708 100644 --- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/ledmaster_hcs12x_tboard.arxml +++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/ledmaster_hcs12x_tboard.arxml @@ -3142,7 +3142,7 @@ /ArcCore/CanIf/CanIfInitConfiguration/CanIfInitHohConfig/CanIfHrhConfig/CanIfHrhIdSymRef - /blinker_hcs12_card12/Can/CanConfigSet/RxBox + /ledmaster_hcs12x_tboard/Can/CanConfigSet/RxBox @@ -3167,7 +3167,7 @@ /ArcCore/CanIf/CanIfInitConfiguration/CanIfInitHohConfig/CanIfHthConfig/CanIfHthIdSymRef - /blinker_hcs12_card12/Can/CanConfigSet/TxBox + /ledmaster_hcs12x_tboard/Can/CanConfigSet/TxBox @@ -3362,7 +3362,7 @@ /ArcCore/CanIf/CanIfControllerConfig/CanIfControllerIdRef - /blinker_hcs12_card12/Can/CanConfigSet/CAN0 + /ledmaster_hcs12x_tboard/Can/CanConfigSet/CAN0 @@ -3599,7 +3599,7 @@ /ArcCore/Com/ComConfig/ComSignal/ComBitPosition - 0 + 7 /ArcCore/Com/ComConfig/ComSignal/ComBitSize @@ -3658,7 +3658,7 @@ /ArcCore/Com/ComConfig/ComSignal/ComBitPosition - 0 + 7 /ArcCore/Com/ComConfig/ComSignal/ComBitSize @@ -3720,6 +3720,10 @@ /ArcCore/Com/ComGeneral/ComConfigurationUseDet false + + /ArcCore/Com/ComGeneral/ArcComBitPositionVersionAutosar4 + false + @@ -3857,6 +3861,10 @@ /ArcCore/PduR/PduRGeneral/PduRZeroCostOperation true + + /ArcCore/PduR/PduRGeneral/ArcPduRJ1939TpSupport + false + -- 2.39.2