ADC fix for HCS12 and an updated HCS12 example.

diff --git a/arch/hc1x/hcs12d/drivers/Adc.c b/arch/hc1x/hcs12d/drivers/Adc.c
index 1b7b7946b9a61725e6a0a4f3ed83f76408af2713..ba951273458028b3acdc568cc6d88addd16b73d8 100644 (file)
--- a/arch/hc1x/hcs12d/drivers/Adc.c
+++ b/arch/hc1x/hcs12d/drivers/Adc.c
@@ -72,8 +72,12 @@ typedef enum
 /* Function prototypes. */\r
 \r
 /* Development error checking. */\r
+#if (ADC_READ_GROUP_API == STD_ON)\r
 static Std_ReturnType Adc_CheckReadGroup (Adc_GroupType group);\r
+#endif\r
+#if (ADC_ENABLE_START_STOP_GROUP_API == STD_ON)\r
 static Std_ReturnType Adc_CheckStartGroupConversion (Adc_GroupType group);\r
+#endif\r
 static Std_ReturnType Adc_CheckInit (const Adc_ConfigType *ConfigPtr);\r
 static Std_ReturnType Adc_CheckSetupResultBuffer (Adc_GroupType group);\r
 \r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/Tasks.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/Tasks.c
index b820bc9ddffc81f74f388580c701a44fc9e7c346..f50a0e9ac3ed6005f353605d3c6e0108319be57c 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/Tasks.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/Tasks.c
@@ -19,6 +19,7 @@
 #include "Pwm.h"\r
 #include "Com.h"\r
 #include "CanIf.h"\r
+#include "Adc.h"\r
 \r
 // #define USE_LDEBUG_PRINTF // Uncomment this to turn debug statements on.\r
 #include "debug.h"\r
@@ -32,15 +33,14 @@ boolean IncommingFreqReq(PduIdType PduId, const uint8 *IPduData)
 }\r
 \r
 // Tasks\r
-static uint16 y = 0;\r
 void DipTask( void ) {\r
        uint16 value = Dio_ReadPort(DIO_PORT_NAME_DipSwitch);\r
        Dio_WritePort(DIO_PORT_NAME_LEDBar, value);\r
 \r
-       Pwm_SetDutyCycle(GREENLED, y);\r
-       y = y + 0xF00;\r
-       if (y > 0x8000)\r
-               y = 0;\r
+       // Read from Adc to set the green red intensity\r
+       Adc_ReadGroup(ADC_GROUP0, &value);\r
+       value = value*128; // Scale to be between 0 and 32767\r
+       Pwm_SetDutyCycle(GreenLED, value);\r
 \r
        TerminateTask();\r
 }\r
@@ -55,6 +55,9 @@ void StartTask()
 \r
        // Makes the inital value on the bus be correct\r
        SetEvent(TASK_ID_ComReceiveTask, EVENT_MASK_FreqReciveEvent);\r
+\r
+       // Start Group Conversion of ADC\r
+       Adc_StartGroupConversion(ADC_GROUP0);\r
 }\r
 \r
 // Task that toggles the LED\r

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 b44e8df8e440e822a873f306c91e31c4c6f7f97b..187b70d6cab96e8c273b315836eba9cf5d480f8d 100644 (file)
--- 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,10 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.0\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 16:57:11 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 \r
@@ -22,32 +22,29 @@ Adc_GroupStatus AdcGroupStatus[ADC_NBR_OF_GROUPS];
 const Adc_HWConfigurationType AdcHWUnitConfiguration[] =\r
 {\r
        {\r
-               .convTime = ADC_CONVERSION_TIME_8_CLOCKS,\r
+               .convTime = ADC_CONVERSION_TIME_16_CLOCKS,\r
                .resolution = ADC_RESOLUTION_8_BIT,\r
-               .adcPrescale = ADC_SYSTEM_CLOCK_DIVIDE_FACTOR_6,\r
+               .adcPrescale = ADC_SYSTEM_CLOCK_DIVIDE_FACTOR_30,\r
        },\r
 };\r
 \r
-const Adc_ChannelConfigurationType AdcChannelConfiguration [ADC_NBR_OF_CHANNELS] =\r
-{\r
-       { .adcChannelConvTime = ADC_SampleTime_0 },\r
-};\r
-const Adc_ChannelType Adc_ADCGroup1ChannelList[ADC_NBR_OF_ADCGROUP1_CHANNELS] =\r
+\r
+const Adc_ChannelType Adc_MainGroupChannelList[ADC_NBR_OF_MAINGROUP_CHANNELS] =\r
 {      \r
        ADC_CH2,\r
 };\r
 \r
