electronics
/
libopencm3
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix stm32f1 filenames and path

This commit is contained in:
Stephen Caudle 2011-10-12 23:58:27 -04:00
parent 878c094871
commit 8ceeb99902
95 changed files with 184 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/stm32f1/Makefile.include
View File

@ -25,12 +25,12 @@ LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump
# Uncomment this line if you want to use the installed (not local) library.
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
#TOOLCHAIN_DIR = ../../../..
#TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
TOOLCHAIN_DIR = ../../../..
CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
-fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD
-fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD -DSTM32F1
LDSCRIPT = $(BINARY).ld
LDFLAGS += -lc -lnosys -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32 \
LDFLAGS += -lc -lnosys -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32f1 \
-T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \
-mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
OBJS += $(BINARY).o
@ -75,13 +75,13 @@ flash: $(BINARY).flash
@#printf " OBJDUMP $(*).list\n"
$(Q)$(OBJDUMP) -S $(*).elf > $(*).list
foo.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_stm32.a
foo.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32f1/libopencm3_stm32f1.a
@#printf " LD $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(LD) -o foo.elf $(OBJS) -lopencm3_stm32 $(LDFLAGS)
$(Q)$(LD) -o foo.elf $(OBJS) -lopencm3_stm32f1 $(LDFLAGS)
%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_stm32.a
%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32f1/libopencm3_stm32f1.a
@#printf " LD $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32 $(LDFLAGS)
$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32f1 $(LDFLAGS)
%.o: %.c Makefile
@#printf " CC $(subst $(shell pwd)/,,$(@))\n"

4
examples/stm32f1/lisa-m/fancyblink/fancyblink.c
View File

@ -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)

2
examples/stm32f1/lisa-m/fancyblink/fancyblink.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

8
examples/stm32f1/lisa-m/usb_dfu/usbdfu.c
View File

@ -18,10 +18,10 @@
*/
#include <string.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/flash.h>
#include <libopencm3/stm32/scb.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/dfu.h>

2
examples/stm32f1/lisa-m/usb_dfu/usbdfu.ld
View File

@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/lisa-m/usb_hid/usbhid.c
View File

@ -19,8 +19,8 @@
*/
#include <stdlib.h>
#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/systick.h>
#include <libopencm3/stm32/otg_fs.h>
#include <libopencm3/usb/usbd.h>
@ -30,7 +30,7 @@
#define INCLUDE_DFU_INTERFACE
#ifdef INCLUDE_DFU_INTERFACE
#include <libopencm3/stm32/scb.h>
#include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/dfu.h>
#endif

2
examples/stm32f1/lisa-m/usb_hid/usbhid.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/mb525/fancyblink/fancyblink.c
View File

@ -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>
void clock_setup(void)
{

2
examples/stm32f1/mb525/fancyblink/fancyblink.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/mb525/pwmleds/pwmleds.c
View File

@ -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

2
examples/stm32f1/mb525/pwmleds/pwmleds.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/obldc/can/can.c
View File

@ -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>

2
examples/stm32f1/obldc/can/can.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/obldc/led/led.c
View File

@ -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)

2
examples/stm32f1/obldc/led/led.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/obldc/pwmleds/pwmleds.c
View File

@ -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

2
examples/stm32f1/obldc/pwmleds/pwmleds.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/obldc/systick/systick.c
View File

@ -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>

2
examples/stm32f1/obldc/systick/systick.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/obldc/usart/usart.c
View File

@ -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);

2
examples/stm32f1/obldc/usart/usart.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/obldc/usart_irq/usart_irq.c
View File

@ -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);

2
examples/stm32f1/obldc/usart_irq/usart_irq.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

10
examples/stm32f1/other/adc_temperature_sensor/adc.c
View File

@ -17,11 +17,11 @@
* 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/f1/adc.h>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/adc.h>
void usart_setup(void)
{
@ -34,7 +34,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */
usart_set_baudrate(USART1, 115200);
usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency);
usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX_RX);

2
examples/stm32f1/other/adc_temperature_sensor/adc.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

10
examples/stm32f1/other/dma_mem2mem/dma.c
View File

