jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'stm32fx' of https://github.com/doceme/libopenstm32 into stm32f2

Browse Source 
Conflicts:
	Makefile
	examples/stm32/lisa-m/fancyblink/fancyblink.ld
	examples/stm32/lisa-m/usb_hid/usbhid.ld
	examples/stm32/mb525/fancyblink/fancyblink.ld
	examples/stm32/obldc/usart_irq/usart_irq.ld
	examples/stm32/other/usb_dfu/usbdfu.c
	examples/stm32/stm32-h103/fancyblink/fancyblink.ld
	examples/stm32/stm32-h103/usart_irq/usart_irq.ld
	examples/stm32/stm32-h103/usb_dfu/usbdfu.c
	examples/stm32/stm32-h103/usb_hid/usbhid.ld
	examples/stm32f1/Makefile.include
	examples/stm32f1/lisa-m/fancyblink/fancyblink.ld
	examples/stm32f1/lisa-m/usb_hid/usbhid.ld
	examples/stm32f1/mb525/fancyblink/fancyblink.ld
	examples/stm32f1/obldc/usart_irq/usart_irq.ld
	examples/stm32f1/other/usb_dfu/usbdfu.c
	examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
	examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
	examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
	examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
	examples/stm32f2/jobygps/usart_printf/usart_printf.ld
	lib/lm3s/Makefile
	lib/lpc13xx/Makefile
	lib/stm32f1/Makefile
This commit is contained in:
Fergus Noble 2011-10-13 00:11:32 -07:00
commit ae44add1b6
103 changed files with 243 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -17,11 +17,12 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
PREFIX ?= arm-none-eabi PREFIX ?= arm-none-eabi
# PREFIX ?= arm-elf #PREFIX ?= arm-elf
DESTDIR ?= /usr/local DESTDIR ?= /usr/local
INCDIR = $(DESTDIR)/$(PREFIX)/include INCDIR = $(DESTDIR)/$(PREFIX)/include
LIBDIR = $(DESTDIR)/$(PREFIX)/lib LIBDIR = $(DESTDIR)/$(PREFIX)/lib
SHAREDIR = $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts
INSTALL = install INSTALL = install
TARGETS = stm32f1 stm32f2 lpc13xx lm3s TARGETS = stm32f1 stm32f2 lpc13xx lm3s
@ -57,11 +58,14 @@ install: lib
@printf " INSTALL headers\n" @printf " INSTALL headers\n"
$(Q)$(INSTALL) -d $(INCDIR)/libopencm3 $(Q)$(INSTALL) -d $(INCDIR)/libopencm3
$(Q)$(INSTALL) -d $(LIBDIR) $(Q)$(INSTALL) -d $(LIBDIR)
$(Q)$(INSTALL) -d $(SHAREDIR)
$(Q)cp -r include/libopencm3/* $(INCDIR)/libopencm3 $(Q)cp -r include/libopencm3/* $(INCDIR)/libopencm3
@printf " INSTALL libs\n" @printf " INSTALL libs\n"
$(Q)$(INSTALL) -m 0644 lib/*/*.a $(LIBDIR) $(Q)$(INSTALL) -m 0644 lib/*/*.a $(LIBDIR)
@printf " INSTALL ldscripts\n" @printf " INSTALL ldscripts\n"
$(Q)$(INSTALL) -m 0644 lib/*/*.ld $(LIBDIR) $(Q)$(INSTALL) -m 0644 lib/*/*.ld $(LIBDIR)
@printf " INSTALL scripts\n"
$(Q)$(INSTALL) -m 0644 scripts/* $(SHAREDIR)
clean: clean:
$(Q)for i in $(addprefix lib/,$(TARGETS)) \ $(Q)for i in $(addprefix lib/,$(TARGETS)) \

4
examples/lm3s/Makefile.include
View File

@ -18,8 +18,8 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
# PREFIX ?= arm-none-eabi PREFIX ?= arm-none-eabi
PREFIX ?= arm-elf #PREFIX ?= arm-elf
CC = $(PREFIX)-gcc CC = $(PREFIX)-gcc
LD = $(PREFIX)-gcc LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy OBJCOPY = $(PREFIX)-objcopy

4
examples/lpc13xx/Makefile.include
View File

@ -18,8 +18,8 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
# PREFIX ?= arm-none-eabi PREFIX ?= arm-none-eabi
PREFIX ?= arm-elf #PREFIX ?= arm-elf
CC = $(PREFIX)-gcc CC = $(PREFIX)-gcc
LD = $(PREFIX)-gcc LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy OBJCOPY = $(PREFIX)-objcopy

16
examples/stm32f1/Makefile.include
View File

@ -25,12 +25,12 @@ LD = $(PREFIX)-gcc
OBJCOPY = $(PREFIX)-objcopy OBJCOPY = $(PREFIX)-objcopy
OBJDUMP = $(PREFIX)-objdump OBJDUMP = $(PREFIX)-objdump
# Uncomment this line if you want to use the installed (not local) library. # Uncomment this line if you want to use the installed (not local) library.
TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX) #TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
#TOOLCHAIN_DIR = ../../../.. TOOLCHAIN_DIR = ../../../..
CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \ 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 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 \ -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \
-mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
OBJS += $(BINARY).o OBJS += $(BINARY).o
@ -75,13 +75,13 @@ flash: $(BINARY).flash
@#printf " OBJDUMP $(*).list\n" @#printf " OBJDUMP $(*).list\n"
$(Q)$(OBJDUMP) -S $(*).elf > $(*).list $(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" @#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" @#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 %.o: %.c Makefile
@#printf " CC $(subst $(shell pwd)/,,$(@))\n" @#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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
void clock_setup(void) 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 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 <string.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/scb.h> #include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/dfu.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 the common ld script. */
INCLUDE libopencm3_stm32.ld INCLUDE libopencm3_stm32f1.ld

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

