From 33373dd250ae27edded5d92c4a3d5090d4957a4d Mon Sep 17 00:00:00 2001 From: "S.J.R. van Schaik" Date: Fri, 28 Jul 2017 13:15:07 +0200 Subject: [PATCH] main: swap around USART1 and USART2 to be compatible with tbm-schematics --- scripts/Makefile.stm32f0 | 1 - source/main.c | 4 ++-- source/platform/stm32f0/Makefile | 1 + source/{drivers/usart_console.c => platform/stm32f0/usart.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename source/{drivers/usart_console.c => platform/stm32f0/usart.c} (100%) diff --git a/scripts/Makefile.stm32f0 b/scripts/Makefile.stm32f0 index eb6e35d..9070df3 100644 --- a/scripts/Makefile.stm32f0 +++ b/scripts/Makefile.stm32f0 @@ -23,7 +23,6 @@ STLINK_PORT ?= :4242 obj-y += source/core/spi.o obj-y += source/drivers/spi_flash.o -obj-y += source/drivers/usart_console.o $(OPENCM3_DIR)/lib/lib$(OPENCM3_LIBNAME).a: @if [ ! -e libopencm3/.git ]; then \ diff --git a/source/main.c b/source/main.c index 3c87082..e0f6dbf 100644 --- a/source/main.c +++ b/source/main.c @@ -51,8 +51,8 @@ int main(void) gpio_init(); rtc_init(NULL); - user_con = console_init(0); - admin_con = console_init(1); + user_con = console_init(1); + admin_con = console_init(0); flash = flash_probe(); flash = ftl_mount(flash); diff --git a/source/platform/stm32f0/Makefile b/source/platform/stm32f0/Makefile index fc896b0..10ead10 100644 --- a/source/platform/stm32f0/Makefile +++ b/source/platform/stm32f0/Makefile @@ -2,3 +2,4 @@ obj-y += source/platform/stm32f0/gpio.o obj-y += source/platform/stm32f0/rcc.o obj-y += source/platform/stm32f0/rtc.o obj-y += source/platform/stm32f0/spi.o +obj-y += source/platform/stm32f0/usart.o diff --git a/source/drivers/usart_console.c b/source/platform/stm32f0/usart.c similarity index 100% rename from source/drivers/usart_console.c rename to source/platform/stm32f0/usart.c