@ -17,11 +17,11 @@
* 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/f1/dma.h>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/dma.h>
void usart_setup(void)
{
@ -34,7 +34,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */
usart_set_baudrate(USART1, 115200);
usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency);
usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX_RX);

2
examples/stm32f1/other/dma_mem2mem/dma.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

2
examples/stm32f1/other/dogm128/dogm128.h
View File

@ -21,7 +21,7 @@
#define DOGM128_H
#include <libopencm3/cm3/common.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/spi.h>
/* PB10 GPIO - ~RESET

6
examples/stm32f1/other/dogm128/main.c
View File

@ -17,9 +17,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/usart.h>
#include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/nvic.h>

2
examples/stm32f1/other/dogm128/main.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

8
examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
View File

@ -17,9 +17,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/usart.h>
#include <libopencm3/stm32/i2c.h>
#include "stts75.h"
@ -35,7 +35,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */
usart_set_baudrate(USART1, 115200);
usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency);
usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX_RX);

2
examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

8
examples/stm32f1/other/rtc/rtc.c
View File

@ -17,10 +17,10 @@
* 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/f1/rtc.h>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/rtc.h>
#include <libopencm3/stm32/pwr.h>
#include <libopencm3/stm32/nvic.h>
@ -43,7 +43,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */
usart_set_baudrate(USART1, 38400);
usart_set_baudrate(USART1, 38400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX);

2
examples/stm32f1/other/rtc/rtc.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/other/systick/systick.c
View File

@ -17,9 +17,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>

2
examples/stm32f1/other/systick/systick.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/other/timer_interrupt/timer.c
View File

@ -17,9 +17,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/timer.h>
#include <libopencm3/stm32/nvic.h>

2
examples/stm32f1/other/timer_interrupt/timer.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/other/usb_cdcacm/cdcacm.c
View File

@ -18,8 +18,8 @@
*/
#include <stdlib.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/cdc.h>

2
examples/stm32f1/other/usb_cdcacm/cdcacm.ld
View File

@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

8
examples/stm32f1/other/usb_dfu/usbdfu.c
View File

@ -18,10 +18,10 @@
*/
#include <string.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/flash.h>
#include <libopencm3/stm32/scb.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/dfu.h>

2
examples/stm32f1/other/usb_dfu/usbdfu.ld
View File

@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/other/usb_hid/usbhid.c
View File

@ -18,8 +18,8 @@
*/
#include <stdlib.h>
#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/systick.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h>
@ -28,7 +28,7 @@
#define INCLUDE_DFU_INTERFACE
#ifdef INCLUDE_DFU_INTERFACE
#include <libopencm3/stm32/scb.h>
#include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/dfu.h>
#endif

2
examples/stm32f1/other/usb_hid/usbhid.ld
View File

@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-discovery/button/button.c
View File

@ -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>
u16 exti_line_state;

2
examples/stm32f1/stm32-discovery/button/button.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-discovery/fancyblink/fancyblink.c
View File

@ -19,8 +19,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 24 MHz. */
void clock_setup(void)

2
examples/stm32f1/stm32-discovery/fancyblink/fancyblink.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-discovery/miniblink/miniblink.c
View File

@ -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>
void gpio_setup(void)
{

2
examples/stm32f1/stm32-discovery/miniblink/miniblink.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/stm32-discovery/rtc/rtc.c
View File

@ -18,10 +18,10 @@
* 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/f1/rtc.h>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/rtc.h>
#include <libopencm3/stm32/pwr.h>
#include <libopencm3/stm32/nvic.h>

2
examples/stm32f1/stm32-discovery/rtc/rtc.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-discovery/usart/usart.c
View File

@ -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)

2
examples/stm32f1/stm32-discovery/usart/usart.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-h103/button/button.c
View File

@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/exti.h>
u16 exti_line_state;

2
examples/stm32f1/stm32-h103/button/button.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-h103/exti_both/exti_both.c
View File

@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/exti.h>
u16 exti_line_state;

2
examples/stm32f1/stm32-h103/exti_both/exti_both.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
View File

@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/exti.h>
#define FALLING 0

2
examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-h103/fancyblink/fancyblink.c
View File

@ -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>
/* Set STM32 to 72 MHz. */
void clock_setup(void)

2
examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-h103/led_stripe/led_stripe.c
View File

