aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32/obldc
diff options
context:
space:
mode:
Diffstat (limited to 'examples/stm32/obldc')
-rw-r--r--examples/stm32/obldc/Makefile56
-rw-r--r--examples/stm32/obldc/usart_irq/usart_irq.c4
2 files changed, 2 insertions, 58 deletions
diff --git a/examples/stm32/obldc/Makefile b/examples/stm32/obldc/Makefile
deleted file mode 100644
index 626d889..0000000
--- a/examples/stm32/obldc/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-##
-## This file is part of the libopencm3 project.
-##
-## Copyright (C) 2010 Piotr Esden-Tempski <piotr@esden.net>
-##
-## 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
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program. If not, see <http://www.gnu.org/licenses/>.
-##
-
-# Be silent per default, but 'make V=1' will show all compiler calls.
-ifneq ($(V),1)
-Q := @
-# Do not print "Entering directory ...".
-MAKEFLAGS += --no-print-directory
-endif
-
-all: led systick usart can
-
-led:
- @printf " BUILD examples/stm32/obldc/led\n"
- $(Q)$(MAKE) -C led
-
-systick:
- @printf " BUILD examples/stm32/obldc/systick\n"
- $(Q)$(MAKE) -C systick
-
-usart:
- @printf " BUILD examples/stm32/obldc/usart\n"
- $(Q)$(MAKE) -C usart
-
-can:
- @printf " BUILD examples/stm32/obldc/can\n"
- $(Q)$(MAKE) -C can
-
-clean:
- @printf " CLEAN examples/stm32/obldc/led\n"
- $(Q)$(MAKE) -C led clean
- @printf " CLEAN examples/stm32/obldc/systick\n"
- $(Q)$(MAKE) -C systick clean
- @printf " CLEAN examples/stm32/obldc/usart\n"
- $(Q)$(MAKE) -C usart clean
- @printf " CLEAN examples/stm32/obldc/can\n"
- $(Q)$(MAKE) -C can clean
-
-.PHONY: led systick usart can
-
diff --git a/examples/stm32/obldc/usart_irq/usart_irq.c b/examples/stm32/obldc/usart_irq/usart_irq.c
index 7e5f971..82320c1 100644
--- a/examples/stm32/obldc/usart_irq/usart_irq.c
+++ b/examples/stm32/obldc/usart_irq/usart_irq.c
@@ -80,7 +80,7 @@ void usart1_isr(void)
static u8 data = 'A';
/* Check if we were called because of RXNE. */
- if (((USART_CR1(USART1) & USART_SR_RXNEIE) != 0) &&
+ if (((USART_CR1(USART1) & USART_CR1_RXNEIE) != 0) &&
((USART_SR(USART1) & USART_SR_RXNE) != 0)) {
/* Indicate that we got data. */
gpio_toggle(GPIOA, GPIO6);
@@ -93,7 +93,7 @@ void usart1_isr(void)
}
/* Check if we were called because of TXE. */
- if ((USART_CR1(USART1) & USART_SR_TXEIE) != 0) &&
+ if (((USART_CR1(USART1) & USART_CR1_TXEIE) != 0) &&
((USART_SR(USART1) & USART_SR_TXE) != 0)) {
/* Indicate that we are sending out data. */
gpio_toggle(GPIOA, GPIO7);