-Adc_ValueGroupType Adc_ADCGroup1Buffer [sizeof(Adc_ADCGroup1ChannelList)/sizeof(Adc_ADCGroup1ChannelList[0])];\r
+Adc_ValueGroupType Adc_MainGroupBuffer [sizeof(Adc_MainGroupChannelList)/sizeof(Adc_MainGroupChannelList[0])];\r
 \r
 const Adc_GroupDefType AdcGroupConfiguration [] =\r
 {\r
        {\r
                .conversionMode         = ADC_CONV_MODE_CONTINUOUS,\r
-               .triggerSrc             = ADC_TRIGG_SRC_SW,\r
+               .triggerSrc             = ADC_TRIGG_SRC_HW,\r
                .groupCallback          = NULL,\r
-               .channelList            = Adc_ADCGroup1ChannelList,\r
-               .resultBuffer       = Adc_ADCGroup1Buffer,              \r
-               .numberOfChannels   = sizeof(Adc_ADCGroup1ChannelList)/sizeof(Adc_ADCGroup1ChannelList[0]),\r
+               .channelList            = Adc_MainGroupChannelList,\r
+               .resultBuffer       = Adc_MainGroupBuffer,              \r
+               .numberOfChannels   = sizeof(Adc_MainGroupChannelList)/sizeof(Adc_MainGroupChannelList[0]),\r
                .status             = &AdcGroupStatus[0],               \r
        },\r
 };\r

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 ee7c4563a90ae3cea3965cacae344af36b67d412..57ccdc772e870eb98ffa4ff079077f2d25c86940 100644 (file)
--- 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,10 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.0\r
+* Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 16:57:11 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 
@@ -25,16 +25,16 @@
 #define ADC_DEINIT_API                    STD_OFF\r
 #define ADC_DEV_ERROR_DETECT              STD_OFF\r
 #define ADC_ENABLE_QUEUING                STD_OFF\r
-#define ADC_ENABLE_START_STOP_GROUP_API   STD_OFF\r
+#define ADC_ENABLE_START_STOP_GROUP_API   STD_ON\r
 #define ADC_GRP_NOTIF_CAPABILITY          STD_OFF\r
 #define ADC_HW_TRIGGER_API                STD_OFF           /* Not implemented. */\r
 #define ADC_PRIORITY_IMPLEMENTATION       0                 /* Not implemented. */\r
-#define ADC_READ_GROUP_API                STD_OFF\r
+#define ADC_READ_GROUP_API                STD_ON\r
 #define ADC_VERSION_API                   STD_ON            /* Not implemented. */\r
 \r
 #include "Adc_ConfigTypes.h"\r
 \r
