aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32/f1
diff options
context:
space:
mode:
authorUwe Hermann2011-11-12 10:43:33 +0100
committerUwe Hermann2011-11-12 17:53:04 +0100
commit793bd23851a5319cb634bd18b1ceaa07d1ecd2e6 (patch)
treea561001b3048828e3b0eeadaf69b2eb110833b5e /examples/stm32/f1
parent905badef24c62d27898b85ef5fb3fe6ab0e13cee (diff)
mb525: Fix coding-style and comments.
Diffstat (limited to 'examples/stm32/f1')
-rw-r--r--examples/stm32/f1/mb525/fancyblink/README2
-rw-r--r--examples/stm32/f1/mb525/fancyblink/fancyblink.c4
-rw-r--r--examples/stm32/f1/mb525/pwmleds/README1
-rw-r--r--examples/stm32/f1/mb525/pwmleds/pwmleds.c45
4 files changed, 26 insertions, 26 deletions
diff --git a/examples/stm32/f1/mb525/fancyblink/README b/examples/stm32/f1/mb525/fancyblink/README
index 226cb21..497b689 100644
--- a/examples/stm32/f1/mb525/fancyblink/README
+++ b/examples/stm32/f1/mb525/fancyblink/README
@@ -6,5 +6,5 @@ This is a blink example program using libopencm3.
It's intended for the ST STM32-based MB525 eval board (see
http://www.st.com/stonline/products/literature/um/13472.htm for details).
-It should blink the LED on the board.
+It should blink the LEDs on the board.
diff --git a/examples/stm32/f1/mb525/fancyblink/fancyblink.c b/examples/stm32/f1/mb525/fancyblink/fancyblink.c
index 54ef47c..9efce8f 100644
--- a/examples/stm32/f1/mb525/fancyblink/fancyblink.c
+++ b/examples/stm32/f1/mb525/fancyblink/fancyblink.c
@@ -31,7 +31,7 @@ void clock_setup(void)
void gpio_setup(void)
{
- /* Set GPIO6 (in GPIO port C) to 'output push-pull'. */
+ /* Set GPIO6/7/8/9 (in GPIO port C) to 'output push-pull'. */
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO6 | GPIO7 | GPIO8 | GPIO9);
}
@@ -43,7 +43,7 @@ int main(void)
clock_setup();
gpio_setup();
- /* Blink the LED (PC12) on the board. */
+ /* Blink the LEDs on the board. */
gpio_set(GPIOC, GPIO6);
while (1) {
gpio_toggle(GPIOC, GPIO6); /* LED on/off */
diff --git a/examples/stm32/f1/mb525/pwmleds/README b/examples/stm32/f1/mb525/pwmleds/README
index b2a6d95..e9c37e0 100644
--- a/examples/stm32/f1/mb525/pwmleds/README
+++ b/examples/stm32/f1/mb525/pwmleds/README
@@ -6,5 +6,4 @@ This is a PWM based LED fading example using libopencm3.
It's intended for the ST STM32-based MB525 eval board (see
http://www.st.com/stonline/products/literature/um/13472.htm for details).
-It should blink the LED on the board.
diff --git a/examples/stm32/f1/mb525/pwmleds/pwmleds.c b/examples/stm32/f1/mb525/pwmleds/pwmleds.c
index 5505231..9e3d363 100644
--- a/examples/stm32/f1/mb525/pwmleds/pwmleds.c
+++ b/examples/stm32/f1/mb525/pwmleds/pwmleds.c
@@ -156,7 +156,7 @@ static const u16 gamma_table_2_2[] = {
49275, 49761, 50249, 50739, 51232, 51728, 52226, 52727,
53230, 53736, 54245, 54756, 55270, 55787, 56306, 56828,
57352, 57879, 58409, 58941, 59476, 60014, 60554, 61097,
- 61642, 62190, 62741, 63295, 63851, 64410, 64971, 65535
+ 61642, 62190, 62741, 63295, 63851, 64410, 64971, 65535,
};
#endif
@@ -251,29 +251,30 @@ void clock_setup(void)
void gpio_setup(void)
{
/*
- * Set GPIO6 (in GPIO port C) to
+ * Set GPIO_TIM1_CH1/2/3/4 (in GPIO port A) to
* 'output alternate function push-pull'.
*/
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
- GPIO_CNF_OUTPUT_ALTFN_PUSHPULL,
- GPIO_TIM1_CH1 |
- GPIO_TIM1_CH2 |
- GPIO_TIM1_CH3 |
- GPIO_TIM1_CH4);
+ GPIO_CNF_OUTPUT_ALTFN_PUSHPULL,
+ GPIO_TIM1_CH1 | GPIO_TIM1_CH2 |
+ GPIO_TIM1_CH3 | GPIO_TIM1_CH4);
- /* Remap TIM1:
+ /*
+ * Remap TIM1:
* CH1 -> PC6
* CH2 -> PC7
* CH3 -> PC8
* CH4 -> PC9
*/
- //AFIO_MAPR |= AFIO_MAPR_TIM3_REMAP_FULL_REMAP;
+ // AFIO_MAPR |= AFIO_MAPR_TIM3_REMAP_FULL_REMAP;
}
+
void tim_setup(void)
{
#if 0
TIM1_CR1 = TIM_CR1_CMS_CENTER_1 | TIM_CR1_ARPE;
- TIM1_CCMR1 = TIM_CCMR1_OC1M_PWM1 | TIM_CCMR1_OC1PE | TIM_CCMR1_OC2M_PWM1 | TIM_CCMR1_OC2PE;
+ TIM1_CCMR1 = TIM_CCMR1_OC1M_PWM1 | TIM_CCMR1_OC1PE |
+ TIM_CCMR1_OC2M_PWM1 | TIM_CCMR1_OC2PE;
TIM1_CCMR2 = TIM_CCMR2_OC3M_PWM1 | TIM_CCMR2_OC3PE;
TIM1_CCER &= ~TIM_CCER_CC1P;
@@ -471,18 +472,18 @@ int main(void)
if (j == 100) {
j = 0;
switch (k += kd) {
- case 0:
- j0 = 255;
- break;
- case 1:
- j1 = 255;
- break;
- case 2:
- j2 = 255;
- break;
- case 3:
- j3 = 255;
- break;
+ case 0:
+ j0 = 255;
+ break;
+ case 1:
+ j1 = 255;
+ break;
+ case 2:
+ j2 = 255;
+ break;
+ case 3:
+ j3 = 255;
+ break;
}
if (k == 3)
kd =- 1;