From 91e4dee81eef472b69d7b5fe321d8c16b4a0ac59 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Thu, 31 Mar 2011 12:35:42 +0000 Subject: Generic improvements to the GPT driver organization. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2854 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/ARMCM3-STM32F100-DISCOVERY/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'demos') diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/main.c b/demos/ARMCM3-STM32F100-DISCOVERY/main.c index d638b5926..bc7e5f632 100644 --- a/demos/ARMCM3-STM32F100-DISCOVERY/main.c +++ b/demos/ARMCM3-STM32F100-DISCOVERY/main.c @@ -63,6 +63,8 @@ static const ADCConversionGroup adcgrpcfg = { * the active state is a logic one. */ static PWMConfig pwmcfg = { + 10000, /* 10KHz PWM clock frequency. */ + 10000, /* PWM period 1S (in ticks). */ pwmpcb, { {PWM_OUTPUT_DISABLED, NULL}, @@ -71,8 +73,6 @@ static PWMConfig pwmcfg = { {PWM_OUTPUT_ACTIVE_HIGH, NULL} }, /* HW dependent part.*/ - PWM_COMPUTE_PSC(STM32_TIMCLK1, 10000), /* 10KHz PWM clock frequency. */ - PWM_COMPUTE_ARR(10000, 1000000000), /* PWM period 1S (in nS). */ 0 }; @@ -115,7 +115,7 @@ void adccb(ADCDriver *adcp, adcsample_t *buffer, size_t n) { (void) buffer; (void) n; /* Note, only in the ADC_COMPLETE state because the ADC driver fires an intermediate callback when the buffer is half full.*/ - if (adcp->ad_state == ADC_COMPLETE) { + if (adcp->state == ADC_COMPLETE) { adcsample_t avg_ch1, avg_ch2; /* Calculates the average values from the ADC samples.*/ -- cgit v1.2.3