From 70a18d2b7a2fc5c1b87b2e17077c8e1578ad5464 Mon Sep 17 00:00:00 2001 From: joek Date: Wed, 17 Nov 2010 10:22:32 +0100 Subject: [PATCH] Corrected code for ADC configuration on HCS12 (Tboard) --- arch/hc1x/hcs12d/drivers/Adc.c | 2 +- boards/hcs12_elmicro_card12/config/Adc_Cfg.h | 2 +- boards/hcs12x_elmicro_tboard/config/Adc_Cfg.c | 4 ++-- boards/hcs12x_elmicro_tboard/config/Adc_Cfg.h | 6 +++--- boards/hcs12x_elmicro_tboard/tboard_config.arxml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/hc1x/hcs12d/drivers/Adc.c b/arch/hc1x/hcs12d/drivers/Adc.c index 7b17124b..712b261b 100644 --- a/arch/hc1x/hcs12d/drivers/Adc.c +++ b/arch/hc1x/hcs12d/drivers/Adc.c @@ -159,7 +159,7 @@ Std_ReturnType Adc_ReadGroup (Adc_GroupType group, Adc_ValueGroupType *dataBuffe if (E_OK == Adc_CheckReadGroup (group)) { - if ((ADC_CONV_MODE_CONTINOUS == AdcConfigPtr->groupConfigPtr[group].conversionMode) && + if ((ADC_CONV_MODE_CONTINUOUS == AdcConfigPtr->groupConfigPtr[group].conversionMode) && ((ADC_STREAM_COMPLETED == AdcConfigPtr->groupConfigPtr[group].status->groupStatus) || (ADC_COMPLETED == AdcConfigPtr->groupConfigPtr[group].status->groupStatus))) { diff --git a/boards/hcs12_elmicro_card12/config/Adc_Cfg.h b/boards/hcs12_elmicro_card12/config/Adc_Cfg.h index 8bf60cd6..dd530b76 100644 --- a/boards/hcs12_elmicro_card12/config/Adc_Cfg.h +++ b/boards/hcs12_elmicro_card12/config/Adc_Cfg.h @@ -113,7 +113,7 @@ typedef enum { ADC_CONV_MODE_DISABLED, ADC_CONV_MODE_ONESHOT = 1, - ADC_CONV_MODE_CONTINOUS = 9, + ADC_CONV_MODE_CONTINUOUS = 9, } Adc_GroupConvModeType; typedef struct diff --git a/boards/hcs12x_elmicro_tboard/config/Adc_Cfg.c b/boards/hcs12x_elmicro_tboard/config/Adc_Cfg.c index dfd9a50e..2f81f1bb 100644 --- a/boards/hcs12x_elmicro_tboard/config/Adc_Cfg.c +++ b/boards/hcs12x_elmicro_tboard/config/Adc_Cfg.c @@ -9,7 +9,7 @@ * * * Generated by Arctic Studio (http://arccore.com) - * on Mon Nov 08 20:30:02 CET 2010 + * on Wed Nov 17 10:10:57 CET 2010 */ #include "Adc.h" @@ -37,7 +37,7 @@ const Adc_GroupDefType AdcGroupConfiguration [] = { { .conversionMode = ADC_CONV_MODE_CONTINUOUS, - .triggerSrc = ADC_TRIGG_SRC_HW, + .triggerSrc = ADC_TRIGG_SRC_SW, .groupCallback = Adc_ATDCallback, .channelList = Adc_ATDGroupChannelList, .resultBuffer = Adc_ATDGroupBuffer, diff --git a/boards/hcs12x_elmicro_tboard/config/Adc_Cfg.h b/boards/hcs12x_elmicro_tboard/config/Adc_Cfg.h index 13127896..6b1114bb 100644 --- a/boards/hcs12x_elmicro_tboard/config/Adc_Cfg.h +++ b/boards/hcs12x_elmicro_tboard/config/Adc_Cfg.h @@ -9,7 +9,7 @@ * * * Generated by Arctic Studio (http://arccore.com) - * on Mon Nov 08 20:30:02 CET 2010 + * on Wed Nov 17 10:10:57 CET 2010 */ @@ -24,8 +24,8 @@ #define ADC_DEINIT_API STD_OFF #define ADC_DEV_ERROR_DETECT STD_ON #define ADC_ENABLE_QUEUING STD_OFF -#define ADC_ENABLE_START_STOP_GROUP_API STD_OFF -#define ADC_GRP_NOTIF_CAPABILITY STD_OFF +#define ADC_ENABLE_START_STOP_GROUP_API STD_ON +#define ADC_GRP_NOTIF_CAPABILITY STD_ON #define ADC_HW_TRIGGER_API STD_OFF /* Not implemented. */ #define ADC_PRIORITY_IMPLEMENTATION ADC_PRIORITY_NONE #define ADC_READ_GROUP_API STD_ON diff --git a/boards/hcs12x_elmicro_tboard/tboard_config.arxml b/boards/hcs12x_elmicro_tboard/tboard_config.arxml index 2d863daa..688a8adc 100644 --- a/boards/hcs12x_elmicro_tboard/tboard_config.arxml +++ b/boards/hcs12x_elmicro_tboard/tboard_config.arxml @@ -2026,7 +2026,7 @@ /ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcGroupTriggSrc - ADC_TRIGG_SRC_HW + ADC_TRIGG_SRC_SW /ArcCore/Adc/AdcConfigSet/AdcHwUnit/AdcGroup/AdcHwTrigSignal @@ -2082,11 +2082,11 @@ /ArcCore/Adc/AdcGeneral/AdcEnableStartStopGroupApi - false + true /ArcCore/Adc/AdcGeneral/AdcGrpNotifCapability - false + true /ArcCore/Adc/AdcGeneral/AdcHwTriggerApi -- 2.39.2