-#define ADC_NBR_OF_ADCGROUP1_CHANNELS 1 \r
+#define ADC_NBR_OF_MAINGROUP_CHANNELS 1 \r
 \r
 typedef enum\r
 {\r

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 65fa59a9a96525232d36ad94cc6eaa841ead33c2..295c7c69a688e456a31b2a8c60ad404f4a0faf19 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.c
@@ -10,7 +10,7 @@
 * Generator version:       2.0.5\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 \r

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 1861184d0c992af8c6fa0328be5148368f80dfb3..65c4f8bfd8e4a39110570d143f981582b947b7ee 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_Cfg.h
@@ -10,7 +10,7 @@
 * Generator version:       2.0.5\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 

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 62729c4d68167daa491ee20cd79728c3d9e20eef..47cffd9b655a4ccd1da996a105cfc804c1c2528e 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_SpecialPdus.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/CanIf_SpecialPdus.h
@@ -10,7 +10,7 @@
 * Generator version:       2.0.5\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 

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 90b8477e14f8ff806e1816328bdcf67bdae62566..ad565d5cb5e5553c7c53d35322cbf80b2357bb83 100644 (file)
--- 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,10 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 

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 ee6f9869403396ab2e94ba17e1cb66b20d4b4084..a4f3e2715c19a7cea21aae7eaf555d42afbdf948 100644 (file)
--- 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,10 @@
 * Configured for (MCU):    HCS12\r
 *\r
 * Module vendor:           ArcCore\r
-* Generator version:       2.0.2\r
+* Generator version:       2.0.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
        \r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_Cfg.h
index 152469726c7d6e35e94a2644fd4ff5d7adffbd1b..f29457848f83af4e01d5bd4f936c25c3f59b3cfa 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_Cfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_Cfg.h
@@ -10,7 +10,7 @@
 * Generator version:       2.0.5\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:52 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.c
index 4a4e230a5af15a17653b8f6b1d785c45ed3c4b8d..07e68ff0720135ae124f66a76771e47e5853a900 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.c
@@ -10,7 +10,7 @@
 * Generator version:       2.0.5\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 \r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.h
index f1d1dee6c63d286ea65bc195a0074d895f9d18e7..fdb87696b64c5369c0d8dbc2ff9c4063f7367b77 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Com_PbCfg.h
@@ -10,7 +10,7 @@
 * Generator version:       2.0.5\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:52 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 

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 4a13a24265ba8172afd932a823d98ba578f008df..9b15b12e3104d5fd92cb0b3e80677127e7abf792 100644 (file)
--- 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,7 @@
 * Generator version:       2.0.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
 

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 9d30e5d3d34ff584390d02a1b588389a56a5db2c..674418ceda05cdc515313ade8867a8d5394098b9 100644 (file)
--- 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,7 @@
 * Generator version:       2.0.0\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
 

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 12e2277578739bc22535226cdbf4c93dfc78ca9c..4584310cb24fdca6632d595f9ab2b219094bcc0d 100644 (file)
--- 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,7 @@
 * Generator version:       2.0.0\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
 \r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM.mk b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM.mk
index b9f36def07f21ddae4a46a414d0b715f041a95d9..a7616a93ded60aa10a30631d68abc53d6ca58fb4 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM.mk
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM.mk
@@ -1,3 +1,3 @@
 \r
-MOD_USE += MCU PWM DIO PORT CAN CANIF COM PDUR \r
+MOD_USE += MCU PWM DIO PORT CAN CANIF COM PDUR ADC \r
 \r

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
index 55ce888f317c911e6729a145a587bfd2e1f9ee92..7e43e7cb447099b8448a4f25542beb37ef8b253a 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Callout_template.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Callout_template.c
@@ -10,7 +10,7 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Fri Jun 17 16:56:37 CEST 2011\r
+*           on Mon Jun 27 21:49:46 CEST 2011\r
 */\r
 \r
 \r
@@ -83,13 +83,17 @@
 #if defined(USE_SPI)\r
 #include "Spi.h"\r
 #endif\r
+#if defined(USE_WDG)\r
+#include "Wdg.h"\r
+#endif\r
+#if defined(USE_WDGM)\r
+#include "WdgM.h"\r
+#endif\r
 \r
 void EcuM_AL_DriverInitZero(void)\r
 {\r
-#if defined(USE_DET)\r
-       Det_Init();\r
-    Det_Start();\r
-#endif\r
+       Det_Init();/** @req EcuM2783 */\r
+    Det_Start();/** @req EcuM2634 */\r
 }\r
 \r
 EcuM_ConfigType* EcuM_DeterminePbConfiguration(void)\r
@@ -99,13 +103,14 @@ EcuM_ConfigType* EcuM_DeterminePbConfiguration(void)
 \r
 void EcuM_AL_DriverInitOne(const EcuM_ConfigType *ConfigPtr)\r
 {\r
+       (void)ConfigPtr;\r
   //lint --e{715}       PC-Lint (715) - ConfigPtr usage depends on configuration of modules\r
 \r
 #if defined(USE_MCU)\r
        Mcu_Init(ConfigPtr->McuConfig);\r
 \r
-       // Set up default clock (Mcu_InitClock requires initRun==1)\r
-       // Ignoring return value\r
+       /* Set up default clock (Mcu_InitClock requires initRun==1) */\r
+       /* Ignoring return value */\r
        (void) Mcu_InitClock( ConfigPtr->McuConfig->McuDefaultClockSettings );\r
 \r
        // Wait for PLL to sync.\r
@@ -132,7 +137,12 @@ void EcuM_AL_DriverInitOne(const EcuM_ConfigType *ConfigPtr)
 #endif\r
 \r
        // Setup watchdog\r
-       // TODO\r
+#if defined(USE_WDG)\r
+       Wdg_Init(ConfigPtr->WdgConfig);\r
+#endif\r
+#if defined(USE_WDGM)\r
+       WdgM_Init(ConfigPtr->WdgMConfig);\r
+#endif\r
 \r
 #if defined(USE_DMA)\r
        // Setup DMA\r
@@ -156,6 +166,7 @@ void EcuM_AL_DriverInitOne(const EcuM_ConfigType *ConfigPtr)
 \r
 void EcuM_AL_DriverInitTwo(const EcuM_ConfigType* ConfigPtr)\r
 {\r
+       (void)ConfigPtr;\r
   //lint --e{715}       PC-Lint (715) - ConfigPtr usage depends on configuration of modules\r
 \r
 #if defined(USE_SPI)\r
@@ -180,7 +191,7 @@ void EcuM_AL_DriverInitTwo(const EcuM_ConfigType* ConfigPtr)
 \r
 #if defined(USE_EA)\r
        // Setup EA\r
-       Ea_init();\r
+       Ea_Init();\r
 #endif\r
 \r
 #if defined(USE_NVM)\r
@@ -248,6 +259,7 @@ void EcuM_AL_DriverInitTwo(const EcuM_ConfigType* ConfigPtr)
 \r
 void EcuM_AL_DriverInitThree(const EcuM_ConfigType* ConfigPtr)\r
 {\r
+       (void)ConfigPtr;\r
   //lint --e{715}       PC-Lint (715) - ConfigPtr usage depends on configuration of modules\r
 \r
 #if defined(USE_DEM)\r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.c
index eb2aaf8b889d5bd58f9fe4027a259e9a04c18cac..8bce38090f5b414797700c0f4992fdb4ab2c98b9 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Cfg.c
@@ -10,7 +10,7 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Fri Jun 17 16:56:37 CEST 2011\r
+*           on Mon Jun 27 21:49:46 CEST 2011\r
 */\r
 \r
 \r
@@ -80,10 +80,25 @@ EcuM_ConfigType EcuMConfig =
 #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

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 a1d196a1bf3e5810ff51f418473102eecf82df37..0f14b5c030de63e0b48e450c1d402daf65e8388b 100644 (file)
--- 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,7 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Generated_Types.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Generated_Types.h
index 87a81a843695a3d3c1b34c34f15a2700b5a648b2..f75149e5bf6a3919c9687427cf6f21d7f718dd60 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Generated_Types.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/EcuM_Generated_Types.h
@@ -10,7 +10,7 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Fri Jun 17 16:56:37 CEST 2011\r
+*           on Mon Jun 27 21:49:46 CEST 2011\r
 */\r
 \r
 
@@ -76,6 +76,16 @@
 #if defined(USE_SPI)\r
 #include "Spi.h"\r
 #endif\r
+#if defined(USE_WDG)\r
+#include "Wdg.h"\r
+#endif\r
+#if defined(USE_WDGM)\r
+#include "WdgM.h"\r
+#endif\r
+#if defined(USE_WDGIF)\r
+#include "WdgIf.h"\r
+#endif\r
+\r
 \r
 typedef struct\r
 {\r
@@ -137,6 +147,15 @@ typedef struct
 #if defined(USE_SPI)\r
        const Spi_ConfigType* SpiConfig;\r
 #endif\r
+#if defined(USE_WDG)\r
+    const Wdg_ConfigType* WdgConfig;\r
+#endif\r
+#if defined(USE_WDGIF)\r
+    const WdgIf_ConfigType* WdgIfConfig;\r
+#endif\r
+#if defined(USE_WDGM)\r
+    const WdgM_ConfigType* WdgMConfig;\r
+#endif\r
 } EcuM_ConfigType;\r
 \r
 #endif /*_ECUM_GENERATED_TYPES_H_*/\r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.c b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.c
index bc5d0dc4e757617f7d28473f4e0d8bd45845124c..f302e8a597892d10b785003dec61c0682de404d5 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.c
@@ -10,7 +10,7 @@
 * Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
 \r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.h b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.h
index cb851895a4d784456c57367aa8450f2f6570b3f6..d01c9a01ab99cbba25a4c4ce2cbb544078644525 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Mcu_Cfg.h
@@ -10,7 +10,7 @@
 * Generator version:       2.0.3\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
 

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 52c865ac692f91210cc930bda5a0be9612cca692..4b5bbf8939a28ccfd90f70070ac54ed6cb4584fd 100644 (file)
--- 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,7 @@
 * Generator version:       2.0.34\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
        \r

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 6342f5f64832ec88956e8125fb9f27b7d71fde16..68e7f0cd32501667754ae88b32640b73d495fa8a 100644 (file)
--- 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,7 @@
 * Generator version:       2.0.34\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
 
@@ -105,8 +105,8 @@ void StartTask( void );
 //#define OS_SC3                                       STD_ON  /* NOT CONFIGURABLE IN TOOLS */  \r
 #define OS_STACK_MONITORING                    STD_ON\r
 #define OS_STATUS_EXTENDED                     STD_ON\r
-#define OS_USE_GET_SERVICE_ID          STD_ON\r
-#define OS_USE_PARAMETER_ACCESS                STD_ON\r
+#define OS_USE_GET_SERVICE_ID          STD_ON  /* NOT CONFIGURABLE IN TOOLS */\r
+#define OS_USE_PARAMETER_ACCESS                STD_ON  /* NOT CONFIGURABLE IN TOOLS */\r
 #define OS_RES_SCHEDULER                       STD_ON  /* NOT CONFIGURABLE IN TOOLS */\r
 \r
 #define OS_ISR_CNT                     0\r

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 66819071c5ea1f00a55a16f455f1821fdf7aa9f7..7fef5f6338c4410254eabdf810c6c7ae62b72a39 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_Cfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_Cfg.h
@@ -10,7 +10,7 @@
 * Generator version:       3.0.8\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:52 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 

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 77e495377ffe468abc0838a1bc30f5f5a245f033..57142e0888a618b0c78dfef7794f2a1eccfef591 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.c
@@ -10,7 +10,7 @@
 * Generator version:       3.0.8\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:52 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 \r

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 72251dfac97ea76d8a370fb7ddd27ce2ebf14098..a7c84445a9acd6e741d2d1172c84bc9f1755a8b4 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/PduR_PbCfg.h
@@ -10,7 +10,7 @@
 * Generator version:       3.0.8\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:52 CEST 2011\r
+*           on Mon Jun 27 21:49:36 CEST 2011\r
 */\r
 \r
 

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 07708aaabed22534cb8254d0d95f548895134fab..2cc3ee85d0f1e85da9102337c8040b4b71a7f740 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.c
@@ -10,7 +10,7 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
        \r

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 acf0b78df1d2cac263f8c2234a081728a2502d94..6d7969ed676e3a59a0e6a86e6e2c36a9e1023c1e 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Port_Cfg.h
@@ -10,7 +10,7 @@
 * Generator version:       2.0.2\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
 

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 4c3ef413a4cbe7541f2a574db032e47522b7a7d7..f5ba880bc37e5914a24a14567b65200970d93d0e 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.c
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.c
@@ -10,7 +10,7 @@
 * Generator version:       2.0.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
 \r
@@ -20,7 +20,7 @@ const Pwm_ConfigType PwmConfig =
 {\r
                .channels = {           \r
                        {\r
-                               .channel =  GREENLED,\r
+                               .channel =  GreenLED,\r
                                DUTY_AND_PERIOD(4096,188.0),\r
                                .centerAlign =  STD_OFF,\r
                                .polarity = POLARITY_NORMAL,\r

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 0eef7f4e4b405ff63d1f3f7ebd9d1e4d0fd74e6a..1276f382f707e6e828f43dbf99325ebd99320f03 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.h
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/config/Pwm_Cfg.h
@@ -10,7 +10,7 @@
 * Generator version:       2.0.1\r
 *\r
 * Generated by Arctic Studio (http://arccore.com) \r
-*           on Sat Jun 18 21:14:51 CEST 2011\r
+*           on Mon Jun 27 21:49:35 CEST 2011\r
 */\r
 \r
 
@@ -29,9 +29,9 @@
 #define PWM_FREEZE_ENABLE           STD_OFF\r
 \r
 // Define what API functions to enable.\r
-#define PWM_GET_OUTPUT_STATE        STD_OFF\r
-#define PWM_SET_PERIOD_AND_DUTY     STD_ON\r
-#define PWM_DEINIT_API              STD_OFF\r
+#define PWM_GET_OUTPUT_STATE_API    STD_OFF\r
+#define PWM_SET_PERIOD_AND_DUTY_API STD_ON\r
+#define PWM_DE_INIT_API             STD_OFF\r
 #define PWM_SET_DUTY_CYCLE_API      STD_ON\r
 #define PWM_SET_OUTPUT_TO_IDLE_API  STD_OFF\r
 #define PWM_VERSION_INFO_API        STD_OFF\r
@@ -66,7 +66,7 @@ typedef uint16 Pwm_PeriodType;
  * Maps a symbolic name to a hardware channel\r
  */\r
 typedef enum {\r
-      GREENLED = 1 ,\r
+      GreenLED = 1 ,\r
     PWM_NUMBER_OF_CHANNELS = 1\r
 } Pwm_NamedChannelsType;\r
 \r

diff --git a/boards/hcs12x_elmicro_tboard/examples/ledmaster/ledmaster_hcs12x_tboard.arxml b/boards/hcs12x_elmicro_tboard/examples/ledmaster/ledmaster_hcs12x_tboard.arxml
index 04922534a898b084ff2dc072cec4957d6f872648..d17713263072eb39318561ef93a2b2e8d4771755 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/examples/ledmaster/ledmaster_hcs12x_tboard.arxml
+++ b/boards/hcs12x_elmicro_tboard/examples/ledmaster/ledmaster_hcs12x_tboard.arxml
@@ -31,6 +31,7 @@
             <MODULE-REF DEST="MODULE-CONFIGURATION">/ledmaster_hcs12x_tboard/CanIf</MODULE-REF>\r
             <MODULE-REF DEST="MODULE-CONFIGURATION">/ledmaster_hcs12x_tboard/Com</MODULE-REF>\r
             <MODULE-REF DEST="MODULE-CONFIGURATION">/ledmaster_hcs12x_tboard/PduR</MODULE-REF>\r
+            <MODULE-REF DEST="MODULE-CONFIGURATION">/ledmaster_hcs12x_tboard/Adc</MODULE-REF>\r
           </MODULE-REFS>\r
         </ECU-CONFIGURATION>\r
         <ECU-SW-COMPOSITION UUID="be624f4a-3019-4509-ba8d-003cc27e8378">\r
@@ -3886,6 +3887,212 @@
             </CONTAINER>\r
           </CONTAINERS>\r
         </MODULE-CONFIGURATION>\r
+        <MODULE-CONFIGURATION UUID="b5e8c82f-c505-4cc4-9160-f9164610898f">\r
+          <SHORT-NAME>Adc</SHORT-NAME>\r
+          <ADMIN-DATA>\r
+            <SDGS>\r
+              <SDG />\r
+              <SDG GID="Arccore::ModuleOptions">\r
+                <SD GID="GENERATE_AND_VALIDATE">true</SD>\r
+                <SD GID="ARCCORE_EDITOR_VERSION">2.0.0</SD>\r
+              </SDG>\r
+            </SDGS>\r
+          </ADMIN-DATA>\r
+          <DEFINITION-REF DEST="MODULE-DEF">/ArcCore/Adc</DEFINITION-REF>\r
+          <CONTAINERS>\r
+            <CONTAINER UUID="0ffa3c7a-fda8-4881-bdec-9e52fd6230d2">\r
+              <SHORT-NAME>AdcConfigSet</SHORT-NAME>\r
+              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Adc/AdcConfigSet</DEFINITION-REF>\r
+              <SUB-CONTAINERS>\r
+                <CONTAINER UUID="4e456590-766e-4e68-b9a3-f07e795b8908">\r
+                  <SHORT-NAME>ADCMainUnit</SHORT-NAME>\r
+                  <ADMIN-DATA>\r
+                    <SDGS>\r
+                      <SDG GID="Arccore::IdentifiableOptions" />\r
+                    </SDGS>\r
+                  </ADMIN-DATA>\r
+                  <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit</DEFINITION-REF>\r
+                  <PARAMETER-VALUES>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/ArcAdcResolution</DEFINITION-REF>\r
+                      <VALUE>8_BIT</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/ArcAdcConvTime</DEFINITION-REF>\r
+                      <VALUE>16_CLOCKS</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                    <ENUMERATION-VALUE>\r
+                      <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/ArcAdcPrescaleDivideFactor</DEFINITION-REF>\r
+                      <VALUE>30</VALUE>\r
+                    </ENUMERATION-VALUE>\r
+                  </PARAMETER-VALUES>\r
+                  <SUB-CONTAINERS>\r
+                    <CONTAINER UUID="22555830-cc2c-4e85-b98a-01f82a181e0f">\r
+                      <SHORT-NAME>PotChannel</SHORT-NAME>\r
+                      <ADMIN-DATA>\r
+                        <SDGS>\r
+                          <SDG GID="Arccore::IdentifiableOptions" />\r
+                        </SDGS>\r
+                      </ADMIN-DATA>\r
+                      <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcChannel</DEFINITION-REF>\r
+                      <PARAMETER-VALUES>\r
+                        <INTEGER-VALUE>\r
+                          <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelConvTime</DEFINITION-REF>\r
+                          <VALUE>0</VALUE>\r
+                        </INTEGER-VALUE>\r
+                        <ENUMERATION-VALUE>\r
+                          <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/ArcAdcChannelId</DEFINITION-REF>\r
+                          <VALUE>ADC_CH2</VALUE>\r
+                        </ENUMERATION-VALUE>\r
+                        <INTEGER-VALUE>\r
+                          <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelRefVoltsrcHigh</DEFINITION-REF>\r
+                          <VALUE>0</VALUE>\r
+                        </INTEGER-VALUE>\r
+                        <INTEGER-VALUE>\r
+                          <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelRefVoltsrcLow</DEFINITION-REF>\r
+                          <VALUE>0</VALUE>\r
+                        </INTEGER-VALUE>\r
+                        <INTEGER-VALUE>\r
+                          <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelResolution</DEFINITION-REF>\r
+                          <VALUE>0</VALUE>\r
+                        </INTEGER-VALUE>\r
+                        <INTEGER-VALUE>\r
+                          <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcChannel/AdcChannelSampTime</DEFINITION-REF>\r
+                          <VALUE>0</VALUE>\r
+                        </INTEGER-VALUE>\r
+                      </PARAMETER-VALUES>\r
+                    </CONTAINER>\r
+                    <CONTAINER UUID="8980c64a-9e18-4f00-bcdf-c5ee9c170a2b">\r
+                      <SHORT-NAME>MainGroup</SHORT-NAME>\r
+                      <ADMIN-DATA>\r
+                        <SDGS>\r
+                          <SDG GID="Arccore::IdentifiableOptions" />\r
+                        </SDGS>\r
+                      </ADMIN-DATA>\r
+                      <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup</DEFINITION-REF>\r
+                      <PARAMETER-VALUES>\r
+                        <ENUMERATION-VALUE>\r
+                          <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcGroupAccessMode</DEFINITION-REF>\r
+                          <VALUE />\r
+                        </ENUMERATION-VALUE>\r
+                        <ENUMERATION-VALUE>\r
+                          <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcGroupConversionMode</DEFINITION-REF>\r
+                          <VALUE>ADC_CONV_MODE_CONTINUOUS</VALUE>\r
+                        </ENUMERATION-VALUE>\r
+                        <INTEGER-VALUE>\r
+                          <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcGroupId</DEFINITION-REF>\r
+                          <VALUE>0</VALUE>\r
+                        </INTEGER-VALUE>\r
+                        <INTEGER-VALUE>\r
+                          <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcGroupPriority</DEFINITION-REF>\r
+                          <VALUE>0</VALUE>\r
+                        </INTEGER-VALUE>\r
+                        <ENUMERATION-VALUE>\r
+                          <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcGroupReplacement</DEFINITION-REF>\r
+                          <VALUE />\r
+                        </ENUMERATION-VALUE>\r
+                        <ENUMERATION-VALUE>\r
+                          <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcGroupTriggSrc</DEFINITION-REF>\r
+                          <VALUE>ADC_TRIGG_SRC_HW</VALUE>\r
+                        </ENUMERATION-VALUE>\r
+                        <ENUMERATION-VALUE>\r
+                          <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcHwTrigSignal</DEFINITION-REF>\r
+                          <VALUE />\r
+                        </ENUMERATION-VALUE>\r
+                        <INTEGER-VALUE>\r
+                          <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcHwTrigTimer</DEFINITION-REF>\r
+                          <VALUE>0</VALUE>\r
+                        </INTEGER-VALUE>\r
+                        <FUNCTION-NAME-VALUE>\r
+                          <DEFINITION-REF DEST="FUNCTION-NAME-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcNotification</DEFINITION-REF>\r
+                          <VALUE />\r
+                        </FUNCTION-NAME-VALUE>\r
+                        <LINKER-SYMBOL-VALUE>\r
+                          <DEFINITION-REF DEST="LINKER-SYMBOL-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcResultBufferPointer</DEFINITION-REF>\r
+                          <VALUE />\r
+                        </LINKER-SYMBOL-VALUE>\r
+                        <ENUMERATION-VALUE>\r
+                          <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcStreamingBufferMode</DEFINITION-REF>\r
+                          <VALUE />\r
+                        </ENUMERATION-VALUE>\r
+                        <INTEGER-VALUE>\r
+                          <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcStreamingNumSamples</DEFINITION-REF>\r
+                          <VALUE>1</VALUE>\r
+                        </INTEGER-VALUE>\r
+                      </PARAMETER-VALUES>\r
+                      <REFERENCE-VALUES>\r
+                        <REFERENCE-VALUE>\r
+                          <DEFINITION-REF DEST="REFERENCE-PARAM-DEF">/ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcGroupDefinition</DEFINITION-REF>\r
+                          <VALUE-REF DEST="CONTAINER">/ledmaster_hcs12x_tboard/Adc/AdcConfigSet/ADCMainUnit/PotChannel</VALUE-REF>\r
+                        </REFERENCE-VALUE>\r
+                      </REFERENCE-VALUES>\r
+                    </CONTAINER>\r
+                  </SUB-CONTAINERS>\r
+                </CONTAINER>\r
+              </SUB-CONTAINERS>\r
+            </CONTAINER>\r
+            <CONTAINER UUID="663d4e48-0bc9-4d89-a026-d3d955221a24">\r
+              <SHORT-NAME>AdcGeneral</SHORT-NAME>\r
+              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Adc/AdcGeneral</DEFINITION-REF>\r
+              <PARAMETER-VALUES>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Adc/AdcGeneral/AdcDeInitApi</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Adc/AdcGeneral/AdcDevErrorDetect</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Adc/AdcGeneral/AdcEnableQueuing</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Adc/AdcGeneral/AdcEnableStartStopGroupApi</DEFINITION-REF>\r
+                  <VALUE>true</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Adc/AdcGeneral/AdcGrpNotifCapability</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Adc/AdcGeneral/AdcHwTriggerApi</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <ENUMERATION-VALUE>\r
+                  <DEFINITION-REF DEST="ENUMERATION-PARAM-DEF">/ArcCore/Adc/AdcGeneral/AdcPriorityImplementation</DEFINITION-REF>\r
+                  <VALUE />\r
+                </ENUMERATION-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Adc/AdcGeneral/AdcReadGroupApi</DEFINITION-REF>\r
+                  <VALUE>true</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Adc/AdcGeneral/AdcVersionInfoApi</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+              </PARAMETER-VALUES>\r
+            </CONTAINER>\r
+            <CONTAINER UUID="a508cf64-1927-4630-a01f-5115bd39fdc0">\r
+              <SHORT-NAME>AdcPublishedInformation</SHORT-NAME>\r
+              <DEFINITION-REF DEST="PARAM-CONF-CONTAINER-DEF">/ArcCore/Adc/AdcPublishedInformation</DEFINITION-REF>\r
+              <PARAMETER-VALUES>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Adc/AdcPublishedInformation/AdcChannelValueSigned</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <BOOLEAN-VALUE>\r
+                  <DEFINITION-REF DEST="BOOLEAN-PARAM-DEF">/ArcCore/Adc/AdcPublishedInformation/AdcGroupFirstChannelFixed</DEFINITION-REF>\r
+                  <VALUE>false</VALUE>\r
+                </BOOLEAN-VALUE>\r
+                <INTEGER-VALUE>\r
+                  <DEFINITION-REF DEST="INTEGER-PARAM-DEF">/ArcCore/Adc/AdcPublishedInformation/AdcMaxChannelResolution</DEFINITION-REF>\r
+                  <VALUE>0</VALUE>\r
+                </INTEGER-VALUE>\r
+              </PARAMETER-VALUES>\r
+            </CONTAINER>\r
+          </CONTAINERS>\r
+        </MODULE-CONFIGURATION>\r
       </ELEMENTS>\r
       <SUB-PACKAGES>\r
         <AR-PACKAGE UUID="3ee55bc9-1d64-4c83-9c19-7243e284be1a">\r

diff --git a/include/hc1x/Adc_ConfigTypes.h b/include/hc1x/Adc_ConfigTypes.h
index d92013332ca3aebcebe2de7f1c88bec289afb782..5698991f7a7c833ae09c6f479a5a0586c953a7e8 100644 (file)
--- a/include/hc1x/Adc_ConfigTypes.h
+++ b/include/hc1x/Adc_ConfigTypes.h
@@ -30,7 +30,7 @@ typedef enum
   ADC_CH5,\r
   ADC_CH6,\r
   ADC_CH7,\r
-  ADC_NOF_CHANNELS,\r
+  ADC_NBR_OF_CHANNELS,\r
 }Adc_ChannelType;\r
 \r
 /* Std-type, supplier defined */\r
@@ -79,6 +79,15 @@ typedef enum
   ADC_CONVERSION_TIME_16_CLOCKS\r
 }Adc_ConversionTimeType;\r
 \r
+/* Channel definitions, std container */\r
+typedef struct\r
+{\r
+  Adc_ConversionTimeType adcChannelConvTime;\r
+  // NOT SUPPORTED Adc_VoltageSourceType  adcChannelRefVoltSrcLow;\r
+  // NOT SUPPORTED Adc_VoltageSourceType  adcChannelRefVoltSrcHigh;\r
+  // NOT SUPPORTED Adc_ResolutionType     adcChannelResolution;\r
+  // NOT SUPPORTED Adc_CalibrationType    adcChannelCalibrationEnable;\r
+} Adc_ChannelConfigurationType;\r
 \r
 typedef enum\r
 {\r