aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32f1/obldc
diff options
context:
space:
mode:
authorStephen Caudle2011-10-12 23:58:27 -0400
committerStephen Caudle2011-10-12 23:58:27 -0400
commit8ceeb99902786041184800248eca4d7f3741d9bf (patch)
tree1c054a31f93ec4234db5444c056ba1bc0ce8d3b9 /examples/stm32f1/obldc
parent878c0948719436f36862feef3908ed0c78cccbdd (diff)
Fix stm32f1 filenames and path
Diffstat (limited to 'examples/stm32f1/obldc')
-rw-r--r--examples/stm32f1/obldc/can/can.c6
-rw-r--r--examples/stm32f1/obldc/can/can.ld2
-rw-r--r--examples/stm32f1/obldc/led/led.c4
-rw-r--r--examples/stm32f1/obldc/led/led.ld2
-rw-r--r--examples/stm32f1/obldc/pwmleds/pwmleds.c4
-rw-r--r--examples/stm32f1/obldc/pwmleds/pwmleds.ld2
-rw-r--r--examples/stm32f1/obldc/systick/systick.c6
-rw-r--r--examples/stm32f1/obldc/systick/systick.ld2
-rw-r--r--examples/stm32f1/obldc/usart/usart.c6
-rw-r--r--examples/stm32f1/obldc/usart/usart.ld2
-rw-r--r--examples/stm32f1/obldc/usart_irq/usart_irq.c6
-rw-r--r--examples/stm32f1/obldc/usart_irq/usart_irq.ld2
12 files changed, 22 insertions, 22 deletions
diff --git a/examples/stm32f1/obldc/can/can.c b/examples/stm32f1/obldc/can/can.c
index 6c63c48..00a05dc 100644
--- a/examples/stm32f1/obldc/can/can.c
+++ b/examples/stm32f1/obldc/can/can.c
@@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/systick.h>
#include <libopencm3/stm32/can.h>
diff --git a/examples/stm32f1/obldc/can/can.ld b/examples/stm32f1/obldc/can/can.ld
index c076521..4f609a8 100644
--- a/examples/stm32f1/obldc/can/can.ld
+++ b/examples/stm32f1/obldc/can/can.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
diff --git a/examples/stm32f1/obldc/led/led.c b/examples/stm32f1/obldc/led/led.c
index 09ae89d..db479b2 100644
--- a/examples/stm32f1/obldc/led/led.c
+++ b/examples/stm32f1/obldc/led/led.c
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
/* Set STM32 to 72 MHz. */
void clock_setup(void)
diff --git a/examples/stm32f1/obldc/led/led.ld b/examples/stm32f1/obldc/led/led.ld
index 7899773..edb52c5 100644
--- a/examples/stm32f1/obldc/led/led.ld
+++ b/examples/stm32f1/obldc/led/led.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
diff --git a/examples/stm32f1/obldc/pwmleds/pwmleds.c b/examples/stm32f1/obldc/pwmleds/pwmleds.c
index 146bb56..faa9aa0 100644
--- a/examples/stm32f1/obldc/pwmleds/pwmleds.c
+++ b/examples/stm32f1/obldc/pwmleds/pwmleds.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/timer.h>
// #define COMPARE
diff --git a/examples/stm32f1/obldc/pwmleds/pwmleds.ld b/examples/stm32f1/obldc/pwmleds/pwmleds.ld
index 7ea2b92..3409b98 100644
--- a/examples/stm32f1/obldc/pwmleds/pwmleds.ld
+++ b/examples/stm32f1/obldc/pwmleds/pwmleds.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
diff --git a/examples/stm32f1/obldc/systick/systick.c b/examples/stm32f1/obldc/systick/systick.c
index 3d75c4a..263230f 100644
--- a/examples/stm32f1/obldc/systick/systick.c
+++ b/examples/stm32f1/obldc/systick/systick.c
@@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/systick.h>
diff --git a/examples/stm32f1/obldc/systick/systick.ld b/examples/stm32f1/obldc/systick/systick.ld
index da4f2b3..a3195d2 100644
--- a/examples/stm32f1/obldc/systick/systick.ld
+++ b/examples/stm32f1/obldc/systick/systick.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
diff --git a/examples/stm32f1/obldc/usart/usart.c b/examples/stm32f1/obldc/usart/usart.c
index ea5ec0e..b2efe71 100644
--- a/examples/stm32f1/obldc/usart/usart.c
+++ b/examples/stm32f1/obldc/usart/usart.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h>
void clock_setup(void)
@@ -47,7 +47,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_RE_TX);
/* Setup UART parameters. */
- usart_set_baudrate(USART1, 230400);
+ usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX);
diff --git a/examples/stm32f1/obldc/usart/usart.ld b/examples/stm32f1/obldc/usart/usart.ld
index 7899773..edb52c5 100644
--- a/examples/stm32f1/obldc/usart/usart.ld
+++ b/examples/stm32f1/obldc/usart/usart.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
diff --git a/examples/stm32f1/obldc/usart_irq/usart_irq.c b/examples/stm32f1/obldc/usart_irq/usart_irq.c
index 82320c1..20ff0a1 100644
--- a/examples/stm32f1/obldc/usart_irq/usart_irq.c
+++ b/examples/stm32f1/obldc/usart_irq/usart_irq.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/nvic.h>
@@ -52,7 +52,7 @@ void usart_setup(void)
GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RE_RX);
/* Setup UART parameters. */
- usart_set_baudrate(USART1, 230400);
+ usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_parity(USART1, USART_PARITY_NONE);
diff --git a/examples/stm32f1/obldc/usart_irq/usart_irq.ld b/examples/stm32f1/obldc/usart_irq/usart_irq.ld
index 7899773..edb52c5 100644
--- a/examples/stm32f1/obldc/usart_irq/usart_irq.ld
+++ b/examples/stm32f1/obldc/usart_irq/usart_irq.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld