diff options
Diffstat (limited to 'demos')
-rw-r--r-- | demos/ARMCM3-STM32F100-DISCOVERY-GCC/main.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/demos/ARMCM3-STM32F100-DISCOVERY-GCC/main.c b/demos/ARMCM3-STM32F100-DISCOVERY-GCC/main.c index 4b5978775..9e2ee3a6b 100644 --- a/demos/ARMCM3-STM32F100-DISCOVERY-GCC/main.c +++ b/demos/ARMCM3-STM32F100-DISCOVERY-GCC/main.c @@ -32,7 +32,7 @@ static void spicb(SPIDriver *spip); #define ADC_GRP1_BUF_DEPTH 4
/*
- * ADC samples buffer. + * ADC samples buffer.
*/
static adcsample_t samples[ADC_GRP1_NUM_CHANNELS * ADC_GRP1_BUF_DEPTH];
@@ -57,15 +57,9 @@ static const ADCConversionGroup adcgrpcfg = { };
/*
- * ADC configuration structure, empty for STM32, there is nothing to configure.
- */
-static const ADCConfig adccfg = {
-};
-
-/*
* PWM configuration structure.
* Cyclic callback enabled, channels 3 and 4 enabled without callbacks,
- * the active state is a logic one. + * the active state is a logic one.
*/
static PWMConfig pwmcfg = {
pwmpcb,
@@ -113,7 +107,7 @@ static void pwmpcb(PWMDriver *pwmp) { /*
* ADC end conversion callback.
* The PWM channels are reprogrammed using the latest ADC samples.
- * The latest samples are transmitted into a single SPI transaction. + * The latest samples are transmitted into a single SPI transaction.
*/
void adccb(ADCDriver *adcp, adcsample_t *buffer, size_t n) {
@@ -143,7 +137,7 @@ void adccb(ADCDriver *adcp, adcsample_t *buffer, size_t n) { }
/*
- * SPI end transfer callback. + * SPI end transfer callback.
*/
static void spicb(SPIDriver *spip) {
@@ -192,13 +186,13 @@ int main(void) { /*
* If the user button is pressed after the reset then the test suite is
* executed immediately before activating the various device drivers in
- * order to not alter the benchmark scores. + * order to not alter the benchmark scores.
*/
if (palReadPad(GPIOA, GPIOA_BUTTON))
TestThread(&SD1);
/*
- * Initializes the SPI driver 1. + * Initializes the SPI driver 1.
*/
spiStart(&SPID1, &spicfg);
@@ -217,7 +211,7 @@ int main(void) { * Initializes the ADC driver 1 and performs a conversion.
* The pin PC0 on the port GPIOC is programmed as analog input.
*/
- adcStart(&ADCD1, &adccfg);
+ adcStart(&ADCD1, NULL);
palSetGroupMode(GPIOC, PAL_PORT_BIT(0), PAL_MODE_INPUT_ANALOG);
adcConvert(&ADCD1, &adcgrpcfg, samples, ADC_GRP1_BUF_DEPTH);
@@ -237,5 +231,4 @@ int main(void) { TestThread(&SD1);
chThdSleepMilliseconds(500);
}
- return 0;
}
|