@ -2,6 +2,7 @@
* This file is part of the libopencm3 project. * This file is part of the libopencm3 project.
* *
* Copyright (C) 2010 Gareth McMullin <gareth@blacksphere.co.nz> * Copyright (C) 2010 Gareth McMullin <gareth@blacksphere.co.nz>
* Copyright (C) 2011 Piotr Esden-Tempski <piotr@esden.net>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -18,9 +19,10 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/systick.h> #include <libopencm3/stm32/systick.h>
#include <libopencm3/stm32/otg_fs.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h> #include <libopencm3/usb/hid.h>
@ -28,25 +30,25 @@
#define INCLUDE_DFU_INTERFACE #define INCLUDE_DFU_INTERFACE
#ifdef INCLUDE_DFU_INTERFACE #ifdef INCLUDE_DFU_INTERFACE
#include <libopencm3/stm32/scb.h> #include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/dfu.h> #include <libopencm3/usb/dfu.h>
#endif #endif
const struct usb_device_descriptor dev = { const struct usb_device_descriptor dev = {
.bLength = USB_DT_DEVICE_SIZE, .bLength = USB_DT_DEVICE_SIZE,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = 0x0200, .bcdUSB = 0x0200,
.bDeviceClass = 0, .bDeviceClass = 0,
.bDeviceSubClass = 0, .bDeviceSubClass = 0,
.bDeviceProtocol = 0, .bDeviceProtocol = 0,
.bMaxPacketSize0 = 64, .bMaxPacketSize0 = 64,
.idVendor = 0x0483, .idVendor = 0x0483,
.idProduct = 0x5710, .idProduct = 0x5710,
.bcdDevice = 0x0200, .bcdDevice = 0x0200,
.iManufacturer = 1, .iManufacturer = 1,
.iProduct = 2, .iProduct = 2,
.iSerialNumber = 3, .iSerialNumber = 3,
.bNumConfigurations = 1, .bNumConfigurations = 1,
}; };
/* I have no idea what this means. I haven't read the HID spec. */ /* I have no idea what this means. I haven't read the HID spec. */
@ -174,10 +176,10 @@ static int hid_control_request(struct usb_setup_data *req, u8 **buf, u16 *len,
{ {
(void)complete; (void)complete;
if((req->bmRequestType != 0x81) || if((req->bmRequestType != 0x81) ||
(req->bRequest != USB_REQ_GET_DESCRIPTOR) || (req->bRequest != USB_REQ_GET_DESCRIPTOR) ||
(req->wValue != 0x2200)) (req->wValue != 0x2200))
return 0; return 0;
/* Handle the HID report descriptor */ /* Handle the HID report descriptor */
*buf = (u8*)hid_report_descriptor; *buf = (u8*)hid_report_descriptor;
@ -192,7 +194,7 @@ static void dfu_detach_complete(struct usb_setup_data *req)
(void)req; (void)req;
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO10); GPIO_CNF_OUTPUT_PUSHPULL, GPIO10);
gpio_set(GPIOA, GPIO10); gpio_set(GPIOA, GPIO10);
scb_reset_core(); scb_reset_core();
@ -201,10 +203,10 @@ static void dfu_detach_complete(struct usb_setup_data *req)
static int dfu_control_request(struct usb_setup_data *req, u8 **buf, u16 *len, static int dfu_control_request(struct usb_setup_data *req, u8 **buf, u16 *len,
void (**complete)(struct usb_setup_data *req)) void (**complete)(struct usb_setup_data *req))
{ {
(void)buf; (void)buf;
(void)len; (void)len;
if((req->bmRequestType != 0x21) || (req->bRequest != DFU_DETACH)) if((req->bmRequestType != 0x21) || (req->bRequest != DFU_DETACH))
return 0; /* Only accept class request */ return 0; /* Only accept class request */
*complete = dfu_detach_complete; *complete = dfu_detach_complete;
@ -230,7 +232,7 @@ static void hid_set_config(u16 wValue)
dfu_control_request); dfu_control_request);
#endif #endif
systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8); systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8);
systick_set_reload(100000); systick_set_reload(100000);
systick_interrupt_enable(); systick_interrupt_enable();
systick_counter_enable(); systick_counter_enable();
@ -238,41 +240,37 @@ static void hid_set_config(u16 wValue)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hsi_out_48mhz(); int usb_connect_blink = 0;
rcc_clock_setup_in_hse_12mhz_out_72mhz();
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN); rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
/* USB_DETECT as input */ /* USB_DETECT as input */
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, gpio_set_mode(GPIOA, GPIO_MODE_INPUT,
GPIO_CNF_INPUT_FLOAT, GPIO8); GPIO_CNF_INPUT_FLOAT, GPIO8);
/* disconnect USB_DISC, as output */
gpio_set(GPIOC, GPIO15);
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO15);
/* green LED off, as output */ /* green LED off, as output */
gpio_clear(GPIOC, GPIO13); gpio_set(GPIOC, GPIO2);
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO13); GPIO_CNF_OUTPUT_PUSHPULL, GPIO2);
usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings); usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings);
usbd_register_set_config_callback(hid_set_config); usbd_register_set_config_callback(hid_set_config);
/* delay some seconds to show that pull-up switch works */ /* delay some seconds to show that pull-up switch works */
{int i; for (i=0;i<0x800000;i++);} {int i; for (i=0;i<0x800000;i++) asm("nop");}
/* wait for USB Vbus */ /* wait for USB Vbus */
while(gpio_get(GPIOA, GPIO8) == 0); while(gpio_get(GPIOA, GPIO8) == 0) asm("nop");
/* green LED on, connect USB */ /* green LED on, connect USB */
gpio_set(GPIOC, GPIO13); gpio_clear(GPIOC, GPIO2);
gpio_clear(GPIOC, GPIO15); //OTG_FS_GCCFG &= ~OTG_FS_GCCFG_VBUSBSEN;
while (1) while (1)
usbd_poll(); usbd_poll();
} }

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

