Build changed to use EcuM_PBCfg.c instead of EcuM_Cfg.c

diff --git a/boards/board_common.mk b/boards/board_common.mk
index 7e95d9789fcf68eec3cb6ddb1346f28f9d2304e0..0489d3b1b1e224c730096d840f9e5a5218170fec 100644 (file)
--- a/boards/board_common.mk
+++ b/boards/board_common.mk
@@ -35,7 +35,7 @@ endif
 #Ecu\r
 obj-$(USE_ECUM) += EcuM.o\r
 obj-$(USE_ECUM) += EcuM_Main.o\r
-obj-$(USE_ECUM) += EcuM_Cfg.o\r
+obj-$(USE_ECUM) += EcuM_PBCfg.o\r
 obj-$(USE_ECUM) += EcuM_Callout_Stubs.o\r
 obj-$(USE_ECUM)-$(CFG_ECUM_USE_RTE) += EcuM_ServicePort.o\r
 inc-$(USE_ECUM) += $(ROOTDIR)/system/EcuM\r

diff --git a/boards/generic/EcuM_Cfg.h b/boards/generic/EcuM_Cfg.h
index e6dd1f5e16f76cf3c1b27e038b8aac6ff25ffcc6..ab70825c0788d51a4c951096527d8adad2fd7356 100644 (file)
--- a/boards/generic/EcuM_Cfg.h
+++ b/boards/generic/EcuM_Cfg.h
@@ -1,45 +1,46 @@
 /*\r
- * Configuration of module EcuM (EcuM_Cfg.h)\r
- *\r
- * Created by: \r
- * Configured for (MCU):\r
- *\r
- * Module vendor: ArcCore\r
- * Module version: 2.0.0\r
- *\r
- * \r
- * Generated by Arctic Studio (http://arccore.com) \r
- *           on Thu Oct 14 15:29:52 CEST 2010\r
- */\r
-\r
+* Configuration of module: EcuM (EcuM_Cfg.h)\r
+*\r
+* Created by:              \r
+* Copyright:               \r
+*\r
+* Configured for (MCU):    MPC551x\r
+*\r
+* Module vendor:           ArcCore\r
+* Generator version:       2.0.2\r
+*\r
+* Generated by Arctic Studio (http://arccore.com) \r
+*/\r
 \r
 #warning "This default file may only be used as an example!"\r
-\r
-#if ((ECUM_SW_MAJOR_VERSION != 2) && (ECUM_SW_MINOR_VERSION != 0))\r
-#error "EcuM: Configuration file version differs from BSW version."\r
-#endif\r
-\r
+
+#if !(((ECUM_SW_MAJOR_VERSION == 2) && (ECUM_SW_MINOR_VERSION == 0)) )
+#error EcuM: Configuration file expected BSW module version to be 2.0.*
+#endif
+
 \r
 \r
 #ifndef ECUM_CFG_H_\r
 #define ECUM_CFG_H_\r
 \r
-#define ECUM_VERSION_INFO_API  STD_ON\r
-#define ECUM_DEV_ERROR_DETECT  STD_ON\r
+#define ECUM_VERSION_INFO_API  STD_OFF\r
+#define ECUM_DEV_ERROR_DETECT  STD_OFF\r
 \r
 #include "EcuM_Generated_Types.h"\r
 \r
-#define ECUM_MAIN_FUNCTION_PERIOD      (200)\r
-#define ECUM_NVRAM_READALL_TIMEOUT     (10000)\r
-#define ECUM_NVRAM_WRITEALL_TIMEOUT    (10000)\r
-#define ECUM_NVRAM_MIN_RUN_DURATION    (10000)\r
+#define ECUM_MAIN_FUNCTION_PERIOD  (200)\r
+#define ECUM_NVRAM_READALL_TIMEOUT (10000)\r
+#define ECUM_NVRAM_WRITEALL_TIMEOUT (10000)\r
+#define ECUM_NVRAM_MIN_RUN_DURATION (10000)\r
+\r
 \r
-// EcuM_UserType definitions\r
 typedef enum {\r
-        ECUM_USER_SYSTEM,   // Dummy user to get at least one user in system\r
+       ECUM_USER_User_1,\r
        ECUM_USER_ENDMARK       // Must be the last in list!\r
 } EcuM_UserList;\r
 \r
+\r
 extern EcuM_ConfigType EcuMConfig;\r
 \r
 #endif /*ECUM_CFG_H_*/\r
+\r

diff --git a/boards/generic/EcuM_Cfg.c b/boards/generic/EcuM_PBcfg.c
similarity index 67%
rename from boards/generic/EcuM_Cfg.c
rename to boards/generic/EcuM_PBcfg.c
index aefc75d9b759381d8a5c33260d3f94e24e7866aa..6b68290fff3abf454be084914117dbaf416bebf6 100644 (file)
--- a/boards/generic/EcuM_Cfg.c
+++ b/boards/generic/EcuM_PBcfg.c
@@ -1,103 +1,119 @@
-/* -------------------------------- Arctic Core ------------------------------
- * Arctic Core - the open source AUTOSAR platform http://arccore.com
- *
- * Copyright (C) 2009  ArcCore AB <contact@arccore.com>
- *
- * This source code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by the
- * Free Software Foundation; See <http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- * -------------------------------- Arctic Core ------------------------------*/
+/*\r
+* Configuration of module: EcuM (EcuM_PBcfg.c)\r
+*\r
+* Created by:              \r
+* Copyright:               \r
+*\r
+* Configured for (MCU):    MPC551x\r
+*\r
+* Module vendor:           ArcCore\r
+* Generator version:       2.0.2\r
+*\r
+* Generated by Arctic Studio (http://arccore.com) \r
+*/\r
 \r
-#warning "This default file may only be used as an example!"
-
-#include "EcuM.h"
 \r
-#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
+\r
+#include "EcuM.h"\r
+\r
+\r
+#if defined(USE_CANSM)\r
+extern const CanSM_ConfigType CanSM_Config;\r
+#endif\r
+#if defined(USE_NM)\r
+extern const Nm_ConfigType Nm_Config;\r
+#endif\r
+#if defined(USE_CANNM)\r
+extern const CanNm_ConfigType CanNm_Config;\r
+#endif\r
+#if defined(USE_UDPNM)\r
+extern const UdpNm_ConfigType UdpNm_Config;\r
+#endif\r
+#if defined(USE_COMM)\r
+extern const ComM_ConfigType ComM_Config;\r
+#endif\r
+\r
+#if defined(USE_J1939TP)\r
+extern const J1939Tp_ConfigType J1939Tp_Config;\r
+#endif\r
+\r
 \r
 EcuM_ConfigType EcuMConfig =\r
 {\r
        .EcuMDefaultShutdownTarget = ECUM_STATE_RESET,\r
        .EcuMDefaultSleepMode = 0, // Don't care\r
        .EcuMDefaultAppMode = OSDEFAULTAPPMODE,\r
-       .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,
-       .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,
-       .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,
+       .EcuMNvramReadAllTimeout = ECUM_NVRAM_READALL_TIMEOUT,\r
+       .EcuMNvramWriteAllTimeout = ECUM_NVRAM_WRITEALL_TIMEOUT,\r
+       .EcuMRunMinimumDuration = ECUM_NVRAM_MIN_RUN_DURATION,\r
 \r
-#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
-
+#if defined(USE_MCU)\r
+        .McuConfig = McuConfigData,\r
+#endif\r
+#if defined(USE_PORT)\r
+        .PortConfig = &PortConfigData,\r
+#endif\r
+#if defined(USE_CAN)\r
+        .CanConfig = &CanConfigData,\r
+#endif\r
+#if defined(USE_CANIF)\r
+        .CanIfConfig = &CanIf_Config,\r
+#endif\r
+#if defined(USE_CANSM)\r
+        .CanSMConfig = &CanSM_Config,\r
+#endif\r
+#if defined(USE_CANNM)\r
+        .CanNmConfig = &CanNm_Config,\r
+#endif\r
+#if defined(USE_UDPNM)\r
+        .UdpNmConfig = &UdpNm_Config,\r
+#endif\r
+#if defined(USE_COM)\r
+        .ComConfig = &ComConfiguration,\r
+#endif\r
+#if defined(USE_COMM)\r
+        .ComMConfig = &ComM_Config,\r
+#endif\r
+#if defined(USE_J1939TP)\r
+        .J1939TpConfig = &J1939Tp_Config,\r
+#endif\r
+#if defined(USE_NM)\r
+        .NmConfig = &Nm_Config,\r
+#endif\r
+#if defined(USE_PDUR)\r
+        .PduRConfig = &PduR_Config,\r
+#endif\r
+#if defined(USE_J1939TP)\r
+        .J1939TpConfig = &J1939Tp_Config,\r
+#endif\r
+#if defined(USE_DMA)\r
+        .DmaConfig = DmaConfig,\r
+#endif\r
+#if defined(USE_ADC)\r
+        .AdcConfig = AdcConfig,\r
+#endif\r
+#if defined(USE_PWM)\r
+        .PwmConfig = &PwmConfig,\r
+#endif\r
+#if defined(USE_WDG)\r
+    .WdgConfig = &WdgConfig,\r
+#endif\r
+#if defined(USE_WDGM)\r
+    .WdgMConfig = &WdgMConfig,\r
+#endif\r
+#if defined(USE_WDGIF)\r
+    .WdgIfConfig = &WdgIfConfig,\r
+#endif\r
+#if defined(USE_GPT)\r
+        .GptConfig = GptConfigData,\r
+#endif\r
+#if defined(USE_FLS)\r
+       .FlashConfig = FlsConfigSet,\r
+#endif\r
+#if defined(USE_EEP)\r
+       .EepConfig = EepConfigData,\r
+#endif\r
+#if defined(USE_SPI)\r
+       .SpiConfig = &SpiConfigData,\r
+#endif\r
 };\r