@ -26,8 +26,8 @@
#include <stdlib.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#define SPI_BANK GPIOB
#define SCLK_PIN GPIO13

2
examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-h103/miniblink/miniblink.c
View File

@ -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>
void gpio_setup(void)
{

2
examples/stm32f1/stm32-h103/miniblink/miniblink.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c
View File

@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/exti.h>
#define FALLING 0

2
examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

2
examples/stm32f1/stm32-h103/spi/spi.c
View File

@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/spi.h>
void clock_setup(void)

2
examples/stm32f1/stm32-h103/spi/spi.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/stm32-h103/timer/timer.c
View File

@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/exti.h>
u16 frequency_sequence[18] = {

2
examples/stm32f1/stm32-h103/timer/timer.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-h103/traceswo/traceswo.c
View File

@ -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/dbgmcu.h>
#include <libopencm3/cm3/scs.h>

2
examples/stm32f1/stm32-h103/traceswo/traceswo.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

10
examples/stm32f1/stm32-h103/usart/usart.c
View File

@ -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)
@ -40,7 +40,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */
usart_set_baudrate(USART1, 38400);
usart_set_baudrate(USART1, 38400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX);
@ -55,7 +55,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX);
/* Setup UART parameters. */
usart_set_baudrate(USART2, 38400);
usart_set_baudrate(USART2, 38400, rcc_ppre1_frequency);
usart_set_databits(USART2, 8);
usart_set_stopbits(USART2, USART_STOPBITS_1);
usart_set_mode(USART2, USART_MODE_TX);
@ -70,7 +70,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART3_TX);
/* Setup UART parameters. */
usart_set_baudrate(USART3, 38400);
usart_set_baudrate(USART3, 38400, rcc_ppre1_frequency);
usart_set_databits(USART3, 8);
usart_set_stopbits(USART3, USART_STOPBITS_1);
usart_set_mode(USART3, USART_MODE_TX);

2
examples/stm32f1/stm32-h103/usart/usart.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/stm32-h103/usart_irq/usart_irq.c
View File

@ -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>
@ -49,7 +49,7 @@ void usart_setup(void)
GPIO_CNF_INPUT_FLOAT, GPIO_USART1_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);

2
examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
View File

@ -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>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/systick.h>
@ -145,7 +145,7 @@ void usart_setup(void)
GPIO_CNF_INPUT_FLOAT, GPIO_USART1_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);

2
examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/stm32-h103/usart_printf/usart_printf.c
View File

@ -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>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/nvic.h>
@ -46,7 +46,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_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_parity(USART1, USART_PARITY_NONE);

2
examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c
View File

@ -18,8 +18,8 @@
*/
#include <stdlib.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/cdc.h>

2
examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

8
examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
View File

@ -18,10 +18,10 @@
*/
#include <string.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/flash.h>
#include <libopencm3/stm32/scb.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/dfu.h>

2
examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld
View File

@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

6
examples/stm32f1/stm32-h103/usb_hid/usbhid.c
View File

@ -18,8 +18,8 @@
*/
#include <stdlib.h>
#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/systick.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h>
@ -28,7 +28,7 @@
#define INCLUDE_DFU_INTERFACE
#ifdef INCLUDE_DFU_INTERFACE
#include <libopencm3/stm32/scb.h>
#include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/dfu.h>
#endif

2
examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

8
examples/stm32f1/stm32-h103/usb_iap/usbiap.c
View File

@ -18,10 +18,10 @@
*/
#include <string.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/flash.h>
#include <libopencm3/stm32/scb.h>
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/dfu.h>

2
examples/stm32f1/stm32-h103/usb_iap/usbiap.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-h107/fancyblink/fancyblink.c
View File

@ -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)

2
examples/stm32f1/stm32-h107/fancyblink/fancyblink.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

4
examples/stm32f1/stm32-h107/usb_simple/usb_simple.c
View File

@ -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/usb/usbd.h>

2
examples/stm32f1/stm32-h107/usb_simple/usb_simple.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f1.ld

2
examples/stm32f2/jobygps/usart_printf/usart_printf.ld
View File

@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
INCLUDE libopencm3_stm32.ld
INCLUDE libopencm3_stm32f2.ld