@ -27,5 +27,5 @@ MEMORY
} }
/* Include the common ld script. */ /* 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
void clock_setup(void) void clock_setup(void)
{ {

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

@ -27,5 +27,5 @@ MEMORY
} }
/* Include the common ld script. */ /* 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/timer.h> #include <libopencm3/stm32/timer.h>
// #define COMPARE // #define COMPARE

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

@ -27,5 +27,5 @@ MEMORY
} }
/* Include the common ld script. */ /* 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/>. * 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/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/nvic.h> #include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/systick.h> #include <libopencm3/stm32/systick.h>
#include <libopencm3/stm32/can.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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
void clock_setup(void) void clock_setup(void)

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

@ -27,5 +27,5 @@ MEMORY
} }
/* Include the common ld script. */ /* 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/timer.h> #include <libopencm3/stm32/timer.h>
// #define COMPARE // #define COMPARE

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

@ -27,5 +27,5 @@ MEMORY
} }
/* Include the common ld script. */ /* 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/>. * 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/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/nvic.h> #include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/systick.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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
void clock_setup(void) void clock_setup(void)
@ -47,7 +47,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_RE_TX); GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_RE_TX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 230400); usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX); 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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/nvic.h> #include <libopencm3/stm32/nvic.h>
@ -52,7 +52,7 @@ void usart_setup(void)
GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RE_RX); GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RE_RX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 230400); usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_parity(USART1, USART_PARITY_NONE); 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 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/>. * 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/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/adc.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/adc.h>
void usart_setup(void) void usart_setup(void)
{ {
@ -34,7 +34,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 115200); usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX_RX); 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 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/>. * 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/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/dma.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/dma.h>
void usart_setup(void) void usart_setup(void)
{ {
@ -34,7 +34,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 115200); usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX_RX); 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 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 #define DOGM128_H
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/spi.h> #include <libopencm3/stm32/spi.h>
/* PB10 GPIO - ~RESET /* 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/>. * 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/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/timer.h> #include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/nvic.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 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/>. * 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/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/i2c.h> #include <libopencm3/stm32/i2c.h>
#include "stts75.h" #include "stts75.h"
@ -35,7 +35,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 115200); usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX_RX); 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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/rtc.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/rtc.h>
#include <libopencm3/stm32/pwr.h> #include <libopencm3/stm32/pwr.h>
#include <libopencm3/stm32/nvic.h> #include <libopencm3/stm32/nvic.h>
@ -43,7 +43,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 38400); usart_set_baudrate(USART1, 38400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX); 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 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/>. * 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/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/nvic.h> #include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/systick.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 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/>. * 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/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/timer.h> #include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/nvic.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 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 <stdlib.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/cdc.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 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 <string.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/scb.h> #include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/dfu.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 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 <stdlib.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/systick.h> #include <libopencm3/stm32/systick.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h> #include <libopencm3/usb/hid.h>
@ -28,7 +28,7 @@
#define INCLUDE_DFU_INTERFACE #define INCLUDE_DFU_INTERFACE
#ifdef INCLUDE_DFU_INTERFACE #ifdef INCLUDE_DFU_INTERFACE
#include <libopencm3/stm32/scb.h> #include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/dfu.h> #include <libopencm3/usb/dfu.h>
#endif #endif

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

@ -25,5 +25,5 @@ MEMORY
} }
/* Include the common ld script. */ /* 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
u16 exti_line_state; 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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
/* Set STM32 to 24 MHz. */ /* Set STM32 to 24 MHz. */
void clock_setup(void) 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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
void gpio_setup(void) 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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/f1/rtc.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/rtc.h>
#include <libopencm3/stm32/pwr.h> #include <libopencm3/stm32/pwr.h>
#include <libopencm3/stm32/nvic.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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
void clock_setup(void) 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 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/>. * 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/nvic.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/exti.h> #include <libopencm3/stm32/exti.h>
u16 exti_line_state; 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 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/>. * 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/nvic.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/exti.h> #include <libopencm3/stm32/exti.h>
u16 exti_line_state; 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 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/>. * 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/nvic.h>
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/exti.h> #include <libopencm3/stm32/exti.h>
#define FALLING 0 #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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
void clock_setup(void) 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 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 <stdlib.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#define SPI_BANK GPIOB #define SPI_BANK GPIOB
#define SCLK_PIN GPIO13 #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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
void gpio_setup(void) 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 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/>. * 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/nvic.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/timer.h> #include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/exti.h> #include <libopencm3/stm32/exti.h>
#define FALLING 0 #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 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/>. * 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> #include <libopencm3/stm32/spi.h>
void clock_setup(void) 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 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/>. * 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/nvic.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/gpio.h>
#include <libopencm3/stm32/timer.h> #include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/exti.h> #include <libopencm3/stm32/exti.h>
u16 frequency_sequence[18] = { 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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/dbgmcu.h> #include <libopencm3/stm32/dbgmcu.h>
#include <libopencm3/cm3/scs.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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
void clock_setup(void) void clock_setup(void)
@ -40,7 +40,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 38400); usart_set_baudrate(USART1, 38400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX); usart_set_mode(USART1, USART_MODE_TX);
@ -55,7 +55,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX); GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART2, 38400); usart_set_baudrate(USART2, 38400, rcc_ppre1_frequency);
usart_set_databits(USART2, 8); usart_set_databits(USART2, 8);
usart_set_stopbits(USART2, USART_STOPBITS_1); usart_set_stopbits(USART2, USART_STOPBITS_1);
usart_set_mode(USART2, USART_MODE_TX); usart_set_mode(USART2, USART_MODE_TX);
@ -70,7 +70,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART3_TX); GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART3_TX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART3, 38400); usart_set_baudrate(USART3, 38400, rcc_ppre1_frequency);
usart_set_databits(USART3, 8); usart_set_databits(USART3, 8);
usart_set_stopbits(USART3, USART_STOPBITS_1); usart_set_stopbits(USART3, USART_STOPBITS_1);
usart_set_mode(USART3, USART_MODE_TX); 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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/nvic.h> #include <libopencm3/stm32/nvic.h>
@ -49,7 +49,7 @@ void usart_setup(void)
GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX); GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 230400); usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_parity(USART1, USART_PARITY_NONE); 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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/nvic.h> #include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/systick.h> #include <libopencm3/stm32/systick.h>
@ -145,7 +145,7 @@ void usart_setup(void)
GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX); GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 230400); usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_parity(USART1, USART_PARITY_NONE); 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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/nvic.h> #include <libopencm3/stm32/nvic.h>
@ -46,7 +46,7 @@ void usart_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 230400); usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_parity(USART1, USART_PARITY_NONE); 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 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 <stdlib.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/cdc.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 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 <string.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/scb.h> #include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/dfu.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 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 <stdlib.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/systick.h> #include <libopencm3/stm32/systick.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h> #include <libopencm3/usb/hid.h>
@ -28,7 +28,7 @@
#define INCLUDE_DFU_INTERFACE #define INCLUDE_DFU_INTERFACE
#ifdef INCLUDE_DFU_INTERFACE #ifdef INCLUDE_DFU_INTERFACE
#include <libopencm3/stm32/scb.h> #include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/dfu.h> #include <libopencm3/usb/dfu.h>
#endif #endif

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

@ -27,5 +27,5 @@ MEMORY
} }
/* Include the common ld script. */ /* 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 <string.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/scb.h> #include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/dfu.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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
void clock_setup(void) 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 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/>. * 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/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/usb/usbd.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 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 the common ld script. */
INCLUDE libopencm3_stm32.ld INCLUDE libopencm3_stm32f2.ld

4
lib/lm3s/Makefile
View File

@ -19,8 +19,8 @@
LIBNAME = libopencm3_lm3s LIBNAME = libopencm3_lm3s
PREFIX ?= arm-none-eabi PREFIX ?= arm-none-eabi
# PREFIX ?= arm-elf #PREFIX ?= arm-elf
CC = $(PREFIX)-gcc CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar AR = $(PREFIX)-ar
CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \ CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \

4
lib/lpc13xx/Makefile
View File

@ -19,8 +19,8 @@
LIBNAME = libopencm3_lpc13xx LIBNAME = libopencm3_lpc13xx
PREFIX ?= arm-none-eabi PREFIX ?= arm-none-eabi
# PREFIX ?= arm-elf #PREFIX ?= arm-elf
CC = $(PREFIX)-gcc CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar AR = $(PREFIX)-ar
CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \ CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \

Some files were not shown because too many files have changed in this diff Show More